Commit header panel. File type icons. Docs page.

diff --git a/src/com/gitblit/utils/JGitUtils.java b/src/com/gitblit/utils/JGitUtils.java
index eddd3df610bc4671ba0ccdea31921cb6a39749eb..e5dbfd2d85a56308606af81578ccd18306fe859b 100644 (file)
--- a/src/com/gitblit/utils/JGitUtils.java
+++ b/src/com/gitblit/utils/JGitUtils.java
@@ -8,6 +8,7 @@ import java.text.DateFormat;
 import java.text.ParseException;\r
 import java.text.SimpleDateFormat;\r
 import java.util.ArrayList;\r
+import java.util.Collection;\r
 import java.util.Collections;\r
 import java.util.Date;\r
 import java.util.HashMap;\r
@@ -43,8 +44,10 @@ import org.eclipse.jgit.revwalk.RevWalk;
 import org.eclipse.jgit.revwalk.filter.RevFilter;\r
 import org.eclipse.jgit.treewalk.TreeWalk;\r
 import org.eclipse.jgit.treewalk.filter.AndTreeFilter;\r
+import org.eclipse.jgit.treewalk.filter.OrTreeFilter;\r
 import org.eclipse.jgit.treewalk.filter.PathFilter;\r
 import org.eclipse.jgit.treewalk.filter.PathFilterGroup;\r
+import org.eclipse.jgit.treewalk.filter.PathSuffixFilter;\r
 import org.eclipse.jgit.treewalk.filter.TreeFilter;\r
 import org.eclipse.jgit.util.io.DisabledOutputStream;\r
 import org.slf4j.Logger;\r
@@ -352,6 +355,42 @@ public class JGitUtils {
                }\r
                return list;\r
        }\r
+       \r
+       public static List<PathModel> getDocuments(Repository r, List<String> extensions) {\r
+               List<PathModel> list = new ArrayList<PathModel>();\r
+               RevCommit commit = getCommit(r, Constants.HEAD);                \r
+               final TreeWalk walk = new TreeWalk(r);\r
+               try {\r
+                       walk.addTree(commit.getTree());\r
+                       if (extensions != null && extensions.size() > 0) {\r
+                               Collection<TreeFilter> suffixFilters = new ArrayList<TreeFilter>();\r
+                               for (String extension:extensions) {\r
+                                       if (extension.charAt(0) == '.') {\r
+                                               suffixFilters.add(PathSuffixFilter.create(extension));\r
+                                       } else {\r
+                                               // escape the . since this is a regexp filter\r
+                                               suffixFilters.add(PathSuffixFilter.create("\\." + extension));\r
+                                       }\r
+                               }\r
+                               TreeFilter filter = OrTreeFilter.create(suffixFilters);\r
+                               walk.setFilter(filter);\r
+                               walk.setRecursive(true);\r
+                               while (walk.next()) {\r
+                                       list.add(getPathModel(walk, null, commit));\r
+                               }\r
+                       } else {\r
+                               while (walk.next()) {\r
+                                       list.add(getPathModel(walk, null, commit));\r
+                               }\r
+                       }\r
+               } catch (IOException e) {\r
+                       LOGGER.error("Failed to get files for commit " + commit.getName(), e);\r
+               } finally {\r
+                       walk.release();\r
+               }\r
+               Collections.sort(list);\r
+               return list;\r
+       }\r
 \r
        public static Map<ChangeType, AtomicInteger> getChangedPathsStats(List<PathChangeModel> paths) {\r
                Map<ChangeType, AtomicInteger> stats = new HashMap<ChangeType, AtomicInteger>();\r
@@ -895,10 +934,6 @@ public class JGitUtils {
                return metrics;\r
        }\r
        \r
-       public static RefModel getDocumentsBranch(Repository r) {\r
-               return getTicketsBranch(r);\r
-       }\r
-\r
        public static RefModel getTicketsBranch(Repository r) {\r
                RefModel ticgitBranch = null;\r
                try {\r

diff --git a/src/com/gitblit/wicket/BasePage.html b/src/com/gitblit/wicket/BasePage.html
index c3c56efcbe8e6605b3e84b97d62183967beb8731..b88192b562fc599ce9cbafd87f1628d541aad5b0 100644 (file)
--- a/src/com/gitblit/wicket/BasePage.html
+++ b/src/com/gitblit/wicket/BasePage.html
@@ -21,7 +21,8 @@
                                        <img src="resources/gitblt_25.png" width="79" height="25" alt="gitblit" class="logo"/>\r
                                </wicket:link>\r
                        </a>\r
-                       <a href="/"><span wicket:id="siteName">[site name]</span></a> / <span wicket:id="repositoryName">[repository name]</span> <span wicket:id="pageName">[page name]</span> \r
+                       <a href="/"><span wicket:id="siteName">[site name]</span></a> / <span wicket:id="repositoryName">[repository name]</span> <span wicket:id="pageName">[page name]</span>\r
+                       <div style="float:none;" wicket:id="feedback">[Feedback Panel]</div> \r
                </div>\r
 \r
                <!-- page content -->\r

diff --git a/src/com/gitblit/wicket/BasePage.java b/src/com/gitblit/wicket/BasePage.java
index 33feacb34a7f5752c97580655d498430509c2c2b..8daab447c4a84c56c62b99a619e06f62ba0a796c 100644 (file)
--- a/src/com/gitblit/wicket/BasePage.java
+++ b/src/com/gitblit/wicket/BasePage.java
@@ -7,6 +7,7 @@ import javax.servlet.http.HttpServletRequest;
 import org.apache.wicket.PageParameters;\r
 import org.apache.wicket.markup.html.WebPage;\r
 import org.apache.wicket.markup.html.basic.Label;\r
+import org.apache.wicket.markup.html.panel.FeedbackPanel;\r
 import org.apache.wicket.protocol.http.servlet.ServletWebRequest;\r
 import org.slf4j.Logger;\r
 import org.slf4j.LoggerFactory;\r
@@ -45,6 +46,9 @@ public abstract class BasePage extends WebPage {
                add(new LinkPanel("repositoryName", null, repositoryName, SummaryPage.class, WicketUtils.newRepositoryParameter(repositoryName)));\r
                add(new Label("pageName", pageName));\r
 \r
+               // Feedback panel for info, warning, and non-fatal error messages\r
+               add(new FeedbackPanel("feedback"));\r
+\r
                // footer\r
                if (GitBlit.self().settings().getBoolean(Keys.web.authenticateViewPages, true)\r
                                || GitBlit.self().settings().getBoolean(Keys.web.authenticateAdminPages, true)) {\r

diff --git a/src/com/gitblit/wicket/GitBlitWebApp.java b/src/com/gitblit/wicket/GitBlitWebApp.java
index e3c41cd647dbf0675bd55febabc1fc48719f7cfe..7410dfa5754cb870619b214e5d73343a2adbbd33 100644 (file)
--- a/src/com/gitblit/wicket/GitBlitWebApp.java
+++ b/src/com/gitblit/wicket/GitBlitWebApp.java
@@ -15,6 +15,7 @@ import com.gitblit.wicket.pages.BlobPage;
 import com.gitblit.wicket.pages.BranchesPage;\r
 import com.gitblit.wicket.pages.CommitDiffPage;\r
 import com.gitblit.wicket.pages.CommitPage;\r
+import com.gitblit.wicket.pages.DocsPage;\r
 import com.gitblit.wicket.pages.HistoryPage;\r
 import com.gitblit.wicket.pages.LogPage;\r
 import com.gitblit.wicket.pages.MarkdownPage;\r
@@ -69,6 +70,7 @@ public class GitBlitWebApp extends WebApplication {
                mount(new MixedParamUrlCodingStrategy("/ticket", TicketPage.class, new String[] { "r", "h", "f" }));\r
 \r
                // setup the markdown urls\r
+               mount(new MixedParamUrlCodingStrategy("/docs", DocsPage.class, new String[] { "r" }));\r
                mount(new MixedParamUrlCodingStrategy("/markdown", MarkdownPage.class, new String[] { "r", "h", "f" }));\r
                \r
                // setup login/logout urls, if we are using authentication\r

diff --git a/src/com/gitblit/wicket/GitBlitWebApp.properties b/src/com/gitblit/wicket/GitBlitWebApp.properties
index 18b1e789929a8b3bd858a0d50e95b35bed48613a..367ae3df246e2120369af67f7282e138a5ad2019 100644 (file)
--- a/src/com/gitblit/wicket/GitBlitWebApp.properties
+++ b/src/com/gitblit/wicket/GitBlitWebApp.properties
@@ -70,4 +70,9 @@ gb.searchTooltip = Search Git:Blit
 gb.rename = rename\r
 gb.delete = delete\r
 gb.docs = docs\r
-gb.restrictedAccess = restricted access
\ No newline at end of file
+gb.restrictedAccess = restricted access\r
+gb.name = name\r
+gb.group = group\r
+gb.description = description\r
+gb.enableTickets = enable tickets\r
+gb.enableDocs = enable docs
\ No newline at end of file

diff --git a/src/com/gitblit/wicket/WicketUtils.java b/src/com/gitblit/wicket/WicketUtils.java
index fb8e29676f2538dd9239f9cf29a6232d751deee5..bf2bcb9332fde0740395a0d3f572500f5862a2e8 100644 (file)
--- a/src/com/gitblit/wicket/WicketUtils.java
+++ b/src/com/gitblit/wicket/WicketUtils.java
@@ -3,6 +3,7 @@ package com.gitblit.wicket;
 import java.text.DateFormat;\r
 import java.text.SimpleDateFormat;\r
 import java.util.Date;\r
+import java.util.List;\r
 import java.util.TimeZone;\r
 \r
 import org.apache.wicket.Component;\r
@@ -83,10 +84,55 @@ public class WicketUtils {
                return label;\r
        }\r
 \r
+       public static ContextImage getFileImage(String wicketId, String filename) {\r
+               filename = filename.toLowerCase();\r
+               if (filename.endsWith(".java")) {\r
+                       return newImage(wicketId, "file_java_16x16.png");\r
+               } else if (filename.endsWith(".rb")) {\r
+                       return newImage(wicketId, "file_ruby_16x16.png");\r
+               } else if (filename.endsWith(".php")) {\r
+                       return newImage(wicketId, "file_php_16x16.png");\r
+               } else if (filename.endsWith(".cs")) {\r
+                       return newImage(wicketId, "file_cs_16x16.png");\r
+               } else if (filename.endsWith(".cpp")) {\r
+                       return newImage(wicketId, "file_cpp_16x16.png");\r
+               } else if (filename.endsWith(".c")) {\r
+                       return newImage(wicketId, "file_c_16x16.png");\r
+               } else if (filename.endsWith(".h")) {\r
+                       return newImage(wicketId, "file_h_16x16.png");\r
+               } else if (filename.endsWith(".sln")) {\r
+                       return newImage(wicketId, "file_vs_16x16.png");\r
+               } else if (filename.endsWith(".csv") || filename.endsWith(".xls") || filename.endsWith(".xlsx")) {\r
+                       return newImage(wicketId, "file_excel_16x16.png");\r
+               } else if (filename.endsWith(".doc") || filename.endsWith(".docx")) {\r
+                       return newImage(wicketId, "file_word_16x16.png");\r
+               } else if (filename.endsWith(".ppt")) {\r
+                       return newImage(wicketId, "file_ppt_16x16.png");\r
+               } else if (filename.endsWith(".zip")) {\r
+                       return newImage(wicketId, "file_zip_16x16.png");\r
+               } else if (filename.endsWith(".pdf")) {\r
+                       return newImage(wicketId, "file_acrobat_16x16.png");\r
+               } else if (filename.endsWith(".htm") || filename.endsWith(".html")) {\r
+                       return newImage(wicketId, "file_world_16x16.png");\r
+               } else if (filename.endsWith(".xml")) {\r
+                       return newImage(wicketId, "file_code_16x16.png");\r
+               } else if (filename.endsWith(".properties")) {\r
+                       return newImage(wicketId, "file_settings_16x16.png");\r
+               }\r
+\r
+               List<String> mdExtensions = GitBlit.self().settings().getStrings(Keys.web.markdownExtensions);\r
+               for (String ext : mdExtensions) {\r
+                       if (filename.endsWith('.' + ext.toLowerCase())) {\r
+                               return newImage(wicketId, "file_world_16x16.png");\r
+                       }\r
+               }\r
+               return newImage(wicketId, "file_16x16.png");\r
+       }\r
+\r
        public static ContextImage newClearPixel(String wicketId) {\r
                return newImage(wicketId, "pixel.png");\r
        }\r
-       \r
+\r
        public static ContextImage newBlankImage(String wicketId) {\r
                return newImage(wicketId, "blank.png");\r
        }\r
@@ -102,7 +148,7 @@ public class WicketUtils {
                }\r
                return img;\r
        }\r
-       \r
+\r
        public static ContextRelativeResource getResource(String file) {\r
                return new ContextRelativeResource("/com/gitblit/wicket/resources/" + file);\r
        }\r

diff --git a/src/com/gitblit/wicket/pages/BlobDiffPage.html b/src/com/gitblit/wicket/pages/BlobDiffPage.html
index a20b24cad24d1eb2f63f4e71007068382fe0cf1d..12271696a3b1cc3bb1fea0c1fec97acdb9c163ae 100644 (file)
--- a/src/com/gitblit/wicket/pages/BlobDiffPage.html
+++ b/src/com/gitblit/wicket/pages/BlobDiffPage.html
@@ -15,8 +15,8 @@
                <span wicket:id="blameLink">[blame link]</span> | <a wicket:id="historyLink"><wicket:message key="gb.history"></wicket:message></a> | <a wicket:id="patchLink"><wicket:message key="gb.patch"></wicket:message></a> | <a wicket:id="commitLink"><wicket:message key="gb.commit"></wicket:message></a> | <a wicket:id="commitDiffLink"><wicket:message key="gb.commitdiff"></wicket:message></a>\r
        </div>  \r
        \r
-       <!-- shortlog header -->\r
-       <div class="header" wicket:id="shortlog">[shortlog header]</div>\r
+       <!-- commit header -->\r
+       <div wicket:id="commitHeader">[commit header]</div>\r
 \r
        <!-- breadcrumbs -->\r
        <div wicket:id="breadcrumbs">[breadcrumbs]</div>\r

diff --git a/src/com/gitblit/wicket/pages/BlobDiffPage.java b/src/com/gitblit/wicket/pages/BlobDiffPage.java
index 4bb281c98e7f6ca6e0dd5d9d04c646b016998065..983b3c48ef3c19f323205ca23fadb5d70da7f49a 100644 (file)
--- a/src/com/gitblit/wicket/pages/BlobDiffPage.java
+++ b/src/com/gitblit/wicket/pages/BlobDiffPage.java
@@ -11,9 +11,9 @@ import com.gitblit.Keys;
 import com.gitblit.utils.JGitUtils;\r
 import com.gitblit.utils.JGitUtils.DiffOutputType;\r
 import com.gitblit.utils.StringUtils;\r
-import com.gitblit.wicket.LinkPanel;\r
 import com.gitblit.wicket.RepositoryPage;\r
 import com.gitblit.wicket.WicketUtils;\r
+import com.gitblit.wicket.panels.CommitHeaderPanel;\r
 import com.gitblit.wicket.panels.PathBreadcrumbsPanel;\r
 \r
 public class BlobDiffPage extends RepositoryPage {\r
@@ -48,7 +48,7 @@ public class BlobDiffPage extends RepositoryPage {
                add(new Label("blameLink", getString("gb.blame")));\r
                add(new BookmarkablePageLink<Void>("historyLink", HistoryPage.class, WicketUtils.newPathParameter(repositoryName, objectId, blobPath)));\r
 \r
-               add(new LinkPanel("shortlog", "title", commit.getShortMessage(), CommitPage.class, newCommitParameter()));\r
+               add(new CommitHeaderPanel("commitHeader", repositoryName, commit));\r
 \r
                add(new PathBreadcrumbsPanel("breadcrumbs", repositoryName, blobPath, objectId));\r
 \r

diff --git a/src/com/gitblit/wicket/pages/BlobPage.html b/src/com/gitblit/wicket/pages/BlobPage.html
index 2ca76e3b7e0bad4bbb5e80315ab12a7d59bfa0b8..80ff059dc219aa103136dce562048da65f2a35bc 100644 (file)
--- a/src/com/gitblit/wicket/pages/BlobPage.html
+++ b/src/com/gitblit/wicket/pages/BlobPage.html
@@ -24,8 +24,8 @@
                        <span wicket:id="blameLink">[blame link]</span> | <a wicket:id="historyLink"><wicket:message key="gb.history"></wicket:message></a> | <a wicket:id="rawLink"><wicket:message key="gb.raw"></wicket:message></a> | <a wicket:id="headLink"><wicket:message key="gb.head"></wicket:message></a>\r
                </div>  \r
        \r
-               <!-- shortlog header -->\r
-               <div class="header" wicket:id="shortlog">[shortlog header]</div>\r
+               <!-- commit header -->\r
+               <div wicket:id="commitHeader">[commit header]</div>\r
 \r
                <!-- breadcrumbs -->\r
                <div wicket:id="breadcrumbs">[breadcrumbs]</div>\r

diff --git a/src/com/gitblit/wicket/pages/BlobPage.java b/src/com/gitblit/wicket/pages/BlobPage.java
index 335d25a19b9ec58cd791d215e8b422ada1a4db8b..ca2afe9e6f5b16bd5023a50da78fc2dd00711384 100644 (file)
--- a/src/com/gitblit/wicket/pages/BlobPage.java
+++ b/src/com/gitblit/wicket/pages/BlobPage.java
@@ -14,9 +14,9 @@ import org.eclipse.jgit.revwalk.RevCommit;
 import com.gitblit.GitBlit;\r
 import com.gitblit.Keys;\r
 import com.gitblit.utils.JGitUtils;\r
-import com.gitblit.wicket.LinkPanel;\r
 import com.gitblit.wicket.RepositoryPage;\r
 import com.gitblit.wicket.WicketUtils;\r
+import com.gitblit.wicket.panels.CommitHeaderPanel;\r
 import com.gitblit.wicket.panels.PathBreadcrumbsPanel;\r
 \r
 public class BlobPage extends RepositoryPage {\r
@@ -49,7 +49,7 @@ public class BlobPage extends RepositoryPage {
                add(new BookmarkablePageLink<Void>("rawLink", RawPage.class, WicketUtils.newPathParameter(repositoryName, objectId, blobPath)));\r
                add(new BookmarkablePageLink<Void>("headLink", BlobPage.class, WicketUtils.newPathParameter(repositoryName, Constants.HEAD, blobPath)));\r
 \r
-               add(new LinkPanel("shortlog", "title", commit.getShortMessage(), CommitPage.class, newCommitParameter()));\r
+               add(new CommitHeaderPanel("commitHeader", repositoryName, commit));\r
 \r
                add(new PathBreadcrumbsPanel("breadcrumbs", repositoryName, blobPath, objectId));\r
 \r

diff --git a/src/com/gitblit/wicket/pages/CommitDiffPage.html b/src/com/gitblit/wicket/pages/CommitDiffPage.html
index cc7404ad4724d9a492a9aa09a933508fd342faf4..4e3a26855427cf5dc08438683db7877e278c145f 100644 (file)
--- a/src/com/gitblit/wicket/pages/CommitDiffPage.html
+++ b/src/com/gitblit/wicket/pages/CommitDiffPage.html
@@ -14,14 +14,17 @@
        <div class="page_nav2">\r
                <wicket:message key="gb.parent"></wicket:message>: <span wicket:id="parentLink">[parent link]</span> | <a wicket:id="patchLink"><wicket:message key="gb.patch"></wicket:message></a> | <a wicket:id="commitLink"><wicket:message key="gb.commit"></wicket:message></a>\r
        </div>  \r
-\r
-       <!-- commit legend -->\r
-       <div style="text-align:right;" wicket:id="commitLegend"></div>\r
        \r
-       <!-- shortlog header -->\r
-       <div class="header" wicket:id="shortlog">[shortlog header]</div>\r
+       <!-- commit header -->\r
+       <div wicket:id="commitHeader">[commit header]</div>\r
 \r
        <!-- changed paths -->\r
+       <div style="padding-top:15px;">\r
+               <!-- commit legend -->\r
+               <div style="text-align:right;" wicket:id="commitLegend"></div>\r
+       \r
+               <div class="header"><wicket:message key="gb.changedFiles">[changed files]</wicket:message></div>\r
+       </div>\r
        <table class="pretty">\r
                <tr wicket:id="changedPath">\r
                        <td class="changeType"><span wicket:id="changeType">[change type]</span></td>           \r

diff --git a/src/com/gitblit/wicket/pages/CommitDiffPage.java b/src/com/gitblit/wicket/pages/CommitDiffPage.java
index 0d4867ab3740735b9336e0aeb69e47a368634a1f..eb30e0888dd5bb35cf0067c2be500a999dd6535d 100644 (file)
--- a/src/com/gitblit/wicket/pages/CommitDiffPage.java
+++ b/src/com/gitblit/wicket/pages/CommitDiffPage.java
@@ -20,6 +20,7 @@ import com.gitblit.wicket.LinkPanel;
 import com.gitblit.wicket.RepositoryPage;\r
 import com.gitblit.wicket.WicketUtils;\r
 import com.gitblit.wicket.models.PathModel.PathChangeModel;\r
+import com.gitblit.wicket.panels.CommitHeaderPanel;\r
 import com.gitblit.wicket.panels.CommitLegendPanel;\r
 \r
 public class CommitDiffPage extends RepositoryPage {\r
@@ -48,7 +49,7 @@ public class CommitDiffPage extends RepositoryPage {
                add(new BookmarkablePageLink<Void>("patchLink", PatchPage.class, WicketUtils.newObjectParameter(repositoryName, objectId)));\r
                add(new BookmarkablePageLink<Void>("commitLink", CommitPage.class, WicketUtils.newObjectParameter(repositoryName, objectId)));\r
 \r
-               add(new LinkPanel("shortlog", "title", commit.getShortMessage(), CommitPage.class, newCommitParameter()));\r
+               add(new CommitHeaderPanel("commitHeader", repositoryName, commit));\r
 \r
                // changed paths list\r
                List<PathChangeModel> paths = JGitUtils.getFilesInCommit(r, commit);\r

diff --git a/src/com/gitblit/wicket/pages/CommitPage.html b/src/com/gitblit/wicket/pages/CommitPage.html
index 2e1f47c4d3200700fca1cef6e049cc376bfe3a4f..26013038e334ad9f0eada5535c61faf7ef354788 100644 (file)
--- a/src/com/gitblit/wicket/pages/CommitPage.html
+++ b/src/com/gitblit/wicket/pages/CommitPage.html
@@ -15,8 +15,8 @@
                <wicket:message key="gb.parent"></wicket:message>: <span wicket:id="parentLink">[parent link]</span> | <a wicket:id="patchLink"><wicket:message key="gb.patch"></wicket:message></a> | <span wicket:id="commitdiffLink">[commitdiff link]</span>\r
        </div>  \r
        \r
-       <!-- shortlog header -->\r
-       <div class="header" wicket:id="shortlog">[shortlog header]</div>\r
+       <!-- commit header -->\r
+       <div wicket:id="commitHeader">[commit header]</div>\r
        \r
        <!-- commit info -->\r
        <table class="plain">\r

diff --git a/src/com/gitblit/wicket/pages/CommitPage.java b/src/com/gitblit/wicket/pages/CommitPage.java
index cae500f6e64c5906ae60a57ea3634962725d4652..e724ca1222fa561e5133a80db8bc131e778b13b7 100644 (file)
--- a/src/com/gitblit/wicket/pages/CommitPage.java
+++ b/src/com/gitblit/wicket/pages/CommitPage.java
@@ -19,6 +19,7 @@ import com.gitblit.wicket.LinkPanel;
 import com.gitblit.wicket.RepositoryPage;\r
 import com.gitblit.wicket.WicketUtils;\r
 import com.gitblit.wicket.models.PathModel.PathChangeModel;\r
+import com.gitblit.wicket.panels.CommitHeaderPanel;\r
 import com.gitblit.wicket.panels.CommitLegendPanel;\r
 \r
 public class CommitPage extends RepositoryPage {\r
@@ -46,7 +47,7 @@ public class CommitPage extends RepositoryPage {
                }\r
                add(new BookmarkablePageLink<Void>("patchLink", PatchPage.class, WicketUtils.newObjectParameter(repositoryName, objectId)));\r
 \r
-               add(new LinkPanel("shortlog", "title", c.getShortMessage(), CommitDiffPage.class, WicketUtils.newObjectParameter(repositoryName, objectId)));\r
+               add(new CommitHeaderPanel("commitHeader", repositoryName, c));\r
 \r
                addRefs(r, c);\r
 \r

diff --git a/src/com/gitblit/wicket/pages/DocsPage.html b/src/com/gitblit/wicket/pages/DocsPage.html
new file mode 100644 (file)
index 0000000..c098bcf
--- /dev/null
+++ b/src/com/gitblit/wicket/pages/DocsPage.html
@@ -0,0 +1,31 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">\r
+<html xmlns="http://www.w3.org/1999/xhtml"  \r
+      xmlns:wicket="http://wicket.apache.org/dtds.data/wicket-xhtml1.3-strict.dtd"  \r
+      xml:lang="en"  \r
+      lang="en"> \r
+\r
+<body>\r
+<wicket:extend>\r
+       \r
+       <!-- page nav links --> \r
+       <div wicket:id="pageLinks">[page links]</div>\r
+       \r
+       <!-- header -->\r
+       <div style="margin-top:5px;" class="header"><span wicket:id="header">[header]</span></div>\r
+       \r
+       <!-- documents -->      \r
+       <table style="width:100%" class="pretty">\r
+               <tr wicket:id="document">\r
+                       <td class="icon"><img wicket:id="docIcon" /></td>\r
+                       <td><span wicket:id="docName"></span></td>                      \r
+                       <td class="size"><span wicket:id="docSize">[doc size]</span></td>\r
+                       <td class="treeLinks">\r
+                               <span class="link">\r
+                                       <a wicket:id="view"><wicket:message key="gb.view"></wicket:message></a> | <a wicket:id="raw"><wicket:message key="gb.raw"></wicket:message></a> | <a wicket:id="blame"><wicket:message key="gb.blame"></wicket:message></a> | <a wicket:id="history"><wicket:message key="gb.history"></wicket:message></a>\r
+                               </span> \r
+                       </td>\r
+               </tr>\r
+       </table>        \r
+</wicket:extend>       \r
+</body>\r
+</html>
\ No newline at end of file

diff --git a/src/com/gitblit/wicket/pages/DocsPage.java b/src/com/gitblit/wicket/pages/DocsPage.java
new file mode 100644 (file)
index 0000000..302d29d
--- /dev/null
+++ b/src/com/gitblit/wicket/pages/DocsPage.java
@@ -0,0 +1,63 @@
+package com.gitblit.wicket.pages;\r
+\r
+import java.util.List;\r
+\r
+import org.apache.wicket.PageParameters;\r
+import org.apache.wicket.markup.html.basic.Label;\r
+import org.apache.wicket.markup.html.link.BookmarkablePageLink;\r
+import org.apache.wicket.markup.repeater.Item;\r
+import org.apache.wicket.markup.repeater.data.DataView;\r
+import org.apache.wicket.markup.repeater.data.ListDataProvider;\r
+import org.eclipse.jgit.lib.Repository;\r
+\r
+import com.gitblit.GitBlit;\r
+import com.gitblit.Keys;\r
+import com.gitblit.utils.ByteFormat;\r
+import com.gitblit.utils.JGitUtils;\r
+import com.gitblit.wicket.LinkPanel;\r
+import com.gitblit.wicket.RepositoryPage;\r
+import com.gitblit.wicket.WicketUtils;\r
+import com.gitblit.wicket.models.PathModel;\r
+\r
+public class DocsPage extends RepositoryPage {\r
+\r
+       public DocsPage(PageParameters params) {\r
+               super(params);\r
+\r
+               Repository r = getRepository();\r
+               List<String> extensions = GitBlit.self().settings().getStrings(Keys.web.markdownExtensions);\r
+               List<PathModel> paths = JGitUtils.getDocuments(r, extensions);\r
+\r
+               final ByteFormat byteFormat = new ByteFormat();\r
+\r
+               add(new Label("header", getString("gb.docs")));\r
+               \r
+               // documents list\r
+               ListDataProvider<PathModel> pathsDp = new ListDataProvider<PathModel>(paths);\r
+               DataView<PathModel> pathsView = new DataView<PathModel>("document", pathsDp) {\r
+                       private static final long serialVersionUID = 1L;\r
+                       int counter = 0;\r
+\r
+                       public void populateItem(final Item<PathModel> item) {\r
+                               PathModel entry = item.getModelObject();\r
+                               item.add(WicketUtils.newImage("docIcon", "file_world_16x16.png"));\r
+                               item.add(new Label("docSize", byteFormat.format(entry.size)));\r
+                               item.add(new LinkPanel("docName", "list", entry.name, BlobPage.class, newPathParameter(entry.path)));\r
+\r
+                               // links\r
+                               item.add(new BookmarkablePageLink<Void>("view", BlobPage.class, WicketUtils.newPathParameter(repositoryName, entry.commitId, entry.path)));\r
+                               item.add(new BookmarkablePageLink<Void>("raw", RawPage.class, WicketUtils.newPathParameter(repositoryName, entry.commitId, entry.path)));\r
+                               item.add(new BookmarkablePageLink<Void>("blame", BlobPage.class).setEnabled(false));\r
+                               item.add(new BookmarkablePageLink<Void>("history", HistoryPage.class, WicketUtils.newPathParameter(repositoryName, entry.commitId, entry.path)));                               \r
+                               WicketUtils.setAlternatingBackground(item, counter);\r
+                               counter++;\r
+                       }\r
+               };\r
+               add(pathsView);\r
+       }\r
+\r
+       @Override\r
+       protected String getPageName() {\r
+               return getString("gb.docs");\r
+       }\r
+}\r

diff --git a/src/com/gitblit/wicket/pages/EditRepositoryPage.html b/src/com/gitblit/wicket/pages/EditRepositoryPage.html
index f202e918f33f4c4fa50f22e0bef7cac59eaed050..4aebef3d42f7180f84940d53758fd5006d3a780c 100644 (file)
--- a/src/com/gitblit/wicket/pages/EditRepositoryPage.html
+++ b/src/com/gitblit/wicket/pages/EditRepositoryPage.html
@@ -13,12 +13,12 @@
        <form wicket:id="editForm">\r
                <table class="plain">\r
                        <tbody>\r
-                               <tr><th>Name</th><td class="edit"><input type="text" wicket:id="name" size="30" tabindex="1" /></td></tr>\r
-                               <tr><th>Description</th><td class="edit"><input type="text" wicket:id="description" size="80" tabindex="2" /></td></tr>\r
-                               <tr><th>Owner</th><td class="edit"><input type="text" wicket:id="owner" size="30" tabindex="3" /></td></tr>\r
-                               <tr><th>Group</th><td class="edit"><input type="text" wicket:id="group" size="30" tabindex="4" /></td></tr>\r
-                               <tr><th>Enable Tickets</th><td class="edit"><input type="checkbox" wicket:id="useTickets" tabindex="5" /> <i>distributed Ticgit ticketing</i></td></tr>\r
-                               <tr><th>Enable Docs</th><td class="edit"><input type="checkbox" wicket:id="useDocs" tabindex="6" /> <i>distributed Markdown documentation</i></td></tr>\r
+                               <tr><th><wicket:message key="gb.name"></wicket:message></th><td class="edit"><input type="text" wicket:id="name" size="30" tabindex="1" /></td></tr>\r
+                               <tr><th><wicket:message key="gb.description"></wicket:message></th><td class="edit"><input type="text" wicket:id="description" size="80" tabindex="2" /></td></tr>\r
+                               <tr><th><wicket:message key="gb.owner"></wicket:message></th><td class="edit"><input type="text" wicket:id="owner" size="30" tabindex="3" /></td></tr>\r
+                               <tr><th><wicket:message key="gb.group"></wicket:message></th><td class="edit"><input type="text" wicket:id="group" size="30" tabindex="4" /></td></tr>\r
+                               <tr><th><wicket:message key="gb.enableTickets"></wicket:message></th><td class="edit"><input type="checkbox" wicket:id="useTickets" tabindex="5" /> &nbsp;<i>distributed Ticgit issues</i></td></tr>\r
+                               <tr><th><wicket:message key="gb.enableDocs"></wicket:message></th><td class="edit"><input type="checkbox" wicket:id="useDocs" tabindex="6" /> &nbsp;<i>enumerates repository Markdown documentation</i></td></tr>\r
                                <tr><td class="edit" colspan="2"><input type="submit" value="Submit" tabindex="7" /></td></tr>\r
                        </tbody>\r
                </table>\r

diff --git a/src/com/gitblit/wicket/pages/HistoryPage.html b/src/com/gitblit/wicket/pages/HistoryPage.html
index a77933eba49b5727f7c8908653ab4a438f4567db..f132e5994a8a6905968e49e81aa1627cb1147e47 100644 (file)
--- a/src/com/gitblit/wicket/pages/HistoryPage.html
+++ b/src/com/gitblit/wicket/pages/HistoryPage.html
@@ -11,7 +11,7 @@
        <div wicket:id="pageLinks">[page links]</div>\r
 \r
        <!-- pager links -->\r
-       <div style="padding-top:5px;padding-bottom:5px;">\r
+       <div style="padding-top:5px;">\r
                <a wicket:id="firstPageTop"><wicket:message key="gb.pageFirst"></wicket:message></a> | <a wicket:id="prevPageTop"><wicket:message key="gb.pagePrevious"></wicket:message></a> | <a wicket:id="nextPageTop"><wicket:message key="gb.pageNext"></wicket:message></a> \r
        </div>\r
        \r

diff --git a/src/com/gitblit/wicket/pages/LogPage.html b/src/com/gitblit/wicket/pages/LogPage.html
index 325e751b3082fb6dd8af315b2ae6aead5e20f5ed..ad39b779a60e09be442a3e11aff05042a4ef3294 100644 (file)
--- a/src/com/gitblit/wicket/pages/LogPage.html
+++ b/src/com/gitblit/wicket/pages/LogPage.html
@@ -11,7 +11,7 @@
        <div wicket:id="pageLinks">[page links]</div>\r
 \r
        <!-- pager links -->\r
-       <div style="padding-top:5px;padding-bottom:5px;">\r
+       <div style="padding-top:5px;">\r
                <a wicket:id="firstPageTop"><wicket:message key="gb.pageFirst"></wicket:message></a> | <a wicket:id="prevPageTop"><wicket:message key="gb.pagePrevious"></wicket:message></a> | <a wicket:id="nextPageTop"><wicket:message key="gb.pageNext"></wicket:message></a> \r
        </div>\r
        \r

diff --git a/src/com/gitblit/wicket/pages/SearchPage.html b/src/com/gitblit/wicket/pages/SearchPage.html
index 7d2a537bb4673d11bea0cff4f7251f00560bc46b..246601a4b7bd853e65802b8a97cc6a73763a0926 100644 (file)
--- a/src/com/gitblit/wicket/pages/SearchPage.html
+++ b/src/com/gitblit/wicket/pages/SearchPage.html
@@ -11,7 +11,7 @@
        <div wicket:id="pageLinks">[page links]</div>\r
 \r
        <!-- pager links -->\r
-       <div style="padding-top:5px;padding-bottom:5px;">\r
+       <div style="padding-top:5px;">\r
                <a wicket:id="firstPageTop"><wicket:message key="gb.pageFirst"></wicket:message></a> | <a wicket:id="prevPageTop"><wicket:message key="gb.pagePrevious"></wicket:message></a> | <a wicket:id="nextPageTop"><wicket:message key="gb.pageNext"></wicket:message></a> \r
        </div>\r
        \r

diff --git a/src/com/gitblit/wicket/pages/TreePage.html b/src/com/gitblit/wicket/pages/TreePage.html
index f180c9d3e0c6337e2d4f1e2b778f6a94bf448895..90ca62bffd0528ce7f384c1c6a6b3939fcd7fe4e 100644 (file)
--- a/src/com/gitblit/wicket/pages/TreePage.html
+++ b/src/com/gitblit/wicket/pages/TreePage.html
@@ -15,8 +15,8 @@
                <a wicket:id="historyLink"><wicket:message key="gb.history"></wicket:message></a> | <a wicket:id="headLink"><wicket:message key="gb.head"></wicket:message></a>\r
        </div>  \r
        \r
-       <!-- shortlog header -->\r
-       <div class="header" wicket:id="shortlog">[shortlog header]</div>\r
+       <!-- commit header -->\r
+       <div wicket:id="commitHeader">[commit header]</div>\r
 \r
        <!-- breadcrumbs -->\r
        <div wicket:id="breadcrumbs">[breadcrumbs]</div>\r
@@ -28,7 +28,7 @@
                        <td><span wicket:id="pathName"></span></td>                     \r
                        <td class="size"><span wicket:id="pathSize">[path size]</span></td>\r
                        <td class="mode"><span wicket:id="pathPermissions">[path permissions]</span></td>\r
-                       <td class="rightAlign"><span wicket:id="pathLinks">[path links]</span></td>\r
+                       <td class="treeLinks"><span wicket:id="pathLinks">[path links]</span></td>\r
                </tr>\r
        </table>\r
 \r

diff --git a/src/com/gitblit/wicket/pages/TreePage.java b/src/com/gitblit/wicket/pages/TreePage.java
index 9022d444f14ba5dc4e2b071d09b39e1e612099fa..56f96d65fdd26e8a93f104de2ccd6132c23237af 100644 (file)
--- a/src/com/gitblit/wicket/pages/TreePage.java
+++ b/src/com/gitblit/wicket/pages/TreePage.java
@@ -19,6 +19,7 @@ import com.gitblit.wicket.LinkPanel;
 import com.gitblit.wicket.RepositoryPage;\r
 import com.gitblit.wicket.WicketUtils;\r
 import com.gitblit.wicket.models.PathModel;\r
+import com.gitblit.wicket.panels.CommitHeaderPanel;\r
 import com.gitblit.wicket.panels.PathBreadcrumbsPanel;\r
 \r
 public class TreePage extends RepositoryPage {\r
@@ -36,7 +37,7 @@ public class TreePage extends RepositoryPage {
                add(new BookmarkablePageLink<Void>("historyLink", HistoryPage.class, WicketUtils.newPathParameter(repositoryName, objectId, path)));\r
                add(new BookmarkablePageLink<Void>("headLink", TreePage.class, WicketUtils.newPathParameter(repositoryName, Constants.HEAD, path)));\r
 \r
-               add(new LinkPanel("shortlog", "title", commit == null ? "" : commit.getShortMessage(), CommitPage.class, newCommitParameter()));\r
+               add(new CommitHeaderPanel("commitHeader", repositoryName, commit));\r
 \r
                // breadcrumbs\r
                add(new PathBreadcrumbsPanel("breadcrumbs", repositoryName, path, objectId));\r
@@ -66,7 +67,7 @@ public class TreePage extends RepositoryPage {
                                                // folder/tree link\r
                                                item.add(WicketUtils.newImage("pathIcon", "folder_16x16.png"));\r
                                                item.add(new Label("pathSize", ""));\r
-                                               item.add(new LinkPanel("pathName", null, entry.name, TreePage.class, newPathParameter(entry.path)));\r
+                                               item.add(new LinkPanel("pathName", "list", entry.name, TreePage.class, newPathParameter(entry.path)));\r
 \r
                                                // links\r
                                                Fragment links = new Fragment("pathLinks", "treeLinks", this);\r
@@ -75,7 +76,7 @@ public class TreePage extends RepositoryPage {
                                                item.add(links);\r
                                        } else {\r
                                                // blob link\r
-                                               item.add(WicketUtils.newImage("pathIcon", "file_16x16.png"));\r
+                                               item.add(WicketUtils.getFileImage("pathIcon", entry.name));\r
                                                item.add(new Label("pathSize", byteFormat.format(entry.size)));\r
                                                item.add(new LinkPanel("pathName", "list", entry.name, BlobPage.class, newPathParameter(entry.path)));\r
 \r

diff --git a/src/com/gitblit/wicket/panels/CommitHeaderPanel.html b/src/com/gitblit/wicket/panels/CommitHeaderPanel.html
new file mode 100644 (file)
index 0000000..e02fc25
--- /dev/null
+++ b/src/com/gitblit/wicket/panels/CommitHeaderPanel.html
@@ -0,0 +1,15 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">\r
+<html xmlns="http://www.w3.org/1999/xhtml"  \r
+      xmlns:wicket="http://wicket.apache.org/dtds.data/wicket-xhtml1.3-strict.dtd"  \r
+      xml:lang="en"  \r
+      lang="en"> \r
+\r
+<wicket:panel> \r
+       <div class="commitHeader">\r
+               <div style="float:right;">\r
+                       <span wicket:id="author">[author]</span> &nbsp; &nbsp;<span wicket:id="date">[date]</span>\r
+               </div>\r
+               <span wicket:id="shortmessage">[short message]</span> <span wicket:id="commitid">[commit id]</span>\r
+       </div>\r
+</wicket:panel>\r
+</html>
\ No newline at end of file

diff --git a/src/com/gitblit/wicket/panels/CommitHeaderPanel.java b/src/com/gitblit/wicket/panels/CommitHeaderPanel.java
new file mode 100644 (file)
index 0000000..da72a7c
--- /dev/null
+++ b/src/com/gitblit/wicket/panels/CommitHeaderPanel.java
@@ -0,0 +1,23 @@
+package com.gitblit.wicket.panels;\r
+\r
+import java.util.Date;\r
+\r
+import org.apache.wicket.markup.html.basic.Label;\r
+import org.eclipse.jgit.revwalk.RevCommit;\r
+\r
+import com.gitblit.wicket.LinkPanel;\r
+import com.gitblit.wicket.WicketUtils;\r
+import com.gitblit.wicket.pages.CommitPage;\r
+\r
+public class CommitHeaderPanel extends BasePanel {\r
+\r
+       private static final long serialVersionUID = 1L;\r
+\r
+       public CommitHeaderPanel(String id, String repositoryName, RevCommit c) {\r
+               super(id);\r
+               add(new LinkPanel("shortmessage", "title", c == null ? "" : c.getShortMessage(), CommitPage.class, WicketUtils.newObjectParameter(repositoryName, c == null ? "" : c.getName())));\r
+               add(new Label("commitid", "(" + c.getName().substring(0, 8) + ")"));            \r
+               add(new Label("author", c == null ? "" : c.getAuthorIdent().getName()));\r
+               add(WicketUtils.createDateLabel("date", c == null ? new Date(0) : c.getAuthorIdent().getWhen(), getTimeZone()));\r
+       }\r
+}
\ No newline at end of file

diff --git a/src/com/gitblit/wicket/panels/HistoryPanel.html b/src/com/gitblit/wicket/panels/HistoryPanel.html
index 3fa2262ee9ef88d34713189b21661e517856b5e9..9589d1411dcbdc18505546adeeb42fcd19f7bc51 100644 (file)
--- a/src/com/gitblit/wicket/panels/HistoryPanel.html
+++ b/src/com/gitblit/wicket/panels/HistoryPanel.html
@@ -7,8 +7,8 @@
 <body>\r
 <wicket:panel>\r
 \r
-       <!-- header --> \r
-       <div class="header" wicket:id="header">[history header]</div>\r
+       <!-- commit header -->\r
+       <div wicket:id="commitHeader">[commit header]</div>\r
 \r
        <!-- breadcrumbs -->\r
        <div wicket:id="breadcrumbs">[breadcrumbs]</div>\r

diff --git a/src/com/gitblit/wicket/panels/HistoryPanel.java b/src/com/gitblit/wicket/panels/HistoryPanel.java
index 234e00baf308cd1323f3fd704d888c79de0d37ed..71ab93007f2649a425490c53fccee5452e90e115 100644 (file)
--- a/src/com/gitblit/wicket/panels/HistoryPanel.java
+++ b/src/com/gitblit/wicket/panels/HistoryPanel.java
@@ -29,7 +29,6 @@ import com.gitblit.wicket.pages.BlobPage;
 import com.gitblit.wicket.pages.CommitDiffPage;\r
 import com.gitblit.wicket.pages.CommitPage;\r
 import com.gitblit.wicket.pages.HistoryPage;\r
-import com.gitblit.wicket.pages.LogPage;\r
 import com.gitblit.wicket.pages.SearchPage;\r
 import com.gitblit.wicket.pages.TreePage;\r
 \r
@@ -73,16 +72,7 @@ public class HistoryPanel extends BasePanel {
                // works unless commits.size() represents the exact end.\r
                hasMore = commits.size() >= itemsPerPage;\r
 \r
-               // header\r
-               if (pageResults) {\r
-                       // history page\r
-                       // show commit page link\r
-                       add(new LinkPanel("header", "title", commit == null ? "" : commit.getShortMessage(), CommitPage.class, WicketUtils.newObjectParameter(repositoryName, objectId)));\r
-               } else {\r
-                       // summary page\r
-                       // show history page link\r
-                       add(new LinkPanel("header", "title", new StringResourceModel("gb.history", this, null), LogPage.class, WicketUtils.newRepositoryParameter(repositoryName)));\r
-               }\r
+               add(new CommitHeaderPanel("commitHeader", repositoryName, commit));\r
 \r
                // breadcrumbs\r
                add(new PathBreadcrumbsPanel("breadcrumbs", repositoryName, path, objectId));\r

diff --git a/src/com/gitblit/wicket/panels/PageLinksPanel.java b/src/com/gitblit/wicket/panels/PageLinksPanel.java
index c2bae8fea0ed1ed3a9fd10d543700bb9d2871a69..0f33501080294b4bb02590066d07c029049bd1a1 100644 (file)
--- a/src/com/gitblit/wicket/panels/PageLinksPanel.java
+++ b/src/com/gitblit/wicket/panels/PageLinksPanel.java
@@ -27,6 +27,7 @@ import com.gitblit.utils.JGitUtils.SearchType;
 import com.gitblit.wicket.LinkPanel;\r
 import com.gitblit.wicket.WicketUtils;\r
 import com.gitblit.wicket.pages.BranchesPage;\r
+import com.gitblit.wicket.pages.DocsPage;\r
 import com.gitblit.wicket.pages.LogPage;\r
 import com.gitblit.wicket.pages.SearchPage;\r
 import com.gitblit.wicket.pages.SummaryPage;\r
@@ -72,7 +73,7 @@ public class PageLinksPanel extends Panel {
 \r
                // Get the repository docs setting\r
                boolean checkDocs = JGitUtils.getRepositoryUseDocs(r);\r
-               if (checkDocs && JGitUtils.getDocumentsBranch(r) != null) {\r
+               if (checkDocs) {\r
                        extras.add("docs");\r
                }\r
 \r
@@ -87,7 +88,7 @@ public class PageLinksPanel extends Panel {
                                        item.add(new LinkPanel("extraLink", null, getString("gb.tickets"), TicketsPage.class, WicketUtils.newRepositoryParameter(repositoryName)));\r
                                } else if (extra.equals("docs")) {\r
                                        item.add(new Label("extraSeparator", " | "));\r
-                                       item.add(new LinkPanel("extraLink", null, getString("gb.docs"), TicketsPage.class, WicketUtils.newRepositoryParameter(repositoryName)));\r
+                                       item.add(new LinkPanel("extraLink", null, getString("gb.docs"), DocsPage.class, WicketUtils.newRepositoryParameter(repositoryName)));\r
                                }\r
                        }\r
                };\r

diff --git a/src/com/gitblit/wicket/resources/file_acrobat_16x16.png b/src/com/gitblit/wicket/resources/file_acrobat_16x16.png
new file mode 100644 (file)
index 0000000..f162783
Binary files /dev/null and b/src/com/gitblit/wicket/resources/file_acrobat_16x16.png differ

diff --git a/src/com/gitblit/wicket/resources/file_c_16x16.png b/src/com/gitblit/wicket/resources/file_c_16x16.png
new file mode 100644 (file)
index 0000000..44045a9
Binary files /dev/null and b/src/com/gitblit/wicket/resources/file_c_16x16.png differ

diff --git a/src/com/gitblit/wicket/resources/file_code_16x16.png b/src/com/gitblit/wicket/resources/file_code_16x16.png
new file mode 100644 (file)
index 0000000..931b0d6
Binary files /dev/null and b/src/com/gitblit/wicket/resources/file_code_16x16.png differ

diff --git a/src/com/gitblit/wicket/resources/file_cpp_16x16.png b/src/com/gitblit/wicket/resources/file_cpp_16x16.png
new file mode 100644 (file)
index 0000000..d3f55ee
Binary files /dev/null and b/src/com/gitblit/wicket/resources/file_cpp_16x16.png differ

diff --git a/src/com/gitblit/wicket/resources/file_cs_16x16.png b/src/com/gitblit/wicket/resources/file_cs_16x16.png
new file mode 100644 (file)
index 0000000..8013020
Binary files /dev/null and b/src/com/gitblit/wicket/resources/file_cs_16x16.png differ

diff --git a/src/com/gitblit/wicket/resources/file_doc_16x16.png b/src/com/gitblit/wicket/resources/file_doc_16x16.png
new file mode 100644 (file)
index 0000000..225c3b0
Binary files /dev/null and b/src/com/gitblit/wicket/resources/file_doc_16x16.png differ

diff --git a/src/com/gitblit/wicket/resources/file_excel_16x16.png b/src/com/gitblit/wicket/resources/file_excel_16x16.png
new file mode 100644 (file)
index 0000000..04e0332
Binary files /dev/null and b/src/com/gitblit/wicket/resources/file_excel_16x16.png differ

diff --git a/src/com/gitblit/wicket/resources/file_h_16x16.png b/src/com/gitblit/wicket/resources/file_h_16x16.png
new file mode 100644 (file)
index 0000000..3f7f539
Binary files /dev/null and b/src/com/gitblit/wicket/resources/file_h_16x16.png differ

diff --git a/src/com/gitblit/wicket/resources/file_java_16x16.png b/src/com/gitblit/wicket/resources/file_java_16x16.png
new file mode 100644 (file)
index 0000000..16620e5
Binary files /dev/null and b/src/com/gitblit/wicket/resources/file_java_16x16.png differ

diff --git a/src/com/gitblit/wicket/resources/file_php_16x16.png b/src/com/gitblit/wicket/resources/file_php_16x16.png
new file mode 100644 (file)
index 0000000..4ac5618
Binary files /dev/null and b/src/com/gitblit/wicket/resources/file_php_16x16.png differ

diff --git a/src/com/gitblit/wicket/resources/file_ppt_16x16.png b/src/com/gitblit/wicket/resources/file_ppt_16x16.png
new file mode 100644 (file)
index 0000000..44bbf26
Binary files /dev/null and b/src/com/gitblit/wicket/resources/file_ppt_16x16.png differ

diff --git a/src/com/gitblit/wicket/resources/file_ruby_16x16.png b/src/com/gitblit/wicket/resources/file_ruby_16x16.png
new file mode 100644 (file)
index 0000000..f29349d
Binary files /dev/null and b/src/com/gitblit/wicket/resources/file_ruby_16x16.png differ

diff --git a/src/com/gitblit/wicket/resources/file_settings_16x16.png b/src/com/gitblit/wicket/resources/file_settings_16x16.png
new file mode 100644 (file)
index 0000000..92953fe
Binary files /dev/null and b/src/com/gitblit/wicket/resources/file_settings_16x16.png differ

diff --git a/src/com/gitblit/wicket/resources/file_vs_16x16.png b/src/com/gitblit/wicket/resources/file_vs_16x16.png
new file mode 100644 (file)
index 0000000..645fa7a
Binary files /dev/null and b/src/com/gitblit/wicket/resources/file_vs_16x16.png differ

diff --git a/src/com/gitblit/wicket/resources/file_world_16x16.png b/src/com/gitblit/wicket/resources/file_world_16x16.png
new file mode 100644 (file)
index 0000000..0a4fa8b
Binary files /dev/null and b/src/com/gitblit/wicket/resources/file_world_16x16.png differ

diff --git a/src/com/gitblit/wicket/resources/file_zip_16x16.png b/src/com/gitblit/wicket/resources/file_zip_16x16.png
new file mode 100644 (file)
index 0000000..1584592
Binary files /dev/null and b/src/com/gitblit/wicket/resources/file_zip_16x16.png differ

diff --git a/src/com/gitblit/wicket/resources/gitblit.css b/src/com/gitblit/wicket/resources/gitblit.css
index 3200381bc33a9ac90ddf484400fb241c332480af..ce3be676c440fbd8d15b2c6e23ae145acf273e8c 100644 (file)
--- a/src/com/gitblit/wicket/resources/gitblit.css
+++ b/src/com/gitblit/wicket/resources/gitblit.css
@@ -72,20 +72,27 @@ div.repositories_message {
        line-height: inherit;\r
 }\r
 \r
-div.header {\r
+div.header, div.commitHeader {\r
        background-color: #D2C3AF;\r
        padding: 3px;\r
        border: 1px solid #808080;\r
+}\r
+\r
+div.header {\r
        border-radius: 3px 3px 0 0;\r
 }\r
 \r
-div.header a {\r
+div.commitHeader {\r
+       border-radius: 3px;\r
+}\r
+\r
+div.header a, div.commitHeader a {\r
        color: black;\r
        text-decoration: none;\r
        font-weight: bold;\r
 }\r
 \r
-div.header a:hover {\r
+div.header a:hover, div.commitHeader a:hover {\r
        text-decoration: underline;\r
 }\r
 \r
@@ -558,14 +565,15 @@ span.sha1, span.sha1 a, span.sha1 a span {
 }\r
 \r
 td.mode {\r
+       text-align: right;\r
        font-family: monospace;\r
-       width:90px;\r
+       width: 8em;\r
        padding-right:15px;\r
 }\r
 \r
 td.size {\r
        text-align: right;\r
-       width:100px;    \r
+       width: 8em;     \r
        padding-right:15px;\r
 }\r
 \r
@@ -573,6 +581,11 @@ td.rightAlign {
        text-align: right;\r
 }\r
 \r
+td.treeLinks {\r
+       text-align: right;\r
+       width: 13em;\r
+}\r
+\r
 span .tagRef, span .headRef, span .remoteRef, span .otherRef { \r
        padding: 0px 3px;\r
        margin-right:2px;\r

diff --git a/src/com/gitblit/wicket/resources/welcome.mkd b/src/com/gitblit/wicket/resources/welcome.mkd
index a38cbb54e8843c3ce64ce45ca189ce5f5bfb5e43..7f744068100e79c5891335025489686aca378ffc 100644 (file)
--- a/src/com/gitblit/wicket/resources/welcome.mkd
+++ b/src/com/gitblit/wicket/resources/welcome.mkd
@@ -2,4 +2,4 @@
 \r
 A quick and easy way to host your own Git repositories.\r
 \r
-Built with [JGit](http://eclipse.org/jgit) [Wicket](http://wicket.apache.org) [WicketStuff GoogleCharts](https://github.com/wicketstuff/core/wiki/GoogleCharts) [MarkdownPapers](http://markdown.tautua.org) [Jetty](http://eclipse.org/jetty) [SLF4J](http://www.slf4j.org) [Log4j](http://logging.apache.org/log4j) [google-code-prettify](http://code.google.com/p/google-code-prettify) [JCommander](http://jcommander.org)
\ No newline at end of file
+Built with [JGit](http://eclipse.org/jgit), [Wicket](http://wicket.apache.org), [WicketStuff GoogleCharts](https://github.com/wicketstuff/core/wiki/GoogleCharts), [markitup](http://markitup.jaysalvat.com), [MarkdownPapers](http://markdown.tautua.org), [Jetty](http://eclipse.org/jetty), [SLF4J](http://www.slf4j.org), [Log4j](http://logging.apache.org/log4j), [google-code-prettify](http://code.google.com/p/google-code-prettify), [JCommander](http://jcommander.org), Most icons courtesy of [FatCow Hosting](http://www.fatcow.com/free-icons)
\ No newline at end of file