Improved look of Lucene page

diff --git a/resources/gitblit.css b/resources/gitblit.css
index bfa1c20213c1f1e3b903dbd02c89b2b7f409a8b0..8f65986540d81aa12111da9a81555959641a0c83 100644 (file)
--- a/resources/gitblit.css
+++ b/resources/gitblit.css
@@ -278,6 +278,14 @@ div.searchResult .branch {
        color: #008000;\r
 }\r
 \r
+div.searchResult .author {\r
+       font-style: italic !important;\r
+}\r
+\r
+div.searchResult .date {\r
+       color:#999;\r
+}\r
+\r
 div.header, div.commitHeader, table.repositories th {\r
        background-color:#e0e0e0;\r
        background-repeat:repeat-x;\r

diff --git a/src/com/gitblit/wicket/pages/LucenePage.html b/src/com/gitblit/wicket/pages/LucenePage.html
index a3b01727c13978ab281b57d068e2d5d6085373e7..867e607b028b7b546ac1b176e2d021fa6f41636a 100644 (file)
--- a/src/com/gitblit/wicket/pages/LucenePage.html
+++ b/src/com/gitblit/wicket/pages/LucenePage.html
@@ -14,8 +14,8 @@
        </form>\r
        <div class="searchResult" wicket:id="searchResults">\r
                <div><i wicket:id="type"></i><span class="summary" wicket:id="summary"></span></div>\r
-               <span class="repository" wicket:id="repository"></span>:<span class="branch" wicket:id="branch"></span>\r
-               <span wicket:id="author"></span> <span wicket:id="date"></span>\r
+               <span class="author" wicket:id="author"></span> committed to <span class="repository" wicket:id="repository"></span>:<span class="branch" wicket:id="branch"></span><br/>\r
+               <span class="date" wicket:id="date"></span>\r
        </div>\r
 </wicket:extend>\r
 </body>\r

diff --git a/src/com/gitblit/wicket/pages/LucenePage.java b/src/com/gitblit/wicket/pages/LucenePage.java
index 75df31456c9b97b6d4463af99825e4751146554e..47f731c21f9026b50248f3ed64880ae28da8c31e 100644 (file)
--- a/src/com/gitblit/wicket/pages/LucenePage.java
+++ b/src/com/gitblit/wicket/pages/LucenePage.java
@@ -26,11 +26,13 @@ import org.apache.wicket.markup.repeater.Item;
 import org.apache.wicket.markup.repeater.data.DataView;\r
 import org.apache.wicket.markup.repeater.data.ListDataProvider;\r
 import org.apache.wicket.model.Model;\r
+import org.eclipse.jgit.lib.Constants;\r
 import org.eclipse.jgit.lib.Repository;\r
 \r
 import com.gitblit.GitBlit;\r
 import com.gitblit.models.SearchResult;\r
 import com.gitblit.utils.LuceneUtils;\r
+import com.gitblit.utils.StringUtils;\r
 import com.gitblit.wicket.WicketUtils;\r
 import com.gitblit.wicket.panels.LinkPanel;\r
 \r
@@ -77,8 +79,8 @@ public class LucenePage extends RootPage {
                                        break;\r
                                }\r
                                }\r
-                               item.add(new Label("repository", sr.repository));\r
-                               item.add(new Label("branch", sr.branch));\r
+                               item.add(new LinkPanel("repository", null, sr.repository, SummaryPage.class, WicketUtils.newRepositoryParameter(sr.repository)));\r
+                               item.add(new LinkPanel("branch", "branch", StringUtils.getRelativePath(Constants.R_HEADS, sr.branch), LogPage.class, WicketUtils.newObjectParameter(sr.repository, sr.branch)));\r
                                item.add(new Label("author", sr.author));\r
                                item.add(WicketUtils.createTimestampLabel("date", sr.date, getTimeZone()));\r
                        }\r