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 2018/10/26 07:42:27 UTC

[isis] 04/07: ISIS-2023: updates some stale documentation on themes

This is an automated email from the ASF dual-hosted git repository.

danhaywood pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/isis.git

commit bfb47dfe69bf9227b0cdef7a1c63253d47ddd1c8
Author: danhaywood <da...@haywood-associates.co.uk>
AuthorDate: Fri Oct 19 14:55:45 2018 +0100

    ISIS-2023: updates some stale documentation on themes
---
 .../ugvw/_ugvw_configuration-properties.adoc       | 16 ++++++++----
 .../asciidoc/guides/ugvw/_ugvw_customisation.adoc  |  1 -
 .../ugvw/_ugvw_customisation_default-theme.adoc    | 29 ----------------------
 3 files changed, 11 insertions(+), 35 deletions(-)

diff --git a/adocs/documentation/src/main/asciidoc/guides/ugvw/_ugvw_configuration-properties.adoc b/adocs/documentation/src/main/asciidoc/guides/ugvw/_ugvw_configuration-properties.adoc
index d1bcbfe..400ee79 100644
--- a/adocs/documentation/src/main/asciidoc/guides/ugvw/_ugvw_configuration-properties.adoc
+++ b/adocs/documentation/src/main/asciidoc/guides/ugvw/_ugvw_configuration-properties.adoc
@@ -577,10 +577,15 @@ See further discussion below.
 
 The Wicket viewer uses link:http://getbootstrap.com/[Bootstrap] styles and components (courtesy of the https://github.com/l0rdn1kk0n/wicket-bootstrap[Wicket Bootstrap] integration).
 
-Unless a xref:../ugvw/ugvw.adoc#_ugvw_customisation_default-theme[default theme has been specified], the viewer uses the default bootstrap theme.
-However, the viewer can also be configured to allow the end-user to switch theme to another theme, in particular one of those provided by http://bootswatch.com[bootswatch.com].
+By default the viewer uses the "Flatly" theme from http://bootswatch.com[bootswatch.com].
+This can be overridden using the following configuration property:
 
-This is done using the following configuration property (in `WEB-INF/viewer_wicket.properties`):
+[source,ini]
+----
+isis.viewer.wicket.themes.initial=Darky
+----
+
+The end-user can also be given the choice of changing the theme:
 
 [source,ini]
 ----
@@ -594,7 +599,9 @@ image::{_imagesdir}theme-chooser/example-1.png[width="720px",link="{_imagesdir}t
 .Example 2:
 image::{_imagesdir}theme-chooser/example-2.png[width="720px",link="{_imagesdir}theme-chooser/example-2.png"]
 
-It is also possible to restrict the themes shown to some subset of those in bootswatch. This is done using a further
+
+It is also possible to restrict the themes shown to some subset of those in bootswatch.
+This is done using a further
 property:
 
 [source,ini]
@@ -611,7 +618,6 @@ You can also develop and install a custom themes (eg to fit your company's look-
 
 
 
-
 [[_ugvw_configuration-properties_date-formatting]]
 == Date Formatting & Date Picker
 
diff --git a/adocs/documentation/src/main/asciidoc/guides/ugvw/_ugvw_customisation.adoc b/adocs/documentation/src/main/asciidoc/guides/ugvw/_ugvw_customisation.adoc
index d8e75f8..4579c02 100644
--- a/adocs/documentation/src/main/asciidoc/guides/ugvw/_ugvw_customisation.adoc
+++ b/adocs/documentation/src/main/asciidoc/guides/ugvw/_ugvw_customisation.adoc
@@ -8,7 +8,6 @@
 
 include::_ugvw_customisation_top-level-index-page.adoc[leveloffset=+1]
 include::_ugvw_customisation_brand-logo.adoc[leveloffset=+1]
-include::_ugvw_customisation_default-theme.adoc[leveloffset=+1]
 include::_ugvw_customisation_welcome-page.adoc[leveloffset=+1]
 include::_ugvw_customisation_about-page.adoc[leveloffset=+1]
 include::_ugvw_customisation_tweaking-css-classes.adoc[leveloffset=+1]
diff --git a/adocs/documentation/src/main/asciidoc/guides/ugvw/_ugvw_customisation_default-theme.adoc b/adocs/documentation/src/main/asciidoc/guides/ugvw/_ugvw_customisation_default-theme.adoc
deleted file mode 100644
index 837c941..0000000
--- a/adocs/documentation/src/main/asciidoc/guides/ugvw/_ugvw_customisation_default-theme.adoc
+++ /dev/null
@@ -1,29 +0,0 @@
-[[_ugvw_customisation_default-theme]]
-= Specifying a default theme
-:Notice: 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 ag [...]
-:_basedir: ../../
-:_imagesdir: images/
-
-
-
-The Apache Isis Wicket viewer uses http://getbootstrap.com/[Bootstrap] styles and components (courtesy of the https://github.com/l0rdn1kk0n/wicket-bootstrap[Wicket Bootstrap] integration).
-
-Unless specified otherwise, the viewer uses the default bootstrap theme. However, this can be changed by overriding `init()` in the application's subclass of `IsisWicketApplication`. For example, to set the http://bootswatch.com/flatly/[bootswatch.com flatly] theme
- as the default, use:
-
-[source,java]
-----
-@Override
-protected void init() {
-    super.init();
-    IBootstrapSettings settings = Bootstrap.getSettings();
-    settings.setThemeProvider(new BootswatchThemeProvider(BootswatchTheme.Flatly));
-}
-----
-
-If you have developed a custom Bootstrap theme (as described xref:../ugvw/ugvw.adoc#_ugvw_extending_custom-bootstrap-theme[here]) then this can also be specified using the https://github.com/l0rdn1kk0n/wicket-bootstrap/wiki/Themes[Wicket Bootstrap API].
-
-
-
-
-