You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@isis.apache.org by da...@apache.org on 2012/11/16 09:26:49 UTC
svn commit: r1410247 - in
/isis/trunk/framework/viewer/wicket/wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/login:
WicketSignInPage.html WicketSignInPage.java
Author: danhaywood
Date: Fri Nov 16 08:26:48 2012
New Revision: 1410247
URL: http://svn.apache.org/viewvc?rev=1410247&view=rev
Log:
ISIS-232: wicket signin page now references application.css
Modified:
isis/trunk/framework/viewer/wicket/wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/login/WicketSignInPage.html
isis/trunk/framework/viewer/wicket/wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/login/WicketSignInPage.java
Modified: isis/trunk/framework/viewer/wicket/wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/login/WicketSignInPage.html
URL: http://svn.apache.org/viewvc/isis/trunk/framework/viewer/wicket/wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/login/WicketSignInPage.html?rev=1410247&r1=1410246&r2=1410247&view=diff
==============================================================================
--- isis/trunk/framework/viewer/wicket/wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/login/WicketSignInPage.html (original)
+++ isis/trunk/framework/viewer/wicket/wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/login/WicketSignInPage.html Fri Nov 16 08:26:48 2012
@@ -28,7 +28,6 @@
<link href="WicketSignInPage.css" rel="stylesheet" />
<link href="../cssreset.css" rel="stylesheet" type="text/css"/>
</wicket:link>
- <link href="application.css" rel="stylesheet" type="text/css"/>
</head>
<body>
<div id="container" class="wicketSignInPanel">
Modified: isis/trunk/framework/viewer/wicket/wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/login/WicketSignInPage.java
URL: http://svn.apache.org/viewvc/isis/trunk/framework/viewer/wicket/wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/login/WicketSignInPage.java?rev=1410247&r1=1410246&r2=1410247&view=diff
==============================================================================
--- isis/trunk/framework/viewer/wicket/wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/login/WicketSignInPage.java (original)
+++ isis/trunk/framework/viewer/wicket/wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/login/WicketSignInPage.java Fri Nov 16 08:26:48 2012
@@ -23,6 +23,9 @@ import com.google.inject.Inject;
import com.google.inject.name.Named;
import org.apache.wicket.authroles.authentication.pages.SignInPage;
+import org.apache.wicket.markup.head.CssReferenceHeaderItem;
+import org.apache.wicket.markup.head.IHeaderResponse;
+import org.apache.wicket.markup.head.JavaScriptReferenceHeaderItem;
import org.apache.wicket.markup.html.basic.Label;
import org.apache.wicket.request.mapper.parameter.PageParameters;
@@ -49,6 +52,21 @@ public final class WicketSignInPage exte
@Named("applicationName")
private String applicationName;
+ /**
+ * {@link Inject}ed when {@link #init() initialized}.
+ */
+ @Inject
+ @Named("applicationCss")
+ private String applicationCss;
+
+ /**
+ * {@link Inject}ed when {@link #init() initialized}.
+ */
+ @Inject
+ @Named("applicationJs")
+ private String applicationJs;
+
+
public WicketSignInPage(final PageParameters parameters) {
addPageTitle(parameters);
addApplicationName();
@@ -61,4 +79,17 @@ public final class WicketSignInPage exte
private void addApplicationName() {
add(new Label(ID_APPLICATION_NAME, applicationName));
}
+
+ @Override
+ public void renderHead(IHeaderResponse response) {
+ super.renderHead(response);
+ if(applicationCss != null) {
+ response.render(CssReferenceHeaderItem.forUrl(applicationCss));
+ }
+ if(applicationJs != null) {
+ response.render(JavaScriptReferenceHeaderItem.forUrl(applicationJs));
+ }
+ }
+
+
}
\ No newline at end of file