Revert "Eliminated redundant "view" links (issue 168)"

This reverts commit 5ad03d053fc3154b09c551530a790b921bc462e5.

diff --git a/src/com/gitblit/wicket/panels/HistoryPanel.html b/src/com/gitblit/wicket/panels/HistoryPanel.html
index 3da731ff3ead803bf253c058bfadf2f13d6dad81..2fe6f050e62fe165093e9618e6883c39bda8ceb9 100644 (file)
--- a/src/com/gitblit/wicket/panels/HistoryPanel.html
+++ b/src/com/gitblit/wicket/panels/HistoryPanel.html
@@ -19,8 +19,8 @@
                        <td class="date"><span wicket:id="commitDate">[commit date]</span></td>\r
                        <td class="icon"><img wicket:id="commitIcon" /></td>\r
                        <td class="hidden-phone author"><span wicket:id="commitAuthor">[commit author]</span></td>\r
-                       <td class="message"><table class="nestedTable"><tr><td><span style="vertical-align:middle;" wicket:id="commitShortMessage">[commit short message]</span></td><td><div style="text-align:right;" wicket:id="commitRefs">[commit refs]</div></td></tr></table></td>\r
                        <td class="hidden-phone hidden-tablet"><span wicket:id="commitHash">[commit hash]</span></td>\r
+                       <td class="message"><table class="nestedTable"><tr><td><span style="vertical-align:middle;" wicket:id="commitShortMessage">[commit short message]</span></td><td><div style="text-align:right;" wicket:id="commitRefs">[commit refs]</div></td></tr></table></td>\r
                        <td class="hidden-phone rightAlign">\r
                                <span wicket:id="historyLinks">[history links]</span>\r
                                </td>\r
@@ -32,14 +32,14 @@
        <!--  tree links -->\r
        <wicket:fragment wicket:id="treeLinks">\r
                <span class="link">\r
-                       <a wicket:id="commitdiff"><wicket:message key="gb.commitdiff"></wicket:message></a>\r
+                       <a wicket:id="tree"><wicket:message key="gb.tree"></wicket:message></a> | <a wicket:id="commitdiff"><wicket:message key="gb.commitdiff"></wicket:message></a>\r
                </span>\r
        </wicket:fragment>\r
        \r
        <!-- blob links -->\r
        <wicket:fragment wicket:id="blobLinks">\r
                <span class="link">\r
-                       <a wicket:id="commitdiff"><wicket:message key="gb.commitdiff"></wicket:message></a> | <a wicket:id="difftocurrent"><wicket:message key="gb.difftocurrent"></wicket:message></a>\r
+                       <a wicket:id="view"><wicket:message key="gb.view"></wicket:message></a> | <a wicket:id="commitdiff"><wicket:message key="gb.commitdiff"></wicket:message></a> | <a wicket:id="difftocurrent"><wicket:message key="gb.difftocurrent"></wicket:message></a>\r
                </span> \r
        </wicket:fragment>\r
        \r

diff --git a/src/com/gitblit/wicket/panels/HistoryPanel.java b/src/com/gitblit/wicket/panels/HistoryPanel.java
index 2ad09438aa074edf6ca7234818d1448dd51f68ef..838f103e5ed2fb1aa9bd7eb692df63ae8c85d379 100644 (file)
--- a/src/com/gitblit/wicket/panels/HistoryPanel.java
+++ b/src/com/gitblit/wicket/panels/HistoryPanel.java
@@ -180,6 +180,8 @@ public class HistoryPanel extends BasePanel {
                                        item.add(links);\r
                                } else {\r
                                        Fragment links = new Fragment("historyLinks", "blobLinks", this);\r
+                                       links.add(new BookmarkablePageLink<Void>("view", BlobPage.class, WicketUtils\r
+                                                       .newPathParameter(repositoryName, entry.getName(), path)));\r
                                        links.add(new BookmarkablePageLink<Void>("commitdiff", CommitDiffPage.class,\r
                                                        WicketUtils.newObjectParameter(repositoryName, entry.getName())));\r
                                        links.add(new BookmarkablePageLink<Void>("difftocurrent", BlobDiffPage.class,\r

diff --git a/src/com/gitblit/wicket/panels/LogPanel.html b/src/com/gitblit/wicket/panels/LogPanel.html
index 3c3da74547e9a55c8db6cb235b429894e7f0f287..f6c2327e3fb3fc1d62b27d9d3324ef4b32757800 100644 (file)
--- a/src/com/gitblit/wicket/panels/LogPanel.html
+++ b/src/com/gitblit/wicket/panels/LogPanel.html
@@ -14,12 +14,12 @@
                        <tr wicket:id="commit">\r
                        <td class="date" style="width:6em;"><span wicket:id="commitDate">[commit date]</span></td>\r
                        <td class="hidden-phone author"><span wicket:id="commitAuthor">[commit author]</span></td>\r
+                       <td class="hidden-phone hidden-tablet"><span wicket:id="commitHash">[commit hash]</span></td>\r
                        <td class="hidden-phone icon"><img wicket:id="commitIcon" /></td>\r
                        <td class="message"><table class="nestedTable"><tr><td><span style="vertical-align:middle;" wicket:id="commitShortMessage">[commit short message]</span></td><td><div style="text-align:right;" wicket:id="commitRefs">[commit refs]</div></td></tr></table></td>\r
-                       <td class="hidden-phone hidden-tablet"><span wicket:id="commitHash">[commit hash]</span></td>\r
                        <td class="hidden-phone hidden-tablet rightAlign">\r
                                <span class="link">\r
-                                               <a wicket:id="diff"><wicket:message key="gb.diff"></wicket:message></a> | <a wicket:id="tree"><wicket:message key="gb.tree"></wicket:message></a>\r
+                                               <a wicket:id="view"><wicket:message key="gb.view"></wicket:message></a> | <a wicket:id="diff"><wicket:message key="gb.diff"></wicket:message></a> | <a wicket:id="tree"><wicket:message key="gb.tree"></wicket:message></a>\r
                                        </span>\r
                                </td>\r
                        </tr>\r

diff --git a/src/com/gitblit/wicket/panels/LogPanel.java b/src/com/gitblit/wicket/panels/LogPanel.java
index 0a56b31523598ce77c1a746c342e48d6c7bd1eba..6d06e7b852899a1682ed3676a897b9201e9a8110 100644 (file)
--- a/src/com/gitblit/wicket/panels/LogPanel.java
+++ b/src/com/gitblit/wicket/panels/LogPanel.java
@@ -135,6 +135,8 @@ public class LogPanel extends BasePanel {
 \r
                                item.add(new RefsPanel("commitRefs", repositoryName, entry, allRefs));\r
 \r
+                               item.add(new BookmarkablePageLink<Void>("view", CommitPage.class, WicketUtils\r
+                                               .newObjectParameter(repositoryName, entry.getName())));\r
                                item.add(new BookmarkablePageLink<Void>("diff", CommitDiffPage.class, WicketUtils\r
                                                .newObjectParameter(repositoryName, entry.getName())).setEnabled(entry\r
                                                .getParentCount() > 0));\r