From c658df9e87d65b08d5482cf04489cb0532ff83dd Mon Sep 17 00:00:00 2001 From: James Moger <james.moger@gitblit.com> Date: Sat, 13 Oct 2012 10:50:35 -0400 Subject: [PATCH] Merge branch 'master' of https://github.com/Mrbytes/gitblit --- src/com/gitblit/wicket/pages/CommitPage.html | 104 +++++++++++++++++++++++++++++++++++++++------------ 1 files changed, 79 insertions(+), 25 deletions(-) diff --git a/src/com/gitblit/wicket/pages/CommitPage.html b/src/com/gitblit/wicket/pages/CommitPage.html index c2edbea..20e6b60 100644 --- a/src/com/gitblit/wicket/pages/CommitPage.html +++ b/src/com/gitblit/wicket/pages/CommitPage.html @@ -1,45 +1,99 @@ -<?xml version="1.0" encoding="UTF-8"?> -<html xmlns="http://www.w3.org/1999/xhtml" > -<body> - <!-- page header --> - <div wicket:id="pageHeader"></div> +<!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"> - <!-- page nav links --> - <div wicket:id="pageLinks"></div> - +<body> +<wicket:extend> + <!-- commit nav links --> <div class="page_nav2"> - parent: <span wicket:id="parentLink"></span> | <span wicket:id="patchLink"></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"></div> + <!-- commit header --> + <div wicket:id="commitHeader">[commit header]</div> + <div class="row"> + + + <div class="span10"> <!-- commit info --> <table class="plain"> - <tr><th>refs</th><td><div wicket:id="refsPanel"></div></td></tr> - <tr><th>author</th><td><span wicket:id="commitAuthor">Message goes here</span></td></tr> - <tr><th></th><td><span wicket:id="commitAuthorDate">Message goes here</span></td></tr> - <tr><th>committer</th><td><span wicket:id="commitCommitter">Message goes here</span></td></tr> - <tr><th></th><td><span wicket:id="commitCommitterDate">Message goes here</span></td></tr> - <tr><th>commit</th><td class="sha1"><span wicket:id="commitId">Message goes here</span></td></tr> - <tr><th>tree</th><td class="sha1"><span wicket:id="commitTree">Message goes here</span></td></tr> - <tr><th>parent</th><td class="sha1"><span wicket:id="commitParents"> - <div wicket:id="commitParent">Message goes here</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 class="hidden-phone"><th><wicket:message key="gb.commit">commit</wicket:message></th><td><span class="sha1" wicket:id="commitId">[commit id]</span></td></tr> + <tr class="hidden-phone"><th><wicket:message key="gb.tree">tree</wicket:message></th> + <td><span class="sha1" wicket:id="commitTree">[commit tree]</span> + <span class="link"> + <a wicket:id="treeLink"><wicket:message key="gb.tree"></wicket:message></a> | <a wicket:id="zipLink"><wicket:message key="gb.zip"></wicket:message></a> + </span> + </td></tr> + <tr class="hidden-phone"><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> + </div> + + </div> <!-- full message --> - <div class="commit_message" wicket:id="fullMessage"></div> + <div class="commit_message" 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> + + <!-- header --> + <div class="header"><i class="icon-file"></i> <wicket:message key="gb.changedFiles">[changed files]</wicket:message></div> <!-- changed paths --> <table class="pretty"> <tr wicket:id="changedPath"> - <td class="path"><span wicket:id="pathName"></span></td> - <td><span wicket:id="pathLinks"></span></td> + <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="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> - <!-- footer --> - <div wicket:id="pageFooter"></div> + <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