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 2013/06/06 13:35:57 UTC
git commit: ISIS-424: suppress remember me.
Updated Branches:
refs/heads/master c375a4f1d -> 90c22cbf7
ISIS-424: suppress remember me.
Project: http://git-wip-us.apache.org/repos/asf/isis/repo
Commit: http://git-wip-us.apache.org/repos/asf/isis/commit/90c22cbf
Tree: http://git-wip-us.apache.org/repos/asf/isis/tree/90c22cbf
Diff: http://git-wip-us.apache.org/repos/asf/isis/diff/90c22cbf
Branch: refs/heads/master
Commit: 90c22cbf776340b1d7c60f4affef336fae8c3552
Parents: c375a4f
Author: Dan Haywood <da...@apache.org>
Authored: Thu Jun 6 12:26:24 2013 +0100
Committer: Dan Haywood <da...@apache.org>
Committed: Thu Jun 6 12:26:24 2013 +0100
----------------------------------------------------------------------
.../wicket/ui/pages/login/WicketSignInPage.html | 2 +-
.../wicket/ui/pages/login/WicketSignInPage.java | 29 ++++++++++++++-
.../main/webapp/WEB-INF/viewer_wicket.properties | 3 ++
3 files changed, 31 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/isis/blob/90c22cbf/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/login/WicketSignInPage.html
----------------------------------------------------------------------
diff --git a/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/login/WicketSignInPage.html b/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/login/WicketSignInPage.html
index 0ddb1d5..ee372b4 100644
--- a/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/login/WicketSignInPage.html
+++ b/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/login/WicketSignInPage.html
@@ -39,7 +39,7 @@
<div class="clear"/>
</div>
<div class="loginPanel">
- <h2>Member Login</h2>
+ <h2>Login</h2>
<span wicket:id="signInPanel"/>
</div>
<div wicket:id="exceptionStackTrace" class="exceptionStackTrace"/>
http://git-wip-us.apache.org/repos/asf/isis/blob/90c22cbf/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/login/WicketSignInPage.java
----------------------------------------------------------------------
diff --git a/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/login/WicketSignInPage.java b/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/login/WicketSignInPage.java
index 7343d37..0e220d6 100644
--- a/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/login/WicketSignInPage.java
+++ b/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/login/WicketSignInPage.java
@@ -23,16 +23,21 @@ import com.google.inject.Inject;
import com.google.inject.name.Named;
import org.apache.wicket.Application;
+import org.apache.wicket.MarkupContainer;
import org.apache.wicket.authroles.authentication.pages.SignInPage;
+import org.apache.wicket.authroles.authentication.panel.SignInPanel;
import org.apache.wicket.markup.head.CssReferenceHeaderItem;
import org.apache.wicket.markup.head.IHeaderResponse;
import org.apache.wicket.markup.head.JavaScriptHeaderItem;
import org.apache.wicket.markup.head.JavaScriptReferenceHeaderItem;
import org.apache.wicket.markup.head.PriorityHeaderItem;
import org.apache.wicket.markup.html.WebMarkupContainer;
+import org.apache.wicket.markup.html.WebPage;
import org.apache.wicket.markup.html.basic.Label;
import org.apache.wicket.request.mapper.parameter.PageParameters;
+import org.apache.isis.core.commons.config.IsisConfiguration;
+import org.apache.isis.core.runtime.system.context.IsisContext;
import org.apache.isis.viewer.wicket.model.mementos.PageParameterNames;
import org.apache.isis.viewer.wicket.ui.errors.ExceptionModel;
import org.apache.isis.viewer.wicket.ui.errors.ExceptionStackTracePanel;
@@ -41,7 +46,7 @@ import org.apache.isis.viewer.wicket.ui.pages.PageAbstract;
/**
* Boilerplate, pick up our HTML and CSS.
*/
-public final class WicketSignInPage extends SignInPage {
+public class WicketSignInPage extends WebPage {
private static final long serialVersionUID = 1L;
@@ -91,6 +96,7 @@ public final class WicketSignInPage extends SignInPage {
public WicketSignInPage(final PageParameters parameters, ExceptionModel exceptionModel) {
addPageTitle(parameters);
addApplicationName();
+ addSignInPanel();
if(exceptionModel != null) {
add(new ExceptionStackTracePanel(ID_EXCEPTION_STACK_TRACE, exceptionModel));
@@ -107,6 +113,18 @@ public final class WicketSignInPage extends SignInPage {
add(new Label(ID_APPLICATION_NAME, applicationName));
}
+ protected SignInPanel addSignInPanel() {
+ final boolean suppressRememberMe = getConfiguration().getBoolean("isis.viewer.wicket.suppressRememberMe", false);
+ final boolean rememberMe = !suppressRememberMe;
+ return addSignInPanel(rememberMe);
+ }
+
+ private SignInPanel addSignInPanel(boolean rememberMe) {
+ final SignInPanel signInPanel = new SignInPanel("signInPanel", rememberMe);
+ add(signInPanel);
+ return signInPanel;
+ }
+
@Override
public void renderHead(IHeaderResponse response) {
super.renderHead(response);
@@ -120,6 +138,13 @@ public final class WicketSignInPage extends SignInPage {
}
}
-
+
+ // ///////////////////////////////////////////////////
+ // System components
+ // ///////////////////////////////////////////////////
+
+ protected IsisConfiguration getConfiguration() {
+ return IsisContext.getConfiguration();
+ }
}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/isis/blob/90c22cbf/example/application/quickstart_wicket_restful_jdo/webapp/src/main/webapp/WEB-INF/viewer_wicket.properties
----------------------------------------------------------------------
diff --git a/example/application/quickstart_wicket_restful_jdo/webapp/src/main/webapp/WEB-INF/viewer_wicket.properties b/example/application/quickstart_wicket_restful_jdo/webapp/src/main/webapp/WEB-INF/viewer_wicket.properties
index 6d50e1c..5641bc9 100644
--- a/example/application/quickstart_wicket_restful_jdo/webapp/src/main/webapp/WEB-INF/viewer_wicket.properties
+++ b/example/application/quickstart_wicket_restful_jdo/webapp/src/main/webapp/WEB-INF/viewer_wicket.properties
@@ -37,3 +37,6 @@ isis.viewer.wicket.datePickerPattern=dd-mm-yy
#isis.viewer.wicket.datePattern=dd/MM/yy
#isis.viewer.wicket.dateTimePattern=dd/MM/yy HH:mm
#isis.viewer.wicket.datePickerPattern=dd/mm/y
+
+
+#isis.viewer.wicket.suppressRememberMe=true