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/TicGitTicketPage.html | 42 ++++++++++++++++++++++--------------------
1 files changed, 22 insertions(+), 20 deletions(-)
diff --git a/src/com/gitblit/wicket/pages/TicGitTicketPage.html b/src/com/gitblit/wicket/pages/TicGitTicketPage.html
index b66bf50..aafbf8c 100644
--- a/src/com/gitblit/wicket/pages/TicGitTicketPage.html
+++ b/src/com/gitblit/wicket/pages/TicGitTicketPage.html
@@ -1,39 +1,41 @@
-<?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>
<!-- ticket title -->
- <div style="font-size:150%;padding-top:5px;" wicket:id="ticketTitle"></div>
+ <div style="font-size:150%;padding-top:5px;" wicket:id="ticketTitle">[ticket title]</div>
<!-- ticket info -->
<table class="plain">
- <tr><th>ticket id</th><td class="sha1"><span wicket:id="ticketId">Message goes here</span></td></tr>
- <tr><th>assigned</th><td><span wicket:id=ticketHandler>Message goes here</span></td></tr>
- <tr><th>open date</th><td><span wicket:id="ticketOpenDate">Message goes here</span></td></tr>
- <tr><th>state</th><td><span wicket:id="ticketState">Message goes here</span></td></tr>
- <tr><th>tags</th><td><span wicket:id="ticketTags">Message goes here</span></td></tr>
+ <tr><th><wicket:message key="gb.ticketId">ticket id</wicket:message></th><td><span class="sha1" wicket:id="ticketId">[ticket id]</span></td></tr>
+ <tr><th><wicket:message key="gb.ticketAssigned">assigned</wicket:message></th><td><span wicket:id=ticketHandler>[ticket title]</span></td></tr>
+ <tr><th><wicket:message key="gb.ticketOpenDate">open date</wicket:message></th><td><span wicket:id="ticketOpenDate">[ticket open date]</span></td></tr>
+ <tr><th><wicket:message key="gb.ticketState">state</wicket:message></th><td><span wicket:id="ticketState">[ticket state]</span></td></tr>
+ <tr><th><wicket:message key="gb.tags">tags</wicket:message></th><td><span wicket:id="ticketTags">[ticket tags]</span></td></tr>
</table>
<!-- comments header -->
- <div class="header">Comments</div>
+ <div class="header"><wicket:message key="gb.ticketComments">comments</wicket:message></div>
<!-- comments -->
- <table style="width:100%;" class="pretty">
+ <table style="width:100%;" class="comments">
<tbody>
- <tr wicket:id="comment">
- <td class="date"><span wicket:id="commentDate"></span></td>
- <td><b><div wicket:id="commentAuthor"></div></b></td>
- <td><div wicket:id="commentText"></div></td>
+ <tr valign="top" wicket:id="comment">
+ <td><span class="date" wicket:id="commentDate">[comment date]</span><br/>
+ <span class="author" wicket:id="commentAuthor">[comment author]</span></td>
+ <td><span wicket:id="commentText">[comment text]</span></td>
</tr>
</tbody>
</table>
-
- <!-- footer -->
- <div wicket:id="pageFooter"></div>
+
+</wicket:extend>
</body>
</html>
\ No newline at end of file
--
Gitblit v1.9.1