From 67b82a67335cc24b3cadf3e31de097b21294b244 Mon Sep 17 00:00:00 2001 From: James Moger <james.moger@gitblit.com> Date: Wed, 18 Sep 2013 11:31:01 -0400 Subject: [PATCH] Added GitNotes to the commitdiff page --- src/main/java/com/gitblit/wicket/pages/CommitDiffPage.html | 24 ++++++++++++++++++++++++ 1 files changed, 24 insertions(+), 0 deletions(-) diff --git a/src/main/java/com/gitblit/wicket/pages/CommitDiffPage.html b/src/main/java/com/gitblit/wicket/pages/CommitDiffPage.html index 7437d2e..7fd3857 100644 --- a/src/main/java/com/gitblit/wicket/pages/CommitDiffPage.html +++ b/src/main/java/com/gitblit/wicket/pages/CommitDiffPage.html @@ -18,6 +18,22 @@ <!-- 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> + <!-- commit legend --> <div class="hidden-phone" style="text-align:right;" wicket:id="commitLegend"></div> @@ -38,6 +54,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