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/10/26 16:23:23 UTC

[1/3] git commit: ISIS-537: delete regular-vs-uppercase property (which disables the text-transform: stuff), as defunct with the new bootstrap stuff.

Repository: isis
Updated Branches:
  refs/heads/master 51725835c -> 982e16303


ISIS-537: delete regular-vs-uppercase property (which disables the text-transform: stuff), as defunct with the new bootstrap stuff.


Project: http://git-wip-us.apache.org/repos/asf/isis/repo
Commit: http://git-wip-us.apache.org/repos/asf/isis/commit/a35b1592
Tree: http://git-wip-us.apache.org/repos/asf/isis/tree/a35b1592
Diff: http://git-wip-us.apache.org/repos/asf/isis/diff/a35b1592

Branch: refs/heads/master
Commit: a35b15928d2004896c63d4a17865c78c7bf06060
Parents: 5172583
Author: Dan Haywood <da...@haywood-associates.co.uk>
Authored: Sun Oct 26 14:14:25 2014 +0000
Committer: Dan Haywood <da...@haywood-associates.co.uk>
Committed: Sun Oct 26 14:14:25 2014 +0000

----------------------------------------------------------------------
 .../ui/overlays/Overlays-regular-case.css       | 146 -------------------
 .../viewer/wicket/ui/overlays/Overlays.java     |  29 ----
 .../viewer/wicket/ui/pages/PageAbstract.java    |  23 +--
 3 files changed, 2 insertions(+), 196 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/isis/blob/a35b1592/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/overlays/Overlays-regular-case.css
----------------------------------------------------------------------
diff --git a/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/overlays/Overlays-regular-case.css b/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/overlays/Overlays-regular-case.css
deleted file mode 100644
index ddb24e9..0000000
--- a/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/overlays/Overlays-regular-case.css
+++ /dev/null
@@ -1,146 +0,0 @@
-/*
- *  Licensed to the Apache Software Foundation (ASF) under one
- *  or more contributor license agreements.  See the NOTICE file
- *  distributed with this work for additional information
- *  regarding copyright ownership.  The ASF licenses this file
- *  to you under the Apache License, Version 2.0 (the
- *  "License"); you may not use this file except in compliance
- *  with the License.  You may obtain a copy of the License at
- *
- *        http://www.apache.org/licenses/LICENSE-2.0
- *
- *  Unless required by applicable law or agreed to in writing,
- *  software distributed under the License is distributed on an
- *  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- *  KIND, either express or implied.  See the License for the
- *  specific language governing permissions and limitations
- *  under the License.
- */
- 
-.jarManifestPanel .heading span {
-    text-transform: none;
-}
- 
-.jarManifestPanel .manifestAttributesList .caused_by_label {
-    text-transform: none;
-}
-
-
-
-.bookmarkedPagesPanel .bookmarkedPagesPanelHolder {
-    text-transform: none;
-}
-
-.bookmarkedPagesPanel .showPanelTab {
-    text-transform: none;
-}
-
-
-
-.collectionContentsAsAjaxTablePanel table.contents tr th,
-.collectionContentsAsAjaxTablePanel table.contents tr th a span { 
-    text-transform: none;
-}
-
-.collectionContentsAsAjaxTablePanel table.contents tbody td,
-.collectionContentsAsAjaxTablePanel table.contents thead th {
-    text-transform: none;
-}
-
-
-
-
-.collectionContentsAsSummary .aggregateName {
-    text-transform: none;
-}
-
-
-
-
-.isisBlobPanel .scalarValue span.downloadTitle,
-.isisBlobPanel .scalarValue span.uploadTitle,
-.isisBlobPanel .scalarValue span.clearTitle {
-    text-transform: none;
-}
-
-
-
-/* CssMenuPanel */
-
-.groupedActions .cssMenuPanel .menuh a:link,
-.groupedActions .cssMenuPanel .menuh a:visited,
-.groupedActions .cssMenuPanel .menuh a:active,
-.groupedActions .cssMenuPanel .menuh p {
-    text-transform: none;
-}
-
-.entityActions .cssMenuPanel .menuh a:link,
-.entityActions .cssMenuPanel .menuh a:visited,
-.entityActions .cssMenuPanel .menuh a:active,
-.entityActions .cssMenuPanel .menuh p {
-    text-transform: none;
-}
-
-.additionalLinkList li a,
-.additionalLinkList li em {
-    text-transform: none;
-}
-
-
-
-
-.exceptionStackTracePanel .heading span {
-    text-transform: none;
-}
-
-.exceptionStackTracePanel .exceptionStackTrace .caused_by_label {
-    text-transform: none;
-}
-
-
-
-.loginPanel form input[type=submit] {
-    text-transform: none;
-}
-
-.loginPanel form input[type=reset] {
-    text-transform: none;
-}
-
-
-
-
-/* PageAbstract */
-
-.links {
-    text-transform: none;
-}
-
-.edit,
-.ok,
-.okButton {
-    text-transform: none;
-}
-
-.cancel {
-    text-transform: none;
-}
-
-#applicationActions .cssMenuPanel .menuh a:link, 
-#applicationActions .cssMenuPanel .menuh a:visited, 
-#applicationActions .cssMenuPanel .menuh a:active, 
-#applicationActions .cssMenuPanel .menuh p {
-    font-size: larger;
-    text-transform: none;
-}
-
-.scalarName, .collectionName {
-    text-transform: none;
-}
-
-
-
-
-.linksSelectorPanel .ViewLinkItem {
-    text-transform: none;
-}

http://git-wip-us.apache.org/repos/asf/isis/blob/a35b1592/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/overlays/Overlays.java
----------------------------------------------------------------------
diff --git a/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/overlays/Overlays.java b/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/overlays/Overlays.java
deleted file mode 100644
index 056814e..0000000
--- a/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/overlays/Overlays.java
+++ /dev/null
@@ -1,29 +0,0 @@
-/*
- *  Licensed to the Apache Software Foundation (ASF) under one
- *  or more contributor license agreements.  See the NOTICE file
- *  distributed with this work for additional information
- *  regarding copyright ownership.  The ASF licenses this file
- *  to you under the Apache License, Version 2.0 (the
- *  "License"); you may not use this file except in compliance
- *  with the License.  You may obtain a copy of the License at
- *
- *        http://www.apache.org/licenses/LICENSE-2.0
- *
- *  Unless required by applicable law or agreed to in writing,
- *  software distributed under the License is distributed on an
- *  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- *  KIND, either express or implied.  See the License for the
- *  specific language governing permissions and limitations
- *  under the License.
- */
-
-package org.apache.isis.viewer.wicket.ui.overlays;
-
-
-public final class Overlays {
-
-    private Overlays() {
-    }
-
-
-}

http://git-wip-us.apache.org/repos/asf/isis/blob/a35b1592/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 7dd9250..8ace237 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
@@ -31,12 +31,7 @@ import org.apache.wicket.MarkupContainer;
 import org.apache.wicket.Page;
 import org.apache.wicket.RestartResponseAtInterceptPageException;
 import org.apache.wicket.event.Broadcast;
-import org.apache.wicket.markup.head.CssHeaderItem;
-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.head.*;
 import org.apache.wicket.markup.head.filter.HeaderResponseContainer;
 import org.apache.wicket.markup.html.WebMarkupContainer;
 import org.apache.wicket.markup.html.WebPage;
@@ -64,13 +59,7 @@ import org.apache.isis.core.runtime.system.context.IsisContext;
 import org.apache.isis.core.runtime.system.persistence.PersistenceSession;
 import org.apache.isis.viewer.wicket.model.hints.IsisEnvelopeEvent;
 import org.apache.isis.viewer.wicket.model.hints.IsisEventLetterAbstract;
-import org.apache.isis.viewer.wicket.model.models.ActionPrompt;
-import org.apache.isis.viewer.wicket.model.models.ActionPromptProvider;
-import org.apache.isis.viewer.wicket.model.models.ApplicationActionsModel;
-import org.apache.isis.viewer.wicket.model.models.BookmarkableModel;
-import org.apache.isis.viewer.wicket.model.models.BookmarkedPagesModel;
-import org.apache.isis.viewer.wicket.model.models.EntityModel;
-import org.apache.isis.viewer.wicket.model.models.PageType;
+import org.apache.isis.viewer.wicket.model.models.*;
 import org.apache.isis.viewer.wicket.ui.ComponentFactory;
 import org.apache.isis.viewer.wicket.ui.ComponentType;
 import org.apache.isis.viewer.wicket.ui.app.registry.ComponentFactoryRegistry;
@@ -80,7 +69,6 @@ import org.apache.isis.viewer.wicket.ui.components.widgets.breadcrumbs.Breadcrum
 import org.apache.isis.viewer.wicket.ui.components.widgets.themepicker.ThemeChooser;
 import org.apache.isis.viewer.wicket.ui.errors.ExceptionModel;
 import org.apache.isis.viewer.wicket.ui.errors.JGrowlBehaviour;
-import org.apache.isis.viewer.wicket.ui.overlays.Overlays;
 import org.apache.isis.viewer.wicket.ui.pages.about.AboutPage;
 import org.apache.isis.viewer.wicket.ui.panels.PanelUtil;
 import org.apache.isis.viewer.wicket.ui.util.CssClassAppender;
@@ -94,8 +82,6 @@ public abstract class PageAbstract extends WebPage implements ActionPromptProvid
 
     private static final long serialVersionUID = 1L;
 
-    private static final String REGULAR_CASE_KEY = "isis.viewer.wicket.regularCase";
-
     /**
      * @see <a href="http://github.com/brandonaaron/livequery">livequery</a>
      */
@@ -262,11 +248,6 @@ public abstract class PageAbstract extends WebPage implements ActionPromptProvid
         JGrowlBehaviour jGrowlBehaviour = new JGrowlBehaviour();
         jGrowlBehaviour.renderFeedbackMessages(response);
 
-        // overlays
-        if(getConfiguration().getBoolean(REGULAR_CASE_KEY, false)) {
-            response.render(CssReferenceHeaderItem.forReference(PanelUtil.cssResourceReferenceFor(Overlays.class, "regular-case")));
-        }
-
         if(applicationCss != null) {
             response.render(CssReferenceHeaderItem.forUrl(applicationCss));
         }


[2/3] git commit: ISIS-537: added comments to properties in viewer_wicket.properties

Posted by da...@apache.org.
ISIS-537: added comments to properties in viewer_wicket.properties


Project: http://git-wip-us.apache.org/repos/asf/isis/repo
Commit: http://git-wip-us.apache.org/repos/asf/isis/commit/c02fb76a
Tree: http://git-wip-us.apache.org/repos/asf/isis/tree/c02fb76a
Diff: http://git-wip-us.apache.org/repos/asf/isis/diff/c02fb76a

Branch: refs/heads/master
Commit: c02fb76af31b0f673dbe05ce3a995506bc29f990
Parents: a35b159
Author: Dan Haywood <da...@haywood-associates.co.uk>
Authored: Sun Oct 26 14:14:47 2014 +0000
Committer: Dan Haywood <da...@haywood-associates.co.uk>
Committed: Sun Oct 26 14:14:47 2014 +0000

----------------------------------------------------------------------
 .../webapp/WEB-INF/viewer_wicket.properties     | 33 +++++++++++++++----
 .../webapp/WEB-INF/viewer_wicket.properties     | 34 ++++++++++++++++----
 2 files changed, 55 insertions(+), 12 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/isis/blob/c02fb76a/example/application/simpleapp/webapp/src/main/webapp/WEB-INF/viewer_wicket.properties
----------------------------------------------------------------------
diff --git a/example/application/simpleapp/webapp/src/main/webapp/WEB-INF/viewer_wicket.properties b/example/application/simpleapp/webapp/src/main/webapp/WEB-INF/viewer_wicket.properties
index cfb9b3e..34f1ed0 100644
--- a/example/application/simpleapp/webapp/src/main/webapp/WEB-INF/viewer_wicket.properties
+++ b/example/application/simpleapp/webapp/src/main/webapp/WEB-INF/viewer_wicket.properties
@@ -41,23 +41,44 @@ isis.viewer.wicket.maxTitleLengthInParentedTables=0
 #isis.viewer.wicket.datePickerPattern=dd/mm/y
 
 
-#isis.viewer.wicket.suppressRememberMe=true
+#
+# whether to strip wicket tags from markup (default is true, as they may break some CSS rules)
+#
+#isis.viewer.wicket.stripWicketTags=false
+
+
+#
+# whether to suppress the 'rememberMe' checkbox on the login page (default is false)
+#
+#isis.viewer.wicket.suppressRememberMe=false
 
 #
 # if user attempts to access a protected URL before signing in, then as a convenience the viewer will continue
 # through to that destination after successful login.  If you consider this to be a security risk then this flag
-# disables that behaviour.
+# disables that behaviour (default is false).
 #
 #isis.viewer.wicket.clearOriginalDestination=true
 
-#isis.viewer.wicket.disableModalDialogs=true
 
+#
+# whether to show action dialogs on their own page rather than as a modal dialog (default is false)
+#
+#isis.viewer.wicket.disableModalDialogs=false
 
-# default is for wicket tags to be stripped because they may break some CSS rules
-# isis.viewer.wicket.stripWicketTags=false
 
+#
+# the maximum number of pages to list in bookmark (default is 15)
+#
 #isis.viewer.wicket.bookmarkedPages.maxSize=15
 
-#isis.viewer.wicket.regularCase=false
 
+#
+# whether to show the bootstrap theme chooser (defaults false)
+#
+#isis.viewer.wicket.themes.showChooser=false
 isis.viewer.wicket.themes.showChooser=true
+
+#
+# comma-separated list of themes to choose from (default is to show all themes from bootswatch.com).
+#
+#isis.viewer.wicket.themes.enabled=bootstrap-theme,Amelia,Flatly,Darkly,Sandstone

http://git-wip-us.apache.org/repos/asf/isis/blob/c02fb76a/example/application/todoapp/webapp/src/main/webapp/WEB-INF/viewer_wicket.properties
----------------------------------------------------------------------
diff --git a/example/application/todoapp/webapp/src/main/webapp/WEB-INF/viewer_wicket.properties b/example/application/todoapp/webapp/src/main/webapp/WEB-INF/viewer_wicket.properties
index 2087410..9731b61 100644
--- a/example/application/todoapp/webapp/src/main/webapp/WEB-INF/viewer_wicket.properties
+++ b/example/application/todoapp/webapp/src/main/webapp/WEB-INF/viewer_wicket.properties
@@ -42,22 +42,44 @@ isis.viewer.wicket.maxTitleLengthInParentedTables=0
 
 
 
-# default is for wicket tags to be stripped because they may break some CSS rules
-# isis.viewer.wicket.stripWicketTags=false
+#
+# whether to strip wicket tags from markup (default is true, as they may break some CSS rules)
+#
+#isis.viewer.wicket.stripWicketTags=false
 
-#isis.viewer.wicket.suppressRememberMe=true
+
+#
+# whether to suppress the 'rememberMe' checkbox on the login page (default is false)
+#
+#isis.viewer.wicket.suppressRememberMe=false
 
 #
 # if user attempts to access a protected URL before signing in, then as a convenience the viewer will continue
 # through to that destination after successful login.  If you consider this to be a security risk then this flag
-# disables that behaviour.
+# disables that behaviour (default is false).
 #
 #isis.viewer.wicket.clearOriginalDestination=true
 
-#isis.viewer.wicket.disableModalDialogs=true
 
+#
+# whether to show action dialogs on their own page rather than as a modal dialog (default is false)
+#
+#isis.viewer.wicket.disableModalDialogs=false
+
+
+#
+# the maximum number of pages to list in bookmark (default is 15)
+#
 #isis.viewer.wicket.bookmarkedPages.maxSize=15
 
-#isis.viewer.wicket.regularCase=false
 
+#
+# whether to show the bootstrap theme chooser (defaults false)
+#
+#isis.viewer.wicket.themes.showChooser=false
 isis.viewer.wicket.themes.showChooser=true
+
+#
+# comma-separated list of themes to choose from (default is to show all themes from bootswatch.com).
+#
+#isis.viewer.wicket.themes.enabled=bootstrap-theme,Amelia,Flatly,Darkly,Sandstone


[3/3] git commit: ISIS-537: for todoapp, simpleapp: bootstrap themes, default theme.

Posted by da...@apache.org.
ISIS-537: for todoapp, simpleapp: bootstrap themes, default theme.


Project: http://git-wip-us.apache.org/repos/asf/isis/repo
Commit: http://git-wip-us.apache.org/repos/asf/isis/commit/982e1630
Tree: http://git-wip-us.apache.org/repos/asf/isis/tree/982e1630
Diff: http://git-wip-us.apache.org/repos/asf/isis/diff/982e1630

Branch: refs/heads/master
Commit: 982e1630372ee9421920ed3a57d051c1878ca92e
Parents: c02fb76
Author: Dan Haywood <da...@haywood-associates.co.uk>
Authored: Sun Oct 26 15:22:20 2014 +0000
Committer: Dan Haywood <da...@haywood-associates.co.uk>
Committed: Sun Oct 26 15:22:41 2014 +0000

----------------------------------------------------------------------
 .../src/main/java/webapp/SimpleApplication.java     | 16 +++++++++++++++-
 .../main/webapp/WEB-INF/viewer_wicket.properties    |  2 +-
 .../src/main/java/webapp/ToDoApplication.java       | 15 ++++++++++++++-
 .../main/webapp/WEB-INF/viewer_wicket.properties    |  3 ++-
 4 files changed, 32 insertions(+), 4 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/isis/blob/982e1630/example/application/simpleapp/webapp/src/main/java/webapp/SimpleApplication.java
----------------------------------------------------------------------
diff --git a/example/application/simpleapp/webapp/src/main/java/webapp/SimpleApplication.java b/example/application/simpleapp/webapp/src/main/java/webapp/SimpleApplication.java
index e8b3310..fa557ea 100644
--- a/example/application/simpleapp/webapp/src/main/java/webapp/SimpleApplication.java
+++ b/example/application/simpleapp/webapp/src/main/java/webapp/SimpleApplication.java
@@ -18,6 +18,11 @@
  */
 package webapp;
 
+import de.agilecoders.wicket.core.Bootstrap;
+import de.agilecoders.wicket.core.settings.IBootstrapSettings;
+import de.agilecoders.wicket.themes.markup.html.bootswatch.BootswatchTheme;
+import de.agilecoders.wicket.themes.markup.html.bootswatch.BootswatchThemeProvider;
+
 import java.io.IOException;
 import java.io.InputStream;
 import java.nio.charset.Charset;
@@ -70,7 +75,16 @@ public class SimpleApplication extends IsisWicketApplication {
      * for demos only, obvious.
      */
     private final static boolean DEMO_MODE_USING_CREDENTIALS_AS_QUERYARGS = false;
-    
+
+
+    @Override
+    protected void init() {
+        super.init();
+
+        IBootstrapSettings settings = Bootstrap.getSettings();
+        settings.setThemeProvider(new BootswatchThemeProvider(BootswatchTheme.Flatly));
+    }
+
     @Override
     public Session newSession(final Request request, final Response response) {
         if(!DEMO_MODE_USING_CREDENTIALS_AS_QUERYARGS) {

http://git-wip-us.apache.org/repos/asf/isis/blob/982e1630/example/application/simpleapp/webapp/src/main/webapp/WEB-INF/viewer_wicket.properties
----------------------------------------------------------------------
diff --git a/example/application/simpleapp/webapp/src/main/webapp/WEB-INF/viewer_wicket.properties b/example/application/simpleapp/webapp/src/main/webapp/WEB-INF/viewer_wicket.properties
index 34f1ed0..06d675e 100644
--- a/example/application/simpleapp/webapp/src/main/webapp/WEB-INF/viewer_wicket.properties
+++ b/example/application/simpleapp/webapp/src/main/webapp/WEB-INF/viewer_wicket.properties
@@ -81,4 +81,4 @@ isis.viewer.wicket.themes.showChooser=true
 #
 # comma-separated list of themes to choose from (default is to show all themes from bootswatch.com).
 #
-#isis.viewer.wicket.themes.enabled=bootstrap-theme,Amelia,Flatly,Darkly,Sandstone
+#isis.viewer.wicket.themes.enabled=bootstrap-theme,Cosmo,Flatly,Darkly,Sandstone,United
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/isis/blob/982e1630/example/application/todoapp/webapp/src/main/java/webapp/ToDoApplication.java
----------------------------------------------------------------------
diff --git a/example/application/todoapp/webapp/src/main/java/webapp/ToDoApplication.java b/example/application/todoapp/webapp/src/main/java/webapp/ToDoApplication.java
index 12c17f8..3fa5ba3 100644
--- a/example/application/todoapp/webapp/src/main/java/webapp/ToDoApplication.java
+++ b/example/application/todoapp/webapp/src/main/java/webapp/ToDoApplication.java
@@ -18,6 +18,11 @@
  */
 package webapp;
 
+import de.agilecoders.wicket.core.Bootstrap;
+import de.agilecoders.wicket.core.settings.IBootstrapSettings;
+import de.agilecoders.wicket.themes.markup.html.bootswatch.BootswatchTheme;
+import de.agilecoders.wicket.themes.markup.html.bootswatch.BootswatchThemeProvider;
+
 import java.io.IOException;
 import java.io.InputStream;
 import java.nio.charset.Charset;
@@ -68,7 +73,15 @@ public class ToDoApplication extends IsisWicketApplication {
      * for demos only, obvious.
      */
     private final static boolean DEMO_MODE_USING_CREDENTIALS_AS_QUERYARGS = false;
-    
+
+    @Override
+    protected void init() {
+        super.init();
+
+        IBootstrapSettings settings = Bootstrap.getSettings();
+        settings.setThemeProvider(new BootswatchThemeProvider(BootswatchTheme.Flatly));
+    }
+
     @Override
     public Session newSession(final Request request, final Response response) {
         if(!DEMO_MODE_USING_CREDENTIALS_AS_QUERYARGS) {

http://git-wip-us.apache.org/repos/asf/isis/blob/982e1630/example/application/todoapp/webapp/src/main/webapp/WEB-INF/viewer_wicket.properties
----------------------------------------------------------------------
diff --git a/example/application/todoapp/webapp/src/main/webapp/WEB-INF/viewer_wicket.properties b/example/application/todoapp/webapp/src/main/webapp/WEB-INF/viewer_wicket.properties
index 9731b61..fcdf306 100644
--- a/example/application/todoapp/webapp/src/main/webapp/WEB-INF/viewer_wicket.properties
+++ b/example/application/todoapp/webapp/src/main/webapp/WEB-INF/viewer_wicket.properties
@@ -82,4 +82,5 @@ isis.viewer.wicket.themes.showChooser=true
 #
 # comma-separated list of themes to choose from (default is to show all themes from bootswatch.com).
 #
-#isis.viewer.wicket.themes.enabled=bootstrap-theme,Amelia,Flatly,Darkly,Sandstone
+#isis.viewer.wicket.themes.enabled=bootstrap-theme,Cosmo,Flatly,Darkly,Sandstone,United
+isis.viewer.wicket.themes.enabled=bootstrap-theme,Cosmo,Flatly,Darkly,Sandstone,United