From fc948cacef9c9b8c0a1e84cbc082ca67cd5f68d9 Mon Sep 17 00:00:00 2001 From: James Moger <james.moger@gitblit.com> Date: Thu, 14 Apr 2011 18:29:10 -0400 Subject: [PATCH] Authenticate the webapp against the same realm as the git servlet. --- src/com/gitblit/wicket/pages/CommitPage.html | 78 +++++++++++++++++++++----------------- 1 files changed, 43 insertions(+), 35 deletions(-) diff --git a/src/com/gitblit/wicket/pages/CommitPage.html b/src/com/gitblit/wicket/pages/CommitPage.html index a493e04..a639f4a 100644 --- a/src/com/gitblit/wicket/pages/CommitPage.html +++ b/src/com/gitblit/wicket/pages/CommitPage.html @@ -1,51 +1,59 @@ -<?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> - <!-- page header --> - <div wicket:id="pageHeader"></div> +<wicket:extend> <!-- page nav links --> - <div wicket:id="pageLinks"></div> + <div wicket:id="pageLinks">[page links]</div> <!-- 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> - - <!-- Refs --> - <div wicket:id="refsPanel"></div> + <div class="header" wicket:id="shortlog">[shortlog header]</div> <!-- commit info --> - <div class="title_text"> - <table class="object_header"> - <tr><td>author</td><td><span wicket:id="commitAuthor">Message goes here</span></td></tr> - <tr><td></td><td><span wicket:id="commitAuthorDate">Message goes here</span></td></tr> - <tr><td>committer</td><td><span wicket:id="commitCommitter">Message goes here</span></td></tr> - <tr><td></td><td><span wicket:id="commitCommitterDate">Message goes here</span></td></tr> - <tr><td>commit</td><td class="sha1"><span wicket:id="commitId">Message goes here</span></td></tr> - <tr><td>tree</td><td class="sha1"><span wicket:id="commitTree">Message goes here</span></td></tr> - <tr><td>parent</td><td class="sha1"><span wicket:id="commitParents"> - <div wicket:id="commitParent">Message goes here</div></span></td></tr> - </table> - </div> - - <!-- full message --> - <div class="page_body" wicket:id="fullMessage"></div> - - <!-- changed paths --> - <div class="list_head"></div> - <table class="diff_tree"> - <tr wicket:id="changedPath"> - <td class="path"><span wicket:id="pathName"></span></td> - <td></td> - <td><span wicket:id="pathLinks"></span></td> + <table class="plain"> + <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 wicket:id="commitAuthor">[author</span></td></tr> + <tr><th></th><td><span wicket:id="commitAuthorDate">[author date]</span></td></tr> + <tr><th><wicket:message key="gb.committer">committer</wicket:message></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><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><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> + </span> + </td> </tr> </table> - <!-- footer --> - <div wicket:id="pageFooter"></div> + <!-- full message --> + <div class="commit_message" wicket:id="fullMessage">[commit message]</div> + + <!-- changed paths --> + <table style="border-top:1px solid #bbb;" class="pretty"> + <tr wicket:id="changedPath"> + <td class="path"><span wicket:id="pathName">[commit path]</span></td> + <td> + <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:extend> </body> </html> \ No newline at end of file -- Gitblit v1.9.1