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 2014/01/13 21:50:44 UTC
git commit: ISIS-649: custom div to hold theme
Updated Branches:
refs/heads/master a08335605 -> 1e7a523a3
ISIS-649: custom div to hold theme
derived from applicationName
Project: http://git-wip-us.apache.org/repos/asf/isis/repo
Commit: http://git-wip-us.apache.org/repos/asf/isis/commit/1e7a523a
Tree: http://git-wip-us.apache.org/repos/asf/isis/tree/1e7a523a
Diff: http://git-wip-us.apache.org/repos/asf/isis/diff/1e7a523a
Branch: refs/heads/master
Commit: 1e7a523a315d3acd3d876fe2285652bc40119ddb
Parents: a083356
Author: Dan Haywood <da...@apache.org>
Authored: Mon Jan 13 20:37:16 2014 +0000
Committer: Dan Haywood <da...@apache.org>
Committed: Mon Jan 13 20:37:16 2014 +0000
----------------------------------------------------------------------
.../viewer/wicket/ui/pages/PageAbstract.html | 104 ++++++++++---------
.../viewer/wicket/ui/pages/PageAbstract.java | 64 +++++++-----
.../viewer/wicket/ui/pages/about/AboutPage.java | 2 +-
.../ui/pages/actionprompt/ActionPromptPage.java | 4 +-
.../wicket/ui/pages/entity/EntityPage.java | 2 +-
.../viewer/wicket/ui/pages/error/ErrorPage.java | 2 +-
.../viewer/wicket/ui/pages/home/HomePage.java | 10 +-
.../StandaloneCollectionPage.java | 2 +-
.../viewer/wicket/ui/pages/value/ValuePage.java | 4 +-
.../ui/pages/voidreturn/VoidReturnPage.java | 4 +-
.../src/main/java/webapp/ToDoApplication.java | 4 +-
.../src/main/java/dom/simple/SimpleObjects.java | 3 +
.../src/main/java/webapp/SimpleApplication.java | 8 +-
.../webapp/WEB-INF/viewer_wicket.properties | 1 +
14 files changed, 118 insertions(+), 96 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/isis/blob/1e7a523a/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/PageAbstract.html
----------------------------------------------------------------------
diff --git a/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/PageAbstract.html b/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/PageAbstract.html
index 8c0b9bb..d4cbc50 100644
--- a/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/PageAbstract.html
+++ b/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/PageAbstract.html
@@ -34,59 +34,61 @@
</wicket:head>
<body>
<div id="container" class="page container-fluid">
- <div class="headerContainer">
- <div>
- <h1>
- <a wicket:id="homePageLink" id="header" href="#">
- <span wicket:id="applicationName" class="applicationName">[application name]</span>
- </a>
- </h1>
- </div>
-
- <div id="secondaryMenu">
- <div class="links">
- <span wicket:id="userName">[username]</span>
- <a href="#" wicket:id="logoutLink">logout</a>
- <a href="#" wicket:id="aboutLink">about</a>
- </div>
- </div>
-
- <div class="clear"/>
-
- <div wicket:id="applicationActions" id="applicationActions"/>
- <div id="tertiaryMenu">
- <a wicket:id="copyLink" href="#">
- <span> </span>
- </a>
- </div>
- <div id="breadcrumbsMenu">
- <span wicket:id="breadcrumbs"/>
- </div>
-
- </div>
-
- <div id="body">
- <wicket:child/>
-
- <div class="clear"/>
- </div>
-
- <div wicket:id="actionPromptModalWindow"/>
-
- <div id="veil">
- <div class="imgHolder">
- <wicket:link>
- <img src="spinning-icon.gif"/>
- </wicket:link>
+ <div wicket:id="theme">
+ <div class="headerContainer">
+ <div>
+ <h1>
+ <a wicket:id="homePageLink" id="header" href="#">
+ <span wicket:id="applicationName" class="applicationName">[application name]</span>
+ </a>
+ </h1>
+ </div>
+
+ <div id="secondaryMenu">
+ <div class="links">
+ <span wicket:id="userName">[username]</span>
+ <a href="#" wicket:id="logoutLink">logout</a>
+ <a href="#" wicket:id="aboutLink">about</a>
+ </div>
+ </div>
+
+ <div class="clear"/>
+
+ <div wicket:id="applicationActions" id="applicationActions"/>
+ <div id="tertiaryMenu">
+ <a wicket:id="copyLink" href="#">
+ <span> </span>
+ </a>
+ </div>
+ <div id="breadcrumbsMenu">
+ <span wicket:id="breadcrumbs"/>
+ </div>
+
+ </div>
+
+ <div id="body">
+ <wicket:child/>
+
+ <div class="clear"/>
+ </div>
+
+ <div wicket:id="actionPromptModalWindow"/>
+
+ <div id="veil">
+ <div class="imgHolder">
+ <wicket:link>
+ <img src="spinning-icon.gif"/>
+ </wicket:link>
+ </div>
</div>
+
+
+ <div id="footer">
+ <div class="links">
+ powered by: <a href="http://isis.apache.org">Apache Isis</a>
+ </div>
+ </div>
</div>
-
-
- <div id="footer">
- <div class="links">
- powered by: <a href="http://isis.apache.org">Apache Isis</a>
- </div>
- </div>
</div>
<div class="javascriptInFooter">
http://git-wip-us.apache.org/repos/asf/isis/blob/1e7a523a/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/PageAbstract.java
----------------------------------------------------------------------
diff --git a/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/PageAbstract.java b/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/PageAbstract.java
index 758e813..fda149e 100644
--- a/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/PageAbstract.java
+++ b/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/PageAbstract.java
@@ -28,23 +28,22 @@ 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.RestartResponseAtInterceptPageException;
-import org.apache.wicket.ajax.markup.html.AjaxLink;
import org.apache.wicket.event.Broadcast;
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.OnDomReadyHeaderItem;
-import org.apache.wicket.markup.head.OnLoadHeaderItem;
import org.apache.wicket.markup.head.PriorityHeaderItem;
import org.apache.wicket.markup.head.filter.HeaderResponseContainer;
+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.markup.html.link.ExternalLink;
import org.apache.wicket.markup.html.link.Link;
import org.apache.wicket.model.IModel;
-import org.apache.wicket.request.IRequestParameters;
import org.apache.wicket.request.mapper.parameter.PageParameters;
import org.apache.wicket.request.resource.JavaScriptResourceReference;
import org.slf4j.Logger;
@@ -54,7 +53,7 @@ import org.apache.isis.applib.services.exceprecog.ExceptionRecognizer;
import org.apache.isis.applib.services.exceprecog.ExceptionRecognizerComposite;
import org.apache.isis.core.commons.authentication.AuthenticationSession;
import org.apache.isis.core.commons.authentication.MessageBroker;
-import org.apache.isis.core.metamodel.adapter.ObjectAdapter;
+import org.apache.isis.core.commons.lang.StringExtensions;
import org.apache.isis.core.metamodel.services.ServicesInjectorSpi;
import org.apache.isis.core.metamodel.spec.SpecificationLoaderSpi;
import org.apache.isis.core.runtime.system.context.IsisContext;
@@ -79,6 +78,7 @@ import org.apache.isis.viewer.wicket.ui.errors.JGrowlUtil;
import org.apache.isis.viewer.wicket.ui.pages.about.AboutPage;
import org.apache.isis.viewer.wicket.ui.pages.login.WicketSignInPage;
import org.apache.isis.viewer.wicket.ui.util.Components;
+import org.apache.isis.viewer.wicket.ui.util.CssClassAppender;
/**
* Convenience adapter for {@link WebPage}s built up using {@link ComponentType}s.
@@ -86,10 +86,12 @@ import org.apache.isis.viewer.wicket.ui.util.Components;
public abstract class PageAbstract extends WebPage implements ActionPromptProvider {
+
private static Logger LOG = LoggerFactory.getLogger(PageAbstract.class);
private static final long serialVersionUID = 1L;
+ private static final String ID_THEME = "theme";
private static final String ID_BOOKMARKED_PAGES = "bookmarks";
private static final String ID_HOME_PAGE_LINK = "homePageLink";
private static final String ID_APPLICATION_NAME = "applicationName";
@@ -160,9 +162,18 @@ public abstract class PageAbstract extends WebPage implements ActionPromptProvid
// for breadcrumbs support
getSession().bind();
- addApplicationActions(applicationActions);
+ add(new Label(ID_PAGE_TITLE, title != null? title: applicationName));
+
+ themeDiv = new WebMarkupContainer(ID_THEME);
+ add(themeDiv);
+ if(applicationName != null) {
+ themeDiv.add(new CssClassAppender(asCssStyle(applicationName)));
+ }
+
+ addApplicationActions(themeDiv, applicationActions);
this.childComponentIds = Collections.unmodifiableList(Arrays.asList(childComponentIds));
this.pageParameters = pageParameters;
+
addHomePageLinkAndApplicationName();
addUserName();
addLogoutLink();
@@ -170,8 +181,6 @@ public abstract class PageAbstract extends WebPage implements ActionPromptProvid
addBreadcrumbs();
addCopyLink();
- add(new Label(ID_PAGE_TITLE, title != null? title: applicationName));
-
// ensure that all collected JavaScript contributions are loaded at the page footer
add(new HeaderResponseContainer("footerJS", "footerJS"));
@@ -195,6 +204,11 @@ public abstract class PageAbstract extends WebPage implements ActionPromptProvid
}
+ private static String asCssStyle(final String str) {
+ return StringExtensions.asLowerDashed(str);
+ }
+
+
protected ExceptionModel recognizeException(Exception ex) {
List<ExceptionRecognizer> exceptionRecognizers;
try {
@@ -235,16 +249,16 @@ public abstract class PageAbstract extends WebPage implements ActionPromptProvid
// this is a bit hacky, but it'll do...
ExternalLink homePageLink = new ExternalLink(ID_HOME_PAGE_LINK, "/wicket/");
homePageLink.setContextRelative(true);
- add(homePageLink);
+ themeDiv.add(homePageLink);
homePageLink.add(new Label(ID_APPLICATION_NAME, applicationName));
}
private void addUserName() {
- add(new Label(ID_USER_NAME, getAuthenticationSession().getUserName()));
+ themeDiv.add(new Label(ID_USER_NAME, getAuthenticationSession().getUserName()));
}
private void addLogoutLink() {
- add(new Link<Object>(ID_LOGOUT_LINK) {
+ themeDiv.add(new Link<Object>(ID_LOGOUT_LINK) {
private static final long serialVersionUID = 1L;
@Override
@@ -256,7 +270,7 @@ public abstract class PageAbstract extends WebPage implements ActionPromptProvid
}
private void addAboutLink() {
- add(new Link<Object>(ID_ABOUT_LINK) {
+ themeDiv.add(new Link<Object>(ID_ABOUT_LINK) {
private static final long serialVersionUID = 1L;
@Override
@@ -268,12 +282,12 @@ public abstract class PageAbstract extends WebPage implements ActionPromptProvid
private void addBreadcrumbs() {
BreadcrumbPanel breadcrumbPanel = new BreadcrumbPanel(ID_BREADCRUMBS);
- addOrReplace(breadcrumbPanel);
+ themeDiv.addOrReplace(breadcrumbPanel);
}
private void addCopyLink() {
ZeroClipboardPanel zClipCopyLink = new ZeroClipboardPanel(ID_COPY_LINK);
- addOrReplace(zClipCopyLink);
+ themeDiv.addOrReplace(zClipCopyLink);
}
@@ -294,15 +308,15 @@ public abstract class PageAbstract extends WebPage implements ActionPromptProvid
return pageParameters;
}
- private void addApplicationActions(final ApplicationActions applicationActions) {
+ private void addApplicationActions(MarkupContainer container, final ApplicationActions applicationActions) {
if(applicationActions == ApplicationActions.INCLUDE) {
addActionPromptModalWindow();
final ApplicationActionsModel model = new ApplicationActionsModel();
model.setActionPromptModalWindowProvider(this);
- addComponent(ComponentType.APPLICATION_ACTIONS, model);
+ addComponent(container, ComponentType.APPLICATION_ACTIONS, model);
} else {
- Components.permanentlyHide(this, ComponentType.APPLICATION_ACTIONS);
- Components.permanentlyHide(this, ID_ACTION_PROMPT_MODAL_WINDOW);
+ Components.permanentlyHide(container, ComponentType.APPLICATION_ACTIONS);
+ Components.permanentlyHide(container, ID_ACTION_PROMPT_MODAL_WINDOW);
}
}
@@ -316,14 +330,14 @@ public abstract class PageAbstract extends WebPage implements ActionPromptProvid
* - used to find the best matching {@link ComponentFactory} to
* render the model.
*/
- protected void addChildComponents(final IModel<?> model) {
+ protected void addChildComponents(MarkupContainer container, final IModel<?> model) {
for (final ComponentType componentType : getChildModelTypes()) {
- addComponent(componentType, model);
+ addComponent(container, componentType, model);
}
}
- private void addComponent(final ComponentType componentType, final IModel<?> model) {
- getComponentFactoryRegistry().addOrReplaceComponent(this, componentType, model);
+ private void addComponent(MarkupContainer container, final ComponentType componentType, final IModel<?> model) {
+ getComponentFactoryRegistry().addOrReplaceComponent(container, componentType, model);
}
@@ -335,7 +349,7 @@ public abstract class PageAbstract extends WebPage implements ActionPromptProvid
* Convenience for subclasses
*/
protected void addBookmarkedPages() {
- getComponentFactoryRegistry().addOrReplaceComponent(this, ID_BOOKMARKED_PAGES, ComponentType.BOOKMARKED_PAGES, getBookmarkedPagesModel());
+ getComponentFactoryRegistry().addOrReplaceComponent(themeDiv, ID_BOOKMARKED_PAGES, ComponentType.BOOKMARKED_PAGES, getBookmarkedPagesModel());
}
protected void bookmarkPage(BookmarkableModel<?> model) {
@@ -354,13 +368,15 @@ public abstract class PageAbstract extends WebPage implements ActionPromptProvid
// ///////////////////////////////////////////////////////////////////
private ActionPromptModalWindow actionPromptModalWindow;
+
+ protected MarkupContainer themeDiv;
public ActionPrompt getActionPrompt() {
return ActionPromptModalWindow.getActionPromptModalWindowIfEnabled(actionPromptModalWindow);
}
private void addActionPromptModalWindow() {
- this.actionPromptModalWindow = ActionPromptModalWindow.newModalWindow(ID_ACTION_PROMPT_MODAL_WINDOW);
- addOrReplace(actionPromptModalWindow);
+ actionPromptModalWindow = ActionPromptModalWindow.newModalWindow(ID_ACTION_PROMPT_MODAL_WINDOW);
+ themeDiv.addOrReplace(actionPromptModalWindow);
}
http://git-wip-us.apache.org/repos/asf/isis/blob/1e7a523a/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/about/AboutPage.java
----------------------------------------------------------------------
diff --git a/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/about/AboutPage.java b/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/about/AboutPage.java
index 9c9c378..a0e89f5 100644
--- a/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/about/AboutPage.java
+++ b/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/about/AboutPage.java
@@ -34,7 +34,7 @@ public class AboutPage extends PageAbstract {
public AboutPage() {
super(new PageParameters(), ApplicationActions.INCLUDE, null, ComponentType.ABOUT);
addBookmarkedPages();
- addChildComponents(null);
+ addChildComponents(themeDiv, null);
}
}
http://git-wip-us.apache.org/repos/asf/isis/blob/1e7a523a/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/actionprompt/ActionPromptPage.java
----------------------------------------------------------------------
diff --git a/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/actionprompt/ActionPromptPage.java b/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/actionprompt/ActionPromptPage.java
index 38dafd0..1e03f1a 100644
--- a/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/actionprompt/ActionPromptPage.java
+++ b/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/actionprompt/ActionPromptPage.java
@@ -40,7 +40,7 @@ public class ActionPromptPage extends PageAbstract {
*/
public ActionPromptPage(final ActionModel model) {
super(new PageParameters(), ApplicationActions.INCLUDE, model.getActionMemento().getAction().getName(), ComponentType.ACTION_PROMPT);
- addChildComponents(model);
+ addChildComponents(themeDiv, model);
if(model.isBookmarkable()) {
bookmarkPage(model);
@@ -54,7 +54,7 @@ public class ActionPromptPage extends PageAbstract {
public ActionPromptPage(final PageParameters pageParameters, final ActionModel model) {
super(pageParameters, ApplicationActions.INCLUDE, model.getActionMemento().getAction().getName(), ComponentType.ACTION_PROMPT);
- addChildComponents(model);
+ addChildComponents(themeDiv, model);
// no need to bookmark because the ActionPanel will have done so for us
addBookmarkedPages();
http://git-wip-us.apache.org/repos/asf/isis/blob/1e7a523a/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/entity/EntityPage.java
----------------------------------------------------------------------
diff --git a/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/entity/EntityPage.java b/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/entity/EntityPage.java
index d8f03d0..2ffe5df 100644
--- a/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/entity/EntityPage.java
+++ b/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/entity/EntityPage.java
@@ -79,7 +79,7 @@ public class EntityPage extends PageAbstract {
super(pageParameters, ApplicationActions.INCLUDE, titleString, ComponentType.ENTITY);
this.model = entityModel;
- addChildComponents(model);
+ addChildComponents(themeDiv, model);
bookmarkPage(model);
addBookmarkedPages();
http://git-wip-us.apache.org/repos/asf/isis/blob/1e7a523a/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/error/ErrorPage.java
----------------------------------------------------------------------
diff --git a/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/error/ErrorPage.java b/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/error/ErrorPage.java
index 1f61f4c..e55a56f 100644
--- a/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/error/ErrorPage.java
+++ b/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/error/ErrorPage.java
@@ -42,7 +42,7 @@ public class ErrorPage extends PageAbstract {
addBookmarkedPages();
- add(new ExceptionStackTracePanel(ID_EXCEPTION_STACK_TRACE, exceptionModel));
+ themeDiv.add(new ExceptionStackTracePanel(ID_EXCEPTION_STACK_TRACE, exceptionModel));
}
}
http://git-wip-us.apache.org/repos/asf/isis/blob/1e7a523a/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/home/HomePage.java
----------------------------------------------------------------------
diff --git a/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/home/HomePage.java b/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/home/HomePage.java
index 19067d7..82a4715 100644
--- a/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/home/HomePage.java
+++ b/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/home/HomePage.java
@@ -50,7 +50,7 @@ public class HomePage extends PageAbstract {
public HomePage() {
super(new PageParameters(), ApplicationActions.INCLUDE, null);
- addChildComponents(null);
+ addChildComponents(themeDiv, null);
buildGui();
addBookmarkedPages();
@@ -59,12 +59,12 @@ public class HomePage extends PageAbstract {
private void buildGui() {
final ObjectAndAction objectAndAction = lookupHomePageAction();
if(objectAndAction != null) {
- Components.permanentlyHide(this, ComponentType.WELCOME);
+ Components.permanentlyHide(themeDiv, ComponentType.WELCOME);
final IModel<?> actionModel = ActionModel.create(objectAndAction.objectAdapter, objectAndAction.action);
- getComponentFactoryRegistry().addOrReplaceComponent(this, ComponentType.ACTION_PROMPT, actionModel);
+ getComponentFactoryRegistry().addOrReplaceComponent(themeDiv, ComponentType.ACTION_PROMPT, actionModel);
} else {
- Components.permanentlyHide(this, ComponentType.ACTION_PROMPT);
- getComponentFactoryRegistry().addOrReplaceComponent(this, ComponentType.WELCOME, null);
+ Components.permanentlyHide(themeDiv, ComponentType.ACTION_PROMPT);
+ getComponentFactoryRegistry().addOrReplaceComponent(themeDiv, ComponentType.WELCOME, null);
}
}
http://git-wip-us.apache.org/repos/asf/isis/blob/1e7a523a/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/standalonecollection/StandaloneCollectionPage.java
----------------------------------------------------------------------
diff --git a/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/standalonecollection/StandaloneCollectionPage.java b/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/standalonecollection/StandaloneCollectionPage.java
index 72c853a..685fc09 100644
--- a/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/standalonecollection/StandaloneCollectionPage.java
+++ b/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/standalonecollection/StandaloneCollectionPage.java
@@ -41,7 +41,7 @@ public class StandaloneCollectionPage extends PageAbstract {
*/
public StandaloneCollectionPage(final EntityCollectionModel model) {
super(new PageParameters(), ApplicationActions.INCLUDE, actionNameFrom(model), ComponentType.STANDALONE_COLLECTION);
- addChildComponents(model);
+ addChildComponents(themeDiv, model);
addBookmarkedPages();
}
http://git-wip-us.apache.org/repos/asf/isis/blob/1e7a523a/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/value/ValuePage.java
----------------------------------------------------------------------
diff --git a/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/value/ValuePage.java b/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/value/ValuePage.java
index 576114c..f42fa89 100644
--- a/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/value/ValuePage.java
+++ b/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/value/ValuePage.java
@@ -51,9 +51,9 @@ public class ValuePage extends PageAbstract {
private ValuePage(ValueModel valueModel, String actionName) {
super(new PageParameters(), ApplicationActions.INCLUDE, actionName, ComponentType.VALUE);
- addOrReplace(new Label(ID_ACTION_NAME, actionName));
+ themeDiv.addOrReplace(new Label(ID_ACTION_NAME, actionName));
- addChildComponents(valueModel);
+ addChildComponents(themeDiv, valueModel);
addBookmarkedPages();
http://git-wip-us.apache.org/repos/asf/isis/blob/1e7a523a/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/voidreturn/VoidReturnPage.java
----------------------------------------------------------------------
diff --git a/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/voidreturn/VoidReturnPage.java b/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/voidreturn/VoidReturnPage.java
index 2c3a92b..6bf8592 100644
--- a/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/voidreturn/VoidReturnPage.java
+++ b/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/voidreturn/VoidReturnPage.java
@@ -49,9 +49,9 @@ public class VoidReturnPage extends PageAbstract {
private VoidReturnPage(final VoidModel model, final String actionName) {
super(new PageParameters(), ApplicationActions.INCLUDE, actionName, ComponentType.VOID_RETURN);
- addOrReplace(new Label(ID_ACTION_NAME, actionName));
+ themeDiv.addOrReplace(new Label(ID_ACTION_NAME, actionName));
- addChildComponents(model);
+ addChildComponents(themeDiv, model);
addBookmarkedPages();
}
http://git-wip-us.apache.org/repos/asf/isis/blob/1e7a523a/example/application/quickstart_wicket_restful_jdo/webapp/src/main/java/webapp/ToDoApplication.java
----------------------------------------------------------------------
diff --git a/example/application/quickstart_wicket_restful_jdo/webapp/src/main/java/webapp/ToDoApplication.java b/example/application/quickstart_wicket_restful_jdo/webapp/src/main/java/webapp/ToDoApplication.java
index 08c60e3..01bbbb7 100644
--- a/example/application/quickstart_wicket_restful_jdo/webapp/src/main/java/webapp/ToDoApplication.java
+++ b/example/application/quickstart_wicket_restful_jdo/webapp/src/main/java/webapp/ToDoApplication.java
@@ -117,11 +117,11 @@ public class ToDoApplication extends IsisWicketApplication {
bind(ComponentFactoryRegistrar.class).to(ComponentFactoryRegistrarForToDoApp.class);
bind(PageClassList.class).to(PageClassListForToDoApp.class);
- bind(String.class).annotatedWith(Names.named("applicationName")).toInstance("Quick Start App");
+ bind(String.class).annotatedWith(Names.named("applicationName")).toInstance("ToDo App");
bind(String.class).annotatedWith(Names.named("applicationCss")).toInstance("css/application.css");
bind(String.class).annotatedWith(Names.named("applicationJs")).toInstance("scripts/application.js");
bind(String.class).annotatedWith(Names.named("welcomeMessage")).toInstance(readLines("welcome.html"));
- bind(String.class).annotatedWith(Names.named("aboutMessage")).toInstance("QuickStart");
+ bind(String.class).annotatedWith(Names.named("aboutMessage")).toInstance("ToDo App");
bind(InputStream.class).annotatedWith(Names.named("metaInfManifest")).toProvider(Providers.of(getServletContext().getResourceAsStream("/META-INF/MANIFEST.MF")));
}
};
http://git-wip-us.apache.org/repos/asf/isis/blob/1e7a523a/example/application/simple_wicket_restful_jdo/dom/src/main/java/dom/simple/SimpleObjects.java
----------------------------------------------------------------------
diff --git a/example/application/simple_wicket_restful_jdo/dom/src/main/java/dom/simple/SimpleObjects.java b/example/application/simple_wicket_restful_jdo/dom/src/main/java/dom/simple/SimpleObjects.java
index 8270652..2fe82ee 100644
--- a/example/application/simple_wicket_restful_jdo/dom/src/main/java/dom/simple/SimpleObjects.java
+++ b/example/application/simple_wicket_restful_jdo/dom/src/main/java/dom/simple/SimpleObjects.java
@@ -74,6 +74,9 @@ public class SimpleObjects {
container.persistIfNotAlready(obj);
return obj;
}
+
+
+ public void foo(){}
// //////////////////////////////////////
http://git-wip-us.apache.org/repos/asf/isis/blob/1e7a523a/example/application/simple_wicket_restful_jdo/webapp/src/main/java/webapp/SimpleApplication.java
----------------------------------------------------------------------
diff --git a/example/application/simple_wicket_restful_jdo/webapp/src/main/java/webapp/SimpleApplication.java b/example/application/simple_wicket_restful_jdo/webapp/src/main/java/webapp/SimpleApplication.java
index 9f428ad..d12c2f2 100644
--- a/example/application/simple_wicket_restful_jdo/webapp/src/main/java/webapp/SimpleApplication.java
+++ b/example/application/simple_wicket_restful_jdo/webapp/src/main/java/webapp/SimpleApplication.java
@@ -112,21 +112,21 @@ public class SimpleApplication extends IsisWicketApplication {
protected Module newIsisWicketModule() {
final Module isisDefaults = super.newIsisWicketModule();
- final Module quickstartOverrides = new AbstractModule() {
+ final Module simpleOverrides = new AbstractModule() {
@Override
protected void configure() {
bind(ComponentFactoryRegistrar.class).to(ComponentFactoryRegistrarForSimpleApp.class);
- bind(String.class).annotatedWith(Names.named("applicationName")).toInstance("Quick Start App");
+ bind(String.class).annotatedWith(Names.named("applicationName")).toInstance("Simple App");
bind(String.class).annotatedWith(Names.named("applicationCss")).toInstance("css/application.css");
bind(String.class).annotatedWith(Names.named("applicationJs")).toInstance("scripts/application.js");
bind(String.class).annotatedWith(Names.named("welcomeMessage")).toInstance(readLines("welcome.html"));
- bind(String.class).annotatedWith(Names.named("aboutMessage")).toInstance("QuickStart");
+ bind(String.class).annotatedWith(Names.named("aboutMessage")).toInstance("Simple App");
bind(InputStream.class).annotatedWith(Names.named("metaInfManifest")).toProvider(Providers.of(getServletContext().getResourceAsStream("/META-INF/MANIFEST.MF")));
}
};
- return Modules.override(isisDefaults).with(quickstartOverrides);
+ return Modules.override(isisDefaults).with(simpleOverrides);
}
private static String readLines(final String resourceName) {
http://git-wip-us.apache.org/repos/asf/isis/blob/1e7a523a/example/application/simple_wicket_restful_jdo/webapp/src/main/webapp/WEB-INF/viewer_wicket.properties
----------------------------------------------------------------------
diff --git a/example/application/simple_wicket_restful_jdo/webapp/src/main/webapp/WEB-INF/viewer_wicket.properties b/example/application/simple_wicket_restful_jdo/webapp/src/main/webapp/WEB-INF/viewer_wicket.properties
index 830ae0c..b9854f8 100644
--- a/example/application/simple_wicket_restful_jdo/webapp/src/main/webapp/WEB-INF/viewer_wicket.properties
+++ b/example/application/simple_wicket_restful_jdo/webapp/src/main/webapp/WEB-INF/viewer_wicket.properties
@@ -49,3 +49,4 @@ isis.viewer.wicket.datePickerPattern=dd-mm-yy
# not stripped otherwise (Isis' PROTOTYPE mode == Wicket's DEVELOPMENT mode)
# isis.viewer.wicket.stripWicketTags=false
+