Menu
▾
▴
[jtrac-svn] SF.net SVN: j-trac:[1339] trunk/jtrac/src/main/java/info/jtrac/wicket
|
From: <man...@us...> - 2009-12-08 15:06:14
|
Revision: 1339
http://j-trac.svn.sourceforge.net/j-trac/?rev=1339&view=rev
Author: manfredwolff
Date: 2009-12-08 15:06:08 +0000 (Tue, 08 Dec 2009)
Log Message:
-----------
HTML and Java changes for individual head line.
Modified Paths:
--------------
trunk/jtrac/src/main/java/info/jtrac/wicket/BasePage.html
trunk/jtrac/src/main/java/info/jtrac/wicket/BasePage.java
trunk/jtrac/src/main/java/info/jtrac/wicket/IndividualHeadPanel.java
trunk/jtrac/src/main/java/info/jtrac/wicket/LoginPage.html
trunk/jtrac/src/main/java/info/jtrac/wicket/LoginPage.java
trunk/jtrac/src/main/java/info/jtrac/wicket/LogoutPage.html
trunk/jtrac/src/main/java/info/jtrac/wicket/LogoutPage.java
Modified: trunk/jtrac/src/main/java/info/jtrac/wicket/BasePage.html
===================================================================
--- trunk/jtrac/src/main/java/info/jtrac/wicket/BasePage.html 2009-12-08 15:05:04 UTC (rev 1338)
+++ trunk/jtrac/src/main/java/info/jtrac/wicket/BasePage.html 2009-12-08 15:06:08 UTC (rev 1339)
@@ -6,7 +6,8 @@
<link rel="shortcut icon" type="image/x-icon" href="favicon.ico"/>
<link rel="icon" type="image/x-icon" href="favicon.ico"/>
</head>
- <body>
+ <body>
+ <span wicket:id="individuel"></span><br/>
<span wicket:id="header"></span><br/>
<div style="clear:both"><br/></div>
<wicket:child/>
Modified: trunk/jtrac/src/main/java/info/jtrac/wicket/BasePage.java
===================================================================
--- trunk/jtrac/src/main/java/info/jtrac/wicket/BasePage.java 2009-12-08 15:05:04 UTC (rev 1338)
+++ trunk/jtrac/src/main/java/info/jtrac/wicket/BasePage.java 2009-12-08 15:06:08 UTC (rev 1339)
@@ -76,6 +76,7 @@
}
public BasePage() {
+ add(new IndividualHeadPanel().setRenderBodyOnly(true));
add(new HeaderPanel().setRenderBodyOnly(true));
String jtracVersion = getJtrac().getReleaseVersion();
add(new Label("version", jtracVersion));
Modified: trunk/jtrac/src/main/java/info/jtrac/wicket/IndividualHeadPanel.java
===================================================================
--- trunk/jtrac/src/main/java/info/jtrac/wicket/IndividualHeadPanel.java 2009-12-08 15:05:04 UTC (rev 1338)
+++ trunk/jtrac/src/main/java/info/jtrac/wicket/IndividualHeadPanel.java 2009-12-08 15:06:08 UTC (rev 1339)
@@ -46,9 +46,10 @@
private static final long serialVersionUID = 1L;
public final Object getObject() {
// based on some condition return the image source
+ String urlbase = configMap.get("jtrac.url.base");
String url = configMap.get("jtrac.header.picture");
if ((url == null) ||("".equals(url)))
- return "../resources/jtrac-logo.gif";
+ return urlbase + "/resources/jtrac-logo.gif";
else
return url;
}
Modified: trunk/jtrac/src/main/java/info/jtrac/wicket/LoginPage.html
===================================================================
--- trunk/jtrac/src/main/java/info/jtrac/wicket/LoginPage.html 2009-12-08 15:05:04 UTC (rev 1338)
+++ trunk/jtrac/src/main/java/info/jtrac/wicket/LoginPage.html 2009-12-08 15:06:08 UTC (rev 1339)
@@ -6,6 +6,7 @@
<link rel="shortcut icon" type="image/x-icon" href="favicon.ico"/>
</head>
<body>
+ <span wicket:id="individuel"></span><br/>
<table width="100%" class="jtrac alt">
<tr>
<td><a href="app"><wicket:message key="login.home"/></a></td>
Modified: trunk/jtrac/src/main/java/info/jtrac/wicket/LoginPage.java
===================================================================
--- trunk/jtrac/src/main/java/info/jtrac/wicket/LoginPage.java 2009-12-08 15:05:04 UTC (rev 1338)
+++ trunk/jtrac/src/main/java/info/jtrac/wicket/LoginPage.java 2009-12-08 15:06:08 UTC (rev 1339)
@@ -43,6 +43,7 @@
public LoginPage() {
setVersioned(false);
+ add(new IndividualHeadPanel().setRenderBodyOnly(true));
add(new Label("title", getLocalizer().getString("login.title", null)));
add(new LoginForm("form"));
String jtracVersion = JtracApplication.get().getJtrac().getReleaseVersion();
Modified: trunk/jtrac/src/main/java/info/jtrac/wicket/LogoutPage.html
===================================================================
--- trunk/jtrac/src/main/java/info/jtrac/wicket/LogoutPage.html 2009-12-08 15:05:04 UTC (rev 1338)
+++ trunk/jtrac/src/main/java/info/jtrac/wicket/LogoutPage.html 2009-12-08 15:06:08 UTC (rev 1339)
@@ -7,6 +7,7 @@
<link rel="icon" type="image/x-icon" href="favicon.ico"/>
</head>
<body>
+ <span wicket:id="individuel"></span><br/>
<table width="100%" class="jtrac alt">
<tr>
<td><a href="app"><wicket:message key="logout.home"/></a></td>
Modified: trunk/jtrac/src/main/java/info/jtrac/wicket/LogoutPage.java
===================================================================
--- trunk/jtrac/src/main/java/info/jtrac/wicket/LogoutPage.java 2009-12-08 15:05:04 UTC (rev 1338)
+++ trunk/jtrac/src/main/java/info/jtrac/wicket/LogoutPage.java 2009-12-08 15:06:08 UTC (rev 1339)
@@ -36,6 +36,7 @@
getRequestCycle().getSession().setLocale(StringUtils.parseLocaleString(locale));
}
setVersioned(false);
+ add(new IndividualHeadPanel().setRenderBodyOnly(true));
add(new Label("title", getLocalizer().getString("logout.title", null)));
String jtracVersion = JtracApplication.get().getJtrac().getReleaseVersion();
add(new Label("version", jtracVersion));
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
