From d3b1e34c7428fbe4ef3abeee9eaef0f885c3f19b Mon Sep 17 00:00:00 2001 From: James Moger <james.moger@gitblit.com> Date: Mon, 14 Apr 2014 12:31:56 -0400 Subject: [PATCH] Merged #47 "Fix diffstat display for tickets with pending submodule changes" --- src/main/java/com/gitblit/wicket/pages/BlamePage.html | 20 ++++++++++++-------- 1 files changed, 12 insertions(+), 8 deletions(-) diff --git a/src/main/java/com/gitblit/wicket/pages/BlamePage.html b/src/main/java/com/gitblit/wicket/pages/BlamePage.html index 9391eaf..126c337 100644 --- a/src/main/java/com/gitblit/wicket/pages/BlamePage.html +++ b/src/main/java/com/gitblit/wicket/pages/BlamePage.html @@ -9,7 +9,7 @@ <!-- blame nav links --> <div class="page_nav2"> - <a wicket:id="blobLink"><wicket:message key="gb.view"></wicket:message></a> | <a wicket:id="historyLink"><wicket:message key="gb.history"></wicket:message></a> | <a wicket:id="headLink"><wicket:message key="gb.head"></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> + <a wicket:id="blobLink"><wicket:message key="gb.view"></wicket:message></a> | <a wicket:id="historyLink"><wicket:message key="gb.history"></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> </div> <!-- commit header --> @@ -17,19 +17,23 @@ <!-- breadcrumbs --> <div wicket:id="breadcrumbs">[breadcrumbs]</div> + + <div wicket:id="missingBlob">[missing blob]</div> <!-- blame content --> - <table class="annotated" style="margin-bottom:5px;"> + <table class="annotated" style="margin-bottom:0px;"> <tbody> <tr> - <th><wicket:message key="gb.commit">[commit]</wicket:message></th> - <th><wicket:message key="gb.line">[line]</wicket:message></th> - <th><wicket:message key="gb.content">[content]</wicket:message></th> + <td colspan="3" class="rightAlign" style="background-color:#fbfbfb;"> + <span class="link" style="padding-right:10px;"> + <a wicket:id="blameByCommitLink"><wicket:message key="gb.commit">[blamebycommit]</wicket:message></a> | <a wicket:id="blameByAuthorLink"><wicket:message key="gb.author">[blamebyauthor]</wicket:message></a> | <a wicket:id="blameByAgeLink"><wicket:message key="gb.age">[blamebyage]</wicket:message></a> + </span> + </td> </tr> <tr wicket:id="annotation"> - <td><span class="sha1" wicket:id="commit"></span></td> - <td><span class="sha1" wicket:id="line"></span></td> - <td><span class="sha1" wicket:id="data"></span></td> + <td class="lineCommit"><span class="sha1" wicket:id="commit"></span></td> + <td class="lineNumber"><span class="sha1" wicket:id="line"></span></td> + <td class="lineContent sha1" wicket:id="data"></td> </tr> </tbody> </table> -- Gitblit v1.9.1