From c1c3c6a7a2f0a2893ef36ab3dfc7b09d04a133bc Mon Sep 17 00:00:00 2001 From: James Moger <james.moger@gitblit.com> Date: Tue, 26 Apr 2011 18:05:39 -0400 Subject: [PATCH] Commit header panel. File type icons. Docs page. --- src/com/gitblit/wicket/pages/CommitPage.html | 61 +++++++++++++++++++++++------- 1 files changed, 46 insertions(+), 15 deletions(-) diff --git a/src/com/gitblit/wicket/pages/CommitPage.html b/src/com/gitblit/wicket/pages/CommitPage.html index da455d6..2601303 100644 --- a/src/com/gitblit/wicket/pages/CommitPage.html +++ b/src/com/gitblit/wicket/pages/CommitPage.html @@ -1,5 +1,9 @@ -<?xml version="1.0" encoding="UTF-8"?> -<html xmlns="http://www.w3.org/1999/xhtml" > +<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd"> +<html xmlns="http://www.w3.org/1999/xhtml" + xmlns:wicket="http://wicket.apache.org/dtds.data/wicket-xhtml1.3-strict.dtd" + xml:lang="en" + lang="en"> + <body> <wicket:extend> @@ -8,36 +12,63 @@ <!-- commit nav links --> <div class="page_nav2"> - parent: <span wicket:id="parentLink">[parent link]</span> | <span wicket:id="patchLink">[patch link]</span> + <wicket:message key="gb.parent"></wicket:message>: <span wicket:id="parentLink">[parent link]</span> | <a wicket:id="patchLink"><wicket:message key="gb.patch"></wicket:message></a> | <span wicket:id="commitdiffLink">[commitdiff link]</span> </div> - <!-- shortlog header --> - <div class="header" wicket:id="shortlog">[shortlog header]</div> + <!-- commit header --> + <div wicket:id="commitHeader">[commit header]</div> <!-- commit info --> <table class="plain"> - <tr><th>refs</th><td><div wicket:id="refsPanel">[references]</div></td></tr> - <tr><th>author</th><td><span wicket:id="commitAuthor">[author</span></td></tr> - <tr><th></th><td><span wicket:id="commitAuthorDate">[author date]</span></td></tr> - <tr><th>committer</th><td><span wicket:id="commitCommitter">[committer]</span></td></tr> - <tr><th></th><td><span wicket:id="commitCommitterDate">[commit date]</span></td></tr> - <tr><th>commit</th><td class="sha1"><span wicket:id="commitId">[commit id]</span></td></tr> - <tr><th>tree</th><td class="sha1"><span wicket:id="commitTree">[commit tree]</span></td></tr> - <tr><th>parent</th><td class="sha1"><span wicket:id="commitParents"> - <div wicket:id="commitParent">[commit parents]</div></span></td></tr> + <tr><th><wicket:message key="gb.refs">refs</wicket:message></th><td><div wicket:id="refsPanel">[references]</div></td></tr> + <tr><th><wicket:message key="gb.author">author</wicket:message></th><td><span class="sha1" wicket:id="commitAuthor">[author</span></td></tr> + <tr><th></th><td><span class="sha1" wicket:id="commitAuthorDate">[author date]</span></td></tr> + <tr><th><wicket:message key="gb.committer">committer</wicket:message></th><td><span class="sha1" wicket:id="commitCommitter">[committer]</span></td></tr> + <tr><th></th><td><span class="sha1" wicket:id="commitCommitterDate">[commit date]</span></td></tr> + <tr><th><wicket:message key="gb.commit">commit</wicket:message></th><td><span class="sha1" wicket:id="commitId">[commit id]</span></td></tr> + <tr><th><wicket:message key="gb.tree">tree</wicket:message></th><td><span class="sha1" wicket:id="commitTree">[commit tree]</span></td></tr> + <tr><th valign="top"><wicket:message key="gb.parent">parent</wicket:message></th> + <td> + <span wicket:id="commitParents"> + <span class="sha1" wicket:id="commitParent">[commit parents]</span> + <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> + </span><br/> + </span> + </td> + </tr> </table> <!-- full message --> <div class="commit_message" wicket:id="fullMessage">[commit message]</div> + + <!-- commit legend --> + <div style="text-align:right;" wicket:id="commitLegend"></div> + + <!-- header --> + <div class="header"><wicket:message key="gb.changedFiles">[changed files]</wicket:message></div> <!-- changed paths --> <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><span wicket:id="pathLinks">[path links]</span></td> + <td class="rightAlign"> + <span class="link"> + <a wicket:id="diff"><wicket:message key="gb.diff"></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> + </td> </tr> </table> + <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> </html> \ No newline at end of file -- Gitblit v1.9.1