James Moger
2012-11-27 5ad03d053fc3154b09c551530a790b921bc462e5
Eliminated redundant "view" links (issue-168)
4 files modified
14 ■■■■■ changed files
src/com/gitblit/wicket/panels/HistoryPanel.html 6 ●●●● patch | view | raw | blame | history
src/com/gitblit/wicket/panels/HistoryPanel.java 2 ●●●●● patch | view | raw | blame | history
src/com/gitblit/wicket/panels/LogPanel.html 4 ●●●● patch | view | raw | blame | history
src/com/gitblit/wicket/panels/LogPanel.java 2 ●●●●● patch | view | raw | blame | history
src/com/gitblit/wicket/panels/HistoryPanel.html
@@ -19,8 +19,8 @@
                 <td class="date"><span wicket:id="commitDate">[commit date]</span></td>
                 <td class="icon"><img wicket:id="commitIcon" /></td>
                 <td class="hidden-phone author"><span wicket:id="commitAuthor">[commit author]</span></td>
                 <td class="hidden-phone hidden-tablet"><span wicket:id="commitHash">[commit hash]</span></td>
                 <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>
                 <td class="hidden-phone hidden-tablet"><span wicket:id="commitHash">[commit hash]</span></td>
                 <td class="hidden-phone rightAlign">
                     <span wicket:id="historyLinks">[history links]</span>
                </td>
@@ -32,14 +32,14 @@
    <!--  tree links -->
    <wicket:fragment wicket:id="treeLinks">
        <span class="link">
            <a wicket:id="tree"><wicket:message key="gb.tree"></wicket:message></a> | <a wicket:id="commitdiff"><wicket:message key="gb.commitdiff"></wicket:message></a>
            <a wicket:id="commitdiff"><wicket:message key="gb.commitdiff"></wicket:message></a>
        </span>
    </wicket:fragment>
    
    <!-- blob links -->
    <wicket:fragment wicket:id="blobLinks">
        <span class="link">
            <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>
            <a wicket:id="commitdiff"><wicket:message key="gb.commitdiff"></wicket:message></a> | <a wicket:id="difftocurrent"><wicket:message key="gb.difftocurrent"></wicket:message></a>
        </span>    
    </wicket:fragment>
    
src/com/gitblit/wicket/panels/HistoryPanel.java
@@ -180,8 +180,6 @@
                    item.add(links);
                } else {
                    Fragment links = new Fragment("historyLinks", "blobLinks", this);
                    links.add(new BookmarkablePageLink<Void>("view", BlobPage.class, WicketUtils
                            .newPathParameter(repositoryName, entry.getName(), path)));
                    links.add(new BookmarkablePageLink<Void>("commitdiff", CommitDiffPage.class,
                            WicketUtils.newObjectParameter(repositoryName, entry.getName())));
                    links.add(new BookmarkablePageLink<Void>("difftocurrent", BlobDiffPage.class,
src/com/gitblit/wicket/panels/LogPanel.html
@@ -14,12 +14,12 @@
               <tr wicket:id="commit">
                 <td class="date" style="width:6em;"><span wicket:id="commitDate">[commit date]</span></td>
                 <td class="hidden-phone author"><span wicket:id="commitAuthor">[commit author]</span></td>
                 <td class="hidden-phone hidden-tablet"><span wicket:id="commitHash">[commit hash]</span></td>
                 <td class="hidden-phone icon"><img wicket:id="commitIcon" /></td>
                 <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>
                 <td class="hidden-phone hidden-tablet"><span wicket:id="commitHash">[commit hash]</span></td>
                 <td class="hidden-phone hidden-tablet rightAlign">
                     <span class="link">
                        <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>
                        <a wicket:id="diff"><wicket:message key="gb.diff"></wicket:message></a> | <a wicket:id="tree"><wicket:message key="gb.tree"></wicket:message></a>
                    </span>
                </td>
               </tr>
src/com/gitblit/wicket/panels/LogPanel.java
@@ -135,8 +135,6 @@
                item.add(new RefsPanel("commitRefs", repositoryName, entry, allRefs));
                item.add(new BookmarkablePageLink<Void>("view", CommitPage.class, WicketUtils
                        .newObjectParameter(repositoryName, entry.getName())));
                item.add(new BookmarkablePageLink<Void>("diff", CommitDiffPage.class, WicketUtils
                        .newObjectParameter(repositoryName, entry.getName())).setEnabled(entry
                        .getParentCount() > 0));