From 7ef376e794cd6b593d47a86620ac343e97fe01bc Mon Sep 17 00:00:00 2001 From: James Moger <james.moger@gitblit.com> Date: Thu, 29 May 2014 12:44:27 -0400 Subject: [PATCH] Merged #92 "Create setting for work queue default thread pool size" --- src/main/java/com/gitblit/wicket/pages/CommitDiffPage.html | 40 +++++++++++++++++++++++++++++++++------- 1 files changed, 33 insertions(+), 7 deletions(-) diff --git a/src/main/java/com/gitblit/wicket/pages/CommitDiffPage.html b/src/main/java/com/gitblit/wicket/pages/CommitDiffPage.html index de39f4c..2c35a28 100644 --- a/src/main/java/com/gitblit/wicket/pages/CommitDiffPage.html +++ b/src/main/java/com/gitblit/wicket/pages/CommitDiffPage.html @@ -15,21 +15,39 @@ <!-- commit header --> <div wicket:id="commitHeader">[commit header]</div> - <!-- changed paths --> - <div style="padding-top:15px;"> - <!-- commit legend --> - <div class="hidden-phone" style="text-align:right;" wicket:id="commitLegend"></div> + <!-- full message --> + <div wicket:id="fullMessage">[commit message]</div> + + <!-- git notes --> + <table class="gitnotes"> + <tr wicket:id="notes"> + <td class="info"> + <table> + <tr><td><span wicket:id="refName"></span></td></tr> + <tr><td><span class="sha1" wicket:id="authorName"></span></td></tr> + <tr><td><span class="sha1" wicket:id="authorDate"></span></td></tr> + </table> + <!-- Note Author Gravatar --> + <span style="vertical-align: top;" wicket:id="noteAuthorAvatar" /> + </td> + <td class="message"><span class="sha1" wicket:id="noteContent"></span></td> + </tr> + </table> - <div class="header"><i class="icon-file"></i> <wicket:message key="gb.changedFiles">[changed files]</wicket:message></div> - </div> + <!-- commit legend --> + <div class="hidden-phone" style="text-align:right;" wicket:id="commitLegend"></div> + + <!-- changed paths --> + <div class="header"><span wicket:id="diffStat"></span><span style="padding-left:5px;"><wicket:message key="gb.changedFiles">[changed files]</wicket:message></span></div> <table class="pretty"> <tr wicket:id="changedPath"> <td class="changeType"><span wicket:id="changeType">[change type]</span></td> <td class="path"><span wicket:id="pathName">[commit path]</span></td> <td class="hidden-phone rightAlign"> + <span class="hidden-tablet" style="padding-right:20px;" wicket:id="diffStat"></span> <span class="link"> - <a wicket:id="patch"><wicket:message key="gb.patch"></wicket:message></a> | <a wicket:id="view"><wicket:message key="gb.view"></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> + <span class="hidden-tablet"><a wicket:id="patch"><wicket:message key="gb.patch"></wicket:message></a> | </span><a wicket:id="view"><wicket:message key="gb.view"></wicket:message></a><span class="hidden-tablet"> | <a wicket:id="raw"><wicket:message key="gb.raw"></wicket:message></a></span> | <a wicket:id="blame"><wicket:message key="gb.blame"></wicket:message></a> | <a wicket:id="history"><wicket:message key="gb.history"></wicket:message></a> </span> </td> </tr> @@ -37,6 +55,14 @@ <!-- diff content --> <pre style="padding-top:10px;" wicket:id="diffText">[diff text]</pre> + + <wicket:fragment wicket:id="fullPersonIdent"> + <span wicket:id="personName"></span><span wicket:id="personAddress"></span> + </wicket:fragment> + + <wicket:fragment wicket:id="partialPersonIdent"> + <span wicket:id="personName"></span> + </wicket:fragment> </wicket:extend> </body> -- Gitblit v1.9.1