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 2017/04/14 10:28:24 UTC
[1/9] isis git commit: ISIS-1521: moves layout section from
fundamentals guide to wicket viewer guide.
Repository: isis
Updated Branches:
refs/heads/master cc0eadb2b -> da045b830
http://git-wip-us.apache.org/repos/asf/isis/blob/8f18b6f0/adocs/documentation/src/main/asciidoc/guides/ugvw/images/wicket-viewer/suppress-password-reset/login-page-suppress-password-reset.png
----------------------------------------------------------------------
diff --git a/adocs/documentation/src/main/asciidoc/guides/ugvw/images/wicket-viewer/suppress-password-reset/login-page-suppress-password-reset.png b/adocs/documentation/src/main/asciidoc/guides/ugvw/images/wicket-viewer/suppress-password-reset/login-page-suppress-password-reset.png
deleted file mode 100644
index b557269..0000000
Binary files a/adocs/documentation/src/main/asciidoc/guides/ugvw/images/wicket-viewer/suppress-password-reset/login-page-suppress-password-reset.png and /dev/null differ
http://git-wip-us.apache.org/repos/asf/isis/blob/8f18b6f0/adocs/documentation/src/main/asciidoc/guides/ugvw/images/wicket-viewer/suppress-remember-me/login-page-default.png
----------------------------------------------------------------------
diff --git a/adocs/documentation/src/main/asciidoc/guides/ugvw/images/wicket-viewer/suppress-remember-me/login-page-default.png b/adocs/documentation/src/main/asciidoc/guides/ugvw/images/wicket-viewer/suppress-remember-me/login-page-default.png
deleted file mode 100644
index fdf2dee..0000000
Binary files a/adocs/documentation/src/main/asciidoc/guides/ugvw/images/wicket-viewer/suppress-remember-me/login-page-default.png and /dev/null differ
http://git-wip-us.apache.org/repos/asf/isis/blob/8f18b6f0/adocs/documentation/src/main/asciidoc/guides/ugvw/images/wicket-viewer/suppress-remember-me/login-page-suppress-remember-me.png
----------------------------------------------------------------------
diff --git a/adocs/documentation/src/main/asciidoc/guides/ugvw/images/wicket-viewer/suppress-remember-me/login-page-suppress-remember-me.png b/adocs/documentation/src/main/asciidoc/guides/ugvw/images/wicket-viewer/suppress-remember-me/login-page-suppress-remember-me.png
deleted file mode 100644
index fe69496..0000000
Binary files a/adocs/documentation/src/main/asciidoc/guides/ugvw/images/wicket-viewer/suppress-remember-me/login-page-suppress-remember-me.png and /dev/null differ
http://git-wip-us.apache.org/repos/asf/isis/blob/8f18b6f0/adocs/documentation/src/main/asciidoc/guides/ugvw/images/wicket-viewer/suppress-sign-up/login-page-default.png
----------------------------------------------------------------------
diff --git a/adocs/documentation/src/main/asciidoc/guides/ugvw/images/wicket-viewer/suppress-sign-up/login-page-default.png b/adocs/documentation/src/main/asciidoc/guides/ugvw/images/wicket-viewer/suppress-sign-up/login-page-default.png
deleted file mode 100644
index fdf2dee..0000000
Binary files a/adocs/documentation/src/main/asciidoc/guides/ugvw/images/wicket-viewer/suppress-sign-up/login-page-default.png and /dev/null differ
http://git-wip-us.apache.org/repos/asf/isis/blob/8f18b6f0/adocs/documentation/src/main/asciidoc/guides/ugvw/images/wicket-viewer/suppress-sign-up/login-page-suppress-sign-up.png
----------------------------------------------------------------------
diff --git a/adocs/documentation/src/main/asciidoc/guides/ugvw/images/wicket-viewer/suppress-sign-up/login-page-suppress-sign-up.png b/adocs/documentation/src/main/asciidoc/guides/ugvw/images/wicket-viewer/suppress-sign-up/login-page-suppress-sign-up.png
deleted file mode 100644
index 8ff8bc3..0000000
Binary files a/adocs/documentation/src/main/asciidoc/guides/ugvw/images/wicket-viewer/suppress-sign-up/login-page-suppress-sign-up.png and /dev/null differ
http://git-wip-us.apache.org/repos/asf/isis/blob/8f18b6f0/adocs/documentation/src/main/asciidoc/guides/ugvw/images/wicket-viewer/theme-chooser/example-1.png
----------------------------------------------------------------------
diff --git a/adocs/documentation/src/main/asciidoc/guides/ugvw/images/wicket-viewer/theme-chooser/example-1.png b/adocs/documentation/src/main/asciidoc/guides/ugvw/images/wicket-viewer/theme-chooser/example-1.png
deleted file mode 100644
index 4db4b18..0000000
Binary files a/adocs/documentation/src/main/asciidoc/guides/ugvw/images/wicket-viewer/theme-chooser/example-1.png and /dev/null differ
http://git-wip-us.apache.org/repos/asf/isis/blob/8f18b6f0/adocs/documentation/src/main/asciidoc/guides/ugvw/images/wicket-viewer/theme-chooser/example-2.png
----------------------------------------------------------------------
diff --git a/adocs/documentation/src/main/asciidoc/guides/ugvw/images/wicket-viewer/theme-chooser/example-2.png b/adocs/documentation/src/main/asciidoc/guides/ugvw/images/wicket-viewer/theme-chooser/example-2.png
deleted file mode 100644
index 435194d..0000000
Binary files a/adocs/documentation/src/main/asciidoc/guides/ugvw/images/wicket-viewer/theme-chooser/example-2.png and /dev/null differ
http://git-wip-us.apache.org/repos/asf/isis/blob/8f18b6f0/adocs/documentation/src/main/asciidoc/guides/ugvw/images/wicket-viewer/user-registration/login-page-default.png
----------------------------------------------------------------------
diff --git a/adocs/documentation/src/main/asciidoc/guides/ugvw/images/wicket-viewer/user-registration/login-page-default.png b/adocs/documentation/src/main/asciidoc/guides/ugvw/images/wicket-viewer/user-registration/login-page-default.png
deleted file mode 100644
index fdf2dee..0000000
Binary files a/adocs/documentation/src/main/asciidoc/guides/ugvw/images/wicket-viewer/user-registration/login-page-default.png and /dev/null differ
http://git-wip-us.apache.org/repos/asf/isis/blob/8f18b6f0/adocs/documentation/src/main/asciidoc/guides/ugvw/images/wicket-viewer/user-registration/sign-up-after-registration.png
----------------------------------------------------------------------
diff --git a/adocs/documentation/src/main/asciidoc/guides/ugvw/images/wicket-viewer/user-registration/sign-up-after-registration.png b/adocs/documentation/src/main/asciidoc/guides/ugvw/images/wicket-viewer/user-registration/sign-up-after-registration.png
deleted file mode 100644
index 59902f9..0000000
Binary files a/adocs/documentation/src/main/asciidoc/guides/ugvw/images/wicket-viewer/user-registration/sign-up-after-registration.png and /dev/null differ
http://git-wip-us.apache.org/repos/asf/isis/blob/8f18b6f0/adocs/documentation/src/main/asciidoc/guides/ugvw/images/wicket-viewer/user-registration/sign-up-email-with-verification-link.png
----------------------------------------------------------------------
diff --git a/adocs/documentation/src/main/asciidoc/guides/ugvw/images/wicket-viewer/user-registration/sign-up-email-with-verification-link.png b/adocs/documentation/src/main/asciidoc/guides/ugvw/images/wicket-viewer/user-registration/sign-up-email-with-verification-link.png
deleted file mode 100644
index 021b642..0000000
Binary files a/adocs/documentation/src/main/asciidoc/guides/ugvw/images/wicket-viewer/user-registration/sign-up-email-with-verification-link.png and /dev/null differ
http://git-wip-us.apache.org/repos/asf/isis/blob/8f18b6f0/adocs/documentation/src/main/asciidoc/guides/ugvw/images/wicket-viewer/user-registration/sign-up-login-page-after-sign-up.png
----------------------------------------------------------------------
diff --git a/adocs/documentation/src/main/asciidoc/guides/ugvw/images/wicket-viewer/user-registration/sign-up-login-page-after-sign-up.png b/adocs/documentation/src/main/asciidoc/guides/ugvw/images/wicket-viewer/user-registration/sign-up-login-page-after-sign-up.png
deleted file mode 100644
index 3402bf6..0000000
Binary files a/adocs/documentation/src/main/asciidoc/guides/ugvw/images/wicket-viewer/user-registration/sign-up-login-page-after-sign-up.png and /dev/null differ
http://git-wip-us.apache.org/repos/asf/isis/blob/8f18b6f0/adocs/documentation/src/main/asciidoc/guides/ugvw/images/wicket-viewer/user-registration/sign-up-page.png
----------------------------------------------------------------------
diff --git a/adocs/documentation/src/main/asciidoc/guides/ugvw/images/wicket-viewer/user-registration/sign-up-page.png b/adocs/documentation/src/main/asciidoc/guides/ugvw/images/wicket-viewer/user-registration/sign-up-page.png
deleted file mode 100644
index 8e3bdaa..0000000
Binary files a/adocs/documentation/src/main/asciidoc/guides/ugvw/images/wicket-viewer/user-registration/sign-up-page.png and /dev/null differ
http://git-wip-us.apache.org/repos/asf/isis/blob/8f18b6f0/adocs/documentation/src/main/asciidoc/guides/ugvw/images/wicket-viewer/user-registration/sign-up-registration-page.png
----------------------------------------------------------------------
diff --git a/adocs/documentation/src/main/asciidoc/guides/ugvw/images/wicket-viewer/user-registration/sign-up-registration-page.png b/adocs/documentation/src/main/asciidoc/guides/ugvw/images/wicket-viewer/user-registration/sign-up-registration-page.png
deleted file mode 100644
index 189965a..0000000
Binary files a/adocs/documentation/src/main/asciidoc/guides/ugvw/images/wicket-viewer/user-registration/sign-up-registration-page.png and /dev/null differ
http://git-wip-us.apache.org/repos/asf/isis/blob/8f18b6f0/adocs/documentation/src/main/asciidoc/migration-notes/_migration-notes_1.11.0-to-1.12.0.adoc
----------------------------------------------------------------------
diff --git a/adocs/documentation/src/main/asciidoc/migration-notes/_migration-notes_1.11.0-to-1.12.0.adoc b/adocs/documentation/src/main/asciidoc/migration-notes/_migration-notes_1.11.0-to-1.12.0.adoc
index 602291e..3e1c2a4 100644
--- a/adocs/documentation/src/main/asciidoc/migration-notes/_migration-notes_1.11.0-to-1.12.0.adoc
+++ b/adocs/documentation/src/main/asciidoc/migration-notes/_migration-notes_1.11.0-to-1.12.0.adoc
@@ -14,14 +14,14 @@ issues here.
== Dynamic XML Layouts
-The major new feature in 1.12.0 is xref:guides/ugfun.adoc#_ugfun_object-layout_dynamic_xml[dynamic XML layouts], providing
+The major new feature in 1.12.0 is xref:guides/ugvw.adoc#_ugvw_layout_dynamic_xml[dynamic XML layouts], providing
much enhanced support for custom layouts.
The new `Xxx.layout.xml` file is optional; without it domain objects will
continue to be rendered as before, using metadata from annotations (xref:guides/rgant.adoc#_rgant-DomainObjectLayout[`@DomainObjectLayout`],
xref:guides/rgant.adoc#_rgant-PropertyLayout[`@PropertyLayout`], xref:guides/rgant.adoc#_rgant-CollectionLayout[`@CollectionLayout`],
xref:guides/rgant.adoc#_rgant-ActionLayout[`@ActionLayout`], xref:guides/rgant.adoc#_rgant-MemberOrder[`@MemberOrder`] and
-xref:guides/rgant.adoc#_rgant-MemberGroupLayout[`@MemberGroupLayout`]), and also from any xref:guides/ugfun.adoc#_ugfun_object-layout_dynamic[`Xxx.layout.json`]
+xref:guides/rgant.adoc#_rgant-MemberGroupLayout[`@MemberGroupLayout`]), and also from any xref:guides/ugvw.adoc#_ugvw_layout_dynamic[`Xxx.layout.json`]
file that might already exist. There is therefore no requirement to move to the new more flexible XML-based layout.
If you do want to start using the new format, then you will find that 1.12.0 provides a mixin action (available in
http://git-wip-us.apache.org/repos/asf/isis/blob/8f18b6f0/adocs/documentation/src/main/asciidoc/pages/screencasts/screencasts.adoc
----------------------------------------------------------------------
diff --git a/adocs/documentation/src/main/asciidoc/pages/screencasts/screencasts.adoc b/adocs/documentation/src/main/asciidoc/pages/screencasts/screencasts.adoc
index 0d944e3..389fd9d 100644
--- a/adocs/documentation/src/main/asciidoc/pages/screencasts/screencasts.adoc
+++ b/adocs/documentation/src/main/asciidoc/pages/screencasts/screencasts.adoc
@@ -65,7 +65,7 @@ Walking through the main classes that make up the SimpleApp: `SimpleObject` pers
|link:https://www.youtube.com/watch?v=KCJ1ZPPB3pA[004^] +
-Using the optional `Xxx.layout.xml` file to provide xref:guides/ugfun.adoc#_ugfun_object-layout_dynamic_xml[layout metadata] to dynamically render a domain object using the link:http://getbootstrap.com[Bootstrap 3] grid system.
+Using the optional `Xxx.layout.xml` file to provide xref:guides/ugvw.adoc#_ugvw_layout_dynamic_xml[layout metadata] to dynamically render a domain object using the link:http://getbootstrap.com[Bootstrap 3] grid system.
||x|||||||||
@@ -140,7 +140,7 @@ include::_screencasts-playlists.adoc[]
|link:https://www.youtube.com/watch?v=dfRZeYqzMtI[012^] +
-Implementing business logic using a (no-arg) action, and associating with a property using either the xref:guides/rgant.adoc#_rgant-MemberOrder[`@MemberOrder`] annotations or using xref:guides/ugfun.adoc#_ugfun_object-layout_dynamic_xml[dynamic (XML) layouts].
+Implementing business logic using a (no-arg) action, and associating with a property using either the xref:guides/rgant.adoc#_rgant-MemberOrder[`@MemberOrder`] annotations or using xref:guides/ugvw.adoc#_ugvw_layout_dynamic_xml[dynamic (XML) layouts].
|x||||||||x||
@@ -199,7 +199,7 @@ Extending a xref:guides/ugtst.adoc#_ugtst_fixture-scripts[fixture script] to mor
|link:https://www.youtube.com/watch?v=39Hpd7C4Kvo[018^] +
-Using xref:guides/ugfun.adoc#_ugfun_object-layout_dynamic_xml[dynamic (XML) layouts] to specify the page size for a domain object's collection.
+Using xref:guides/ugvw.adoc#_ugvw_layout_dynamic_xml[dynamic (XML) layouts] to specify the page size for a domain object's collection.
||||x|||||||
http://git-wip-us.apache.org/repos/asf/isis/blob/8f18b6f0/adocs/documentation/src/main/asciidoc/pages/tg/_tg_stop-scaffolding-start-coding.adoc
----------------------------------------------------------------------
diff --git a/adocs/documentation/src/main/asciidoc/pages/tg/_tg_stop-scaffolding-start-coding.adoc b/adocs/documentation/src/main/asciidoc/pages/tg/_tg_stop-scaffolding-start-coding.adoc
index b60b217..db271dc 100644
--- a/adocs/documentation/src/main/asciidoc/pages/tg/_tg_stop-scaffolding-start-coding.adoc
+++ b/adocs/documentation/src/main/asciidoc/pages/tg/_tg_stop-scaffolding-start-coding.adoc
@@ -313,7 +313,7 @@ Domain entities have state: either values (primitives, strings) or references to
* revisit the title, consider whether to use the xref:rgant.adoc#_rgant-Title[`@Title`] annotation
** rather than the xref:rgcms.adoc#_rgcms_methods_reserved_title[`title()`] method
* order the properties using the xref:rgant.adoc#_rgant-MemberOrder[`@MemberOrder`], also `@MemberGroupLayout`
-** see also the docs on xref:ugfun.adoc#_ugfun_object-layout_static[static layouts]
+** see also the docs on xref:ugvw.adoc#_ugvw_layout_static[static layouts]
* use the xref:rgant.adoc#_rgant-PropertyLayout[`@PropertyLayout`] annotation to position property/action parameter labels either to the LEFT, TOP or NONE
** do the same for parameters using xref:rgant.adoc#_rgant-ParameterLayout[`@ParameterLayout`]
@@ -396,7 +396,7 @@ So:
Up to this point we've been using annotations (`@MemberOrder`, `@MemberGroupLayout`, `@Named`, `@PropertyLayout`, `@ParameterLayout`, `@ActionLayout` and so on) for UI hints. However, the feedback loop is not good: it requires us stopping the app, editing the code, recompiling and running again. So instead, all these UI hints (and more) can be specified dynamically, using a corresponding `.layout.json` file. If edited while the app is running, it will be reloaded automatically (in IntelliJ, use Run>Reload Changed Classes):
-* Delete the various hint annotations and instead specify layout hints using a xref:ugfun.adoc#_ugfun_object-layout_dynamic[.layout.json] file.
+* Delete the various hint annotations and instead specify layout hints using a xref:ugvw.adoc#_ugvw_layout_dynamic[.layout.json] file.
http://git-wip-us.apache.org/repos/asf/isis/blob/8f18b6f0/adocs/documentation/src/main/asciidoc/release-notes/_release-notes_1.12.0.adoc
----------------------------------------------------------------------
diff --git a/adocs/documentation/src/main/asciidoc/release-notes/_release-notes_1.12.0.adoc b/adocs/documentation/src/main/asciidoc/release-notes/_release-notes_1.12.0.adoc
index bc51799..52a2bf0 100644
--- a/adocs/documentation/src/main/asciidoc/release-notes/_release-notes_1.12.0.adoc
+++ b/adocs/documentation/src/main/asciidoc/release-notes/_release-notes_1.12.0.adoc
@@ -37,7 +37,7 @@ corresponding domain event.
* link:https://issues.apache.org/jira/browse/ISIS-1317[ISIS-1317] - Allow single domain object class to be invalidated through a mixin.
* link:https://issues.apache.org/jira/browse/ISIS-1313[ISIS-1313] - Enhancement to xref:guides/rgmvn.adoc#_rgmvn_xsd[xsd] goal of the isis-maven-plugin to ignore/include the Isis common schemas.
* link:https://issues.apache.org/jira/browse/ISIS-1292[ISIS-1292] - Extend xref:guides/rgsvc.adoc#_rgsvc_api_MetaModelService[`MetaModelService`] to surface packages, classes etc (as used by the security module).
-* link:https://issues.apache.org/jira/browse/ISIS-993[ISIS-993] - Show different object members on multiple tabs (xref:guides/ugfun.adoc#_ugfun_object-layout_dynamic_xml[dynamic XML layouts])
+* link:https://issues.apache.org/jira/browse/ISIS-993[ISIS-993] - Show different object members on multiple tabs (xref:guides/ugvw.adoc#_ugvw_layout_dynamic_xml[dynamic XML layouts])
* link:https://issues.apache.org/jira/browse/ISIS-784[ISIS-784] - Change Wicket viewer to get rid of edit mode, instead allow individual fields to be edited by clicking on them (similar to the way that JIRA works).
@@ -48,7 +48,7 @@ corresponding domain event.
* link:https://issues.apache.org/jira/browse/ISIS-1330[ISIS-1330] - Add CSS classes for table cells and for collections to make it easier to fine tune pages using CSS.
* link:https://issues.apache.org/jira/browse/ISIS-1329[ISIS-1329] - Extend hint support for "show all"
* link:https://issues.apache.org/jira/browse/ISIS-1327[ISIS-1327] - Change the view mode of the select2 (value drop down) to be a simple text field.
-* link:https://issues.apache.org/jira/browse/ISIS-1324[ISIS-1324] - Allow multiple different views of same collection in a layout (xref:guides/ugfun.adoc#_ugfun_object-layout_dynamic_xml[dynamic XML layouts])
+* link:https://issues.apache.org/jira/browse/ISIS-1324[ISIS-1324] - Allow multiple different views of same collection in a layout (xref:guides/ugvw.adoc#_ugvw_layout_dynamic_xml[dynamic XML layouts])
* link:https://issues.apache.org/jira/browse/ISIS-1323[ISIS-1323] - Deprecate @CollectionLayout#renderType, since is duplicated by xref:guides/rgant.adoc#_rgant-CollectionLayout_defaultView[`@CollectionLayout#defaultView()`]
* link:https://issues.apache.org/jira/browse/ISIS-1322[ISIS-1322] - Mixins not exposing the mixedin object in events (for subscribers to veto).
* link:https://issues.apache.org/jira/browse/ISIS-1321[ISIS-1321] - Extend xref:guides/rgsvc.adoc#_rgsvc_api_MetaModelService[`MetaModelService`] to allow CSV of metamodel to be downloaded.
@@ -59,10 +59,10 @@ corresponding domain event.
* link:https://issues.apache.org/jira/browse/ISIS-1298[ISIS-1298] - Fix deprecated annotation use for ViewModel.Cloneable#clone
* link:https://issues.apache.org/jira/browse/ISIS-1295[ISIS-1295] - Run integration tests using thread-local, to allow "complete" tests that also exercise, eg Quartz jobs.
* link:https://issues.apache.org/jira/browse/ISIS-1240[ISIS-1240] - Derive icon from service when not provided
-* link:https://issues.apache.org/jira/browse/ISIS-1239[ISIS-1239] - For wicket ui, use a cookie or similar to remember the hint from last time (xref:guides/ugfun.adoc#_ugfun_object-layout_dynamic_xml[dynamic XML layouts])
+* link:https://issues.apache.org/jira/browse/ISIS-1239[ISIS-1239] - For wicket ui, use a cookie or similar to remember the hint from last time (xref:guides/ugvw.adoc#_ugvw_layout_dynamic_xml[dynamic XML layouts])
* link:https://issues.apache.org/jira/browse/ISIS-1228[ISIS-1228] - Reorganizing/splitting out xref:guides/rgant.adoc#_rgant-DomainObjectContainer[`@DomainObjectContainer`] service.
* link:https://issues.apache.org/jira/browse/ISIS-1048[ISIS-1048] - Make view model URLs more secure, eg through a private key (xref:guides/rgsvc.adoc#_rgsvc_spi_UrlEncodingService[`UrlEncodingService`]).
-* link:https://issues.apache.org/jira/browse/ISIS-1037[ISIS-1037] - Support layout.xml as well as layout.json (xref:guides/ugfun.adoc#_ugfun_object-layout_dynamic_xml[dynamic XML layouts])
+* link:https://issues.apache.org/jira/browse/ISIS-1037[ISIS-1037] - Support layout.xml as well as layout.json (xref:guides/ugvw.adoc#_ugvw_layout_dynamic_xml[dynamic XML layouts])
* link:https://issues.apache.org/jira/browse/ISIS-806[ISIS-806] - In Wicket viewer, shouldn't be possible to invoke an action if editing a form.
[6/9] isis git commit: ISIS-1521: fixes broken image links
Posted by da...@apache.org.
ISIS-1521: fixes broken image links
Project: http://git-wip-us.apache.org/repos/asf/isis/repo
Commit: http://git-wip-us.apache.org/repos/asf/isis/commit/e58b39df
Tree: http://git-wip-us.apache.org/repos/asf/isis/tree/e58b39df
Diff: http://git-wip-us.apache.org/repos/asf/isis/diff/e58b39df
Branch: refs/heads/master
Commit: e58b39df9dfb72ed5c41eae0f5ef91d463b98562
Parents: 8f18b6f
Author: Dan Haywood <da...@haywood-associates.co.uk>
Authored: Fri Apr 14 08:35:45 2017 +0100
Committer: Dan Haywood <da...@haywood-associates.co.uk>
Committed: Fri Apr 14 08:35:45 2017 +0100
----------------------------------------------------------------------
.../src/main/asciidoc/guides/ugvw/_ugvw_layout_dynamic_xml.adoc | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/isis/blob/e58b39df/adocs/documentation/src/main/asciidoc/guides/ugvw/_ugvw_layout_dynamic_xml.adoc
----------------------------------------------------------------------
diff --git a/adocs/documentation/src/main/asciidoc/guides/ugvw/_ugvw_layout_dynamic_xml.adoc b/adocs/documentation/src/main/asciidoc/guides/ugvw/_ugvw_layout_dynamic_xml.adoc
index f95fead..52eab2d 100644
--- a/adocs/documentation/src/main/asciidoc/guides/ugvw/_ugvw_layout_dynamic_xml.adoc
+++ b/adocs/documentation/src/main/asciidoc/guides/ugvw/_ugvw_layout_dynamic_xml.adoc
@@ -43,7 +43,7 @@ This link:https://www.youtube.com/watch?v=MxewC5Pve5k[screencast] describes the
Probably the easiest way to understand dynamic XML layouts is by example. For this we'll use the `ToDoItem` from the
(non-ASF) http://github.com/isisaddons/isis-app-todoapp[Isis addons' todoapp]:
-image::{_imagesdir}ugfun/_ugvw_layout_dynamic_xml/ToDoItem.png[width="940px",link="{_imagesdir}ugfun/_ugvw_layout_dynamic_xml/ToDoItem.png"]
+image::{_imagesdir}layout-dynamic-xml/ToDoItem.png[width="940px",link="{_imagesdir}layout-dynamic-xml/ToDoItem.png"]
=== Namespaces
[4/9] isis git commit: ISIS-1521: moves layout section from
fundamentals guide to wicket viewer guide.
Posted by da...@apache.org.
http://git-wip-us.apache.org/repos/asf/isis/blob/8f18b6f0/adocs/documentation/src/main/asciidoc/guides/ugfun/_ugfun_object-layout_dynamic.adoc
----------------------------------------------------------------------
diff --git a/adocs/documentation/src/main/asciidoc/guides/ugfun/_ugfun_object-layout_dynamic.adoc b/adocs/documentation/src/main/asciidoc/guides/ugfun/_ugfun_object-layout_dynamic.adoc
deleted file mode 100644
index 2566e18..0000000
--- a/adocs/documentation/src/main/asciidoc/guides/ugfun/_ugfun_object-layout_dynamic.adoc
+++ /dev/null
@@ -1,151 +0,0 @@
-[[_ugfun_object-layout_dynamic]]
-= Dynamic (JSON) Layout
-: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 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.
-:_basedir: ../../
-:_imagesdir: images/
-
-
-
-Metadata providing UI hints can be specified either xref:ugfun.adoc#_ugfun_object-layout_static[statically], using annotations, or dynamically, using either a xref:ugfun.adoc#_ugfun_object-layout_dynamic_xml[``layout.xml``] file or (as described here) a `.layout.json` file.
-
-
-[IMPORTANT]
-====
-The use of dynamic layouts through the `.layout.json` is DEPRECATED. Instead, use the
-``.layout.xml`` file, which enables much more sophisticated custom layouts than those provided by ``.layout.json``.
-
-It is possible to download initial `.layout.xml` files - which will capture all the metadata originally in the `.layout.json` file - using the xref:rgsvc.adoc#_rgsvc_api_LayoutService[`LayoutService`] (exposed as an action on the prototyping menu).
-The `.layout.json` file will be ignored once a `.layout.xml` file is present.
-====
-
-== JSON layout file
-
-The JSON layout file for class `Xxx` takes the name `Xxx.layout.json`, and resides in the same package as the class.
-
-
-The format of the file is:
-
-[source,javascript]
-----
-{
- "columns": [ // list of columns
- {
- "span": 6, // span of the left-hand property column
- "memberGroups": { // ordered map of member (property) groups
- "General": { // member group name
- "members": {
- "description": { // property, no associated actions, but with UI hint
- "propertyLayout": {
- "typicalLength": 50 // UI hint for size of field (no longer used in ISIS 1.8.0)
- }
- },
- "category": {},
- "complete": { // property, with associated actions
- "propertyLayout": {
- "describedAs": "Whether this todo item has been completed"
- },
- "actions": {
- "completed": {
- "actionLayout": {
- "named": "Done", // naming UI hint
- "cssClass": "x-highlight" // CSS UI hint
- }
- },
- "notYetCompleted": {
- "actionLayout": {
- "named": "Not done"
- }
- }
- }
- }
- },
- "Misc": {
- "members": {
- "notes": {
- "propertyLayout": {
- "multiLine": 5 // UI hint for text area
- }
- },
- "versionSequence": {}
- }
- }
- }
- }
- },
- {
- "span": 6, // span of the middle property column
- "memberGroups": { ... }
- },
- {
- "span": 0 // span of the right property column (if any)
- },
- {
- "span": 6,
- "collections": { // ordered map of collections
- "dependencies": { // collection, with associated actions
- "collectionLayout": {
- "paged": 10, // pagination UI hint
- "render": "EAGERLY" // lazy-loading UI hint
- },
- "actions": {
- "add":{},
- "delete": {}
- },
- },
- "similarItems": {} // collection, no associated actions
- }
- }
- ],
- "actions": { // actions not associated with any member
- "delete": {},
- "duplicate": {
- "actionLayout": {
- "named": {
- "value": "Clone"
- }
- }
- }
- }
-}
-----
-
-Although advisable, it is not necessary to list all class members in this file. Any members not listed with be
-ordered according either to annotations (if present) or fallback/default values.
-
-Note also that the layout file may contain entries for xref:ugfun.adoc#_ugfun_how-tos_contributed-members[contributed associations and actions]; this allows each contributee classes to define their own layout for their contributions, possibly overriding any static metadata on the original domain service contributor.
-
-
-
-== Downloading an initial layout
-
-The fastest way to get started is to use the (non-ASF) link:http://github.com/isisaddons/isis-module-devutils[Isis addons' devutils] module to download the layout file (derived from any existing static metadata defined by annotations).
-
-
-
-== Required updates to the dom project's pom.xml
-
-Any `.layout.json` files must be compiled and available in the classpath. Ensure the following is defined in the dom project's `pom.xml`:
-
-[source.xml]
-----
-<resources>
- <resource>
- <filtering>false</filtering>
- <directory>src/main/resources</directory>
- </resource>
- <resource>
- <filtering>false</filtering>
- <directory>src/main/java</directory>
- <includes>
- <include>**</include>
- </includes>
- <excludes>
- <exclude>**/*.java</exclude>
- </excludes>
- </resource>
-</resources>
-----
-
-If using an Apache Isis xref:ugfun.adoc#_ugfun_getting-started_simpleapp-archetype[SimpleApp archetype], then the POM is already correctly configured.
-
-
http://git-wip-us.apache.org/repos/asf/isis/blob/8f18b6f0/adocs/documentation/src/main/asciidoc/guides/ugfun/_ugfun_object-layout_dynamic_xml.adoc
----------------------------------------------------------------------
diff --git a/adocs/documentation/src/main/asciidoc/guides/ugfun/_ugfun_object-layout_dynamic_xml.adoc b/adocs/documentation/src/main/asciidoc/guides/ugfun/_ugfun_object-layout_dynamic_xml.adoc
deleted file mode 100644
index aafb409..0000000
--- a/adocs/documentation/src/main/asciidoc/guides/ugfun/_ugfun_object-layout_dynamic_xml.adoc
+++ /dev/null
@@ -1,400 +0,0 @@
-[[_ugfun_object-layout_dynamic_xml]]
-= Dynamic (XML) Layout
-: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 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.
-:_basedir: ../../
-:_imagesdir: images/
-
-
-
-Metadata providing UI hints can be specified either xref:ugfun.adoc#_ugfun_object-layout_static[statically], using annotations, or dynamically using an `Xxx.layout.xml` file (where `Xxx` is the entity or view model object to be rendered).
-
-The `Xxx.layout.xml` file is just the serialized form of a xref:rgcms.adoc#_rgcms_classes_layout[`Grid`] layout class defined within Apache Isis' applib. These are JAXB-annotated classes with corresponding XSD schemas; the upshot of that
-is that IDEs such as IntelliJ and Eclipse can provide "intellisense", making iteasy to author such layout files.
-
-It is also possible to download an initial `.layout.xml` - capturing any existing layout metadata - using the xref:rgsvc.adoc#_rgsvc_api_LayoutService[`LayoutService`] (exposed on the prototyping menu) or using a xref:rgcms.adoc#_rgcms_classes_mixins_Object[mixin action] contributed to every domain object.
-
-[NOTE]
-====
-It is also possible to describe dynamic layouts using a `.layout.json` file, as discussed xref:ugfun.adoc#_ugfun_object-layout_dynamic[here]. The `.layout.json` file should be considered as deprecated: the ``.layout.xml`` file also enables much more sophisticated layouts than those afforded by ``.layout.json``.
-====
-
-== Grids vs Components
-
-The XML file distinguishes between two types of element:
-
-* those that define a grid structure, of: rows, columns, tab groups and tabs. +
-+
-The rows and columns are closely modelled on link:getbootstrap.com[Bootstrap 3] (used in the implementation of the xref:ugvw.adoc[Wicket viewer]).
-
-* those that defines common components, of: fieldsets (previously called member groups or property groups), properties, collections, actions and also the title/icon of the domain object itself.
-
-More information about these classes can be found in xref:rgcms.adoc#_rgcms_classes_layout[the reference guide]. More information on Bootstrap 3's grid system can be found link:http://getbootstrap.com/css/#grid[here].
-
-
-== Screencast
-
-This link:https://www.youtube.com/watch?v=MxewC5Pve5k[screencast] describes the feature.
-
-
-
-
-== Examples
-
-Probably the easiest way to understand dynamic XML layouts is by example. For this we'll use the `ToDoItem` from the
-(non-ASF) http://github.com/isisaddons/isis-app-todoapp[Isis addons' todoapp]:
-
-image::{_imagesdir}ugfun/_ugfun_object-layout_dynamic_xml/ToDoItem.png[width="940px",link="{_imagesdir}ugfun/_ugfun_object-layout_dynamic_xml/ToDoItem.png"]
-
-
-=== Namespaces
-
-First things first; every `.layout.xml` file must properly declare the XSD namespaces and schemas. There are two: one for the grid classes, and one for the common component classes:
-
-[source,xml]
-----
-<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<bs3:grid
- xsi:schemaLocation="http://isis.apache.org/applib/layout/component
- http://isis.apache.org/applib/layout/component/component.xsd
- http://isis.apache.org/applib/layout/grid/bootstrap3
- http://isis.apache.org/applib/layout/grid/bootstrap3/bootstrap3.xsd"
- xmlns:bs3="http://isis.apache.org/applib/layout/grid/bootstrap3"
- xmlns:c="http://isis.apache.org/applib/layout/component"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
- ...
-</bs3:grid>
-----
-
-Most IDEs will automatically download the XSD schemas from the specified schema locations, thereby providing
-"intellisense" help as you edit the file.
-
-
-=== Rows, full-width cols, and tabs
-
-The example layout consists of three rows: a row for the object/icon, a row containing a properties, and a row containing collections. In all three cases the row contains a single column spanning the full width of the page. For the property and collection rows, the column contains a tab group.
-
-This corresponds to the following XML:
-
-[source,xml]
-----
- <bs3:row>
- <bs3:col span="12" unreferencedActions="true">
- <c:domainObject bookmarking="AS_ROOT"/>
- </bs3:col>
- </bs3:row>
- <bs3:row>
- <bs3:col span="12">
- <bs3:tabGroup>
- <bs3:tab name="Properties">...</bs3:tab>
- <bs3:tab name="Other">...</bs3:tab>
- <bs3:tab name="Metadata">...</bs3:tab>
- </bs3:tabGroup>
- </bs3:col>
- </bs3:row>
- <bs3:row>
- <bs3:col span="12">
- <bs3:tabGroup unreferencedCollections="true">
- <bs3:tab name="Similar to">...</bs3:tab>
- <bs3:tab name="Dependencies">...</bs3:tab>
- </bs3:tabGroup>
- </bs3:col>
- </bs3:row>
-----
-
-
-You will notice that one of the ``col``umns has an ``unreferencedActions`` attribute, while one of the ``tabGroup``s has a similar ``unreferencedCollections`` attribute. This topic is discussed in more detail xref:ugfun.adoc#__ugfun_object-layout_dynamic_xml-unreferenced[below].
-
-
-
-=== Fieldsets
-
-The first tab containing properties is divided into two columns, each of which holds a single fieldset of multiple properties. Those properties in turn can have associated actions.
-
-This corresponds to the following XML:
-
-[source,xml]
-----
- <bs3:tab name="Properties">
- <bs3:row>
- <bs3:col span="6">
- <c:fieldSet name="General" id="general" unreferencedProperties="true">
- <c:action id="duplicate" position="PANEL_DROPDOWN"/>
- <c:action id="delete"/>
- <c:property id="description"/>
- <c:property id="category"/>
- <c:property id="subcategory">
- <c:action id="updateCategory"/>
- <c:action id="analyseCategory" position="RIGHT"/>
- </c:property>
- <c:property id="complete">
- <c:action id="completed" cssClassFa="fa-thumbs-up"/>
- <c:action id="notYetCompleted" cssClassFa="fa-thumbs-down"/>
- </c:property>
- </c:fieldSet>
- </bs3:col>
- <bs3:col span="6">
- ...
- </bs3:col>
- </bs3:row>
- </bs3:tab>
-----
-
-The tab defines two columns, each span of 6 (meaning half the width of the page).
-
-In the first column there is a single fieldset. Notice how actions - such as `duplicate` and `delete` - can be associated with this fieldset directly, meaning that they should be rendered on the fieldset's top panel.
-
-Thereafter the fieldset lists the properties in order. Actions can be associated with properties too; here they are rendered underneath or to the right of the field.
-
-Note also the `unreferencedProperties` attribute for the fieldset; this topic is discussed in more detail xref:ugfun.adoc#__ugfun_object-layout_dynamic_xml-unreferenced[below].
-
-
-=== Collections
-
-In the final row the collections are placed in tabs, simply one collection per tab. This corresponds to the following XML:
-
-[source,xml]
-----
- <bs3:tab name="Similar to">
- <bs3:row>
- <bs3:col span="12">
- <c:collection defaultView="table" id="similarTo"/>
- </bs3:col>
- </bs3:row>
- </bs3:tab>
- <bs3:tab name="Dependencies">
- <bs3:row>
- <bs3:col span="12">
- <c:collection defaultView="table" id="dependencies">
- <c:action id="add"/>
- <c:action id="remove"/>
- </c:collection>
- </bs3:col>
- </bs3:row>
- </bs3:tab>
-----
-
-As with properties, actions can be associated with collections; this indicates that they should be rendered in the collection's header.
-
-
-
-[[__ugfun_object-layout_dynamic_xml-unreferenced]]
-== Unreferenced Members
-
-As noted in the preceding discussion, several of the grid's regions have either an ``unreferencedActions``, ``unreferencedCollections`` or ``unreferencedProperties`` attribute.
-
-The rules are:
-
-* `unreferencedActions` attribute can be specified either on a column or on a fieldset. +
-+
-It would normally be typical to use the column holding the `<domainObject/>` icon/title, that is as shown in the example. The unreferenced actions then appear as top-level actions for the domain object.
-
-* `unreferencedCollections` attribute can be specified either on a column or on a tabgroup. +
-+
-If specified on a column, then that column will contain each of the unreferenced collections, stacked one on top of the other. If specified on a tab group, then a separate tab will be created for each collection, with that tab containing only that single collection.
-
-* `unreferencedProperties` attribute can be specified only on a fieldset.
-
-The purpose of these attributes is to indicate where in the layout any unreferenced members should be rendered. Every grid _must_ nominate one region for each of these three member types, the reason being that to ensure that the layout can be used even if it is incomplete with respect to the object members inferred from the Java source code. This might be because the developer forgot to update the layout, or it might be because of a new mixin (property, collection or action) contributed to many objects.
-
-
-The framework ensures that in any given grid exactly one region is specified for each of the three `unreferenced...` attributes. If the grid fails this validation, then a warning message will be displayed, and the invalid XML logged. The layout XML will then be ignored.
-
-
-
-== More advanced features
-
-This section decribes a number of more features useful in more complex layouts.
-
-
-=== Multiple references to a feature
-
-One feature worth being aware of is that it is possible to render a single feature more than once.
-
-For example, the dashboard home page for the (non-ASF) http://github.com/isisaddons/isis-app-todoapp[Isis addons' todoapp] shows
-the "not yet complete" collection of todo items twice, once as a table and also as a calendar:
-
-image::{_imagesdir}ugfun/_ugfun_object-layout_dynamic_xml/ToDoAppDashboard.png[width="940px",link="{_imagesdir}ugfun/_ugfun_object-layout_dynamic_xml/ToDoAppDashboard.png"]
-
-
-This is accomplished using the following (slightly abbreviated) layout:
-
-[source,xml]
-----
-<grid ...>
- <row>
- <col span="2" unreferencedActions="true">
- ...
- </col>
- <col span="5" unreferencedCollections="true" cssClass="custom-padding-top-20">
- <ns2:collection id="notYetComplete" defaultView="calendar"/> <!--1-->
- </col>
- <col span="5" cssClass="custom-padding-top-20">
- <ns2:collection id="notYetComplete" defaultView="table" paged="5"/> <!--2-->
- <ns2:collection id="complete" defaultView="table"/>
- </col>
- <col span="0">
- <ns2:fieldSet name="General" id="general" unreferencedProperties="true"/>
- </col>
- </row>
-</grid>
-----
-<1> render the collection in "calendar" view
-<2> also render the collection in "table" view
-
-In the middle column the `notYetComplete` collection is rendered in "calendar" view, while in the right-most column
-it is rendered in "table" view.
-
-
-It is also possible to reference object properties and actions more than once. This might be useful for a complex
-domain object with multiple tabs; certain properties or actions might appear on a summary tab (that shows the
-most commonly used info), but also on detail tabs.
-
-=== Custom CSS
-
-The ToDoApp's dashboard (above) also shows how custom CSS styles can be associated with specific regions of the layout:
-
-[source,xml]
-----
-<grid ...>
- <row>
- <col span="2" unreferencedActions="true">
- <ns2:domainObject/>
- <row>
- <col span="12" cssClass="custom-width-100"> <!--1-->
- <ns2:action id="exportToWordDoc"/>
- </col>
- </row>
- ...
- </col>
- <col span="5" unreferencedCollections="true" cssClass="custom-padding-top-20"> <!--2-->
- ...
- </col>
- <col span="5" cssClass="custom-padding-top-20"> <!--3-->
- ...
- </col>
- </row>
-</grid>
-----
-<1> Render the column with the `custom-width-100` CSS class.
-<2> Render the column with the `custom-padding-top-20` CSS class.
-<3> Ditto
-
-For example the `custom-width-100` style is used to "stretch" the button for the `exportToWordDoc` action in the
-left-most column. This is accomplished with the following CSS in `application.css`:
-
-[source,css]
-----
-.custom-width-100 ul,
-.custom-width-100 ul li,
-.custom-width-100 ul li a.btn {
- width: 100%;
-}
-----
-
-Similarly, the middle and right columns are rendered using the `custom-padding-top-20` CSS class. This shifts them down
-from the top of the page slightly, using the following CSS:
-
-[source,css]
-----
-.custom-padding-top-20 {
- padding-top: 20px;
-}
-----
-
-
-
-
-== Migrating from earlier versions
-
-As noted earlier on, it is possible to download layout XML files using the xref:rgsvc.adoc#_rgsvc_api_LayoutService[`LayoutService`] (exposed on the prototyping menu); this will download a ZIP file of layout XML files for all domain entities and view models. Alternatively the layout XML for a single domain object can be downloaded using the xref:rgcms.adoc#_rgcms_classes_mixins_Object[mixin action] (contributed to every domain object).
-
-There are four "styles":
-
-* current
-* complete
-* normalized
-* minimal
-
-
-Ignorig the "current" style (which merely downloads the currently cached layout), the other three styles allow the
-developer to choose how much metadata is to be specified in the XML, and how much (if any) will be obtained
-elsewhere, either from annotations in the metamodel or from an earlier `.layout.json` file if present. The table
-below summarises the choices:
-
-.Table caption
-[cols="<.>,^.>,^.>,^.>", options="header"]
-|===
-
-| Style
-|xref:rgant.adoc#_rgant-MemberGroupLayout[`@MemberGroupLayout`]
-| xref:rgant.adoc#_rgant-MemberOrder[`@MemberOrder`]
-| xref:rgant.adoc#_rgant-ActionLayout[`@ActionLayout`], xref:rgant.adoc#_rgant-PropertyLayout[`@PropertyLayout`], xref:rgant.adoc#_rgant-CollectionLayout[`@CollectionLayout`]
-
-
-|`COMPLETE`
-|serialized as XML
-|serialized as XML
-|serialized as XML
-
-
-|`NORMALIZED`
-|serialized as XML
-|serialized as XML
-|not in the XML
-
-
-|`MINIMAL`
-|serialized as XML
-|not in the XML
-|not in the XML
-
-|===
-
-As a developer, you therefore have a choice as to how you provide the metadata required for customised layouts:
-
-* if you want all layout metadata to be read from the `.layout.xml` file, then download the "complete" version, and copy the file alongside the domain class. You can then remove all `@MemberGroupLayout`, `@MemberOrder`, `@ActionLayout`, `@PropertyLayout` and `@CollectionLayout` annotations from the source code of the domain class.
-
-* if you want to use layout XML file to describe the grid (columns, tabs etc) and specify which object members are associated with those regions of the grid, then download the "normalized" version. You can then remove the `@MemberGroupLayout` and `@MemberOrder` annotations from the source code of the domain class, but retain the `@ActionLayout`, `@PropertyLayout` and `@CollectionLayout` annotations.
-
-* if you want to use layout XML file ONLY to describe the grid, then download the "minimal" version. The grid regions will be empty in this version, and the framework will use the `@MemberOrder` annotation to bind object members to those regions. The only annotation that can be safely removed from the source code with this style is the `@MemberGroupLayout` annotation.
-
-
-Download either for a single domain object, or download all domain objects (entities and view models).
-
-
-== Domain Services
-
-For more information about layouts, see:
-
-* xref:rgsvc.adoc#_rgsvc_api_LayoutService[`LayoutService`] (whose functionality is exposed on the prototyping menu as an action) and lso the a xref:rgcms .adoc#_rgcms_classes_mixins_Object[mixin action]
-
-* xref:rgsvc.adoc#_rgsvc_spi_GridService[`GridService`] and its supporting services, xref:rgsvc.adoc#_rgsvc_spi_GridLoaderService[`GridLoaderService`] and xref:rgsvc.adoc#_rgsvc_spi_GridSystemService[`GridSystemService`]
-
-* xref:rgcms.adoc#_rgcms_classes_layout[grid layout classes], defined in the Apache Isis applib
-
-
-== Required updates to the dom project's pom.xml
-
-Any `.layout.xml` files must be compiled and available in the classpath. Ensure the following is defined in the dom project's `pom.xml`:
-
-[source.xml]
-----
-<resources>
- <resource>
- <filtering>false</filtering>
- <directory>src/main/resources</directory>
- </resource>
- <resource>
- <filtering>false</filtering>
- <directory>src/main/java</directory>
- <includes>
- <include>**</include>
- </includes>
- <excludes>
- <exclude>**/*.java</exclude>
- </excludes>
- </resource>
-</resources>
-----
-
-If using an Apache Isis xref:ugfun.adoc#_ugfun_getting-started_simpleapp-archetype[SimpleApp archetype], then the POM is already correctly configured.
http://git-wip-us.apache.org/repos/asf/isis/blob/8f18b6f0/adocs/documentation/src/main/asciidoc/guides/ugfun/_ugfun_object-layout_static-vs-dynamic.adoc
----------------------------------------------------------------------
diff --git a/adocs/documentation/src/main/asciidoc/guides/ugfun/_ugfun_object-layout_static-vs-dynamic.adoc b/adocs/documentation/src/main/asciidoc/guides/ugfun/_ugfun_object-layout_static-vs-dynamic.adoc
deleted file mode 100644
index 01358c2..0000000
--- a/adocs/documentation/src/main/asciidoc/guides/ugfun/_ugfun_object-layout_static-vs-dynamic.adoc
+++ /dev/null
@@ -1,26 +0,0 @@
-[[_ugfun_object-layout_static-vs-dynamic]]
-= Static vs Dynamic Layouts
-: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 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.
-:_basedir: ../../
-:_imagesdir: images/
-
-
-
-
-Using xref:ugfun.adoc#_ugfun_object-layout_dynamic[dynamic object layout]s using JSON has the huge benefit that the layout can be updated without requiring a recompile of the code and redeploy of the app. Many developers also find it easier to rationalize about layout when all the hints are collated together in a single place (rather than scattered across the class members as annotations).
-
-Another benefit of dynamic layout is that UI hints can be provided for xref:ugfun.adoc#_ugfun_how-tos_contributed-members[contributed associations and actions] that are synthesised at runtime.
-
-The main downsides of using dynamic layouts are a lack of typesafety (a typo will result in the metadata not being picked up for the element) and syntactic fragility (an invalid JSON document will result in no metadata for the entire class).
-
-Also, dynamic layouts have no notion of inheritance, whereas the dewey-decimal format `@MemberOrder` annotation allows the metadata of the subclass its superclasses to fit together relatively seamlessly.
-
-
-
-== Best of both worlds?
-
-Using the (non-ASF) link:http://github.com/isisaddons/isis-jrebel-plugin[Isis addons' jrebel] plugin comes close to getting the best of both words: metadata is specified in a type-safe way using annotations, but can be reloaded automatically.
-
-The downsides are licensing cost, and also the fact that metadata for contributed actions in the contributee class cannot be specified.
-
-Another open source alternative that you might also like to explore is DCEVM; there's a good write-up on the link:http://blog.jetbrains.com/idea/2013/07/get-true-hot-swap-in-java-with-dcevm-and-intellij-idea/[IntelliJ blog].
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/isis/blob/8f18b6f0/adocs/documentation/src/main/asciidoc/guides/ugfun/_ugfun_object-layout_static.adoc
----------------------------------------------------------------------
diff --git a/adocs/documentation/src/main/asciidoc/guides/ugfun/_ugfun_object-layout_static.adoc b/adocs/documentation/src/main/asciidoc/guides/ugfun/_ugfun_object-layout_static.adoc
deleted file mode 100644
index f2e219a..0000000
--- a/adocs/documentation/src/main/asciidoc/guides/ugfun/_ugfun_object-layout_static.adoc
+++ /dev/null
@@ -1,178 +0,0 @@
-[[_ugfun_object-layout_static]]
-= Static Object Layout
-: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 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.
-:_basedir: ../../
-:_imagesdir: images/
-
-
-Metadata providing UI hints can be specified either statically, using annotations, or dynamically, using either a xref:ugfun.adoc#_ugfun_object-layout_dynamic_xml[`layout.xml`] file or a xref:ugfun.adoc#_ugfun_object-layout_dynamic[`.layout.json`] file.
-
-This section describes the static approach, using annotations.
-
-[NOTE]
-====
-Tabs and tabgroups are only supported using xref:ugfun.adoc#_ugfun_object-layout_dynamic_xml[`layout.xml`] files; they are not supported by annotations.
-====
-
-
-
-== `@MemberOrder`
-
-The xref:rgant.adoc#_rgant-MemberOrder[`@MemberOrder`] annotation is used to specify the relative order of domain class properties, collections and actions.
-
-The annotation defines two attributes, xref:rgant.adoc#_rgant-MemberOrder_name[`name()`] and xref:rgant.adoc#_rgant-MemberOrder_sequence[`sequence()`]. Their usage depends on the member type:
-
-* for properties, the `name()` is used to group properties together into a member group (also called a property group
-or a fieldset. The `sequence()` then orders properties within these groups. If no `name()` is specified then the
-property is placed in a fallback "General" group, called "General". +
-+
-The name of these member groups/fieldsets are then referenced by xref:rgant.adoc#_rgant-MemberGroupLayout[`@MemberGroupLayout`].
-
-* for collections, the `name()` attribute is (currently) unused. The `sequence()` orders collections relative to one another
-
-* for actions, the `name()` attribute associates an action with either a property or with a collection. +
-
-** If the `name()` attribute matches a property name, then the action's button is rendered close to the property, according to xref:rgant.adoc#_rgant-ActionLayout_position[`@ActionLayout#position()`] attribute. +
-
-** On the other hand if the `name() attribute matches a collection name, then the action's button is rendered on the collection's header.
-
-** If there is no `name()` value, then the action is considered to pertain to the object as a whole, and its button is rendered close to the object's icon and title.
-
-Within any of these, the `sequence()` then determines the relative ordering of the action with respect to other actions that have been similarly associated with properties/collections or left as "free-standing".
-
-
-
-For example:
-
-[source,java]
-----
-public class ToDoItem {
- @MemberOrder(sequence="1")
- public String getDescription() { ... }
- @MemberOrder(sequence="2")
- public String getCategory() { ... }
- @MemberOrder(sequence="3")
- public boolean isComplete() { ... }
- @MemberOrder(name="Detail", sequence="1")
- public LocalDate getDueBy() { ... }
- @MemberOrder(name="Detail", sequence="2")
- public BigDecimal getCost() { ... }
- @MemberOrder(name="Detail", sequence="4")
- public String getNotes() { ... }
- @MemberOrder(name="Misc", sequence="99")
- public Long getVersionSequence() { ... }
- ...
-}
-----
-
-This defines three property (or member) groups, "General", "Detail" and "Misc"; "General" is the default if no `name` attribute is specified. Properties in the same member group are rendered together, as a fieldset.
-
-In addition, actions can optionally be associated (rendered close to) either properties or actions. This is done by overloading the ``@MemberOrder``'s xref:rgant.adoc#_rgant-MemberOrder_name[`name()`] attribute, holding the value of the property or collection.
-
-For example:
-
-[source,java]
-----
-public class ToDoItem {
- @MemberOrder(sequence="3")
- public boolean isComplete() { ... }
- @MemberOrder(name="complete", sequence="1")
- public ToDoItem completed() { ...}
- @MemberOrder(name="complete", sequence="2")
- public ToDoItem notYetCompleted() { ...}
-
- @MemberOrder(sequence="1")
- public SortedSet<ToDoItem> getDependencies() { ... }
- @MemberOrder(name="dependencies", sequence="1")
- public ToDoItem add(ToDoItem t) { ...}
- @MemberOrder(name="dependencies", sequence="2")
- public ToDoItem remove(ToDoItem t) { ...}
- ...
-}
-----
-
-will associate the `completed()` and `notYetCompleted()` actions with the `complete` property, and will associate the `add()` and `remove()` actions with the `dependencies` collection.
-
-
-The value of xref:rgant.adoc#_rgant-MemberOrder_sequence[`sequence()`] is a string. The simplest convention (as shown in the example above) is to use numbers -- 1, 2, 3 -- though it is a better idea to leave gaps in the numbers -- 10, 20, 30 perhaps -- such that a new member may be added without having to edit existing numbers.
-
-Even better is to adopt the 'dewey-decimal' notation -- 1, 1.1, 1.2, 2, 3, 5.1.1, 5.2.2, 5.2, 5.3 -- which allows for an indefinite amount of future insertion. It also allows subclasses to insert their class members as required.
-
-
-
-
-== `@MemberGroupLayout`
-
-The xref:rgant.adoc#_rgant-MemberGroupLayout[`@MemberGroupLayout`] annotation specifies the relative positioning of property groups/fieldsets as being either in a left column, a middle column or in a right column. The annotation also specifies the relative width of the columns.
-
-The property groups/fieldsets in this case are those that are inferred from the `@MemberOrder#name()` attribute.
-
-[TIP]
-====
-It is also possible to combine `@MemberOrder` with dynamic layouts, either using xref:ugfun.adoc#_ugfun_object-layout_xml[XML] or xref:ugfun.adoc#_ugfun_object-layout_dynamic[JSON]. The layout file defines only the regions of a grid structure (fieldsets/columns etc), but does __not__ specify the properties/collections/actions within those grid regions. The `@MemberOrder` annotation in effect "binds" the properties or collections to those regions of the grid.
-
-When dynamic layouts are used this way, the xref:rgant.adoc#_rgant-MemberGroupLayout[`@MemberGroupLayout`] annotation is essentially ignored, but the metadata from the xref:rgant.adoc#_rgant-MemberOrder[`@MemberOrder`] annotation (and the other layout annotations, xref:rgant.adoc#_rgant-ActionLayout[`@ActionLayout`], xref:rgant.adoc#_rgant-PropertyLayout[`@PropertyLayout`] and xref:rgant.adoc#_rgant-CollectionLayout[`@CollectionLayout`]) are all still honoured.
-====
-
-For example:
-
-[source,java]
-----
-@MemberGroupLayout(
- columnSpans={3,3,0,6},
- left={"General", "Misc"},
- middle="Detail"
- )
-public class ToDoItem {
- ...
-}
-----
-
-Four values are given in the `columnSpans` attribute. The first three are the relative widths of the three columns of property groups. The fourth, meanwhile, indicates the width of a final column that holds all the collections of the object.
-
-The values of these spans are taken as proportions of 12 virtual columns across the page (this taken from the link:http://getbootstrap.com/2.3.2/[Bootstrap] library).
-
-For example:
-
-* `{3,3,0,6}` indicates:
-** a left column of properties taking up 25% of the width
-** a middle column of properties taking up 25% of the width
-** a right column of collections taking up 50% of the width
-* `{2,6,0,4}` indicates:
-** a left column of properties taking up ~16% of the width
-** a middle column of properties taking up 50% of the width
-** a right column of collections taking up ~33% of the width
-* `{2,3,3,4}` indicates:
-** a left column of properties taking up ~16% of the width
-** a middle column of properties taking up 25% of the width
-** a right column of properties taking up 25% of the width
-** a far right column of collections taking up ~33% of the width
-
-If the sum of all the columns exceeds 12, then the collections are placed underneath the properties, taking up the full span. For example:
-
-* {4,4,4,12} indicates:
-** a left column of properties taking up ~33% of the width
-** a middle column of properties taking up ~33% of the width
-** a right column of properties taking up ~33% of the width
-** the collections underneath the property columns, taking up the full width
-
-== Example Layouts
-
-Below are sketches for the layout of the https://github.com/apache/isis/blob/f38fdb92941172eabb12e0943509f239e6d5925f/example/application/quickstart_wicket_restful_jdo/dom/src/main/java/dom/todo/ToDoItem.java[ToDoItem] class of the Isis addons example https://github.com/isisaddons/isis-app-todoapp/[todoapp] (not ASF):
-
-The first divides the properties into two equal sized columns (6-6-0) and puts the collections underneath (12):
-
-image::{_imagesdir}reference-layout/6-6-0-12.png[width="720px",link="{_imagesdir}reference-layout/6-6-0-12.png"]
-
-The next divides the collections into three equal sized columns (4-4-4) and again puts the collections underneath (12):
-
-image::{_imagesdir}reference-layout/4-4-4-12.png[width="720px",link="{_imagesdir}reference-layout/4-4-4-12.png"]
-
-The last puts the properties into a single column (4-0) and places the collections into the other larger column (8-0):
-
-image::{_imagesdir}reference-layout/4-0-8-0.png[width="720px",link="{_imagesdir}reference-layout/4-0-8-0.png"]
-
-
-== Other Annotations
-
-As of 1.8.0, all the layout annotations have been consolidated into the various `XxxLayout` annotations: xref:rgant.adoc#_rgant-ActionLayout, [`@ActionLayout`] xref:rgant.adoc#_rgant-CollectionLayout[`@CollectionLayout`], xref:rgant.adoc#_rgant-DomainObjectLayout[`@DomainObjectLayout`], xref:rgant.adoc#_rgant-DomainServiceLayout[`@DomainServiceLayout`], xref:rgant.adoc#_rgant-ParameterLayout[`@ParameterLayout`], xref:rgant.adoc#_rgant-PropertyLayout[`@PropertyLayout`], and xref:rgant.adoc#_rgant-ViewModelLayout[`@ViewModelLayout`]
http://git-wip-us.apache.org/repos/asf/isis/blob/8f18b6f0/adocs/documentation/src/main/asciidoc/guides/ugfun/images/reference-layout/4-0-8-0.png
----------------------------------------------------------------------
diff --git a/adocs/documentation/src/main/asciidoc/guides/ugfun/images/reference-layout/4-0-8-0.png b/adocs/documentation/src/main/asciidoc/guides/ugfun/images/reference-layout/4-0-8-0.png
deleted file mode 100644
index 1ebb062..0000000
Binary files a/adocs/documentation/src/main/asciidoc/guides/ugfun/images/reference-layout/4-0-8-0.png and /dev/null differ
http://git-wip-us.apache.org/repos/asf/isis/blob/8f18b6f0/adocs/documentation/src/main/asciidoc/guides/ugfun/images/reference-layout/4-4-4-12.png
----------------------------------------------------------------------
diff --git a/adocs/documentation/src/main/asciidoc/guides/ugfun/images/reference-layout/4-4-4-12.png b/adocs/documentation/src/main/asciidoc/guides/ugfun/images/reference-layout/4-4-4-12.png
deleted file mode 100644
index fd946bf..0000000
Binary files a/adocs/documentation/src/main/asciidoc/guides/ugfun/images/reference-layout/4-4-4-12.png and /dev/null differ
http://git-wip-us.apache.org/repos/asf/isis/blob/8f18b6f0/adocs/documentation/src/main/asciidoc/guides/ugfun/images/reference-layout/6-6-0-12.png
----------------------------------------------------------------------
diff --git a/adocs/documentation/src/main/asciidoc/guides/ugfun/images/reference-layout/6-6-0-12.png b/adocs/documentation/src/main/asciidoc/guides/ugfun/images/reference-layout/6-6-0-12.png
deleted file mode 100644
index 369efb7..0000000
Binary files a/adocs/documentation/src/main/asciidoc/guides/ugfun/images/reference-layout/6-6-0-12.png and /dev/null differ
http://git-wip-us.apache.org/repos/asf/isis/blob/8f18b6f0/adocs/documentation/src/main/asciidoc/guides/ugfun/images/reference-layout/isis-layout-show-facets.css
----------------------------------------------------------------------
diff --git a/adocs/documentation/src/main/asciidoc/guides/ugfun/images/reference-layout/isis-layout-show-facets.css b/adocs/documentation/src/main/asciidoc/guides/ugfun/images/reference-layout/isis-layout-show-facets.css
deleted file mode 100644
index c6b6334..0000000
--- a/adocs/documentation/src/main/asciidoc/guides/ugfun/images/reference-layout/isis-layout-show-facets.css
+++ /dev/null
@@ -1,3 +0,0 @@
-\ufefful.isis-facets {
- display: initial;
-}
http://git-wip-us.apache.org/repos/asf/isis/blob/8f18b6f0/adocs/documentation/src/main/asciidoc/guides/ugfun/images/reference-layout/isis-layout.css
----------------------------------------------------------------------
diff --git a/adocs/documentation/src/main/asciidoc/guides/ugfun/images/reference-layout/isis-layout.css b/adocs/documentation/src/main/asciidoc/guides/ugfun/images/reference-layout/isis-layout.css
deleted file mode 100644
index acd445d..0000000
--- a/adocs/documentation/src/main/asciidoc/guides/ugfun/images/reference-layout/isis-layout.css
+++ /dev/null
@@ -1,253 +0,0 @@
-\ufeff.primary-1 {
- background-color: #669900;
-}
-
-.primary-2 {
- background-color: #669900;
-}
-
-.primary-3 {
- background-color: #669900;
-}
-
-.primary-4 {
- background-color: #99FF66;
-}
-
-.primary-5 {
- background-color: #CCFF99;
-}
-
-.secondary-a-1 {
- background-color: #006666;
-}
-
-.secondary-a-2 {
- background-color: #006666;
-}
-
-.secondary-a-3 {
- background-color: #006666;
-}
-
-.secondary-a-4 {
- background-color: #66CCCC;
-}
-
-.secondary-a-5 {
- background-color: #99CCCC;
-}
-
-.secondary-b-1 {
- background-color: #999900;
-}
-
-.secondary-b-2 {
- background-color: #999900;
-}
-
-.secondary-b-3 {
- background-color: #999900;
-}
-
-.secondary-b-4 {
- background-color: #FFFF66;
-}
-
-.secondary-b-5 {
- background-color: #FFFFCC;
-}
-
-.complement-1 {
- background-color: #990033;
-}
-
-.complement-2 {
- background-color: #990033;
-}
-
-.complement-3 {
- background-color: #990033;
-}
-
-.complement-4 {
- background-color: #FF6699;
-}
-
-.complement-5 {
- background-color: #FF99CC;
-}
-
-
-
-legend {
- background-color: white;
-}
-
-fieldset {
- padding-bottom: 10px;
-}
-
-span,li {
- color: white;
-}
-span {
- font-weight: bold;
-}
-
-li {
- padding-bottom: 10px;
- margin-bottom: 10px;
-}
-
-
-
-.isis-header {
- padding: 20px 80px 20px 40px;
- margin-right: 100px;
- background-color: #99CCCC;
- display: block;
- width: 100%;
-}
-
-.isis-header span.isis-title {
- font-size: xx-large;
- padding: 5px 80px 5px 40px;
- margin-right: 50px;
- color: black;
- background-color: #99FF66;
- display: inline-table;
- vertical-align: bottom;
-}
-
-.isis-header div.isis-actions span {
- font-size: large;
- padding: 5px 5px 5px 5px;
- display: inline-table;
-}
-
-.isis-memberGroup, .isis-collection {
- margin-top: 10px;
- margin-bottom: 10px;
- min-height: 100px;
-}
-
-.isis-memberGroup {
- background-color: #669900;
-}
-
-.isis-collection {
- background-color: #999900;
-}
-
-
-div.isis-property > span {
- margin-left: 5%;
- padding-left: 10px;
- width: 90%;
- display: block;
-}
-
-fieldset div.isis-property > span {
- padding: 5px;
- margin: 10px;
- background-color: #006666;
-}
-
-.isis-header div.isis-actions,
-fieldset div.isis-actions {
- margin-left: 60px;
-}
-
-fieldset.isis-collection div.isis-actions {
- margin-left: 60px;
-}
-
-.isis-header .isis-actions {
- display: inline-block;
-}
-
-.isis-header div.isis-action,
-fieldset div.isis-action {
- display: inline-table;
- padding: 5px;
- margin-top: 5px;
- margin-bottom: 5px;
- background-color: #990033;
-}
-
-
-fieldset div.isis-action span {
- background-color: #990033;
-}
-
-.isis-memberGroups {}
-
-.isis-memberGroup.min-height-50,
-.isis-collection.min-height-50 {
- min-height: 50px;
-}
-
-.isis-memberGroup.min-height-100,
-.isis-collection.min-height-100 {
- min-height: 100px;
-}
-
-.isis-memberGroup.min-height-150,
-.isis-collection.min-height-150 {
- min-height: 150px;
-}
-
-.isis-memberGroup.min-height-200,
-.isis-collection.min-height-200 {
- min-height: 200px;
-}
-
-.isis-memberGroup.min-height-250,
-.isis-collection.min-height-250 {
- min-height: 250px;
-}
-
-.isis-memberGroup.min-height-300,
-.isis-collection.min-height-300 {
- min-height: 300px;
-}
-
-.isis-memberGroup.min-height-350,
-.isis-collection.min-height-350 {
- min-height: 350px;
-}
-
-.isis-memberGroup.min-height-400,
-.isis-collection.min-height-400 {
- min-height: 400px;
-}
-
-.isis-memberGroup .isis-hidden {
- display: none;
-}
-
-.isis-action ul.isis-facets li {
- margin-top: 30px;
-}
-ul.isis-facets li {
- margin-left: 40px;
- font-size: small;
-}
-.isis-action ul.isis-facets li {
- margin-top: 10px;
- margin-left: 20px;
-}
-.isis-action ul.isis-facets li {
- font-size: small;
-}
-ul.isis-facets {
- line-height: 0px;
-}
-ul.isis-facets {
- margin:0px;
-}
-
-.isis-facets {
- display: none;
-}
http://git-wip-us.apache.org/repos/asf/isis/blob/8f18b6f0/adocs/documentation/src/main/asciidoc/guides/ugfun/images/reference-layout/layout-4-0-8-0.html
----------------------------------------------------------------------
diff --git a/adocs/documentation/src/main/asciidoc/guides/ugfun/images/reference-layout/layout-4-0-8-0.html b/adocs/documentation/src/main/asciidoc/guides/ugfun/images/reference-layout/layout-4-0-8-0.html
deleted file mode 100644
index 4d77ad0..0000000
--- a/adocs/documentation/src/main/asciidoc/guides/ugfun/images/reference-layout/layout-4-0-8-0.html
+++ /dev/null
@@ -1,198 +0,0 @@
-\ufeff<!DOCTYPE html>
-<html lang="en">
-<head>
- <meta charset="utf-8">
- <meta http-equiv="X-UA-Compatible" content="IE=edge">
- <meta name="viewport" content="width=device-width, initial-scale=1">
- <title>colspans={4,0,8,0}</title>
-
- <!-- Bootstrap -->
- <!--
- <link rel="stylesheet" href="//netdna.bootstrapcdn.com/bootstrap/3.1.1/css/bootstrap.min.css">
- <link rel="stylesheet" href="//netdna.bootstrapcdn.com/bootstrap/3.1.1/css/bootstrap-theme.min.css">
- <script src="//netdna.bootstrapcdn.com/bootstrap/3.1.1/js/bootstrap.min.js"></script>
- -->
-
- <!-- Bootstrap -->
- <link href="css/bootstrap.min.css" rel="stylesheet">
-
- <!-- HTML5 Shim and Respond.js IE8 support of HTML5 elements and media queries -->
- <!-- WARNING: Respond.js doesn't work if you view the page via file:// -->
- <!--[if lt IE 9]>
- <script src="https://oss.maxcdn.com/libs/html5shiv/3.7.0/html5shiv.js"></script>
- <script src="https://oss.maxcdn.com/libs/respond.js/1.4.2/respond.min.js"></script>
- <![endif]-->
- <link href="isis-layout.css" rel="stylesheet">
- <!--<link href="isis-layout-show-facets.css" rel="stylesheet">-->
-</head>
- <body>
- <div class="container">
- <h1>colspans={4,0,8,0}</h1>
- <div class="row">
- <div class="col-md-12">
- <div class="isis-header">
- <span class="isis-title">Buy bread</span>
- <div class="isis-actions">
- <div class="isis-action x-caution">
- <span>delete</span>
- </div>
- <div class="isis-action">
- <span data-isis-id="duplicate">clone</span>
- <ul class="isis-facets">
- <li>describedAs.value="Create a new todo item from this one"</li>
- </ul>
- </div>
- <div class="isis-action">
- <span>recentChanges</span>
- </div>
- <div class="isis-action">
- <span>recentChanges</span>
- </div>
- </div>
- </div>
- </div>
- </div>
- <div class="row">
- <div class="col-md-4 isis-memberGroups">
- <fieldset class="isis-memberGroup min-height-100">
- <legend>General</legend>
- <div class="isis-property">
- <span data-isis-typicallength="50">description</span>
- <ul class="isis-facets">
- <li>typicalLength.value=50</li>
- </ul>
- </div>
- <div class="isis-property">
- <span>category</span>
- <ul class="isis-facets">
- <li>disabled.reason="Use action to update both category and subcategory"</li>
- </ul>
- </div>
- <div class="isis-property">
- <span>subcategory</span>
- <ul class="isis-facets">
- <li>disabled.reason="Use action to update both category and subcategory"</li>
- </ul>
- <div class="isis-actions">
- <div class="isis-action">
- <span data-isis-id="updateCategory">update</span>
- </div>
- <div class="isis-action">
- <span>analyseCategory</span>
- </div>
- </div>
- </div>
- <div class="isis-property">
- <span class="isis-hidden">ownedBy</span>
- </div>
- <div class="isis-property x-highlight">
- <span data-isis-id="complete">done</span>
- <div class="isis-actions">
- <div class="isis-action">
- <span data-isis-id="completed">done</span>
- <ul class="isis-facets">
- <li>describedAs.value="Mark this todo item as having been completed"</li>
- </ul>
- </div>
- <div class="isis-action">
- <span>scheduleExplicitly</span>
- </div>
- <div class="isis-action">
- <span>scheduleImplicitly</span>
- </div>
- <div class="isis-action">
- <span data-isis-id="notYetCompleted">not done</span>
- </div>
- </div>
- </div>
- </fieldset>
- <fieldset class="isis-memberGroup">
- <legend>Priority</legend>
- <div class="isis-property">
- <span>relativePriority</span>
- <div class="isis-actions">
- <div class="isis-action">
- <span>previous</span>
- </div>
- <div class="isis-action">
- <span>next</span>
- </div>
- </div>
- </div>
- <div class="isis-property x-key">
- <span>dueBy</span>
- </div>
- <legend>Other</legend>
- <div class="isis-property">
- <span>cost</span>
- <div class="isis-actions">
- <div class="isis-action">
- <span data-isis-id="updateCost">update</span>
- </div>
- </div>
- </div>
- <div class="isis-property">
- <span>notes</span>
- <ul class="isis-facets">
- <li>multiLine.numberOfLines=5</li>
- <li>hidden.where=ALL_TABLES</li>
- </ul>
- </div>
- <div class="isis-property">
- <span>attachment</span>
- <ul class="isis-facets">
- <li>hidden.where=ALL_TABLES</li>
- </ul>
- </div>
- <div class="isis-property">
- <span data-isis-id="versionSequence">version</span>
- <ul class="isis-facets">
- <li>disabled</li>
- <li>hidden.where=STANDALONE_TABLES</li>
- </ul>
- </div>
- </fieldset>
- </div>
- <div class="col-md-8">
- <fieldset class="isis-collection min-height-100">
- <legend>dependencies</legend>
- <div class="isis-actions">
- <div class="isis-action">
- <span>add</span>
- </div>
- <div class="isis-action x-caution">
- <span>remove</span>
- </div>
- </div>
- <ul class="isis-facets">
- <li>disabled</li>
- <li>paged.value=5</li>
- <li>render.value=EAGERLY</li>
- </ul>
- </fieldset>
- <fieldset class="isis-collection min-height-200">
- <legend>similarTo</legend>
- <ul class="isis-facets">
- <li>disabled</li>
- <li>paged.value=3</li>
- <li>render.value=LAZILY</li>
- </ul>
- </fieldset>
- </div>
- </div>
- <div class="row">
- <div class="col-md-12">
- </div>
- </div>
- </div>
-
- <!-- jQuery (necessary for Bootstrap's JavaScript plugins) -->
- <script src="https://ajax.googleapis.com/ajax/libs/jquery/1.11.0/jquery.min.js"></script>
- <!-- Include all compiled plugins (below), or include individual files as needed -->
- <script src="js/bootstrap.min.js"></script>
- <script>
- $(document).ready(function () {
- });
- </script>
- </body>
-</html>
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/isis/blob/8f18b6f0/adocs/documentation/src/main/asciidoc/guides/ugfun/images/reference-layout/layout-4-4-4-12.html
----------------------------------------------------------------------
diff --git a/adocs/documentation/src/main/asciidoc/guides/ugfun/images/reference-layout/layout-4-4-4-12.html b/adocs/documentation/src/main/asciidoc/guides/ugfun/images/reference-layout/layout-4-4-4-12.html
deleted file mode 100644
index d95a916..0000000
--- a/adocs/documentation/src/main/asciidoc/guides/ugfun/images/reference-layout/layout-4-4-4-12.html
+++ /dev/null
@@ -1,205 +0,0 @@
-\ufeff<!DOCTYPE html>
-<html lang="en">
-<head>
- <meta charset="utf-8">
- <meta http-equiv="X-UA-Compatible" content="IE=edge">
- <meta name="viewport" content="width=device-width, initial-scale=1">
- <title>colspans={4,4,4,12}</title>
-
- <!-- Bootstrap -->
- <!--
- <link rel="stylesheet" href="//netdna.bootstrapcdn.com/bootstrap/3.1.1/css/bootstrap.min.css">
- <link rel="stylesheet" href="//netdna.bootstrapcdn.com/bootstrap/3.1.1/css/bootstrap-theme.min.css">
- <script src="//netdna.bootstrapcdn.com/bootstrap/3.1.1/js/bootstrap.min.js"></script>
- -->
-
- <!-- Bootstrap -->
- <link href="css/bootstrap.min.css" rel="stylesheet">
-
- <!-- HTML5 Shim and Respond.js IE8 support of HTML5 elements and media queries -->
- <!-- WARNING: Respond.js doesn't work if you view the page via file:// -->
- <!--[if lt IE 9]>
- <script src="https://oss.maxcdn.com/libs/html5shiv/3.7.0/html5shiv.js"></script>
- <script src="https://oss.maxcdn.com/libs/respond.js/1.4.2/respond.min.js"></script>
- <![endif]-->
- <link href="isis-layout.css" rel="stylesheet">
- <!--<link href="isis-layout-show-facets.css" rel="stylesheet">-->
-</head>
- <body>
- <div class="container">
- <h1>colspans={4,4,4,12}</h1>
- <div class="row">
- <div class="col-md-12">
- <div class="isis-header">
- <span class="isis-title">Buy bread</span>
- <div class="isis-actions">
- <div class="isis-action x-caution">
- <span>delete</span>
- </div>
- <div class="isis-action">
- <span data-isis-id="duplicate">clone</span>
- <ul class="isis-facets">
- <li>describedAs.value="Create a new todo item from this one"</li>
- </ul>
- </div>
- <div class="isis-action">
- <span>recentChanges</span>
- </div>
- <div class="isis-action">
- <span>recentChanges</span>
- </div>
- </div>
- </div>
- </div>
- </div>
- <div class="row">
- <div class="col-md-4 isis-memberGroups">
- <fieldset class="isis-memberGroup min-height-100">
- <legend>General</legend>
- <div class="isis-property">
- <span data-isis-typicallength="50">description</span>
- <ul class="isis-facets">
- <li>typicalLength.value=50</li>
- </ul>
- </div>
- <div class="isis-property">
- <span>category</span>
- <ul class="isis-facets">
- <li>disabled.reason="Use action to update both category and subcategory"</li>
- </ul>
- </div>
- <div class="isis-property">
- <span>subcategory</span>
- <ul class="isis-facets">
- <li>disabled.reason="Use action to update both category and subcategory"</li>
- </ul>
- <div class="isis-actions">
- <div class="isis-action">
- <span data-isis-id="updateCategory">update</span>
- </div>
- <div class="isis-action">
- <span>analyseCategory</span>
- </div>
- </div>
- </div>
- <div class="isis-property">
- <span class="isis-hidden">ownedBy</span>
- </div>
- <div class="isis-property x-highlight">
- <span data-isis-id="complete">done</span>
- <div class="isis-actions">
- <div class="isis-action">
- <span data-isis-id="completed">done</span>
- <ul class="isis-facets">
- <li>describedAs.value="Mark this todo item as having been completed"</li>
- </ul>
- </div>
- <div class="isis-action">
- <span>scheduleExplicitly</span>
- </div>
- <div class="isis-action">
- <span>scheduleImplicitly</span>
- </div>
- <div class="isis-action">
- <span data-isis-id="notYetCompleted">not done</span>
- </div>
- </div>
- </div>
- </fieldset>
- </div>
- <div class="col-md-4 isis-memberGroups">
- <fieldset class="isis-memberGroup">
- <legend>Priority</legend>
- <div class="isis-property">
- <span>relativePriority</span>
- <div class="isis-actions">
- <div class="isis-action">
- <span>previous</span>
- </div>
- <div class="isis-action">
- <span>next</span>
- </div>
- </div>
- </div>
- <div class="isis-property x-key">
- <span>dueBy</span>
- </div>
- </fieldset>
- </div>
- <div class="col-md-4 isis-memberGroups">
- <fieldset class="isis-memberGroup">
- <legend>Other</legend>
- <div class="isis-property">
- <span>cost</span>
- <div class="isis-actions">
- <div class="isis-action">
- <span data-isis-id="updateCost">update</span>
- </div>
- </div>
- </div>
- <div class="isis-property">
- <span>notes</span>
- <ul class="isis-facets">
- <li>multiLine.numberOfLines=5</li>
- <li>hidden.where=ALL_TABLES</li>
- </ul>
- </div>
- <div class="isis-property">
- <span>attachment</span>
- <ul class="isis-facets">
- <li>hidden.where=ALL_TABLES</li>
- </ul>
- </div>
- </fieldset>
- <fieldset class="isis-memberGroup min-height-100">
- <legend>Misc</legend>
- <div class="isis-property">
- <span data-isis-id="versionSequence">version</span>
- <ul class="isis-facets">
- <li>disabled</li>
- <li>hidden.where=STANDALONE_TABLES</li>
- </ul>
- </div>
- </fieldset>
- </div>
- </div>
- <div class="row">
- <div class="col-md-12">
- <fieldset class="isis-collection min-height-100">
- <legend>dependencies</legend>
- <div class="isis-actions">
- <div class="isis-action">
- <span>add</span>
- </div>
- <div class="isis-action x-caution">
- <span>remove</span>
- </div>
- </div>
- <ul class="isis-facets">
- <li>disabled</li>
- <li>paged.value=5</li>
- <li>render.value=EAGERLY</li>
- </ul>
- </fieldset>
- <fieldset class="isis-collection min-height-200">
- <legend>similarTo</legend>
- <ul class="isis-facets">
- <li>disabled</li>
- <li>paged.value=3</li>
- <li>render.value=LAZILY</li>
- </ul>
- </fieldset>
- </div>
- </div>
- </div>
-
- <!-- jQuery (necessary for Bootstrap's JavaScript plugins) -->
- <script src="https://ajax.googleapis.com/ajax/libs/jquery/1.11.0/jquery.min.js"></script>
- <!-- Include all compiled plugins (below), or include individual files as needed -->
- <script src="js/bootstrap.min.js"></script>
- <script>
- $(document).ready(function () {
- });
- </script>
- </body>
-</html>
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/isis/blob/8f18b6f0/adocs/documentation/src/main/asciidoc/guides/ugfun/images/reference-layout/layout-6-6-0-12.html
----------------------------------------------------------------------
diff --git a/adocs/documentation/src/main/asciidoc/guides/ugfun/images/reference-layout/layout-6-6-0-12.html b/adocs/documentation/src/main/asciidoc/guides/ugfun/images/reference-layout/layout-6-6-0-12.html
deleted file mode 100644
index c6c4482..0000000
--- a/adocs/documentation/src/main/asciidoc/guides/ugfun/images/reference-layout/layout-6-6-0-12.html
+++ /dev/null
@@ -1,203 +0,0 @@
-\ufeff<!DOCTYPE html>
-<html lang="en">
-<head>
- <meta charset="utf-8">
- <meta http-equiv="X-UA-Compatible" content="IE=edge">
- <meta name="viewport" content="width=device-width, initial-scale=1">
- <title>colspans={6,6,0,12}</title>
-
- <!-- Bootstrap -->
- <!--
- <link rel="stylesheet" href="//netdna.bootstrapcdn.com/bootstrap/3.1.1/css/bootstrap.min.css">
- <link rel="stylesheet" href="//netdna.bootstrapcdn.com/bootstrap/3.1.1/css/bootstrap-theme.min.css">
- <script src="//netdna.bootstrapcdn.com/bootstrap/3.1.1/js/bootstrap.min.js"></script>
- -->
-
- <!-- Bootstrap -->
- <link href="css/bootstrap.min.css" rel="stylesheet">
-
- <!-- HTML5 Shim and Respond.js IE8 support of HTML5 elements and media queries -->
- <!-- WARNING: Respond.js doesn't work if you view the page via file:// -->
- <!--[if lt IE 9]>
- <script src="https://oss.maxcdn.com/libs/html5shiv/3.7.0/html5shiv.js"></script>
- <script src="https://oss.maxcdn.com/libs/respond.js/1.4.2/respond.min.js"></script>
- <![endif]-->
- <link href="isis-layout.css" rel="stylesheet">
- <!--<link href="isis-layout-show-facets.css" rel="stylesheet">-->
-</head>
- <body>
- <div class="container">
- <h1>colspans={6,6,0,12}</h1>
- <div class="row">
- <div class="col-md-12">
- <div class="isis-header">
- <span class="isis-title">Buy bread</span>
- <div class="isis-actions">
- <div class="isis-action x-caution">
- <span>delete</span>
- </div>
- <div class="isis-action">
- <span data-isis-id="duplicate">clone</span>
- <ul class="isis-facets">
- <li>describedAs.value="Create a new todo item from this one"</li>
- </ul>
- </div>
- <div class="isis-action">
- <span>recentChanges</span>
- </div>
- <div class="isis-action">
- <span>recentChanges</span>
- </div>
- </div>
- </div>
- </div>
- </div>
- <div class="row">
- <div class="col-md-6 isis-memberGroups">
- <fieldset class="isis-memberGroup min-height-100">
- <legend>General</legend>
- <div class="isis-property">
- <span data-isis-typicallength="50">description</span>
- <ul class="isis-facets">
- <li>typicalLength.value=50</li>
- </ul>
- </div>
- <div class="isis-property">
- <span>category</span>
- <ul class="isis-facets">
- <li>disabled.reason="Use action to update both category and subcategory"</li>
- </ul>
- </div>
- <div class="isis-property">
- <span>subcategory</span>
- <ul class="isis-facets">
- <li>disabled.reason="Use action to update both category and subcategory"</li>
- </ul>
- <div class="isis-actions">
- <div class="isis-action">
- <span data-isis-id="updateCategory">update</span>
- </div>
- <div class="isis-action">
- <span>analyseCategory</span>
- </div>
- </div>
- </div>
- <div class="isis-property">
- <span class="isis-hidden">ownedBy</span>
- </div>
- <div class="isis-property x-highlight">
- <span data-isis-id="complete">done</span>
- <div class="isis-actions">
- <div class="isis-action">
- <span data-isis-id="completed">done</span>
- <ul class="isis-facets">
- <li>describedAs.value="Mark this todo item as having been completed"</li>
- </ul>
- </div>
- <div class="isis-action">
- <span>scheduleExplicitly</span>
- </div>
- <div class="isis-action">
- <span>scheduleImplicitly</span>
- </div>
- <div class="isis-action">
- <span data-isis-id="notYetCompleted">not done</span>
- </div>
- </div>
- </div>
- </fieldset>
- <fieldset class="isis-memberGroup min-height-100">
- <legend>Misc</legend>
- <div class="isis-property">
- <span data-isis-id="versionSequence">version</span>
- <ul class="isis-facets">
- <li>disabled</li>
- <li>hidden.where=STANDALONE_TABLES</li>
- </ul>
- </div>
- </fieldset>
- </div>
- <div class="col-md-6 isis-memberGroups">
- <fieldset class="isis-memberGroup">
- <legend>Priority</legend>
- <div class="isis-property">
- <span>relativePriority</span>
- <div class="isis-actions">
- <div class="isis-action">
- <span>previous</span>
- </div>
- <div class="isis-action">
- <span>next</span>
- </div>
- </div>
- </div>
- <div class="isis-property x-key">
- <span>dueBy</span>
- </div>
- </fieldset>
- <fieldset class="isis-memberGroup">
- <legend>Other</legend>
- <div class="isis-property">
- <span>cost</span>
- <div class="isis-actions">
- <div class="isis-action">
- <span data-isis-id="updateCost">update</span>
- </div>
- </div>
- </div>
- <div class="isis-property">
- <span>notes</span>
- <ul class="isis-facets">
- <li>multiLine.numberOfLines=5</li>
- <li>hidden.where=ALL_TABLES</li>
- </ul>
- </div>
- <div class="isis-property">
- <span>attachment</span>
- <ul class="isis-facets">
- <li>hidden.where=ALL_TABLES</li>
- </ul>
- </div>
- </fieldset>
- </div>
- </div>
- <div class="row">
- <div class="col-md-12">
- <fieldset class="isis-collection min-height-100">
- <legend>dependencies</legend>
- <div class="isis-actions">
- <div class="isis-action">
- <span>add</span>
- </div>
- <div class="isis-action x-caution">
- <span>remove</span>
- </div>
- </div>
- <ul class="isis-facets">
- <li>disabled</li>
- <li>paged.value=5</li>
- <li>render.value=EAGERLY</li>
- </ul>
- </fieldset>
- <fieldset class="isis-collection min-height-200">
- <legend>similarTo</legend>
- <ul class="isis-facets">
- <li>disabled</li>
- <li>paged.value=3</li>
- <li>render.value=LAZILY</li>
- </ul>
- </fieldset>
- </div>
- </div>
- </div>
-
- <!-- jQuery (necessary for Bootstrap's JavaScript plugins) -->
- <script src="https://ajax.googleapis.com/ajax/libs/jquery/1.11.0/jquery.min.js"></script>
- <!-- Include all compiled plugins (below), or include individual files as needed -->
- <script src="js/bootstrap.min.js"></script>
- <script>
- $(document).ready(function () {
- });
- </script>
- </body>
-</html>
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/isis/blob/8f18b6f0/adocs/documentation/src/main/asciidoc/guides/ugfun/images/ugfun/_ugfun_object-layout_dynamic_xml/ToDoAppDashboard.png
----------------------------------------------------------------------
diff --git a/adocs/documentation/src/main/asciidoc/guides/ugfun/images/ugfun/_ugfun_object-layout_dynamic_xml/ToDoAppDashboard.png b/adocs/documentation/src/main/asciidoc/guides/ugfun/images/ugfun/_ugfun_object-layout_dynamic_xml/ToDoAppDashboard.png
deleted file mode 100644
index 69340be..0000000
Binary files a/adocs/documentation/src/main/asciidoc/guides/ugfun/images/ugfun/_ugfun_object-layout_dynamic_xml/ToDoAppDashboard.png and /dev/null differ
http://git-wip-us.apache.org/repos/asf/isis/blob/8f18b6f0/adocs/documentation/src/main/asciidoc/guides/ugfun/images/ugfun/_ugfun_object-layout_dynamic_xml/ToDoItem.png
----------------------------------------------------------------------
diff --git a/adocs/documentation/src/main/asciidoc/guides/ugfun/images/ugfun/_ugfun_object-layout_dynamic_xml/ToDoItem.png b/adocs/documentation/src/main/asciidoc/guides/ugfun/images/ugfun/_ugfun_object-layout_dynamic_xml/ToDoItem.png
deleted file mode 100644
index c47d52f..0000000
Binary files a/adocs/documentation/src/main/asciidoc/guides/ugfun/images/ugfun/_ugfun_object-layout_dynamic_xml/ToDoItem.png and /dev/null differ
http://git-wip-us.apache.org/repos/asf/isis/blob/8f18b6f0/adocs/documentation/src/main/asciidoc/guides/ugfun/images/wicket-viewer/application-menu/dividers.png
----------------------------------------------------------------------
diff --git a/adocs/documentation/src/main/asciidoc/guides/ugfun/images/wicket-viewer/application-menu/dividers.png b/adocs/documentation/src/main/asciidoc/guides/ugfun/images/wicket-viewer/application-menu/dividers.png
deleted file mode 100644
index dcb415d..0000000
Binary files a/adocs/documentation/src/main/asciidoc/guides/ugfun/images/wicket-viewer/application-menu/dividers.png and /dev/null differ
http://git-wip-us.apache.org/repos/asf/isis/blob/8f18b6f0/adocs/documentation/src/main/asciidoc/guides/ugfun/images/wicket-viewer/application-menu/layout-menus.pdn
----------------------------------------------------------------------
diff --git a/adocs/documentation/src/main/asciidoc/guides/ugfun/images/wicket-viewer/application-menu/layout-menus.pdn b/adocs/documentation/src/main/asciidoc/guides/ugfun/images/wicket-viewer/application-menu/layout-menus.pdn
deleted file mode 100644
index 01453f7..0000000
Binary files a/adocs/documentation/src/main/asciidoc/guides/ugfun/images/wicket-viewer/application-menu/layout-menus.pdn and /dev/null differ
http://git-wip-us.apache.org/repos/asf/isis/blob/8f18b6f0/adocs/documentation/src/main/asciidoc/guides/ugfun/images/wicket-viewer/application-menu/layout-menus.png
----------------------------------------------------------------------
diff --git a/adocs/documentation/src/main/asciidoc/guides/ugfun/images/wicket-viewer/application-menu/layout-menus.png b/adocs/documentation/src/main/asciidoc/guides/ugfun/images/wicket-viewer/application-menu/layout-menus.png
deleted file mode 100644
index 0bc73d1..0000000
Binary files a/adocs/documentation/src/main/asciidoc/guides/ugfun/images/wicket-viewer/application-menu/layout-menus.png and /dev/null differ
http://git-wip-us.apache.org/repos/asf/isis/blob/8f18b6f0/adocs/documentation/src/main/asciidoc/guides/ugfun/images/wicket-viewer/application-menu/tertiary.png
----------------------------------------------------------------------
diff --git a/adocs/documentation/src/main/asciidoc/guides/ugfun/images/wicket-viewer/application-menu/tertiary.png b/adocs/documentation/src/main/asciidoc/guides/ugfun/images/wicket-viewer/application-menu/tertiary.png
deleted file mode 100644
index f2d2281..0000000
Binary files a/adocs/documentation/src/main/asciidoc/guides/ugfun/images/wicket-viewer/application-menu/tertiary.png and /dev/null differ
http://git-wip-us.apache.org/repos/asf/isis/blob/8f18b6f0/adocs/documentation/src/main/asciidoc/guides/ugfun/ugfun.adoc
----------------------------------------------------------------------
diff --git a/adocs/documentation/src/main/asciidoc/guides/ugfun/ugfun.adoc b/adocs/documentation/src/main/asciidoc/guides/ugfun/ugfun.adoc
index 99bf620..f119338 100644
--- a/adocs/documentation/src/main/asciidoc/guides/ugfun/ugfun.adoc
+++ b/adocs/documentation/src/main/asciidoc/guides/ugfun/ugfun.adoc
@@ -13,7 +13,7 @@ This guide introduces the xref:ugfun.adoc#_ugfun_core-concepts[core concepts] an
and tells you how to xref:ugfun.adoc#_ugfun_getting-started[get started] with a Maven archetype.
It also describes a number of xref:ugfun.adoc#_ugfun_how-tos[how-to]s, describes how to influence the
-xref:ugfun.adoc#_ugfun_object-layout[UI layout] of your domain objects (this is ultimately just a type of metadata), and it
+xref:ugvw.adoc#_ugvw_layout[UI layout] of your domain objects (this is ultimately just a type of metadata), and it
catalogues various xref:ugfun.adoc#_ugfun_faqs.adoc[FAQ]s.
=== Other Guides
@@ -50,7 +50,7 @@ include::_ugfun_core-concepts.adoc[leveloffset=+1]
include::_ugfun_getting-started.adoc[leveloffset=+1]
include::_ugfun_how-tos.adoc[leveloffset=+1]
-include::_ugfun_object-layout.adoc[leveloffset=+1]
+include::_ugvw_layout.adoc[leveloffset=+1]
include::_ugfun_faqs.adoc[leveloffset=+1]
http://git-wip-us.apache.org/repos/asf/isis/blob/8f18b6f0/adocs/documentation/src/main/asciidoc/guides/ugvw/_ugvw_configuration-properties_showing-theme-chooser.adoc
----------------------------------------------------------------------
diff --git a/adocs/documentation/src/main/asciidoc/guides/ugvw/_ugvw_configuration-properties_showing-theme-chooser.adoc b/adocs/documentation/src/main/asciidoc/guides/ugvw/_ugvw_configuration-properties_showing-theme-chooser.adoc
index 7cb4916..afeffc4 100644
--- a/adocs/documentation/src/main/asciidoc/guides/ugvw/_ugvw_configuration-properties_showing-theme-chooser.adoc
+++ b/adocs/documentation/src/main/asciidoc/guides/ugvw/_ugvw_configuration-properties_showing-theme-chooser.adoc
@@ -19,11 +19,11 @@ isis.viewer.wicket.themes.showChooser=true
----
.Example 1
-image::{_imagesdir}wicket-viewer/theme-chooser/example-1.png[width="720px",link="{_imagesdir}wicket-viewer/theme-chooser/example-1.png"]
+image::{_imagesdir}theme-chooser/example-1.png[width="720px",link="{_imagesdir}theme-chooser/example-1.png"]
.Example 2:
-image::{_imagesdir}wicket-viewer/theme-chooser/example-2.png[width="720px",link="{_imagesdir}wicket-viewer/theme-chooser/example-2.png"]
+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
property:
http://git-wip-us.apache.org/repos/asf/isis/blob/8f18b6f0/adocs/documentation/src/main/asciidoc/guides/ugvw/_ugvw_configuration-properties_suppressing-password-reset.adoc
----------------------------------------------------------------------
diff --git a/adocs/documentation/src/main/asciidoc/guides/ugvw/_ugvw_configuration-properties_suppressing-password-reset.adoc b/adocs/documentation/src/main/asciidoc/guides/ugvw/_ugvw_configuration-properties_suppressing-password-reset.adoc
index 02de0ef..240e7e4 100644
--- a/adocs/documentation/src/main/asciidoc/guides/ugvw/_ugvw_configuration-properties_suppressing-password-reset.adoc
+++ b/adocs/documentation/src/main/asciidoc/guides/ugvw/_ugvw_configuration-properties_suppressing-password-reset.adoc
@@ -16,11 +16,11 @@ The 'password reset' link can be suppressed, if required, by setting a configura
With 'password reset' not suppressed (the default):
-image::{_imagesdir}wicket-viewer/suppress-password-reset/login-page-default.png[width="300px",link="{_imagesdir}wicket-viewer/suppress-password-reset/login-page-default.png"]
+image::{_imagesdir}suppress-password-reset/login-page-default.png[width="300px",link="{_imagesdir}suppress-password-reset/login-page-default.png"]
and with the link suppressed:
-image::{_imagesdir}wicket-viewer/suppress-password-reset/login-page-suppress-password-reset.png[width="300px",link="{_imagesdir}wicket-viewer/suppress-password-reset/login-page-suppress-password-reset.png"]
+image::{_imagesdir}suppress-password-reset/login-page-suppress-password-reset.png[width="300px",link="{_imagesdir}suppress-password-reset/login-page-suppress-password-reset.png"]
http://git-wip-us.apache.org/repos/asf/isis/blob/8f18b6f0/adocs/documentation/src/main/asciidoc/guides/ugvw/_ugvw_configuration-properties_suppressing-remember-me.adoc
----------------------------------------------------------------------
diff --git a/adocs/documentation/src/main/asciidoc/guides/ugvw/_ugvw_configuration-properties_suppressing-remember-me.adoc b/adocs/documentation/src/main/asciidoc/guides/ugvw/_ugvw_configuration-properties_suppressing-remember-me.adoc
index d86fc59..49beb99 100644
--- a/adocs/documentation/src/main/asciidoc/guides/ugvw/_ugvw_configuration-properties_suppressing-remember-me.adoc
+++ b/adocs/documentation/src/main/asciidoc/guides/ugvw/_ugvw_configuration-properties_suppressing-remember-me.adoc
@@ -14,11 +14,11 @@ The 'remember me' checkbox on the login page can be suppressed, if required, by
With 'remember me' not suppressed (the default):
-image::{_imagesdir}wicket-viewer/suppress-remember-me/login-page-default.png[width="300px",link="{_imagesdir}wicket-viewer/suppress-remember-me/login-page-default.png"]
+image::{_imagesdir}suppress-remember-me/login-page-default.png[width="300px",link="{_imagesdir}suppress-remember-me/login-page-default.png"]
and with the checkbox suppressed:
-image::{_imagesdir}wicket-viewer/suppress-remember-me/login-page-suppress-remember-me.png[width="300px",link="{_imagesdir}wicket-viewer/suppress-remember-me/login-page-suppress-remember-me.png"]
+image::{_imagesdir}suppress-remember-me/login-page-suppress-remember-me.png[width="300px",link="{_imagesdir}suppress-remember-me/login-page-suppress-remember-me.png"]
[7/9] isis git commit: ISIS-1521: changes 'dynamic layout' to
'file-based layout'
Posted by da...@apache.org.
http://git-wip-us.apache.org/repos/asf/isis/blob/badd1011/adocs/documentation/src/main/asciidoc/guides/ugvw/_ugvw_layout_file-based.adoc
----------------------------------------------------------------------
diff --git a/adocs/documentation/src/main/asciidoc/guides/ugvw/_ugvw_layout_file-based.adoc b/adocs/documentation/src/main/asciidoc/guides/ugvw/_ugvw_layout_file-based.adoc
new file mode 100644
index 0000000..3b56d84
--- /dev/null
+++ b/adocs/documentation/src/main/asciidoc/guides/ugvw/_ugvw_layout_file-based.adoc
@@ -0,0 +1,406 @@
+[[_ugvw_layout_file-based]]
+= File-based Layouts
+: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 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.
+:_basedir: ../../
+:_imagesdir: images/
+
+
+
+Metadata providing UI hints can be specified either xref:ugvw.adoc#_ugvw_layout_annotation-based[statically], using annotations, or dynamically using an `Xxx.layout.xml` file (where `Xxx` is the entity or view model object to be rendered).
+
+The `Xxx.layout.xml` file is just the serialized form of a xref:rgcms.adoc#_rgcms_classes_layout[`Grid`] layout class defined within Apache Isis' applib. These are JAXB-annotated classes with corresponding XSD schemas; the upshot of that
+is that IDEs such as IntelliJ and Eclipse can provide "intellisense", making iteasy to author such layout files.
+
+It is also possible to download an initial `.layout.xml` - capturing any existing layout metadata - using the xref:rgsvc.adoc#_rgsvc_api_LayoutService[`LayoutService`] (exposed on the prototyping menu) or using a xref:rgcms.adoc#_rgcms_classes_mixins_Object[mixin action] contributed to every domain object.
+
+[NOTE]
+====
+It is also possible to describe layouts using a `.layout.json` file.
+However, `.layout.json` support is deprecated; the ``.layout.xml`` file also enables much more sophisticated layouts than those afforded by ``.layout.json``.
+
+If you have an application with older `.layout.json` files, then it is possible to download initial `.layout.xml` files using the xref:rgsvc.adoc#_rgsvc_api_LayoutService[`LayoutService`] (exposed as an action on the prototyping menu).
+The `.layout.json` file will be ignored once a `.layout.xml` file is present.
+====
+
+== Grids vs Components
+
+The XML file distinguishes between two types of element:
+
+* those that define a grid structure, of: rows, columns, tab groups and tabs. +
++
+The rows and columns are closely modelled on link:getbootstrap.com[Bootstrap 3] (used in the implementation of the xref:ugvw.adoc[Wicket viewer]).
+
+* those that defines common components, of: fieldsets (previously called member groups or property groups), properties, collections, actions and also the title/icon of the domain object itself.
+
+More information about these classes can be found in xref:rgcms.adoc#_rgcms_classes_layout[the reference guide]. More information on Bootstrap 3's grid system can be found link:http://getbootstrap.com/css/#grid[here].
+
+
+== Screencast
+
+This link:https://www.youtube.com/watch?v=MxewC5Pve5k[screencast] describes the feature.
+
+
+
+
+== Examples
+
+Probably the easiest way to understand dynamic XML layouts is by example. For this we'll use the `ToDoItem` from the
+(non-ASF) http://github.com/isisaddons/isis-app-todoapp[Isis addons' todoapp]:
+
+image::{_imagesdir}layout-dynamic-xml/ToDoItem.png[width="940px",link="{_imagesdir}layout-dynamic-xml/ToDoItem.png"]
+
+
+=== Namespaces
+
+First things first; every `.layout.xml` file must properly declare the XSD namespaces and schemas. There are two: one for the grid classes, and one for the common component classes:
+
+[source,xml]
+----
+<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
+<bs3:grid
+ xsi:schemaLocation="http://isis.apache.org/applib/layout/component
+ http://isis.apache.org/applib/layout/component/component.xsd
+ http://isis.apache.org/applib/layout/grid/bootstrap3
+ http://isis.apache.org/applib/layout/grid/bootstrap3/bootstrap3.xsd"
+ xmlns:bs3="http://isis.apache.org/applib/layout/grid/bootstrap3"
+ xmlns:c="http://isis.apache.org/applib/layout/component"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+ ...
+</bs3:grid>
+----
+
+Most IDEs will automatically download the XSD schemas from the specified schema locations, thereby providing
+"intellisense" help as you edit the file.
+
+
+=== Rows, full-width cols, and tabs
+
+The example layout consists of three rows: a row for the object/icon, a row containing a properties, and a row containing collections. In all three cases the row contains a single column spanning the full width of the page. For the property and collection rows, the column contains a tab group.
+
+This corresponds to the following XML:
+
+[source,xml]
+----
+ <bs3:row>
+ <bs3:col span="12" unreferencedActions="true">
+ <c:domainObject bookmarking="AS_ROOT"/>
+ </bs3:col>
+ </bs3:row>
+ <bs3:row>
+ <bs3:col span="12">
+ <bs3:tabGroup>
+ <bs3:tab name="Properties">...</bs3:tab>
+ <bs3:tab name="Other">...</bs3:tab>
+ <bs3:tab name="Metadata">...</bs3:tab>
+ </bs3:tabGroup>
+ </bs3:col>
+ </bs3:row>
+ <bs3:row>
+ <bs3:col span="12">
+ <bs3:tabGroup unreferencedCollections="true">
+ <bs3:tab name="Similar to">...</bs3:tab>
+ <bs3:tab name="Dependencies">...</bs3:tab>
+ </bs3:tabGroup>
+ </bs3:col>
+ </bs3:row>
+----
+
+
+You will notice that one of the ``col``umns has an ``unreferencedActions`` attribute, while one of the ``tabGroup``s has a similar ``unreferencedCollections`` attribute. This topic is discussed in more detail xref:ugfun.adoc#__ugvw_layout_dynamic_xml-unreferenced[below].
+
+
+
+=== Fieldsets
+
+The first tab containing properties is divided into two columns, each of which holds a single fieldset of multiple properties. Those properties in turn can have associated actions.
+
+This corresponds to the following XML:
+
+[source,xml]
+----
+ <bs3:tab name="Properties">
+ <bs3:row>
+ <bs3:col span="6">
+ <c:fieldSet name="General" id="general" unreferencedProperties="true">
+ <c:action id="duplicate" position="PANEL_DROPDOWN"/>
+ <c:action id="delete"/>
+ <c:property id="description"/>
+ <c:property id="category"/>
+ <c:property id="subcategory">
+ <c:action id="updateCategory"/>
+ <c:action id="analyseCategory" position="RIGHT"/>
+ </c:property>
+ <c:property id="complete">
+ <c:action id="completed" cssClassFa="fa-thumbs-up"/>
+ <c:action id="notYetCompleted" cssClassFa="fa-thumbs-down"/>
+ </c:property>
+ </c:fieldSet>
+ </bs3:col>
+ <bs3:col span="6">
+ ...
+ </bs3:col>
+ </bs3:row>
+ </bs3:tab>
+----
+
+The tab defines two columns, each span of 6 (meaning half the width of the page).
+
+In the first column there is a single fieldset. Notice how actions - such as `duplicate` and `delete` - can be associated with this fieldset directly, meaning that they should be rendered on the fieldset's top panel.
+
+Thereafter the fieldset lists the properties in order. Actions can be associated with properties too; here they are rendered underneath or to the right of the field.
+
+Note also the `unreferencedProperties` attribute for the fieldset; this topic is discussed in more detail xref:ugfun.adoc#__ugvw_layout_dynamic_xml-unreferenced[below].
+
+
+=== Collections
+
+In the final row the collections are placed in tabs, simply one collection per tab. This corresponds to the following XML:
+
+[source,xml]
+----
+ <bs3:tab name="Similar to">
+ <bs3:row>
+ <bs3:col span="12">
+ <c:collection defaultView="table" id="similarTo"/>
+ </bs3:col>
+ </bs3:row>
+ </bs3:tab>
+ <bs3:tab name="Dependencies">
+ <bs3:row>
+ <bs3:col span="12">
+ <c:collection defaultView="table" id="dependencies">
+ <c:action id="add"/>
+ <c:action id="remove"/>
+ </c:collection>
+ </bs3:col>
+ </bs3:row>
+ </bs3:tab>
+----
+
+As with properties, actions can be associated with collections; this indicates that they should be rendered in the collection's header.
+
+
+
+[[__ugvw_layout_dynamic_xml-unreferenced]]
+== Unreferenced Members
+
+As noted in the preceding discussion, several of the grid's regions have either an ``unreferencedActions``, ``unreferencedCollections`` or ``unreferencedProperties`` attribute.
+
+The rules are:
+
+* `unreferencedActions` attribute can be specified either on a column or on a fieldset. +
++
+It would normally be typical to use the column holding the `<domainObject/>` icon/title, that is as shown in the example. The unreferenced actions then appear as top-level actions for the domain object.
+
+* `unreferencedCollections` attribute can be specified either on a column or on a tabgroup. +
++
+If specified on a column, then that column will contain each of the unreferenced collections, stacked one on top of the other. If specified on a tab group, then a separate tab will be created for each collection, with that tab containing only that single collection.
+
+* `unreferencedProperties` attribute can be specified only on a fieldset.
+
+The purpose of these attributes is to indicate where in the layout any unreferenced members should be rendered. Every grid _must_ nominate one region for each of these three member types, the reason being that to ensure that the layout can be used even if it is incomplete with respect to the object members inferred from the Java source code. This might be because the developer forgot to update the layout, or it might be because of a new mixin (property, collection or action) contributed to many objects.
+
+
+The framework ensures that in any given grid exactly one region is specified for each of the three `unreferenced...` attributes. If the grid fails this validation, then a warning message will be displayed, and the invalid XML logged. The layout XML will then be ignored.
+
+
+
+== More advanced features
+
+This section decribes a number of more features useful in more complex layouts.
+
+
+=== Multiple references to a feature
+
+One feature worth being aware of is that it is possible to render a single feature more than once.
+
+For example, the dashboard home page for the (non-ASF) http://github.com/isisaddons/isis-app-todoapp[Isis addons' todoapp] shows
+the "not yet complete" collection of todo items twice, once as a table and also as a calendar:
+
+image::{_imagesdir}layout-dynamic-xml/ToDoAppDashboard.png[width="940px",link="{_imagesdir}layout-dynamic-xml/ToDoAppDashboard.png"]
+
+
+This is accomplished using the following (slightly abbreviated) layout:
+
+[source,xml]
+----
+<grid ...>
+ <row>
+ <col span="2" unreferencedActions="true">
+ ...
+ </col>
+ <col span="5" unreferencedCollections="true" cssClass="custom-padding-top-20">
+ <ns2:collection id="notYetComplete" defaultView="calendar"/> <!--1-->
+ </col>
+ <col span="5" cssClass="custom-padding-top-20">
+ <ns2:collection id="notYetComplete" defaultView="table" paged="5"/> <!--2-->
+ <ns2:collection id="complete" defaultView="table"/>
+ </col>
+ <col span="0">
+ <ns2:fieldSet name="General" id="general" unreferencedProperties="true"/>
+ </col>
+ </row>
+</grid>
+----
+<1> render the collection in "calendar" view
+<2> also render the collection in "table" view
+
+In the middle column the `notYetComplete` collection is rendered in "calendar" view, while in the right-most column
+it is rendered in "table" view.
+
+
+It is also possible to reference object properties and actions more than once. This might be useful for a complex
+domain object with multiple tabs; certain properties or actions might appear on a summary tab (that shows the
+most commonly used info), but also on detail tabs.
+
+=== Custom CSS
+
+The ToDoApp's dashboard (above) also shows how custom CSS styles can be associated with specific regions of the layout:
+
+[source,xml]
+----
+<grid ...>
+ <row>
+ <col span="2" unreferencedActions="true">
+ <ns2:domainObject/>
+ <row>
+ <col span="12" cssClass="custom-width-100"> <!--1-->
+ <ns2:action id="exportToWordDoc"/>
+ </col>
+ </row>
+ ...
+ </col>
+ <col span="5" unreferencedCollections="true" cssClass="custom-padding-top-20"> <!--2-->
+ ...
+ </col>
+ <col span="5" cssClass="custom-padding-top-20"> <!--3-->
+ ...
+ </col>
+ </row>
+</grid>
+----
+<1> Render the column with the `custom-width-100` CSS class.
+<2> Render the column with the `custom-padding-top-20` CSS class.
+<3> Ditto
+
+For example the `custom-width-100` style is used to "stretch" the button for the `exportToWordDoc` action in the
+left-most column. This is accomplished with the following CSS in `application.css`:
+
+[source,css]
+----
+.custom-width-100 ul,
+.custom-width-100 ul li,
+.custom-width-100 ul li a.btn {
+ width: 100%;
+}
+----
+
+Similarly, the middle and right columns are rendered using the `custom-padding-top-20` CSS class. This shifts them down
+from the top of the page slightly, using the following CSS:
+
+[source,css]
+----
+.custom-padding-top-20 {
+ padding-top: 20px;
+}
+----
+
+
+
+
+== Migrating from earlier versions
+
+As noted earlier on, it is possible to download layout XML files using the xref:rgsvc.adoc#_rgsvc_api_LayoutService[`LayoutService`] (exposed on the prototyping menu); this will download a ZIP file of layout XML files for all domain entities and view models. Alternatively the layout XML for a single domain object can be downloaded using the xref:rgcms.adoc#_rgcms_classes_mixins_Object[mixin action] (contributed to every domain object).
+
+There are four "styles":
+
+* current
+* complete
+* normalized
+* minimal
+
+
+Ignorig the "current" style (which merely downloads the currently cached layout), the other three styles allow the
+developer to choose how much metadata is to be specified in the XML, and how much (if any) will be obtained
+elsewhere, either from annotations in the metamodel or from an earlier `.layout.json` file if present. The table
+below summarises the choices:
+
+.Table caption
+[cols="<.>,^.>,^.>,^.>", options="header"]
+|===
+
+| Style
+|xref:rgant.adoc#_rgant-MemberGroupLayout[`@MemberGroupLayout`]
+| xref:rgant.adoc#_rgant-MemberOrder[`@MemberOrder`]
+| xref:rgant.adoc#_rgant-ActionLayout[`@ActionLayout`], xref:rgant.adoc#_rgant-PropertyLayout[`@PropertyLayout`], xref:rgant.adoc#_rgant-CollectionLayout[`@CollectionLayout`]
+
+
+|`COMPLETE`
+|serialized as XML
+|serialized as XML
+|serialized as XML
+
+
+|`NORMALIZED`
+|serialized as XML
+|serialized as XML
+|not in the XML
+
+
+|`MINIMAL`
+|serialized as XML
+|not in the XML
+|not in the XML
+
+|===
+
+As a developer, you therefore have a choice as to how you provide the metadata required for customised layouts:
+
+* if you want all layout metadata to be read from the `.layout.xml` file, then download the "complete" version, and copy the file alongside the domain class. You can then remove all `@MemberGroupLayout`, `@MemberOrder`, `@ActionLayout`, `@PropertyLayout` and `@CollectionLayout` annotations from the source code of the domain class.
+
+* if you want to use layout XML file to describe the grid (columns, tabs etc) and specify which object members are associated with those regions of the grid, then download the "normalized" version. You can then remove the `@MemberGroupLayout` and `@MemberOrder` annotations from the source code of the domain class, but retain the `@ActionLayout`, `@PropertyLayout` and `@CollectionLayout` annotations.
+
+* if you want to use layout XML file ONLY to describe the grid, then download the "minimal" version. The grid regions will be empty in this version, and the framework will use the `@MemberOrder` annotation to bind object members to those regions. The only annotation that can be safely removed from the source code with this style is the `@MemberGroupLayout` annotation.
+
+
+Download either for a single domain object, or download all domain objects (entities and view models).
+
+
+== Domain Services
+
+For more information about layouts, see:
+
+* xref:rgsvc.adoc#_rgsvc_api_LayoutService[`LayoutService`] (whose functionality is exposed on the prototyping menu as an action) and lso the a xref:rgcms .adoc#_rgcms_classes_mixins_Object[mixin action]
+
+* xref:rgsvc.adoc#_rgsvc_spi_GridService[`GridService`] and its supporting services, xref:rgsvc.adoc#_rgsvc_spi_GridLoaderService[`GridLoaderService`] and xref:rgsvc.adoc#_rgsvc_spi_GridSystemService[`GridSystemService`]
+
+* xref:rgcms.adoc#_rgcms_classes_layout[grid layout classes], defined in the Apache Isis applib
+
+
+
+
+== Required updates to the dom project's pom.xml
+
+Any `.layout.xml` files must be compiled and available in the classpath. Ensure the following is defined in the dom project's `pom.xml`:
+
+[source.xml]
+----
+<resources>
+ <resource>
+ <filtering>false</filtering>
+ <directory>src/main/resources</directory>
+ </resource>
+ <resource>
+ <filtering>false</filtering>
+ <directory>src/main/java</directory>
+ <includes>
+ <include>**</include>
+ </includes>
+ <excludes>
+ <exclude>**/*.java</exclude>
+ </excludes>
+ </resource>
+</resources>
+----
+
+If using an Apache Isis xref:ugfun.adoc#_ugfun_getting-started_simpleapp-archetype[SimpleApp archetype], then the POM is already correctly configured.
http://git-wip-us.apache.org/repos/asf/isis/blob/badd1011/adocs/documentation/src/main/asciidoc/guides/ugvw/_ugvw_layout_static-vs-dynamic.adoc
----------------------------------------------------------------------
diff --git a/adocs/documentation/src/main/asciidoc/guides/ugvw/_ugvw_layout_static-vs-dynamic.adoc b/adocs/documentation/src/main/asciidoc/guides/ugvw/_ugvw_layout_static-vs-dynamic.adoc
index 3ef16d6..a686d74 100644
--- a/adocs/documentation/src/main/asciidoc/guides/ugvw/_ugvw_layout_static-vs-dynamic.adoc
+++ b/adocs/documentation/src/main/asciidoc/guides/ugvw/_ugvw_layout_static-vs-dynamic.adoc
@@ -1,5 +1,5 @@
[[_ugvw_layout_static-vs-dynamic]]
-= Static vs Dynamic Layouts
+= Annotation vs File-based Layouts
: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 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.
:_basedir: ../../
:_imagesdir: images/
@@ -7,20 +7,11 @@
-Using xref:ugvw.adoc#_ugvw_layout_dynamic[dynamic object layout]s using JSON has the huge benefit that the layout can be updated without requiring a recompile of the code and redeploy of the app. Many developers also find it easier to rationalize about layout when all the hints are collated together in a single place (rather than scattered across the class members as annotations).
+Using xref:ugvw.adoc#_ugvw_layout_file-based[file-based layout]s has the huge benefit that the layout can be updated without requiring a recompile of the code and redeploy of the app.
+Many developers also find it easier to rationalize about layout when all the hints are collated together in a single place (rather than scattered across the class members as annotations).
-Another benefit of dynamic layout is that UI hints can be provided for xref:ugfun.adoc#_ugfun_how-tos_contributed-members[contributed associations and actions] that are synthesised at runtime.
+Another benefit of file-based layout is that UI hints can be provided for xref:ugfun.adoc#_ugfun_how-tos_contributed-members[contributed associations and actions] that are synthesised at runtime.
-The main downsides of using dynamic layouts are a lack of typesafety (a typo will result in the metadata not being picked up for the element) and syntactic fragility (an invalid JSON document will result in no metadata for the entire class).
+The main downsides of using file-based layouts are a lack of typesafety (a typo will result in the metadata not being picked up for the element) and syntactic fragility (an invalid XML document will result in no metadata for the entire class).
-Also, dynamic layouts have no notion of inheritance, whereas the dewey-decimal format `@MemberOrder` annotation allows the metadata of the subclass its superclasses to fit together relatively seamlessly.
-
-
-
-== Best of both worlds?
-
-Using the (non-ASF) link:http://github.com/isisaddons/isis-jrebel-plugin[Isis addons' jrebel] plugin comes close to getting the best of both words: metadata is specified in a type-safe way using annotations, but can be reloaded automatically.
-
-The downsides are licensing cost, and also the fact that metadata for contributed actions in the contributee class cannot be specified.
-
-Another open source alternative that you might also like to explore is DCEVM; there's a good write-up on the link:http://blog.jetbrains.com/idea/2013/07/get-true-hot-swap-in-java-with-dcevm-and-intellij-idea/[IntelliJ blog].
\ No newline at end of file
+Also, layouts have no notion of inheritance, whereas the dewey-decimal format `@MemberOrder` annotation allows the metadata of the subclass its superclasses to fit together relatively seamlessly.
http://git-wip-us.apache.org/repos/asf/isis/blob/badd1011/adocs/documentation/src/main/asciidoc/guides/ugvw/_ugvw_layout_static.adoc
----------------------------------------------------------------------
diff --git a/adocs/documentation/src/main/asciidoc/guides/ugvw/_ugvw_layout_static.adoc b/adocs/documentation/src/main/asciidoc/guides/ugvw/_ugvw_layout_static.adoc
deleted file mode 100644
index c5807fa..0000000
--- a/adocs/documentation/src/main/asciidoc/guides/ugvw/_ugvw_layout_static.adoc
+++ /dev/null
@@ -1,178 +0,0 @@
-[[_ugvw_layout_static]]
-= Static Object Layout
-: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 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.
-:_basedir: ../../
-:_imagesdir: images/
-
-
-Metadata providing UI hints can be specified either statically, using annotations, or dynamically, using either a xref:ugvw.adoc#_ugvw_layout_dynamic_xml[`layout.xml`] file or a xref:ugvw.adoc#_ugvw_layout_dynamic[`.layout.json`] file.
-
-This section describes the static approach, using annotations.
-
-[NOTE]
-====
-Tabs and tabgroups are only supported using xref:ugvw.adoc#_ugvw_layout_dynamic_xml[`layout.xml`] files; they are not supported by annotations.
-====
-
-
-
-== `@MemberOrder`
-
-The xref:rgant.adoc#_rgant-MemberOrder[`@MemberOrder`] annotation is used to specify the relative order of domain class properties, collections and actions.
-
-The annotation defines two attributes, xref:rgant.adoc#_rgant-MemberOrder_name[`name()`] and xref:rgant.adoc#_rgant-MemberOrder_sequence[`sequence()`]. Their usage depends on the member type:
-
-* for properties, the `name()` is used to group properties together into a member group (also called a property group
-or a fieldset. The `sequence()` then orders properties within these groups. If no `name()` is specified then the
-property is placed in a fallback "General" group, called "General". +
-+
-The name of these member groups/fieldsets are then referenced by xref:rgant.adoc#_rgant-MemberGroupLayout[`@MemberGroupLayout`].
-
-* for collections, the `name()` attribute is (currently) unused. The `sequence()` orders collections relative to one another
-
-* for actions, the `name()` attribute associates an action with either a property or with a collection. +
-
-** If the `name()` attribute matches a property name, then the action's button is rendered close to the property, according to xref:rgant.adoc#_rgant-ActionLayout_position[`@ActionLayout#position()`] attribute. +
-
-** On the other hand if the `name() attribute matches a collection name, then the action's button is rendered on the collection's header.
-
-** If there is no `name()` value, then the action is considered to pertain to the object as a whole, and its button is rendered close to the object's icon and title.
-
-Within any of these, the `sequence()` then determines the relative ordering of the action with respect to other actions that have been similarly associated with properties/collections or left as "free-standing".
-
-
-
-For example:
-
-[source,java]
-----
-public class ToDoItem {
- @MemberOrder(sequence="1")
- public String getDescription() { ... }
- @MemberOrder(sequence="2")
- public String getCategory() { ... }
- @MemberOrder(sequence="3")
- public boolean isComplete() { ... }
- @MemberOrder(name="Detail", sequence="1")
- public LocalDate getDueBy() { ... }
- @MemberOrder(name="Detail", sequence="2")
- public BigDecimal getCost() { ... }
- @MemberOrder(name="Detail", sequence="4")
- public String getNotes() { ... }
- @MemberOrder(name="Misc", sequence="99")
- public Long getVersionSequence() { ... }
- ...
-}
-----
-
-This defines three property (or member) groups, "General", "Detail" and "Misc"; "General" is the default if no `name` attribute is specified. Properties in the same member group are rendered together, as a fieldset.
-
-In addition, actions can optionally be associated (rendered close to) either properties or actions. This is done by overloading the ``@MemberOrder``'s xref:rgant.adoc#_rgant-MemberOrder_name[`name()`] attribute, holding the value of the property or collection.
-
-For example:
-
-[source,java]
-----
-public class ToDoItem {
- @MemberOrder(sequence="3")
- public boolean isComplete() { ... }
- @MemberOrder(name="complete", sequence="1")
- public ToDoItem completed() { ...}
- @MemberOrder(name="complete", sequence="2")
- public ToDoItem notYetCompleted() { ...}
-
- @MemberOrder(sequence="1")
- public SortedSet<ToDoItem> getDependencies() { ... }
- @MemberOrder(name="dependencies", sequence="1")
- public ToDoItem add(ToDoItem t) { ...}
- @MemberOrder(name="dependencies", sequence="2")
- public ToDoItem remove(ToDoItem t) { ...}
- ...
-}
-----
-
-will associate the `completed()` and `notYetCompleted()` actions with the `complete` property, and will associate the `add()` and `remove()` actions with the `dependencies` collection.
-
-
-The value of xref:rgant.adoc#_rgant-MemberOrder_sequence[`sequence()`] is a string. The simplest convention (as shown in the example above) is to use numbers -- 1, 2, 3 -- though it is a better idea to leave gaps in the numbers -- 10, 20, 30 perhaps -- such that a new member may be added without having to edit existing numbers.
-
-Even better is to adopt the 'dewey-decimal' notation -- 1, 1.1, 1.2, 2, 3, 5.1.1, 5.2.2, 5.2, 5.3 -- which allows for an indefinite amount of future insertion. It also allows subclasses to insert their class members as required.
-
-
-
-
-== `@MemberGroupLayout`
-
-The xref:rgant.adoc#_rgant-MemberGroupLayout[`@MemberGroupLayout`] annotation specifies the relative positioning of property groups/fieldsets as being either in a left column, a middle column or in a right column. The annotation also specifies the relative width of the columns.
-
-The property groups/fieldsets in this case are those that are inferred from the `@MemberOrder#name()` attribute.
-
-[TIP]
-====
-It is also possible to combine `@MemberOrder` with dynamic layouts, either using xref:ugvw.adoc#_ugvw_layout_xml[XML] or xref:ugvw.adoc#_ugvw_layout_dynamic[JSON]. The layout file defines only the regions of a grid structure (fieldsets/columns etc), but does __not__ specify the properties/collections/actions within those grid regions. The `@MemberOrder` annotation in effect "binds" the properties or collections to those regions of the grid.
-
-When dynamic layouts are used this way, the xref:rgant.adoc#_rgant-MemberGroupLayout[`@MemberGroupLayout`] annotation is essentially ignored, but the metadata from the xref:rgant.adoc#_rgant-MemberOrder[`@MemberOrder`] annotation (and the other layout annotations, xref:rgant.adoc#_rgant-ActionLayout[`@ActionLayout`], xref:rgant.adoc#_rgant-PropertyLayout[`@PropertyLayout`] and xref:rgant.adoc#_rgant-CollectionLayout[`@CollectionLayout`]) are all still honoured.
-====
-
-For example:
-
-[source,java]
-----
-@MemberGroupLayout(
- columnSpans={3,3,0,6},
- left={"General", "Misc"},
- middle="Detail"
- )
-public class ToDoItem {
- ...
-}
-----
-
-Four values are given in the `columnSpans` attribute. The first three are the relative widths of the three columns of property groups. The fourth, meanwhile, indicates the width of a final column that holds all the collections of the object.
-
-The values of these spans are taken as proportions of 12 virtual columns across the page (this taken from the link:http://getbootstrap.com/2.3.2/[Bootstrap] library).
-
-For example:
-
-* `{3,3,0,6}` indicates:
-** a left column of properties taking up 25% of the width
-** a middle column of properties taking up 25% of the width
-** a right column of collections taking up 50% of the width
-* `{2,6,0,4}` indicates:
-** a left column of properties taking up ~16% of the width
-** a middle column of properties taking up 50% of the width
-** a right column of collections taking up ~33% of the width
-* `{2,3,3,4}` indicates:
-** a left column of properties taking up ~16% of the width
-** a middle column of properties taking up 25% of the width
-** a right column of properties taking up 25% of the width
-** a far right column of collections taking up ~33% of the width
-
-If the sum of all the columns exceeds 12, then the collections are placed underneath the properties, taking up the full span. For example:
-
-* {4,4,4,12} indicates:
-** a left column of properties taking up ~33% of the width
-** a middle column of properties taking up ~33% of the width
-** a right column of properties taking up ~33% of the width
-** the collections underneath the property columns, taking up the full width
-
-== Example Layouts
-
-Below are sketches for the layout of the https://github.com/apache/isis/blob/f38fdb92941172eabb12e0943509f239e6d5925f/example/application/quickstart_wicket_restful_jdo/dom/src/main/java/dom/todo/ToDoItem.java[ToDoItem] class of the Isis addons example https://github.com/isisaddons/isis-app-todoapp/[todoapp] (not ASF):
-
-The first divides the properties into two equal sized columns (6-6-0) and puts the collections underneath (12):
-
-image::{_imagesdir}reference-layout/6-6-0-12.png[width="720px",link="{_imagesdir}reference-layout/6-6-0-12.png"]
-
-The next divides the collections into three equal sized columns (4-4-4) and again puts the collections underneath (12):
-
-image::{_imagesdir}reference-layout/4-4-4-12.png[width="720px",link="{_imagesdir}reference-layout/4-4-4-12.png"]
-
-The last puts the properties into a single column (4-0) and places the collections into the other larger column (8-0):
-
-image::{_imagesdir}reference-layout/4-0-8-0.png[width="720px",link="{_imagesdir}reference-layout/4-0-8-0.png"]
-
-
-== Other Annotations
-
-As of 1.8.0, all the layout annotations have been consolidated into the various `XxxLayout` annotations: xref:rgant.adoc#_rgant-ActionLayout, [`@ActionLayout`] xref:rgant.adoc#_rgant-CollectionLayout[`@CollectionLayout`], xref:rgant.adoc#_rgant-DomainObjectLayout[`@DomainObjectLayout`], xref:rgant.adoc#_rgant-DomainServiceLayout[`@DomainServiceLayout`], xref:rgant.adoc#_rgant-ParameterLayout[`@ParameterLayout`], xref:rgant.adoc#_rgant-PropertyLayout[`@PropertyLayout`], and xref:rgant.adoc#_rgant-ViewModelLayout[`@ViewModelLayout`]
http://git-wip-us.apache.org/repos/asf/isis/blob/badd1011/adocs/documentation/src/main/asciidoc/migration-notes/_migration-notes_1.11.0-to-1.12.0.adoc
----------------------------------------------------------------------
diff --git a/adocs/documentation/src/main/asciidoc/migration-notes/_migration-notes_1.11.0-to-1.12.0.adoc b/adocs/documentation/src/main/asciidoc/migration-notes/_migration-notes_1.11.0-to-1.12.0.adoc
index 3e1c2a4..261314a 100644
--- a/adocs/documentation/src/main/asciidoc/migration-notes/_migration-notes_1.11.0-to-1.12.0.adoc
+++ b/adocs/documentation/src/main/asciidoc/migration-notes/_migration-notes_1.11.0-to-1.12.0.adoc
@@ -14,14 +14,14 @@ issues here.
== Dynamic XML Layouts
-The major new feature in 1.12.0 is xref:guides/ugvw.adoc#_ugvw_layout_dynamic_xml[dynamic XML layouts], providing
+The major new feature in 1.12.0 is xref:guides/ugvw.adoc#_ugvw_layout_file-based[dynamic XML layouts], providing
much enhanced support for custom layouts.
The new `Xxx.layout.xml` file is optional; without it domain objects will
continue to be rendered as before, using metadata from annotations (xref:guides/rgant.adoc#_rgant-DomainObjectLayout[`@DomainObjectLayout`],
xref:guides/rgant.adoc#_rgant-PropertyLayout[`@PropertyLayout`], xref:guides/rgant.adoc#_rgant-CollectionLayout[`@CollectionLayout`],
xref:guides/rgant.adoc#_rgant-ActionLayout[`@ActionLayout`], xref:guides/rgant.adoc#_rgant-MemberOrder[`@MemberOrder`] and
-xref:guides/rgant.adoc#_rgant-MemberGroupLayout[`@MemberGroupLayout`]), and also from any xref:guides/ugvw.adoc#_ugvw_layout_dynamic[`Xxx.layout.json`]
+xref:guides/rgant.adoc#_rgant-MemberGroupLayout[`@MemberGroupLayout`]), and also from any xref:guides/ugvw.adoc#_ugvw_layout_file-based[`Xxx.layout.json`]
file that might already exist. There is therefore no requirement to move to the new more flexible XML-based layout.
If you do want to start using the new format, then you will find that 1.12.0 provides a mixin action (available in
http://git-wip-us.apache.org/repos/asf/isis/blob/badd1011/adocs/documentation/src/main/asciidoc/pages/screencasts/screencasts.adoc
----------------------------------------------------------------------
diff --git a/adocs/documentation/src/main/asciidoc/pages/screencasts/screencasts.adoc b/adocs/documentation/src/main/asciidoc/pages/screencasts/screencasts.adoc
index 389fd9d..7a70d8e 100644
--- a/adocs/documentation/src/main/asciidoc/pages/screencasts/screencasts.adoc
+++ b/adocs/documentation/src/main/asciidoc/pages/screencasts/screencasts.adoc
@@ -65,7 +65,7 @@ Walking through the main classes that make up the SimpleApp: `SimpleObject` pers
|link:https://www.youtube.com/watch?v=KCJ1ZPPB3pA[004^] +
-Using the optional `Xxx.layout.xml` file to provide xref:guides/ugvw.adoc#_ugvw_layout_dynamic_xml[layout metadata] to dynamically render a domain object using the link:http://getbootstrap.com[Bootstrap 3] grid system.
+Using the optional `Xxx.layout.xml` file to provide xref:guides/ugvw.adoc#_ugvw_layout_file-based[layout metadata] to dynamically render a domain object using the link:http://getbootstrap.com[Bootstrap 3] grid system.
||x|||||||||
@@ -140,7 +140,7 @@ include::_screencasts-playlists.adoc[]
|link:https://www.youtube.com/watch?v=dfRZeYqzMtI[012^] +
-Implementing business logic using a (no-arg) action, and associating with a property using either the xref:guides/rgant.adoc#_rgant-MemberOrder[`@MemberOrder`] annotations or using xref:guides/ugvw.adoc#_ugvw_layout_dynamic_xml[dynamic (XML) layouts].
+Implementing business logic using a (no-arg) action, and associating with a property using either the xref:guides/rgant.adoc#_rgant-MemberOrder[`@MemberOrder`] annotations or using xref:guides/ugvw.adoc#_ugvw_layout_file-based[dynamic (XML) layouts].
|x||||||||x||
@@ -199,7 +199,7 @@ Extending a xref:guides/ugtst.adoc#_ugtst_fixture-scripts[fixture script] to mor
|link:https://www.youtube.com/watch?v=39Hpd7C4Kvo[018^] +
-Using xref:guides/ugvw.adoc#_ugvw_layout_dynamic_xml[dynamic (XML) layouts] to specify the page size for a domain object's collection.
+Using xref:guides/ugvw.adoc#_ugvw_layout_file-based[dynamic (XML) layouts] to specify the page size for a domain object's collection.
||||x|||||||
http://git-wip-us.apache.org/repos/asf/isis/blob/badd1011/adocs/documentation/src/main/asciidoc/pages/tg/_tg_stop-scaffolding-start-coding.adoc
----------------------------------------------------------------------
diff --git a/adocs/documentation/src/main/asciidoc/pages/tg/_tg_stop-scaffolding-start-coding.adoc b/adocs/documentation/src/main/asciidoc/pages/tg/_tg_stop-scaffolding-start-coding.adoc
index db271dc..894e0b3 100644
--- a/adocs/documentation/src/main/asciidoc/pages/tg/_tg_stop-scaffolding-start-coding.adoc
+++ b/adocs/documentation/src/main/asciidoc/pages/tg/_tg_stop-scaffolding-start-coding.adoc
@@ -313,7 +313,7 @@ Domain entities have state: either values (primitives, strings) or references to
* revisit the title, consider whether to use the xref:rgant.adoc#_rgant-Title[`@Title`] annotation
** rather than the xref:rgcms.adoc#_rgcms_methods_reserved_title[`title()`] method
* order the properties using the xref:rgant.adoc#_rgant-MemberOrder[`@MemberOrder`], also `@MemberGroupLayout`
-** see also the docs on xref:ugvw.adoc#_ugvw_layout_static[static layouts]
+** see also the docs on xref:ugvw.adoc#_ugvw_layout_annotation-based[static layouts]
* use the xref:rgant.adoc#_rgant-PropertyLayout[`@PropertyLayout`] annotation to position property/action parameter labels either to the LEFT, TOP or NONE
** do the same for parameters using xref:rgant.adoc#_rgant-ParameterLayout[`@ParameterLayout`]
@@ -392,11 +392,12 @@ So:
-== Dynamic Layout
+== File-based Layout
-Up to this point we've been using annotations (`@MemberOrder`, `@MemberGroupLayout`, `@Named`, `@PropertyLayout`, `@ParameterLayout`, `@ActionLayout` and so on) for UI hints. However, the feedback loop is not good: it requires us stopping the app, editing the code, recompiling and running again. So instead, all these UI hints (and more) can be specified dynamically, using a corresponding `.layout.json` file. If edited while the app is running, it will be reloaded automatically (in IntelliJ, use Run>Reload Changed Classes):
+Up to this point we've been using annotations (`@MemberOrder`, `@MemberGroupLayout`, `@Named`, `@PropertyLayout`, `@ParameterLayout`, `@ActionLayout` and so on) for UI hints. However, the feedback loop is not good: it requires us stopping the app, editing the code, recompiling and running again.
+So instead, all these UI hints (and more) can be specified dynamically, using a corresponding `.layout.xml` file. If edited while the app is running, it will be reloaded automatically (in IntelliJ, use Run>Reload Changed Classes):
-* Delete the various hint annotations and instead specify layout hints using a xref:ugvw.adoc#_ugvw_layout_dynamic[.layout.json] file.
+* Delete the various hint annotations and instead specify layout hints using a xref:ugvw.adoc#_ugvw_layout_file-based[.layout.xml] file.
http://git-wip-us.apache.org/repos/asf/isis/blob/badd1011/adocs/documentation/src/main/asciidoc/release-notes/_release-notes_1.12.0.adoc
----------------------------------------------------------------------
diff --git a/adocs/documentation/src/main/asciidoc/release-notes/_release-notes_1.12.0.adoc b/adocs/documentation/src/main/asciidoc/release-notes/_release-notes_1.12.0.adoc
index 52a2bf0..816dc93 100644
--- a/adocs/documentation/src/main/asciidoc/release-notes/_release-notes_1.12.0.adoc
+++ b/adocs/documentation/src/main/asciidoc/release-notes/_release-notes_1.12.0.adoc
@@ -15,16 +15,14 @@ As a result of this change, the support for editing objects has been modified; r
page into edit mode, instead each property is edited individually. The current implementation of this is using a prompt dialog (very
similar to the action prompt dialogs; in a future release we hope to support "in-place" edits instead.
-Another notable change in this release include various new domain services. Some of these are in support of the dynamic layouts
-functionality, others including new access into Apache Isis' metamodel. (Some of these new services were originally part of the (non-ASF)
-link:http://isisaddons.org[Isis Addons]). In addition, the xref:guides/rgsvc.adoc#_rgsvc_api_DomainObjectContainer[`DomainObjectContainer`]
-service has been deprecated, replaced by a number of fine-grained services
-(such as xref:guides/rgsvc.adoc#_rgsvc_api_RepositoryService[`RepositoryService`] and xref:guides/rgsvc.adoc#_rgsvc_api_MessageService[`MessageService`]).
+Another notable change in this release include various new domain services.
+Some of these are in support of the file-based layouts functionality, others including new access into Apache Isis' metamodel.
+(Some of these new services were originally part of the (non-ASF) link:http://isisaddons.org[Isis Addons]).
+In addition, the xref:guides/rgsvc.adoc#_rgsvc_api_DomainObjectContainer[`DomainObjectContainer`] service has been deprecated, replaced by a number of fine-grained services (such as xref:guides/rgsvc.adoc#_rgsvc_api_RepositoryService[`RepositoryService`] and xref:guides/rgsvc.adoc#_rgsvc_api_MessageService[`MessageService`]).
-The release also includes a number of new mixins, to automatically surface in the UI an entity's id, version (if any), and to download the
-layout XML and rebuild the metamodel for a given domain entity. There is also a mixin to clear any UI hints (part of the dynamic layouts
-functionality). In all cases these mixins can be hidden using either security or by writing a xref:guides/rgcms.adoc#_rgcms_classes_super_AbstractSubscriber[subscriber] to veto the visibility of the
-corresponding domain event.
+The release also includes a number of new mixins, to automatically surface in the UI an entity's id, version (if any), and to download the layout XML and rebuild the metamodel for a given domain entity.
+There is also a mixin to clear any UI hints (part of the file-based layouts functionality).
+In all cases these mixins can be hidden using either security or by writing a xref:guides/rgcms.adoc#_rgcms_classes_super_AbstractSubscriber[subscriber] to veto the visibility of the corresponding domain event.
@@ -37,7 +35,7 @@ corresponding domain event.
* link:https://issues.apache.org/jira/browse/ISIS-1317[ISIS-1317] - Allow single domain object class to be invalidated through a mixin.
* link:https://issues.apache.org/jira/browse/ISIS-1313[ISIS-1313] - Enhancement to xref:guides/rgmvn.adoc#_rgmvn_xsd[xsd] goal of the isis-maven-plugin to ignore/include the Isis common schemas.
* link:https://issues.apache.org/jira/browse/ISIS-1292[ISIS-1292] - Extend xref:guides/rgsvc.adoc#_rgsvc_api_MetaModelService[`MetaModelService`] to surface packages, classes etc (as used by the security module).
-* link:https://issues.apache.org/jira/browse/ISIS-993[ISIS-993] - Show different object members on multiple tabs (xref:guides/ugvw.adoc#_ugvw_layout_dynamic_xml[dynamic XML layouts])
+* link:https://issues.apache.org/jira/browse/ISIS-993[ISIS-993] - Show different object members on multiple tabs (xref:guides/ugvw.adoc#_ugvw_layout_file-based[dynamic XML layouts])
* link:https://issues.apache.org/jira/browse/ISIS-784[ISIS-784] - Change Wicket viewer to get rid of edit mode, instead allow individual fields to be edited by clicking on them (similar to the way that JIRA works).
@@ -48,7 +46,7 @@ corresponding domain event.
* link:https://issues.apache.org/jira/browse/ISIS-1330[ISIS-1330] - Add CSS classes for table cells and for collections to make it easier to fine tune pages using CSS.
* link:https://issues.apache.org/jira/browse/ISIS-1329[ISIS-1329] - Extend hint support for "show all"
* link:https://issues.apache.org/jira/browse/ISIS-1327[ISIS-1327] - Change the view mode of the select2 (value drop down) to be a simple text field.
-* link:https://issues.apache.org/jira/browse/ISIS-1324[ISIS-1324] - Allow multiple different views of same collection in a layout (xref:guides/ugvw.adoc#_ugvw_layout_dynamic_xml[dynamic XML layouts])
+* link:https://issues.apache.org/jira/browse/ISIS-1324[ISIS-1324] - Allow multiple different views of same collection in a layout (xref:guides/ugvw.adoc#_ugvw_layout_file-based[dynamic XML layouts])
* link:https://issues.apache.org/jira/browse/ISIS-1323[ISIS-1323] - Deprecate @CollectionLayout#renderType, since is duplicated by xref:guides/rgant.adoc#_rgant-CollectionLayout_defaultView[`@CollectionLayout#defaultView()`]
* link:https://issues.apache.org/jira/browse/ISIS-1322[ISIS-1322] - Mixins not exposing the mixedin object in events (for subscribers to veto).
* link:https://issues.apache.org/jira/browse/ISIS-1321[ISIS-1321] - Extend xref:guides/rgsvc.adoc#_rgsvc_api_MetaModelService[`MetaModelService`] to allow CSV of metamodel to be downloaded.
@@ -59,10 +57,10 @@ corresponding domain event.
* link:https://issues.apache.org/jira/browse/ISIS-1298[ISIS-1298] - Fix deprecated annotation use for ViewModel.Cloneable#clone
* link:https://issues.apache.org/jira/browse/ISIS-1295[ISIS-1295] - Run integration tests using thread-local, to allow "complete" tests that also exercise, eg Quartz jobs.
* link:https://issues.apache.org/jira/browse/ISIS-1240[ISIS-1240] - Derive icon from service when not provided
-* link:https://issues.apache.org/jira/browse/ISIS-1239[ISIS-1239] - For wicket ui, use a cookie or similar to remember the hint from last time (xref:guides/ugvw.adoc#_ugvw_layout_dynamic_xml[dynamic XML layouts])
+* link:https://issues.apache.org/jira/browse/ISIS-1239[ISIS-1239] - For wicket ui, use a cookie or similar to remember the hint from last time (xref:guides/ugvw.adoc#_ugvw_layout_file-based[dynamic XML layouts])
* link:https://issues.apache.org/jira/browse/ISIS-1228[ISIS-1228] - Reorganizing/splitting out xref:guides/rgant.adoc#_rgant-DomainObjectContainer[`@DomainObjectContainer`] service.
* link:https://issues.apache.org/jira/browse/ISIS-1048[ISIS-1048] - Make view model URLs more secure, eg through a private key (xref:guides/rgsvc.adoc#_rgsvc_spi_UrlEncodingService[`UrlEncodingService`]).
-* link:https://issues.apache.org/jira/browse/ISIS-1037[ISIS-1037] - Support layout.xml as well as layout.json (xref:guides/ugvw.adoc#_ugvw_layout_dynamic_xml[dynamic XML layouts])
+* link:https://issues.apache.org/jira/browse/ISIS-1037[ISIS-1037] - Support layout.xml as well as layout.json (xref:guides/ugvw.adoc#_ugvw_layout_file-based[dynamic XML layouts])
* link:https://issues.apache.org/jira/browse/ISIS-806[ISIS-806] - In Wicket viewer, shouldn't be possible to invoke an action if editing a form.
http://git-wip-us.apache.org/repos/asf/isis/blob/badd1011/adocs/documentation/src/main/asciidoc/release-notes/_release-notes_1.13.0.adoc
----------------------------------------------------------------------
diff --git a/adocs/documentation/src/main/asciidoc/release-notes/_release-notes_1.13.0.adoc b/adocs/documentation/src/main/asciidoc/release-notes/_release-notes_1.13.0.adoc
index 32a4c85..c0342c8 100644
--- a/adocs/documentation/src/main/asciidoc/release-notes/_release-notes_1.13.0.adoc
+++ b/adocs/documentation/src/main/asciidoc/release-notes/_release-notes_1.13.0.adoc
@@ -42,7 +42,7 @@ now removed/unsupported. We therefore do recommend that you read and keep in mi
* link:https://issues.apache.org/jira/browse/ISIS-1421[ISIS-1421] - Possible object deadlock when under load.
* link:https://issues.apache.org/jira/browse/ISIS-1420[ISIS-1420] - To support dockerization, have any overrides.properties file take precedence over any other config properties
* link:https://issues.apache.org/jira/browse/ISIS-1418[ISIS-1418] - Support @Nullable for parameters and properties
-* link:https://issues.apache.org/jira/browse/ISIS-1413[ISIS-1413] - Gradle script (and docs) in simpleapp archetype to auto-enhance and for dynamic layouts, also liveReload
+* link:https://issues.apache.org/jira/browse/ISIS-1413[ISIS-1413] - Gradle script (and docs) in simpleapp archetype to auto-enhance and for file-based layouts, also liveReload
* link:https://issues.apache.org/jira/browse/ISIS-1399[ISIS-1399] - MetricsService to capture within InteractionContext, for profiling.
* link:https://issues.apache.org/jira/browse/ISIS-1390[ISIS-1390] - Provide a default CommandService, to return CommandDefault.
* link:https://issues.apache.org/jira/browse/ISIS-1389[ISIS-1389] - New InteractionContext service and Interaction to handle the execution of commands.
http://git-wip-us.apache.org/repos/asf/isis/blob/badd1011/adocs/documentation/src/main/asciidoc/release-notes/_release-notes_1.3.0.adoc
----------------------------------------------------------------------
diff --git a/adocs/documentation/src/main/asciidoc/release-notes/_release-notes_1.3.0.adoc b/adocs/documentation/src/main/asciidoc/release-notes/_release-notes_1.3.0.adoc
index 0355a51..2c6ca2b 100644
--- a/adocs/documentation/src/main/asciidoc/release-notes/_release-notes_1.3.0.adoc
+++ b/adocs/documentation/src/main/asciidoc/release-notes/_release-notes_1.3.0.adoc
@@ -27,8 +27,8 @@
* link:https://issues.apache.org/jira/browse/ISIS-463[ISIS-463] - scope, respectively)
* link:https://issues.apache.org/jira/browse/ISIS-468[ISIS-468] - Provide better layout management of pages in the Wicket viewer.
* link:https://issues.apache.org/jira/browse/ISIS-469[ISIS-469] - Provide implementations of certain layout facets that read from a "Xxx.layout.properties" file
-* link:https://issues.apache.org/jira/browse/ISIS-470[ISIS-470] - Provide the ability to rebuild the metamodel for individual classes, thus allowing dynamic layout capability...
-* link:https://issues.apache.org/jira/browse/ISIS-475[ISIS-475] - Dynamic layout using JSON, using an Xxx.layout.json file
+* link:https://issues.apache.org/jira/browse/ISIS-470[ISIS-470] - Provide the ability to rebuild the metamodel for individual classes, thus allowing file-based layout capability...
+* link:https://issues.apache.org/jira/browse/ISIS-475[ISIS-475] - File-based layout using JSON, using an `Xxx.layout.json` file
* link:https://issues.apache.org/jira/browse/ISIS-478[ISIS-478] - Provide conditional choices, defaults and validation between action parameters
* link:https://issues.apache.org/jira/browse/ISIS-484[ISIS-484] - Contract test for ensuring that injectXxx methods are final and not overridable
* link:https://issues.apache.org/jira/browse/ISIS-497[ISIS-497] - Allow service actions to be rendered as contributed collections or as contributed properties.
@@ -113,7 +113,7 @@
* link:https://issues.apache.org/jira/browse/ISIS-447[ISIS-447] - In Wicket viewer, distinguish prototype/exploration actions in the app menu
* link:https://issues.apache.org/jira/browse/ISIS-457[ISIS-457] - New annotation @CssClass for class member, should render in the HTML markup for that member.
* link:https://issues.apache.org/jira/browse/ISIS-468[ISIS-468] - Provide better layout management of pages in the Wicket viewer.
-* link:https://issues.apache.org/jira/browse/ISIS-475[ISIS-475] - Dynamic layout using JSON, using an Xxx.layout.json file
+* link:https://issues.apache.org/jira/browse/ISIS-475[ISIS-475] - File-based layout using JSON, using an `Xxx.layout.json` file
* link:https://issues.apache.org/jira/browse/ISIS-478[ISIS-478] - Provide conditional choices, defaults and validation between action parameters
* link:https://issues.apache.org/jira/browse/ISIS-497[ISIS-497] - Allow service actions to be rendered as contributed collections or as contributed properties.
* link:https://issues.apache.org/jira/browse/ISIS-498[ISIS-498] - Enhance Wicket's BlobPanel so that, if an image is uploaded as the blob, then it is displayed in thumbnail form.
[3/9] isis git commit: ISIS-1521: moves layout section from
fundamentals guide to wicket viewer guide.
Posted by da...@apache.org.
http://git-wip-us.apache.org/repos/asf/isis/blob/8f18b6f0/adocs/documentation/src/main/asciidoc/guides/ugvw/_ugvw_configuration-properties_suppressing-sign-up.adoc
----------------------------------------------------------------------
diff --git a/adocs/documentation/src/main/asciidoc/guides/ugvw/_ugvw_configuration-properties_suppressing-sign-up.adoc b/adocs/documentation/src/main/asciidoc/guides/ugvw/_ugvw_configuration-properties_suppressing-sign-up.adoc
index f195f10..4afb734 100644
--- a/adocs/documentation/src/main/asciidoc/guides/ugvw/_ugvw_configuration-properties_suppressing-sign-up.adoc
+++ b/adocs/documentation/src/main/asciidoc/guides/ugvw/_ugvw_configuration-properties_suppressing-sign-up.adoc
@@ -19,11 +19,11 @@ The 'sign up' link can be suppressed, if required, by setting a configuration fl
With 'sign up' not suppressed (the default):
-image::{_imagesdir}wicket-viewer/suppress-sign-up/login-page-default.png[width="300px",link="{_imagesdir}wicket-viewer/suppress-sign-up/login-page-default.png"]
+image::{_imagesdir}suppress-sign-up/login-page-default.png[width="300px",link="{_imagesdir}suppress-sign-up/login-page-default.png"]
and with the link suppressed:
-image::{_imagesdir}wicket-viewer/suppress-sign-up/login-page-suppress-sign-up.png[width="300px",link="{_imagesdir}wicket-viewer/suppress-sign-up/login-page-suppress-sign-up.png"]
+image::{_imagesdir}suppress-sign-up/login-page-suppress-sign-up.png[width="300px",link="{_imagesdir}suppress-sign-up/login-page-suppress-sign-up.png"]
http://git-wip-us.apache.org/repos/asf/isis/blob/8f18b6f0/adocs/documentation/src/main/asciidoc/guides/ugvw/_ugvw_customisation_about-page.adoc
----------------------------------------------------------------------
diff --git a/adocs/documentation/src/main/asciidoc/guides/ugvw/_ugvw_customisation_about-page.adoc b/adocs/documentation/src/main/asciidoc/guides/ugvw/_ugvw_customisation_about-page.adoc
index 96d8605..e2450bb 100644
--- a/adocs/documentation/src/main/asciidoc/guides/ugvw/_ugvw_customisation_about-page.adoc
+++ b/adocs/documentation/src/main/asciidoc/guides/ugvw/_ugvw_customisation_about-page.adoc
@@ -13,7 +13,7 @@ Isis' Wicket viewer has an About page that, by default, will provide a dump of t
Here's what the About page looks like with this configuration added:
-image::{_imagesdir}wicket-viewer/about-page/about-page.png[width="800px",link="{_imagesdir}wicket-viewer/about-page/about-page.png"]
+image::{_imagesdir}about-page/about-page.png[width="800px",link="{_imagesdir}about-page/about-page.png"]
[NOTE]
====
http://git-wip-us.apache.org/repos/asf/isis/blob/8f18b6f0/adocs/documentation/src/main/asciidoc/guides/ugvw/_ugvw_customisation_brand-logo.adoc
----------------------------------------------------------------------
diff --git a/adocs/documentation/src/main/asciidoc/guides/ugvw/_ugvw_customisation_brand-logo.adoc b/adocs/documentation/src/main/asciidoc/guides/ugvw/_ugvw_customisation_brand-logo.adoc
index af9eff8..aafbd15 100644
--- a/adocs/documentation/src/main/asciidoc/guides/ugvw/_ugvw_customisation_brand-logo.adoc
+++ b/adocs/documentation/src/main/asciidoc/guides/ugvw/_ugvw_customisation_brand-logo.adoc
@@ -13,11 +13,11 @@ display a png logo instead.
The screenshot below shows the Isis addons example https://github.com/isisaddons/isis-app-todoapp/[todoapp] (not ASF) with a 'brand logo' image in its header:
-image::{_imagesdir}wicket-viewer/brand-logo/brand-logo.png[width="750px",link="{_imagesdir}wicket-viewer/brand-logo/brand-logo.png"]
+image::{_imagesdir}brand-logo/brand-logo.png[width="750px",link="{_imagesdir}brand-logo/brand-logo.png"]
A custom brand logo (typically larger) can also be specified for the signin page:
-image::{_imagesdir}wicket-viewer/brand-logo/brand-logo-signin.png[width="750px",link="{_imagesdir}wicket-viewer/brand-logo/brand-logo-signin.png"]
+image::{_imagesdir}brand-logo/brand-logo-signin.png[width="750px",link="{_imagesdir}brand-logo/brand-logo-signin.png"]
http://git-wip-us.apache.org/repos/asf/isis/blob/8f18b6f0/adocs/documentation/src/main/asciidoc/guides/ugvw/_ugvw_customisation_tweaking-css-classes.adoc
----------------------------------------------------------------------
diff --git a/adocs/documentation/src/main/asciidoc/guides/ugvw/_ugvw_customisation_tweaking-css-classes.adoc b/adocs/documentation/src/main/asciidoc/guides/ugvw/_ugvw_customisation_tweaking-css-classes.adoc
index 2860ced..1d0a526 100644
--- a/adocs/documentation/src/main/asciidoc/guides/ugvw/_ugvw_customisation_tweaking-css-classes.adoc
+++ b/adocs/documentation/src/main/asciidoc/guides/ugvw/_ugvw_customisation_tweaking-css-classes.adoc
@@ -92,7 +92,7 @@ div.x-myapp-highlight span.scalarName {
}
----
-Note also that instead of using `@PropertyLayout(cssClass=...)` annotation, you can also specify the CSS style using a xref:ugfun.adoc#_ugfun_object-layout_dynamic[dynamic layout] JSON file:
+Note also that instead of using `@PropertyLayout(cssClass=...)` annotation, you can also specify the CSS style using a xref:ugvw.adoc#_ugvw_layout_dynamic[dynamic layout] JSON file:
[source,javascript]
----
http://git-wip-us.apache.org/repos/asf/isis/blob/8f18b6f0/adocs/documentation/src/main/asciidoc/guides/ugvw/_ugvw_features_blob-attachments.adoc
----------------------------------------------------------------------
diff --git a/adocs/documentation/src/main/asciidoc/guides/ugvw/_ugvw_features_blob-attachments.adoc b/adocs/documentation/src/main/asciidoc/guides/ugvw/_ugvw_features_blob-attachments.adoc
index 9b702e5..2d2fa69 100644
--- a/adocs/documentation/src/main/asciidoc/guides/ugvw/_ugvw_features_blob-attachments.adoc
+++ b/adocs/documentation/src/main/asciidoc/guides/ugvw/_ugvw_features_blob-attachments.adoc
@@ -24,7 +24,7 @@ The following screenshots are taken from the Isis addons example https://github.
`Blob` field rendered as attachment (with no data):
-image::{_imagesdir}wicket-viewer/blob-attachments/010-attachment-field-940.png[width="800px",link="{_imagesdir}wicket-viewer/blob-attachments/010-attachment-field.png"]
+image::{_imagesdir}blob-attachments/010-attachment-field-940.png[width="800px",link="{_imagesdir}blob-attachments/010-attachment-field.png"]
[NOTE]
====
@@ -36,7 +36,7 @@ Note that these screenshots show an earlier version of the xref:ugvw.adoc#[Wicke
Hit edit; 'choose file' button appears:
-image::{_imagesdir}wicket-viewer/blob-attachments/020-edit-choose-file-940.png[width="800px",link="{_imagesdir}wicket-viewer/blob-attachments/020-edit-choose-file.png"]
+image::{_imagesdir}blob-attachments/020-edit-choose-file-940.png[width="800px",link="{_imagesdir}blob-attachments/020-edit-choose-file.png"]
@@ -44,12 +44,12 @@ image::{_imagesdir}wicket-viewer/blob-attachments/020-edit-choose-file-940.png[w
Choose file using the regular browser window:
-image::{_imagesdir}wicket-viewer/blob-attachments/030-choose-file-using-browser-520.png[width="520px",link="{_imagesdir}wicket-viewer/blob-attachments/030-choose-file-using-browser.png"]
+image::{_imagesdir}blob-attachments/030-choose-file-using-browser-520.png[width="520px",link="{_imagesdir}blob-attachments/030-choose-file-using-browser.png"]
Chosen file is indicated:
-image::{_imagesdir}wicket-viewer/blob-attachments/040-edit-chosen-file-indicated-940.png[width="800px",link="{_imagesdir}wicket-viewer/blob-attachments/040-edit-chosen-file-indicated.png"]
+image::{_imagesdir}blob-attachments/040-edit-chosen-file-indicated-940.png[width="800px",link="{_imagesdir}blob-attachments/040-edit-chosen-file-indicated.png"]
@@ -57,7 +57,7 @@ image::{_imagesdir}wicket-viewer/blob-attachments/040-edit-chosen-file-indicated
Back in view mode (ie once hit OK) if the `Blob` is an image, then it is shown:
-image::{_imagesdir}wicket-viewer/blob-attachments/050-ok-if-image-then-rendered-940.png[width="800px",link="{_imagesdir}wicket-viewer/blob-attachments/050-ok-if-image-then-rendered.png"]
+image::{_imagesdir}blob-attachments/050-ok-if-image-then-rendered-940.png[width="800px",link="{_imagesdir}blob-attachments/050-ok-if-image-then-rendered.png"]
@@ -65,7 +65,7 @@ image::{_imagesdir}wicket-viewer/blob-attachments/050-ok-if-image-then-rendered-
`Blob` can be downloaded:
-image::{_imagesdir}wicket-viewer/blob-attachments/060-download-940.png[width="800px",link="{_imagesdir}wicket-viewer/blob-attachments/060-download.png"]
+image::{_imagesdir}blob-attachments/060-download-940.png[width="800px",link="{_imagesdir}blob-attachments/060-download.png"]
@@ -73,7 +73,7 @@ image::{_imagesdir}wicket-viewer/blob-attachments/060-download-940.png[width="80
Back in edit mode, can choose a different file or clear (assuming property is not mandatory):
-image::{_imagesdir}wicket-viewer/blob-attachments/070-edit-clear-940.png[width="800px",link="{_imagesdir}wicket-viewer/blob-attachments/070-edit-clear.png"]
+image::{_imagesdir}blob-attachments/070-edit-clear-940.png[width="800px",link="{_imagesdir}blob-attachments/070-edit-clear.png"]
http://git-wip-us.apache.org/repos/asf/isis/blob/8f18b6f0/adocs/documentation/src/main/asciidoc/guides/ugvw/_ugvw_features_bookmarked-pages.adoc
----------------------------------------------------------------------
diff --git a/adocs/documentation/src/main/asciidoc/guides/ugvw/_ugvw_features_bookmarked-pages.adoc b/adocs/documentation/src/main/asciidoc/guides/ugvw/_ugvw_features_bookmarked-pages.adoc
index 431dfec..d0de6d8 100644
--- a/adocs/documentation/src/main/asciidoc/guides/ugvw/_ugvw_features_bookmarked-pages.adoc
+++ b/adocs/documentation/src/main/asciidoc/guides/ugvw/_ugvw_features_bookmarked-pages.adoc
@@ -19,7 +19,7 @@ Bookmarking is automatic; whenever a bookmarkable object/action is visited, then
The following screenshot, taken from https://github.com/isisaddons/isis-app-todoapp[Isisaddons example todoapp] (not ASF) shows how the bookmarks are listed in a sliding panel.
-image::{_imagesdir}wicket-viewer/bookmarked-pages/panel.png[width="800px",link="{_imagesdir}wicket-viewer/bookmarked-pages/panel.png"]
+image::{_imagesdir}bookmarked-pages/panel.png[width="800px",link="{_imagesdir}bookmarked-pages/panel.png"]
[NOTE]
====
@@ -30,7 +30,7 @@ Note how the list contains both domain objects and an action ("not yet complete"
Bookmarks can also form a hierarchy. The following screenshot, also taken from the https://github.com/estatio/estatio[Estatio] application, shows a variety of different bookmarked objects with a nested structure:
-image::{_imagesdir}wicket-viewer/bookmarked-pages/panel-estatio.png[width="800px",link="{_imagesdir}wicket-viewer/bookmarked-pages/panel-estatio.png"]
+image::{_imagesdir}bookmarked-pages/panel-estatio.png[width="800px",link="{_imagesdir}bookmarked-pages/panel-estatio.png"]
Some - like `Property`, `Lease` and `Party` - are root nodes. However, `LeaseItem` is bookmarkable as a child of `Lease`, and `LeaseTerm` is bookmarkable only as a child of `LeaseItem`. This parent/child relationship is reflected in the layout.
http://git-wip-us.apache.org/repos/asf/isis/blob/8f18b6f0/adocs/documentation/src/main/asciidoc/guides/ugvw/_ugvw_features_hints-and-copy-url.adoc
----------------------------------------------------------------------
diff --git a/adocs/documentation/src/main/asciidoc/guides/ugvw/_ugvw_features_hints-and-copy-url.adoc b/adocs/documentation/src/main/asciidoc/guides/ugvw/_ugvw_features_hints-and-copy-url.adoc
index 43e6b69..7948b12 100644
--- a/adocs/documentation/src/main/asciidoc/guides/ugvw/_ugvw_features_hints-and-copy-url.adoc
+++ b/adocs/documentation/src/main/asciidoc/guides/ugvw/_ugvw_features_hints-and-copy-url.adoc
@@ -23,7 +23,7 @@ The following screenshots are taken from the [Estatio](https://github.com/estati
This screenshot shows the copy URL button (top right):
-image::{_imagesdir}wicket-viewer/copy-link/010-copy-link-button.png[width="800px",link="{_imagesdir}wicket-viewer/copy-link/010-copy-link-button.png"]
+image::{_imagesdir}copy-link/010-copy-link-button.png[width="800px",link="{_imagesdir}copy-link/010-copy-link-button.png"]
[NOTE]
====
@@ -32,7 +32,7 @@ Note that these screenshots show an earlier version of the xref:ugvw.adoc#[Wicke
Clicking on this button brings up a dialog with the URL preselected:
-image::{_imagesdir}wicket-viewer/copy-link/020-copy-link-dialog.png[width="800px",link="{_imagesdir}wicket-viewer/copy-link/020-copy-link-dialog.png"]
+image::{_imagesdir}copy-link/020-copy-link-dialog.png[width="800px",link="{_imagesdir}copy-link/020-copy-link-dialog.png"]
The URL in this case is something like:
@@ -46,14 +46,14 @@ The user can copy the link (eg `ctrl+C`) into the clipboard, then hit `OK` or `E
Using the viewer the user can hide/show collection tables, can sort the tables by header columns:
-image::{_imagesdir}wicket-viewer/copy-link/030-hints.png[width="800px",link="{_imagesdir}wicket-viewer/copy-link/030-hints.png"]
+image::{_imagesdir}copy-link/030-hints.png[width="800px",link="{_imagesdir}copy-link/030-hints.png"]
Also, if the collection spans multiple pages, then the individual page can be selected.
Once the view has been customised, the URL shown in the copy URL dialog is in an extended form:
-image::{_imagesdir}wicket-viewer/copy-link/040-copy-link-with-hints.png[width="800px",link="{_imagesdir}wicket-viewer/copy-link/040-copy-link-with-hints.png"]
+image::{_imagesdir}copy-link/040-copy-link-with-hints.png[width="800px",link="{_imagesdir}copy-link/040-copy-link-with-hints.png"]
The URL in this case is something like:
@@ -67,7 +67,7 @@ When the user invokes an action on the object, the URL (necessarily) changes to
A quick way for the user to grab a shareable URL is simply by clicking on the object's title:
-image::{_imagesdir}wicket-viewer/copy-link/050-title-url.png[width="800px",link="{_imagesdir}wicket-viewer/copy-link/050-title-url.png"]
+image::{_imagesdir}copy-link/050-title-url.png[width="800px",link="{_imagesdir}copy-link/050-title-url.png"]
http://git-wip-us.apache.org/repos/asf/isis/blob/8f18b6f0/adocs/documentation/src/main/asciidoc/guides/ugvw/_ugvw_features_recent-pages.adoc
----------------------------------------------------------------------
diff --git a/adocs/documentation/src/main/asciidoc/guides/ugvw/_ugvw_features_recent-pages.adoc b/adocs/documentation/src/main/asciidoc/guides/ugvw/_ugvw_features_recent-pages.adoc
index 951a980..00473b1 100644
--- a/adocs/documentation/src/main/asciidoc/guides/ugvw/_ugvw_features_recent-pages.adoc
+++ b/adocs/documentation/src/main/asciidoc/guides/ugvw/_ugvw_features_recent-pages.adoc
@@ -14,7 +14,7 @@ The Wicket viewer provides a recent pages drop-down that acts as a breadcrumb tr
The following screenshot, taken from the https://github.com/estatio/estatio[Estatio] application, shows the recent pages drop-down after a number of pages have been accessed.
-image::{_imagesdir}wicket-viewer/recent-pages/recent-pages.png[width="800px",link="{_imagesdir}wicket-viewer/recent-pages/recent-pages.png"]
+image::{_imagesdir}recent-pages/recent-pages.png[width="800px",link="{_imagesdir}recent-pages/recent-pages.png"]
[NOTE]
http://git-wip-us.apache.org/repos/asf/isis/blob/8f18b6f0/adocs/documentation/src/main/asciidoc/guides/ugvw/_ugvw_features_user-registration.adoc
----------------------------------------------------------------------
diff --git a/adocs/documentation/src/main/asciidoc/guides/ugvw/_ugvw_features_user-registration.adoc b/adocs/documentation/src/main/asciidoc/guides/ugvw/_ugvw_features_user-registration.adoc
index f99aafe..c595ae5 100644
--- a/adocs/documentation/src/main/asciidoc/guides/ugvw/_ugvw_features_user-registration.adoc
+++ b/adocs/documentation/src/main/asciidoc/guides/ugvw/_ugvw_features_user-registration.adoc
@@ -34,32 +34,32 @@ There is _no_ default implementation of the user registration service in the cor
The user is presented with a login page:
-image::{_imagesdir}wicket-viewer/user-registration/login-page-default.png[width="300px",link="{_imagesdir}wicket-viewer/user-registration/login-page-default.png"]
+image::{_imagesdir}user-registration/login-page-default.png[width="300px",link="{_imagesdir}user-registration/login-page-default.png"]
Navigate to the sign up page. Complete the page, and verify:
-image::{_imagesdir}wicket-viewer/user-registration/sign-up-page.png[width="300px",link="{_imagesdir}wicket-viewer/user-registration/sign-up-page.png"]
+image::{_imagesdir}user-registration/sign-up-page.png[width="300px",link="{_imagesdir}user-registration/sign-up-page.png"]
Back to the login page:
-image::{_imagesdir}wicket-viewer/user-registration/sign-up-login-page-after-sign-up.png[width="300px",link="{_imagesdir}wicket-viewer/user-registration/sign-up-login-page-after-sign-up.png"]
+image::{_imagesdir}user-registration/sign-up-login-page-after-sign-up.png[width="300px",link="{_imagesdir}user-registration/sign-up-login-page-after-sign-up.png"]
Email arrives, with link:
-image::{_imagesdir}wicket-viewer/user-registration/sign-up-email-with-verification-link.png[width="500px",link="{_imagesdir}wicket-viewer/user-registration/sign-up-email-with-verification-link.png"]
+image::{_imagesdir}user-registration/sign-up-email-with-verification-link.png[width="500px",link="{_imagesdir}user-registration/sign-up-email-with-verification-link.png"]
Follow the link, complete the page:
-image::{_imagesdir}wicket-viewer/user-registration/sign-up-registration-page.png[width="300px",link="{_imagesdir}wicket-viewer/user-registration/sign-up-registration-page.png"]
+image::{_imagesdir}user-registration/sign-up-registration-page.png[width="300px",link="{_imagesdir}user-registration/sign-up-registration-page.png"]
Automatically logged in:
-image::{_imagesdir}wicket-viewer/user-registration/sign-up-after-registration.png[width="800px",link="{_imagesdir}wicket-viewer/user-registration/sign-up-after-registration.png"]
+image::{_imagesdir}user-registration/sign-up-after-registration.png[width="800px",link="{_imagesdir}user-registration/sign-up-after-registration.png"]
http://git-wip-us.apache.org/repos/asf/isis/blob/8f18b6f0/adocs/documentation/src/main/asciidoc/guides/ugvw/_ugvw_layout.adoc
----------------------------------------------------------------------
diff --git a/adocs/documentation/src/main/asciidoc/guides/ugvw/_ugvw_layout.adoc b/adocs/documentation/src/main/asciidoc/guides/ugvw/_ugvw_layout.adoc
index 3f8c609..3dc46a1 100644
--- a/adocs/documentation/src/main/asciidoc/guides/ugvw/_ugvw_layout.adoc
+++ b/adocs/documentation/src/main/asciidoc/guides/ugvw/_ugvw_layout.adoc
@@ -6,69 +6,19 @@
-The layout of domain objects can be controlled either through annotations, or through the supplementary `layout.xml` file.
-Of these, the `layout.xml` file is superior; it offers more flexibility, and can be reloaded at runtime, thereby reducing the feedback loop.
-In addition, the layout can be fine-tuned using the xref:rgsvc.adoc#_rgsvc_spi_TableColumnOrderService[`TableColumnOrderService`] optional SPI service.
+In implementing the http://en.wikipedia.org/wiki/Naked_objects[naked objects pattern], Apache Isis aims to infer as much information from the domain classes as possible.
+Nevertheless, some metadata relating solely to the UI is inevitably required.
-== `layout.xml`
-For more information, see:
+This chapter describes how this is done both for domain objects -- statically or dynamically -- and for the application menu bar (containing domain service' actions).
-* the xref:ugfun.adoc#_ugfun_object-layout[user guide fundamentals] (layout chapter);
-
-* xref:rgsvc.adoc#_rgsvc_api_LayoutService[`LayoutService`] (whose functionality is exposed on the prototyping menu as an action) and lso the a xref:rgcms .adoc#_rgcms_classes_mixins_Object[mixin action]
-
-* xref:rgsvc.adoc#_rgsvc_spi_GridService[`GridService`] and its supporting services, xref:rgsvc.adoc#_rgsvc_spi_GridLoaderService[`GridLoaderService`] and xref:rgsvc.adoc#_rgsvc_spi_GridSystemService[`GridSystemService`]
-
-* xref:rgcms.adoc#_rgcms_classes_layout[grid layout classes], defined in the Apache Isis applib
-
-
-
-== Reordering columns
-
-The optional xref:rgsvc.adoc#_rgsvc_spi_TableColumnOrderService[`TableColumnOrderService`] SPI service can be used to reorder columns in a table, either for a parented collection (owned by parent domain object) or a standalone collection (returned from an action invocation).
-
-For example, suppose there is a `Customer` and an `Order`:
-
-[plantuml, {_imagesdir}/wicket-viewer/layouts/customer-order, png]
-....
-Customer "1" *--> "many" Order : orders
-
-class Order {
- int num
- Date placedOn
- Date shippedOn
- State state
-}
-....
-
-The order of these properties of `Order`, when rendered in the context of its owning `Customer`, can be controlled using this implementation of `TableColumnOrderService`:
-
-[source,java]
-----
-@DomainService(
- nature = NatureOfService.DOMAIN,
- menuOrder = "100" // <1>
-)
-public class TableColumnOrderServiceForCustomerOrders
- implements TableColumnOrderService {
- public List<String> orderParented(
- final Object parent,
- final String collectionId,
- final Class<?> collectionType,
- final List<String> propertyIds) {
- return parent instanceof Customer && "orders".equals(collectionId)
- ? Arrays.asList("num", "placedOn", "state", "shippedOn")
- : null;
- }
- public List<String> orderStandalone(
- final Class<?> collectionType,
- final List<String> propertyIds) {
- return null;
- }
-}
-----
-<1> specifies the order in which the `TableColumnOrderService` implementations are called.
+include::_ugvw_layout_static.adoc[leveloffset=+1]
+include::_ugvw_layout_dynamic_xml.adoc[leveloffset=+1]
+include::_ugvw_layout_dynamic.adoc[leveloffset=+1]
+include::_ugvw_layout_application-menu.adoc[leveloffset=+1]
+include::_ugvw_layout_static-vs-dynamic.adoc[leveloffset=+1]
+include::_ugvw_layout_handling-columns.adoc[leveloffset=+1]
+include::_ugvw_layout_customising-table-columns.adoc[leveloffset=+1]
http://git-wip-us.apache.org/repos/asf/isis/blob/8f18b6f0/adocs/documentation/src/main/asciidoc/guides/ugvw/_ugvw_layout_application-menu.adoc
----------------------------------------------------------------------
diff --git a/adocs/documentation/src/main/asciidoc/guides/ugvw/_ugvw_layout_application-menu.adoc b/adocs/documentation/src/main/asciidoc/guides/ugvw/_ugvw_layout_application-menu.adoc
new file mode 100644
index 0000000..f849d66
--- /dev/null
+++ b/adocs/documentation/src/main/asciidoc/guides/ugvw/_ugvw_layout_application-menu.adoc
@@ -0,0 +1,171 @@
+[[_ugvw_layout_application-menu]]
+= Application Menu Layout
+: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 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.
+:_basedir: ../../
+:_imagesdir: images/
+
+
+
+The actions of domain services are made available as an application menu bar. By default each domain service
+corresponds to a single menu on this menu bar, with its actions as the drop-down menu items. This is rarely exactly
+what is required, however. The `@MemberOrder` and `@DomainServiceLayout` annotations can be used to rearrange the
+placement of menu items.
+
+The screenshots below are taken from http://github.com/estatio/estatio[Estatio], an open source estate management
+application built using Apache Isis.
+
+== @DomainServiceLayout
+
+Menus for domain services can be placed either on a primary, secondary or tertiary menu bar.
+
+image::{_imagesdir}application-menu/layout-menus.png[width="800px",link="{_imagesdir}application-menu/layout-menus.png"]
+
+Within a single top-level menu (eg "Fixed Assets") there can be actions from multiple services. The Wicket viewer
+automatically adds a divider between each:
+
+image::{_imagesdir}application-menu/dividers.png[width="400px",link="{_imagesdir}application-menu/dividers.png"]
+
+In the example above the top-level menu combines the actions from the `Properties`, `Units` and `FixedAssetRegistrations`
+services. The `Properties` service is annotated:
+
+[source,java]
+----
+@DomainServiceLayout(
+ named="Fixed Assets",
+ menuBar = DomainServiceLayout.MenuBar.PRIMARY,
+ menuOrder = "10.1"
+)
+public class Properties ... { ... }
+----
+
+while the `Units` service is annotated:
+
+[source,java]
+----
+@DomainServiceLayout(
+ named="Fixed Assets",
+ menuBar = DomainServiceLayout.MenuBar.PRIMARY,
+ menuOrder = "10.2"
+)
+public class Units ... { ... }
+----
+
+and similarly `FixedAssetRegistrations` is annotated:
+
+[source,java]
+----
+@DomainServiceLayout(
+ named="Fixed Assets",
+ menuBar = DomainServiceLayout.MenuBar.PRIMARY,
+ menuOrder = "10.3"
+)
+public class FixedAssetRegistrations ... { ... }
+----
+
+Note that in all three cases the value of the `named` attribute and the `menuBar` attribute is the same: "Fixed Assets"
+and PRIMARY. This means that all will appear on a "Fixed Assets" menu in the primary menu bar.
+
+Meanwhile the value of `menuOrder` attribute is significant for two reasons:
+
+* for these three services on the same ("Fixed Assets") top-level menu, it determines the relative order of their sections (`Properties` first, then `Units`, then `FixedAssetRegistrations`)
+* it determines the placement of the top-level menu itself ("Fixed Assets") with respect to other top-level menus on the menu bar.
+
+To illustrate this latter point, the next top-level menu on the menu bar, "Parties", is placed after "Fixed Assets"
+ because the `menuOrder` of the first of its domain services, namely the `Parties` service, is higher than that for
+ "Fixed Assets":
+
+[source,java]
+----
+@DomainServiceLayout(
+ named="Parties",
+ menuBar = DomainServiceLayout.MenuBar.PRIMARY,
+ menuOrder = "20.1"
+)
+public class Parties ... { ... }
+----
+
+Note that only the `menuOrder` of the _first_ domain service is significant in placing the menus along the menu bar;
+thereafter the purpose of the `menuOrder` is to order the menu services sections on the menu itself.
+
+== Ordering menu actions
+
+For a given service, the actions within a section on a menu is determined by the `@MemberOrder` annotation. Thus, for
+the `Units` domain service, its actions are annotated:
+
+[source,java]
+----
+public class Units extends EstatioDomainService<Unit> {
+
+ @MemberOrder(sequence = "1")
+ public Unit newUnit( ... ) { ... }
+
+ @MemberOrder(sequence = "2")
+ public List<Unit> findUnits( ... ) { ... }
+
+ @ActionLayout( prototype = true )
+ @MemberOrder(sequence = "99")
+ public List<Unit> allUnits() { ... }
+ ...
+}
+----
+
+Note that the last is also a prototype action (meaning it is only displayed in SERVER_PROTOTYPE (=Wicket Development) mode).
+In the UI it is rendered in italics.
+
+(It is possible to override this place of a given action by specifying `@MemberOrder(name="...")` where the name is
+that of a top-level menu. Prior to 1.8.0 this was the only way of doing things, as of 1.8.0 its use
+is not recommended).
+
+== Tertiary menubar
+
+The tertiary menu bar consists of a single unnamed menu, rendered underneath the user's login, top right. This is
+intended primarily for actions pertaining to the user themselves, eg their account, profile or settings:
+
+image::{_imagesdir}application-menu/tertiary.png[width="300px",link="{_imagesdir}application-menu/tertiary.png"]
+
+Domain services' actions can be associated with the tertiary menu using the same `@DomainServiceLayout` annotation. For
+example, the `updateEpochDate(...)` and `listAllSettings(...)` actions come from the following service:
+
+[source,java]
+----
+@DomainServiceLayout(
+ menuBar = DomainServiceLayout.MenuBar.TERTIARY,
+ menuOrder = "10.1"
+)
+public class EstatioAdministrationService ... {
+
+ @MemberOrder(sequence = "1")
+ public void updateEpochDate( ... ) { ... }
+
+ @MemberOrder(sequence = "2")
+ public List<ApplicationSetting> listAllSettings() { ... }
+ ...
+}
+----
+
+Because the number of items on the tertiary menu is expected to be small and most will pertain to the current user, the
+viewer does _not_ place dividers between actions from different services on the tertiary menu.
+
+
+== Isis Add-on modules
+
+Some of the (non-ASF) link:http://isisaddons.org[Isis Addons] modules also provide services whose actions appear in top-level menus.
+
+The http://github.com/isisaddons/isis-module-security[security]'s module places its domain service menus in three
+top-level menus:
+
+* its `ApplicationUsers`, `ApplicationRoles`, `ApplicationPermission`, `ApplicationFeatureViewModels` and
+ `ApplicationTenancies` domain services are all grouped together in a single "Security" top-level menu, on the
+ SECONDARY menu bar
+
+* its `SecurityModuleAppFixturesService` domain service, which allows the security modules' fixture scripts to be run,
+ is placed on a "Prototyping" top-level menu, also on the SECONDARY menu bar
+
+* its `MeService` domain service, which provides the `me()` action, is placed on the TERTIARY menu bar.
+
+Meanwhile the http://github.com/isisaddons/isis-module-devutils[devutils] module places its actions - to download layouts and
+so forth - on a "Prototyping" top-level menu, on the SECONDARY menu bar.
+
+Currently there is no facility to alter the placement of these services. However, their UI can be suppressed
+using security or using a xref:ugbtb.adoc#_ugbtb_decoupling_vetoing-visibility[vetoing subscriber].
+
http://git-wip-us.apache.org/repos/asf/isis/blob/8f18b6f0/adocs/documentation/src/main/asciidoc/guides/ugvw/_ugvw_layout_customising-table-columns.adoc
----------------------------------------------------------------------
diff --git a/adocs/documentation/src/main/asciidoc/guides/ugvw/_ugvw_layout_customising-table-columns.adoc b/adocs/documentation/src/main/asciidoc/guides/ugvw/_ugvw_layout_customising-table-columns.adoc
new file mode 100644
index 0000000..8873610
--- /dev/null
+++ b/adocs/documentation/src/main/asciidoc/guides/ugvw/_ugvw_layout_customising-table-columns.adoc
@@ -0,0 +1,54 @@
+[[_ugvw_layout_customising-table-columns]]
+= Customising Table Columns
+: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 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.
+:_basedir: ../../
+:_imagesdir: images/
+
+
+
+
+The optional xref:rgsvc.adoc#_rgsvc_spi_TableColumnOrderService[`TableColumnOrderService`] SPI service can be used to reorder columns in a table, either for a parented collection (owned by parent domain object) or a standalone collection (returned from an action invocation).
+
+For example, suppose there is a `Customer` and an `Order`:
+
+[plantuml, {_imagesdir}/layouts/customer-order, png]
+....
+Customer "1" *--> "many" Order : orders
+
+class Order {
+ int num
+ Date placedOn
+ Date shippedOn
+ State state
+}
+....
+
+The order of these properties of `Order`, when rendered in the context of its owning `Customer`, can be controlled using this implementation of `TableColumnOrderService`:
+
+[source,java]
+----
+@DomainService(
+ nature = NatureOfService.DOMAIN,
+ menuOrder = "100" // <1>
+)
+public class TableColumnOrderServiceForCustomerOrders
+ implements TableColumnOrderService {
+ public List<String> orderParented(
+ final Object parent,
+ final String collectionId,
+ final Class<?> collectionType,
+ final List<String> propertyIds) {
+ return parent instanceof Customer && "orders".equals(collectionId)
+ ? Arrays.asList("num", "placedOn", "state", "shippedOn")
+ : null;
+ }
+ public List<String> orderStandalone(
+ final Class<?> collectionType,
+ final List<String> propertyIds) {
+ return null;
+ }
+}
+----
+<1> specifies the order in which the `TableColumnOrderService` implementations are called.
+
+
http://git-wip-us.apache.org/repos/asf/isis/blob/8f18b6f0/adocs/documentation/src/main/asciidoc/guides/ugvw/_ugvw_layout_dynamic.adoc
----------------------------------------------------------------------
diff --git a/adocs/documentation/src/main/asciidoc/guides/ugvw/_ugvw_layout_dynamic.adoc b/adocs/documentation/src/main/asciidoc/guides/ugvw/_ugvw_layout_dynamic.adoc
new file mode 100644
index 0000000..cf02fca
--- /dev/null
+++ b/adocs/documentation/src/main/asciidoc/guides/ugvw/_ugvw_layout_dynamic.adoc
@@ -0,0 +1,151 @@
+[[_ugvw_layout_dynamic]]
+= Dynamic (JSON) Layout
+: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 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.
+:_basedir: ../../
+:_imagesdir: images/
+
+
+
+Metadata providing UI hints can be specified either xref:ugvw.adoc#_ugvw_layout_static[statically], using annotations, or dynamically, using either a xref:ugvw.adoc#_ugvw_layout_dynamic_xml[``layout.xml``] file or (as described here) a `.layout.json` file.
+
+
+[IMPORTANT]
+====
+The use of dynamic layouts through the `.layout.json` is DEPRECATED. Instead, use the
+``.layout.xml`` file, which enables much more sophisticated custom layouts than those provided by ``.layout.json``.
+
+It is possible to download initial `.layout.xml` files - which will capture all the metadata originally in the `.layout.json` file - using the xref:rgsvc.adoc#_rgsvc_api_LayoutService[`LayoutService`] (exposed as an action on the prototyping menu).
+The `.layout.json` file will be ignored once a `.layout.xml` file is present.
+====
+
+== JSON layout file
+
+The JSON layout file for class `Xxx` takes the name `Xxx.layout.json`, and resides in the same package as the class.
+
+
+The format of the file is:
+
+[source,javascript]
+----
+{
+ "columns": [ // list of columns
+ {
+ "span": 6, // span of the left-hand property column
+ "memberGroups": { // ordered map of member (property) groups
+ "General": { // member group name
+ "members": {
+ "description": { // property, no associated actions, but with UI hint
+ "propertyLayout": {
+ "typicalLength": 50 // UI hint for size of field (no longer used in ISIS 1.8.0)
+ }
+ },
+ "category": {},
+ "complete": { // property, with associated actions
+ "propertyLayout": {
+ "describedAs": "Whether this todo item has been completed"
+ },
+ "actions": {
+ "completed": {
+ "actionLayout": {
+ "named": "Done", // naming UI hint
+ "cssClass": "x-highlight" // CSS UI hint
+ }
+ },
+ "notYetCompleted": {
+ "actionLayout": {
+ "named": "Not done"
+ }
+ }
+ }
+ }
+ },
+ "Misc": {
+ "members": {
+ "notes": {
+ "propertyLayout": {
+ "multiLine": 5 // UI hint for text area
+ }
+ },
+ "versionSequence": {}
+ }
+ }
+ }
+ }
+ },
+ {
+ "span": 6, // span of the middle property column
+ "memberGroups": { ... }
+ },
+ {
+ "span": 0 // span of the right property column (if any)
+ },
+ {
+ "span": 6,
+ "collections": { // ordered map of collections
+ "dependencies": { // collection, with associated actions
+ "collectionLayout": {
+ "paged": 10, // pagination UI hint
+ "render": "EAGERLY" // lazy-loading UI hint
+ },
+ "actions": {
+ "add":{},
+ "delete": {}
+ },
+ },
+ "similarItems": {} // collection, no associated actions
+ }
+ }
+ ],
+ "actions": { // actions not associated with any member
+ "delete": {},
+ "duplicate": {
+ "actionLayout": {
+ "named": {
+ "value": "Clone"
+ }
+ }
+ }
+ }
+}
+----
+
+Although advisable, it is not necessary to list all class members in this file. Any members not listed with be
+ordered according either to annotations (if present) or fallback/default values.
+
+Note also that the layout file may contain entries for xref:ugfun.adoc#_ugfun_how-tos_contributed-members[contributed associations and actions]; this allows each contributee classes to define their own layout for their contributions, possibly overriding any static metadata on the original domain service contributor.
+
+
+
+== Downloading an initial layout
+
+The fastest way to get started is to use the (non-ASF) link:http://github.com/isisaddons/isis-module-devutils[Isis addons' devutils] module to download the layout file (derived from any existing static metadata defined by annotations).
+
+
+
+== Required updates to the dom project's pom.xml
+
+Any `.layout.json` files must be compiled and available in the classpath. Ensure the following is defined in the dom project's `pom.xml`:
+
+[source.xml]
+----
+<resources>
+ <resource>
+ <filtering>false</filtering>
+ <directory>src/main/resources</directory>
+ </resource>
+ <resource>
+ <filtering>false</filtering>
+ <directory>src/main/java</directory>
+ <includes>
+ <include>**</include>
+ </includes>
+ <excludes>
+ <exclude>**/*.java</exclude>
+ </excludes>
+ </resource>
+</resources>
+----
+
+If using an Apache Isis xref:ugfun.adoc#_ugfun_getting-started_simpleapp-archetype[SimpleApp archetype], then the POM is already correctly configured.
+
+
http://git-wip-us.apache.org/repos/asf/isis/blob/8f18b6f0/adocs/documentation/src/main/asciidoc/guides/ugvw/_ugvw_layout_dynamic_xml.adoc
----------------------------------------------------------------------
diff --git a/adocs/documentation/src/main/asciidoc/guides/ugvw/_ugvw_layout_dynamic_xml.adoc b/adocs/documentation/src/main/asciidoc/guides/ugvw/_ugvw_layout_dynamic_xml.adoc
new file mode 100644
index 0000000..f95fead
--- /dev/null
+++ b/adocs/documentation/src/main/asciidoc/guides/ugvw/_ugvw_layout_dynamic_xml.adoc
@@ -0,0 +1,402 @@
+[[_ugvw_layout_dynamic_xml]]
+= Dynamic (XML) Layout
+: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 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.
+:_basedir: ../../
+:_imagesdir: images/
+
+
+
+Metadata providing UI hints can be specified either xref:ugvw.adoc#_ugvw_layout_static[statically], using annotations, or dynamically using an `Xxx.layout.xml` file (where `Xxx` is the entity or view model object to be rendered).
+
+The `Xxx.layout.xml` file is just the serialized form of a xref:rgcms.adoc#_rgcms_classes_layout[`Grid`] layout class defined within Apache Isis' applib. These are JAXB-annotated classes with corresponding XSD schemas; the upshot of that
+is that IDEs such as IntelliJ and Eclipse can provide "intellisense", making iteasy to author such layout files.
+
+It is also possible to download an initial `.layout.xml` - capturing any existing layout metadata - using the xref:rgsvc.adoc#_rgsvc_api_LayoutService[`LayoutService`] (exposed on the prototyping menu) or using a xref:rgcms.adoc#_rgcms_classes_mixins_Object[mixin action] contributed to every domain object.
+
+[NOTE]
+====
+It is also possible to describe dynamic layouts using a `.layout.json` file, as discussed xref:ugvw.adoc#_ugvw_layout_dynamic[here]. The `.layout.json` file should be considered as deprecated: the ``.layout.xml`` file also enables much more sophisticated layouts than those afforded by ``.layout.json``.
+====
+
+== Grids vs Components
+
+The XML file distinguishes between two types of element:
+
+* those that define a grid structure, of: rows, columns, tab groups and tabs. +
++
+The rows and columns are closely modelled on link:getbootstrap.com[Bootstrap 3] (used in the implementation of the xref:ugvw.adoc[Wicket viewer]).
+
+* those that defines common components, of: fieldsets (previously called member groups or property groups), properties, collections, actions and also the title/icon of the domain object itself.
+
+More information about these classes can be found in xref:rgcms.adoc#_rgcms_classes_layout[the reference guide]. More information on Bootstrap 3's grid system can be found link:http://getbootstrap.com/css/#grid[here].
+
+
+== Screencast
+
+This link:https://www.youtube.com/watch?v=MxewC5Pve5k[screencast] describes the feature.
+
+
+
+
+== Examples
+
+Probably the easiest way to understand dynamic XML layouts is by example. For this we'll use the `ToDoItem` from the
+(non-ASF) http://github.com/isisaddons/isis-app-todoapp[Isis addons' todoapp]:
+
+image::{_imagesdir}ugfun/_ugvw_layout_dynamic_xml/ToDoItem.png[width="940px",link="{_imagesdir}ugfun/_ugvw_layout_dynamic_xml/ToDoItem.png"]
+
+
+=== Namespaces
+
+First things first; every `.layout.xml` file must properly declare the XSD namespaces and schemas. There are two: one for the grid classes, and one for the common component classes:
+
+[source,xml]
+----
+<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
+<bs3:grid
+ xsi:schemaLocation="http://isis.apache.org/applib/layout/component
+ http://isis.apache.org/applib/layout/component/component.xsd
+ http://isis.apache.org/applib/layout/grid/bootstrap3
+ http://isis.apache.org/applib/layout/grid/bootstrap3/bootstrap3.xsd"
+ xmlns:bs3="http://isis.apache.org/applib/layout/grid/bootstrap3"
+ xmlns:c="http://isis.apache.org/applib/layout/component"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+ ...
+</bs3:grid>
+----
+
+Most IDEs will automatically download the XSD schemas from the specified schema locations, thereby providing
+"intellisense" help as you edit the file.
+
+
+=== Rows, full-width cols, and tabs
+
+The example layout consists of three rows: a row for the object/icon, a row containing a properties, and a row containing collections. In all three cases the row contains a single column spanning the full width of the page. For the property and collection rows, the column contains a tab group.
+
+This corresponds to the following XML:
+
+[source,xml]
+----
+ <bs3:row>
+ <bs3:col span="12" unreferencedActions="true">
+ <c:domainObject bookmarking="AS_ROOT"/>
+ </bs3:col>
+ </bs3:row>
+ <bs3:row>
+ <bs3:col span="12">
+ <bs3:tabGroup>
+ <bs3:tab name="Properties">...</bs3:tab>
+ <bs3:tab name="Other">...</bs3:tab>
+ <bs3:tab name="Metadata">...</bs3:tab>
+ </bs3:tabGroup>
+ </bs3:col>
+ </bs3:row>
+ <bs3:row>
+ <bs3:col span="12">
+ <bs3:tabGroup unreferencedCollections="true">
+ <bs3:tab name="Similar to">...</bs3:tab>
+ <bs3:tab name="Dependencies">...</bs3:tab>
+ </bs3:tabGroup>
+ </bs3:col>
+ </bs3:row>
+----
+
+
+You will notice that one of the ``col``umns has an ``unreferencedActions`` attribute, while one of the ``tabGroup``s has a similar ``unreferencedCollections`` attribute. This topic is discussed in more detail xref:ugfun.adoc#__ugvw_layout_dynamic_xml-unreferenced[below].
+
+
+
+=== Fieldsets
+
+The first tab containing properties is divided into two columns, each of which holds a single fieldset of multiple properties. Those properties in turn can have associated actions.
+
+This corresponds to the following XML:
+
+[source,xml]
+----
+ <bs3:tab name="Properties">
+ <bs3:row>
+ <bs3:col span="6">
+ <c:fieldSet name="General" id="general" unreferencedProperties="true">
+ <c:action id="duplicate" position="PANEL_DROPDOWN"/>
+ <c:action id="delete"/>
+ <c:property id="description"/>
+ <c:property id="category"/>
+ <c:property id="subcategory">
+ <c:action id="updateCategory"/>
+ <c:action id="analyseCategory" position="RIGHT"/>
+ </c:property>
+ <c:property id="complete">
+ <c:action id="completed" cssClassFa="fa-thumbs-up"/>
+ <c:action id="notYetCompleted" cssClassFa="fa-thumbs-down"/>
+ </c:property>
+ </c:fieldSet>
+ </bs3:col>
+ <bs3:col span="6">
+ ...
+ </bs3:col>
+ </bs3:row>
+ </bs3:tab>
+----
+
+The tab defines two columns, each span of 6 (meaning half the width of the page).
+
+In the first column there is a single fieldset. Notice how actions - such as `duplicate` and `delete` - can be associated with this fieldset directly, meaning that they should be rendered on the fieldset's top panel.
+
+Thereafter the fieldset lists the properties in order. Actions can be associated with properties too; here they are rendered underneath or to the right of the field.
+
+Note also the `unreferencedProperties` attribute for the fieldset; this topic is discussed in more detail xref:ugfun.adoc#__ugvw_layout_dynamic_xml-unreferenced[below].
+
+
+=== Collections
+
+In the final row the collections are placed in tabs, simply one collection per tab. This corresponds to the following XML:
+
+[source,xml]
+----
+ <bs3:tab name="Similar to">
+ <bs3:row>
+ <bs3:col span="12">
+ <c:collection defaultView="table" id="similarTo"/>
+ </bs3:col>
+ </bs3:row>
+ </bs3:tab>
+ <bs3:tab name="Dependencies">
+ <bs3:row>
+ <bs3:col span="12">
+ <c:collection defaultView="table" id="dependencies">
+ <c:action id="add"/>
+ <c:action id="remove"/>
+ </c:collection>
+ </bs3:col>
+ </bs3:row>
+ </bs3:tab>
+----
+
+As with properties, actions can be associated with collections; this indicates that they should be rendered in the collection's header.
+
+
+
+[[__ugvw_layout_dynamic_xml-unreferenced]]
+== Unreferenced Members
+
+As noted in the preceding discussion, several of the grid's regions have either an ``unreferencedActions``, ``unreferencedCollections`` or ``unreferencedProperties`` attribute.
+
+The rules are:
+
+* `unreferencedActions` attribute can be specified either on a column or on a fieldset. +
++
+It would normally be typical to use the column holding the `<domainObject/>` icon/title, that is as shown in the example. The unreferenced actions then appear as top-level actions for the domain object.
+
+* `unreferencedCollections` attribute can be specified either on a column or on a tabgroup. +
++
+If specified on a column, then that column will contain each of the unreferenced collections, stacked one on top of the other. If specified on a tab group, then a separate tab will be created for each collection, with that tab containing only that single collection.
+
+* `unreferencedProperties` attribute can be specified only on a fieldset.
+
+The purpose of these attributes is to indicate where in the layout any unreferenced members should be rendered. Every grid _must_ nominate one region for each of these three member types, the reason being that to ensure that the layout can be used even if it is incomplete with respect to the object members inferred from the Java source code. This might be because the developer forgot to update the layout, or it might be because of a new mixin (property, collection or action) contributed to many objects.
+
+
+The framework ensures that in any given grid exactly one region is specified for each of the three `unreferenced...` attributes. If the grid fails this validation, then a warning message will be displayed, and the invalid XML logged. The layout XML will then be ignored.
+
+
+
+== More advanced features
+
+This section decribes a number of more features useful in more complex layouts.
+
+
+=== Multiple references to a feature
+
+One feature worth being aware of is that it is possible to render a single feature more than once.
+
+For example, the dashboard home page for the (non-ASF) http://github.com/isisaddons/isis-app-todoapp[Isis addons' todoapp] shows
+the "not yet complete" collection of todo items twice, once as a table and also as a calendar:
+
+image::{_imagesdir}layout-dynamic-xml/ToDoAppDashboard.png[width="940px",link="{_imagesdir}layout-dynamic-xml/ToDoAppDashboard.png"]
+
+
+This is accomplished using the following (slightly abbreviated) layout:
+
+[source,xml]
+----
+<grid ...>
+ <row>
+ <col span="2" unreferencedActions="true">
+ ...
+ </col>
+ <col span="5" unreferencedCollections="true" cssClass="custom-padding-top-20">
+ <ns2:collection id="notYetComplete" defaultView="calendar"/> <!--1-->
+ </col>
+ <col span="5" cssClass="custom-padding-top-20">
+ <ns2:collection id="notYetComplete" defaultView="table" paged="5"/> <!--2-->
+ <ns2:collection id="complete" defaultView="table"/>
+ </col>
+ <col span="0">
+ <ns2:fieldSet name="General" id="general" unreferencedProperties="true"/>
+ </col>
+ </row>
+</grid>
+----
+<1> render the collection in "calendar" view
+<2> also render the collection in "table" view
+
+In the middle column the `notYetComplete` collection is rendered in "calendar" view, while in the right-most column
+it is rendered in "table" view.
+
+
+It is also possible to reference object properties and actions more than once. This might be useful for a complex
+domain object with multiple tabs; certain properties or actions might appear on a summary tab (that shows the
+most commonly used info), but also on detail tabs.
+
+=== Custom CSS
+
+The ToDoApp's dashboard (above) also shows how custom CSS styles can be associated with specific regions of the layout:
+
+[source,xml]
+----
+<grid ...>
+ <row>
+ <col span="2" unreferencedActions="true">
+ <ns2:domainObject/>
+ <row>
+ <col span="12" cssClass="custom-width-100"> <!--1-->
+ <ns2:action id="exportToWordDoc"/>
+ </col>
+ </row>
+ ...
+ </col>
+ <col span="5" unreferencedCollections="true" cssClass="custom-padding-top-20"> <!--2-->
+ ...
+ </col>
+ <col span="5" cssClass="custom-padding-top-20"> <!--3-->
+ ...
+ </col>
+ </row>
+</grid>
+----
+<1> Render the column with the `custom-width-100` CSS class.
+<2> Render the column with the `custom-padding-top-20` CSS class.
+<3> Ditto
+
+For example the `custom-width-100` style is used to "stretch" the button for the `exportToWordDoc` action in the
+left-most column. This is accomplished with the following CSS in `application.css`:
+
+[source,css]
+----
+.custom-width-100 ul,
+.custom-width-100 ul li,
+.custom-width-100 ul li a.btn {
+ width: 100%;
+}
+----
+
+Similarly, the middle and right columns are rendered using the `custom-padding-top-20` CSS class. This shifts them down
+from the top of the page slightly, using the following CSS:
+
+[source,css]
+----
+.custom-padding-top-20 {
+ padding-top: 20px;
+}
+----
+
+
+
+
+== Migrating from earlier versions
+
+As noted earlier on, it is possible to download layout XML files using the xref:rgsvc.adoc#_rgsvc_api_LayoutService[`LayoutService`] (exposed on the prototyping menu); this will download a ZIP file of layout XML files for all domain entities and view models. Alternatively the layout XML for a single domain object can be downloaded using the xref:rgcms.adoc#_rgcms_classes_mixins_Object[mixin action] (contributed to every domain object).
+
+There are four "styles":
+
+* current
+* complete
+* normalized
+* minimal
+
+
+Ignorig the "current" style (which merely downloads the currently cached layout), the other three styles allow the
+developer to choose how much metadata is to be specified in the XML, and how much (if any) will be obtained
+elsewhere, either from annotations in the metamodel or from an earlier `.layout.json` file if present. The table
+below summarises the choices:
+
+.Table caption
+[cols="<.>,^.>,^.>,^.>", options="header"]
+|===
+
+| Style
+|xref:rgant.adoc#_rgant-MemberGroupLayout[`@MemberGroupLayout`]
+| xref:rgant.adoc#_rgant-MemberOrder[`@MemberOrder`]
+| xref:rgant.adoc#_rgant-ActionLayout[`@ActionLayout`], xref:rgant.adoc#_rgant-PropertyLayout[`@PropertyLayout`], xref:rgant.adoc#_rgant-CollectionLayout[`@CollectionLayout`]
+
+
+|`COMPLETE`
+|serialized as XML
+|serialized as XML
+|serialized as XML
+
+
+|`NORMALIZED`
+|serialized as XML
+|serialized as XML
+|not in the XML
+
+
+|`MINIMAL`
+|serialized as XML
+|not in the XML
+|not in the XML
+
+|===
+
+As a developer, you therefore have a choice as to how you provide the metadata required for customised layouts:
+
+* if you want all layout metadata to be read from the `.layout.xml` file, then download the "complete" version, and copy the file alongside the domain class. You can then remove all `@MemberGroupLayout`, `@MemberOrder`, `@ActionLayout`, `@PropertyLayout` and `@CollectionLayout` annotations from the source code of the domain class.
+
+* if you want to use layout XML file to describe the grid (columns, tabs etc) and specify which object members are associated with those regions of the grid, then download the "normalized" version. You can then remove the `@MemberGroupLayout` and `@MemberOrder` annotations from the source code of the domain class, but retain the `@ActionLayout`, `@PropertyLayout` and `@CollectionLayout` annotations.
+
+* if you want to use layout XML file ONLY to describe the grid, then download the "minimal" version. The grid regions will be empty in this version, and the framework will use the `@MemberOrder` annotation to bind object members to those regions. The only annotation that can be safely removed from the source code with this style is the `@MemberGroupLayout` annotation.
+
+
+Download either for a single domain object, or download all domain objects (entities and view models).
+
+
+== Domain Services
+
+For more information about layouts, see:
+
+* xref:rgsvc.adoc#_rgsvc_api_LayoutService[`LayoutService`] (whose functionality is exposed on the prototyping menu as an action) and lso the a xref:rgcms .adoc#_rgcms_classes_mixins_Object[mixin action]
+
+* xref:rgsvc.adoc#_rgsvc_spi_GridService[`GridService`] and its supporting services, xref:rgsvc.adoc#_rgsvc_spi_GridLoaderService[`GridLoaderService`] and xref:rgsvc.adoc#_rgsvc_spi_GridSystemService[`GridSystemService`]
+
+* xref:rgcms.adoc#_rgcms_classes_layout[grid layout classes], defined in the Apache Isis applib
+
+
+
+
+== Required updates to the dom project's pom.xml
+
+Any `.layout.xml` files must be compiled and available in the classpath. Ensure the following is defined in the dom project's `pom.xml`:
+
+[source.xml]
+----
+<resources>
+ <resource>
+ <filtering>false</filtering>
+ <directory>src/main/resources</directory>
+ </resource>
+ <resource>
+ <filtering>false</filtering>
+ <directory>src/main/java</directory>
+ <includes>
+ <include>**</include>
+ </includes>
+ <excludes>
+ <exclude>**/*.java</exclude>
+ </excludes>
+ </resource>
+</resources>
+----
+
+If using an Apache Isis xref:ugfun.adoc#_ugfun_getting-started_simpleapp-archetype[SimpleApp archetype], then the POM is already correctly configured.
http://git-wip-us.apache.org/repos/asf/isis/blob/8f18b6f0/adocs/documentation/src/main/asciidoc/guides/ugvw/_ugvw_layout_static-vs-dynamic.adoc
----------------------------------------------------------------------
diff --git a/adocs/documentation/src/main/asciidoc/guides/ugvw/_ugvw_layout_static-vs-dynamic.adoc b/adocs/documentation/src/main/asciidoc/guides/ugvw/_ugvw_layout_static-vs-dynamic.adoc
new file mode 100644
index 0000000..3ef16d6
--- /dev/null
+++ b/adocs/documentation/src/main/asciidoc/guides/ugvw/_ugvw_layout_static-vs-dynamic.adoc
@@ -0,0 +1,26 @@
+[[_ugvw_layout_static-vs-dynamic]]
+= Static vs Dynamic Layouts
+: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 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.
+:_basedir: ../../
+:_imagesdir: images/
+
+
+
+
+Using xref:ugvw.adoc#_ugvw_layout_dynamic[dynamic object layout]s using JSON has the huge benefit that the layout can be updated without requiring a recompile of the code and redeploy of the app. Many developers also find it easier to rationalize about layout when all the hints are collated together in a single place (rather than scattered across the class members as annotations).
+
+Another benefit of dynamic layout is that UI hints can be provided for xref:ugfun.adoc#_ugfun_how-tos_contributed-members[contributed associations and actions] that are synthesised at runtime.
+
+The main downsides of using dynamic layouts are a lack of typesafety (a typo will result in the metadata not being picked up for the element) and syntactic fragility (an invalid JSON document will result in no metadata for the entire class).
+
+Also, dynamic layouts have no notion of inheritance, whereas the dewey-decimal format `@MemberOrder` annotation allows the metadata of the subclass its superclasses to fit together relatively seamlessly.
+
+
+
+== Best of both worlds?
+
+Using the (non-ASF) link:http://github.com/isisaddons/isis-jrebel-plugin[Isis addons' jrebel] plugin comes close to getting the best of both words: metadata is specified in a type-safe way using annotations, but can be reloaded automatically.
+
+The downsides are licensing cost, and also the fact that metadata for contributed actions in the contributee class cannot be specified.
+
+Another open source alternative that you might also like to explore is DCEVM; there's a good write-up on the link:http://blog.jetbrains.com/idea/2013/07/get-true-hot-swap-in-java-with-dcevm-and-intellij-idea/[IntelliJ blog].
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/isis/blob/8f18b6f0/adocs/documentation/src/main/asciidoc/guides/ugvw/_ugvw_layout_static.adoc
----------------------------------------------------------------------
diff --git a/adocs/documentation/src/main/asciidoc/guides/ugvw/_ugvw_layout_static.adoc b/adocs/documentation/src/main/asciidoc/guides/ugvw/_ugvw_layout_static.adoc
new file mode 100644
index 0000000..c5807fa
--- /dev/null
+++ b/adocs/documentation/src/main/asciidoc/guides/ugvw/_ugvw_layout_static.adoc
@@ -0,0 +1,178 @@
+[[_ugvw_layout_static]]
+= Static Object Layout
+: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 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.
+:_basedir: ../../
+:_imagesdir: images/
+
+
+Metadata providing UI hints can be specified either statically, using annotations, or dynamically, using either a xref:ugvw.adoc#_ugvw_layout_dynamic_xml[`layout.xml`] file or a xref:ugvw.adoc#_ugvw_layout_dynamic[`.layout.json`] file.
+
+This section describes the static approach, using annotations.
+
+[NOTE]
+====
+Tabs and tabgroups are only supported using xref:ugvw.adoc#_ugvw_layout_dynamic_xml[`layout.xml`] files; they are not supported by annotations.
+====
+
+
+
+== `@MemberOrder`
+
+The xref:rgant.adoc#_rgant-MemberOrder[`@MemberOrder`] annotation is used to specify the relative order of domain class properties, collections and actions.
+
+The annotation defines two attributes, xref:rgant.adoc#_rgant-MemberOrder_name[`name()`] and xref:rgant.adoc#_rgant-MemberOrder_sequence[`sequence()`]. Their usage depends on the member type:
+
+* for properties, the `name()` is used to group properties together into a member group (also called a property group
+or a fieldset. The `sequence()` then orders properties within these groups. If no `name()` is specified then the
+property is placed in a fallback "General" group, called "General". +
++
+The name of these member groups/fieldsets are then referenced by xref:rgant.adoc#_rgant-MemberGroupLayout[`@MemberGroupLayout`].
+
+* for collections, the `name()` attribute is (currently) unused. The `sequence()` orders collections relative to one another
+
+* for actions, the `name()` attribute associates an action with either a property or with a collection. +
+
+** If the `name()` attribute matches a property name, then the action's button is rendered close to the property, according to xref:rgant.adoc#_rgant-ActionLayout_position[`@ActionLayout#position()`] attribute. +
+
+** On the other hand if the `name() attribute matches a collection name, then the action's button is rendered on the collection's header.
+
+** If there is no `name()` value, then the action is considered to pertain to the object as a whole, and its button is rendered close to the object's icon and title.
+
+Within any of these, the `sequence()` then determines the relative ordering of the action with respect to other actions that have been similarly associated with properties/collections or left as "free-standing".
+
+
+
+For example:
+
+[source,java]
+----
+public class ToDoItem {
+ @MemberOrder(sequence="1")
+ public String getDescription() { ... }
+ @MemberOrder(sequence="2")
+ public String getCategory() { ... }
+ @MemberOrder(sequence="3")
+ public boolean isComplete() { ... }
+ @MemberOrder(name="Detail", sequence="1")
+ public LocalDate getDueBy() { ... }
+ @MemberOrder(name="Detail", sequence="2")
+ public BigDecimal getCost() { ... }
+ @MemberOrder(name="Detail", sequence="4")
+ public String getNotes() { ... }
+ @MemberOrder(name="Misc", sequence="99")
+ public Long getVersionSequence() { ... }
+ ...
+}
+----
+
+This defines three property (or member) groups, "General", "Detail" and "Misc"; "General" is the default if no `name` attribute is specified. Properties in the same member group are rendered together, as a fieldset.
+
+In addition, actions can optionally be associated (rendered close to) either properties or actions. This is done by overloading the ``@MemberOrder``'s xref:rgant.adoc#_rgant-MemberOrder_name[`name()`] attribute, holding the value of the property or collection.
+
+For example:
+
+[source,java]
+----
+public class ToDoItem {
+ @MemberOrder(sequence="3")
+ public boolean isComplete() { ... }
+ @MemberOrder(name="complete", sequence="1")
+ public ToDoItem completed() { ...}
+ @MemberOrder(name="complete", sequence="2")
+ public ToDoItem notYetCompleted() { ...}
+
+ @MemberOrder(sequence="1")
+ public SortedSet<ToDoItem> getDependencies() { ... }
+ @MemberOrder(name="dependencies", sequence="1")
+ public ToDoItem add(ToDoItem t) { ...}
+ @MemberOrder(name="dependencies", sequence="2")
+ public ToDoItem remove(ToDoItem t) { ...}
+ ...
+}
+----
+
+will associate the `completed()` and `notYetCompleted()` actions with the `complete` property, and will associate the `add()` and `remove()` actions with the `dependencies` collection.
+
+
+The value of xref:rgant.adoc#_rgant-MemberOrder_sequence[`sequence()`] is a string. The simplest convention (as shown in the example above) is to use numbers -- 1, 2, 3 -- though it is a better idea to leave gaps in the numbers -- 10, 20, 30 perhaps -- such that a new member may be added without having to edit existing numbers.
+
+Even better is to adopt the 'dewey-decimal' notation -- 1, 1.1, 1.2, 2, 3, 5.1.1, 5.2.2, 5.2, 5.3 -- which allows for an indefinite amount of future insertion. It also allows subclasses to insert their class members as required.
+
+
+
+
+== `@MemberGroupLayout`
+
+The xref:rgant.adoc#_rgant-MemberGroupLayout[`@MemberGroupLayout`] annotation specifies the relative positioning of property groups/fieldsets as being either in a left column, a middle column or in a right column. The annotation also specifies the relative width of the columns.
+
+The property groups/fieldsets in this case are those that are inferred from the `@MemberOrder#name()` attribute.
+
+[TIP]
+====
+It is also possible to combine `@MemberOrder` with dynamic layouts, either using xref:ugvw.adoc#_ugvw_layout_xml[XML] or xref:ugvw.adoc#_ugvw_layout_dynamic[JSON]. The layout file defines only the regions of a grid structure (fieldsets/columns etc), but does __not__ specify the properties/collections/actions within those grid regions. The `@MemberOrder` annotation in effect "binds" the properties or collections to those regions of the grid.
+
+When dynamic layouts are used this way, the xref:rgant.adoc#_rgant-MemberGroupLayout[`@MemberGroupLayout`] annotation is essentially ignored, but the metadata from the xref:rgant.adoc#_rgant-MemberOrder[`@MemberOrder`] annotation (and the other layout annotations, xref:rgant.adoc#_rgant-ActionLayout[`@ActionLayout`], xref:rgant.adoc#_rgant-PropertyLayout[`@PropertyLayout`] and xref:rgant.adoc#_rgant-CollectionLayout[`@CollectionLayout`]) are all still honoured.
+====
+
+For example:
+
+[source,java]
+----
+@MemberGroupLayout(
+ columnSpans={3,3,0,6},
+ left={"General", "Misc"},
+ middle="Detail"
+ )
+public class ToDoItem {
+ ...
+}
+----
+
+Four values are given in the `columnSpans` attribute. The first three are the relative widths of the three columns of property groups. The fourth, meanwhile, indicates the width of a final column that holds all the collections of the object.
+
+The values of these spans are taken as proportions of 12 virtual columns across the page (this taken from the link:http://getbootstrap.com/2.3.2/[Bootstrap] library).
+
+For example:
+
+* `{3,3,0,6}` indicates:
+** a left column of properties taking up 25% of the width
+** a middle column of properties taking up 25% of the width
+** a right column of collections taking up 50% of the width
+* `{2,6,0,4}` indicates:
+** a left column of properties taking up ~16% of the width
+** a middle column of properties taking up 50% of the width
+** a right column of collections taking up ~33% of the width
+* `{2,3,3,4}` indicates:
+** a left column of properties taking up ~16% of the width
+** a middle column of properties taking up 25% of the width
+** a right column of properties taking up 25% of the width
+** a far right column of collections taking up ~33% of the width
+
+If the sum of all the columns exceeds 12, then the collections are placed underneath the properties, taking up the full span. For example:
+
+* {4,4,4,12} indicates:
+** a left column of properties taking up ~33% of the width
+** a middle column of properties taking up ~33% of the width
+** a right column of properties taking up ~33% of the width
+** the collections underneath the property columns, taking up the full width
+
+== Example Layouts
+
+Below are sketches for the layout of the https://github.com/apache/isis/blob/f38fdb92941172eabb12e0943509f239e6d5925f/example/application/quickstart_wicket_restful_jdo/dom/src/main/java/dom/todo/ToDoItem.java[ToDoItem] class of the Isis addons example https://github.com/isisaddons/isis-app-todoapp/[todoapp] (not ASF):
+
+The first divides the properties into two equal sized columns (6-6-0) and puts the collections underneath (12):
+
+image::{_imagesdir}reference-layout/6-6-0-12.png[width="720px",link="{_imagesdir}reference-layout/6-6-0-12.png"]
+
+The next divides the collections into three equal sized columns (4-4-4) and again puts the collections underneath (12):
+
+image::{_imagesdir}reference-layout/4-4-4-12.png[width="720px",link="{_imagesdir}reference-layout/4-4-4-12.png"]
+
+The last puts the properties into a single column (4-0) and places the collections into the other larger column (8-0):
+
+image::{_imagesdir}reference-layout/4-0-8-0.png[width="720px",link="{_imagesdir}reference-layout/4-0-8-0.png"]
+
+
+== Other Annotations
+
+As of 1.8.0, all the layout annotations have been consolidated into the various `XxxLayout` annotations: xref:rgant.adoc#_rgant-ActionLayout, [`@ActionLayout`] xref:rgant.adoc#_rgant-CollectionLayout[`@CollectionLayout`], xref:rgant.adoc#_rgant-DomainObjectLayout[`@DomainObjectLayout`], xref:rgant.adoc#_rgant-DomainServiceLayout[`@DomainServiceLayout`], xref:rgant.adoc#_rgant-ParameterLayout[`@ParameterLayout`], xref:rgant.adoc#_rgant-PropertyLayout[`@PropertyLayout`], and xref:rgant.adoc#_rgant-ViewModelLayout[`@ViewModelLayout`]
http://git-wip-us.apache.org/repos/asf/isis/blob/8f18b6f0/adocs/documentation/src/main/asciidoc/guides/ugvw/_ugvw_request-parameters.adoc
----------------------------------------------------------------------
diff --git a/adocs/documentation/src/main/asciidoc/guides/ugvw/_ugvw_request-parameters.adoc b/adocs/documentation/src/main/asciidoc/guides/ugvw/_ugvw_request-parameters.adoc
index 94798bc..cc358cc 100644
--- a/adocs/documentation/src/main/asciidoc/guides/ugvw/_ugvw_request-parameters.adoc
+++ b/adocs/documentation/src/main/asciidoc/guides/ugvw/_ugvw_request-parameters.adoc
@@ -17,12 +17,12 @@ Currently this support consists simply of being able to suppress the header and/
For example, the regular view is:
-image::{_imagesdir}wicket-viewer/embedded-view/regular.png[width="720px",link="{_imagesdir}wicket-viewer/embedded-view/regular.png"]
+image::{_imagesdir}embedded-view/regular.png[width="720px",link="{_imagesdir}embedded-view/regular.png"]
With the header and footer both suppressed only the main content is shown:
-image::{_imagesdir}wicket-viewer/embedded-view/no-header-no-footer.png[width="720px",link="{_imagesdir}wicket-viewer/embedded-view/no-header-no-footer.png"]
+image::{_imagesdir}embedded-view/no-header-no-footer.png[width="720px",link="{_imagesdir}embedded-view/no-header-no-footer.png"]
It is also possible to suppress just the header, or just the footer.
http://git-wip-us.apache.org/repos/asf/isis/blob/8f18b6f0/adocs/documentation/src/main/asciidoc/guides/ugvw/images/about-page/about-page.png
----------------------------------------------------------------------
diff --git a/adocs/documentation/src/main/asciidoc/guides/ugvw/images/about-page/about-page.png b/adocs/documentation/src/main/asciidoc/guides/ugvw/images/about-page/about-page.png
new file mode 100644
index 0000000..ae5dfc8
Binary files /dev/null and b/adocs/documentation/src/main/asciidoc/guides/ugvw/images/about-page/about-page.png differ
http://git-wip-us.apache.org/repos/asf/isis/blob/8f18b6f0/adocs/documentation/src/main/asciidoc/guides/ugvw/images/application-menu/dividers.png
----------------------------------------------------------------------
diff --git a/adocs/documentation/src/main/asciidoc/guides/ugvw/images/application-menu/dividers.png b/adocs/documentation/src/main/asciidoc/guides/ugvw/images/application-menu/dividers.png
new file mode 100644
index 0000000..dcb415d
Binary files /dev/null and b/adocs/documentation/src/main/asciidoc/guides/ugvw/images/application-menu/dividers.png differ
http://git-wip-us.apache.org/repos/asf/isis/blob/8f18b6f0/adocs/documentation/src/main/asciidoc/guides/ugvw/images/application-menu/layout-menus.pdn
----------------------------------------------------------------------
diff --git a/adocs/documentation/src/main/asciidoc/guides/ugvw/images/application-menu/layout-menus.pdn b/adocs/documentation/src/main/asciidoc/guides/ugvw/images/application-menu/layout-menus.pdn
new file mode 100644
index 0000000..01453f7
Binary files /dev/null and b/adocs/documentation/src/main/asciidoc/guides/ugvw/images/application-menu/layout-menus.pdn differ
http://git-wip-us.apache.org/repos/asf/isis/blob/8f18b6f0/adocs/documentation/src/main/asciidoc/guides/ugvw/images/application-menu/layout-menus.png
----------------------------------------------------------------------
diff --git a/adocs/documentation/src/main/asciidoc/guides/ugvw/images/application-menu/layout-menus.png b/adocs/documentation/src/main/asciidoc/guides/ugvw/images/application-menu/layout-menus.png
new file mode 100644
index 0000000..0bc73d1
Binary files /dev/null and b/adocs/documentation/src/main/asciidoc/guides/ugvw/images/application-menu/layout-menus.png differ
http://git-wip-us.apache.org/repos/asf/isis/blob/8f18b6f0/adocs/documentation/src/main/asciidoc/guides/ugvw/images/application-menu/tertiary.png
----------------------------------------------------------------------
diff --git a/adocs/documentation/src/main/asciidoc/guides/ugvw/images/application-menu/tertiary.png b/adocs/documentation/src/main/asciidoc/guides/ugvw/images/application-menu/tertiary.png
new file mode 100644
index 0000000..f2d2281
Binary files /dev/null and b/adocs/documentation/src/main/asciidoc/guides/ugvw/images/application-menu/tertiary.png differ
http://git-wip-us.apache.org/repos/asf/isis/blob/8f18b6f0/adocs/documentation/src/main/asciidoc/guides/ugvw/images/blob-attachments/010-attachment-field-940.png
----------------------------------------------------------------------
diff --git a/adocs/documentation/src/main/asciidoc/guides/ugvw/images/blob-attachments/010-attachment-field-940.png b/adocs/documentation/src/main/asciidoc/guides/ugvw/images/blob-attachments/010-attachment-field-940.png
new file mode 100644
index 0000000..96cbb31
Binary files /dev/null and b/adocs/documentation/src/main/asciidoc/guides/ugvw/images/blob-attachments/010-attachment-field-940.png differ
http://git-wip-us.apache.org/repos/asf/isis/blob/8f18b6f0/adocs/documentation/src/main/asciidoc/guides/ugvw/images/blob-attachments/010-attachment-field.png
----------------------------------------------------------------------
diff --git a/adocs/documentation/src/main/asciidoc/guides/ugvw/images/blob-attachments/010-attachment-field.png b/adocs/documentation/src/main/asciidoc/guides/ugvw/images/blob-attachments/010-attachment-field.png
new file mode 100644
index 0000000..013f6e2
Binary files /dev/null and b/adocs/documentation/src/main/asciidoc/guides/ugvw/images/blob-attachments/010-attachment-field.png differ
http://git-wip-us.apache.org/repos/asf/isis/blob/8f18b6f0/adocs/documentation/src/main/asciidoc/guides/ugvw/images/blob-attachments/020-edit-choose-file-940.png
----------------------------------------------------------------------
diff --git a/adocs/documentation/src/main/asciidoc/guides/ugvw/images/blob-attachments/020-edit-choose-file-940.png b/adocs/documentation/src/main/asciidoc/guides/ugvw/images/blob-attachments/020-edit-choose-file-940.png
new file mode 100644
index 0000000..7f90bea
Binary files /dev/null and b/adocs/documentation/src/main/asciidoc/guides/ugvw/images/blob-attachments/020-edit-choose-file-940.png differ
http://git-wip-us.apache.org/repos/asf/isis/blob/8f18b6f0/adocs/documentation/src/main/asciidoc/guides/ugvw/images/blob-attachments/020-edit-choose-file.png
----------------------------------------------------------------------
diff --git a/adocs/documentation/src/main/asciidoc/guides/ugvw/images/blob-attachments/020-edit-choose-file.png b/adocs/documentation/src/main/asciidoc/guides/ugvw/images/blob-attachments/020-edit-choose-file.png
new file mode 100644
index 0000000..a7e3dc4
Binary files /dev/null and b/adocs/documentation/src/main/asciidoc/guides/ugvw/images/blob-attachments/020-edit-choose-file.png differ
http://git-wip-us.apache.org/repos/asf/isis/blob/8f18b6f0/adocs/documentation/src/main/asciidoc/guides/ugvw/images/blob-attachments/030-choose-file-using-browser-520.png
----------------------------------------------------------------------
diff --git a/adocs/documentation/src/main/asciidoc/guides/ugvw/images/blob-attachments/030-choose-file-using-browser-520.png b/adocs/documentation/src/main/asciidoc/guides/ugvw/images/blob-attachments/030-choose-file-using-browser-520.png
new file mode 100644
index 0000000..6a32d1b
Binary files /dev/null and b/adocs/documentation/src/main/asciidoc/guides/ugvw/images/blob-attachments/030-choose-file-using-browser-520.png differ
http://git-wip-us.apache.org/repos/asf/isis/blob/8f18b6f0/adocs/documentation/src/main/asciidoc/guides/ugvw/images/blob-attachments/030-choose-file-using-browser.png
----------------------------------------------------------------------
diff --git a/adocs/documentation/src/main/asciidoc/guides/ugvw/images/blob-attachments/030-choose-file-using-browser.png b/adocs/documentation/src/main/asciidoc/guides/ugvw/images/blob-attachments/030-choose-file-using-browser.png
new file mode 100644
index 0000000..700c325
Binary files /dev/null and b/adocs/documentation/src/main/asciidoc/guides/ugvw/images/blob-attachments/030-choose-file-using-browser.png differ
http://git-wip-us.apache.org/repos/asf/isis/blob/8f18b6f0/adocs/documentation/src/main/asciidoc/guides/ugvw/images/blob-attachments/040-edit-chosen-file-indicated-940.png
----------------------------------------------------------------------
diff --git a/adocs/documentation/src/main/asciidoc/guides/ugvw/images/blob-attachments/040-edit-chosen-file-indicated-940.png b/adocs/documentation/src/main/asciidoc/guides/ugvw/images/blob-attachments/040-edit-chosen-file-indicated-940.png
new file mode 100644
index 0000000..d6bc924
Binary files /dev/null and b/adocs/documentation/src/main/asciidoc/guides/ugvw/images/blob-attachments/040-edit-chosen-file-indicated-940.png differ
http://git-wip-us.apache.org/repos/asf/isis/blob/8f18b6f0/adocs/documentation/src/main/asciidoc/guides/ugvw/images/blob-attachments/040-edit-chosen-file-indicated.png
----------------------------------------------------------------------
diff --git a/adocs/documentation/src/main/asciidoc/guides/ugvw/images/blob-attachments/040-edit-chosen-file-indicated.png b/adocs/documentation/src/main/asciidoc/guides/ugvw/images/blob-attachments/040-edit-chosen-file-indicated.png
new file mode 100644
index 0000000..60ea5b3
Binary files /dev/null and b/adocs/documentation/src/main/asciidoc/guides/ugvw/images/blob-attachments/040-edit-chosen-file-indicated.png differ
http://git-wip-us.apache.org/repos/asf/isis/blob/8f18b6f0/adocs/documentation/src/main/asciidoc/guides/ugvw/images/blob-attachments/050-ok-if-image-then-rendered-940.png
----------------------------------------------------------------------
diff --git a/adocs/documentation/src/main/asciidoc/guides/ugvw/images/blob-attachments/050-ok-if-image-then-rendered-940.png b/adocs/documentation/src/main/asciidoc/guides/ugvw/images/blob-attachments/050-ok-if-image-then-rendered-940.png
new file mode 100644
index 0000000..302bbbc
Binary files /dev/null and b/adocs/documentation/src/main/asciidoc/guides/ugvw/images/blob-attachments/050-ok-if-image-then-rendered-940.png differ
http://git-wip-us.apache.org/repos/asf/isis/blob/8f18b6f0/adocs/documentation/src/main/asciidoc/guides/ugvw/images/blob-attachments/050-ok-if-image-then-rendered.png
----------------------------------------------------------------------
diff --git a/adocs/documentation/src/main/asciidoc/guides/ugvw/images/blob-attachments/050-ok-if-image-then-rendered.png b/adocs/documentation/src/main/asciidoc/guides/ugvw/images/blob-attachments/050-ok-if-image-then-rendered.png
new file mode 100644
index 0000000..50799b2
Binary files /dev/null and b/adocs/documentation/src/main/asciidoc/guides/ugvw/images/blob-attachments/050-ok-if-image-then-rendered.png differ
http://git-wip-us.apache.org/repos/asf/isis/blob/8f18b6f0/adocs/documentation/src/main/asciidoc/guides/ugvw/images/blob-attachments/060-download-940.png
----------------------------------------------------------------------
diff --git a/adocs/documentation/src/main/asciidoc/guides/ugvw/images/blob-attachments/060-download-940.png b/adocs/documentation/src/main/asciidoc/guides/ugvw/images/blob-attachments/060-download-940.png
new file mode 100644
index 0000000..41b4b27
Binary files /dev/null and b/adocs/documentation/src/main/asciidoc/guides/ugvw/images/blob-attachments/060-download-940.png differ
http://git-wip-us.apache.org/repos/asf/isis/blob/8f18b6f0/adocs/documentation/src/main/asciidoc/guides/ugvw/images/blob-attachments/060-download.png
----------------------------------------------------------------------
diff --git a/adocs/documentation/src/main/asciidoc/guides/ugvw/images/blob-attachments/060-download.png b/adocs/documentation/src/main/asciidoc/guides/ugvw/images/blob-attachments/060-download.png
new file mode 100644
index 0000000..f726d0d
Binary files /dev/null and b/adocs/documentation/src/main/asciidoc/guides/ugvw/images/blob-attachments/060-download.png differ
http://git-wip-us.apache.org/repos/asf/isis/blob/8f18b6f0/adocs/documentation/src/main/asciidoc/guides/ugvw/images/blob-attachments/070-edit-clear-940.png
----------------------------------------------------------------------
diff --git a/adocs/documentation/src/main/asciidoc/guides/ugvw/images/blob-attachments/070-edit-clear-940.png b/adocs/documentation/src/main/asciidoc/guides/ugvw/images/blob-attachments/070-edit-clear-940.png
new file mode 100644
index 0000000..0eae54e
Binary files /dev/null and b/adocs/documentation/src/main/asciidoc/guides/ugvw/images/blob-attachments/070-edit-clear-940.png differ
http://git-wip-us.apache.org/repos/asf/isis/blob/8f18b6f0/adocs/documentation/src/main/asciidoc/guides/ugvw/images/blob-attachments/070-edit-clear.png
----------------------------------------------------------------------
diff --git a/adocs/documentation/src/main/asciidoc/guides/ugvw/images/blob-attachments/070-edit-clear.png b/adocs/documentation/src/main/asciidoc/guides/ugvw/images/blob-attachments/070-edit-clear.png
new file mode 100644
index 0000000..57c2a24
Binary files /dev/null and b/adocs/documentation/src/main/asciidoc/guides/ugvw/images/blob-attachments/070-edit-clear.png differ
http://git-wip-us.apache.org/repos/asf/isis/blob/8f18b6f0/adocs/documentation/src/main/asciidoc/guides/ugvw/images/bookmarked-pages/panel-940.png
----------------------------------------------------------------------
diff --git a/adocs/documentation/src/main/asciidoc/guides/ugvw/images/bookmarked-pages/panel-940.png b/adocs/documentation/src/main/asciidoc/guides/ugvw/images/bookmarked-pages/panel-940.png
new file mode 100644
index 0000000..c572707
Binary files /dev/null and b/adocs/documentation/src/main/asciidoc/guides/ugvw/images/bookmarked-pages/panel-940.png differ
http://git-wip-us.apache.org/repos/asf/isis/blob/8f18b6f0/adocs/documentation/src/main/asciidoc/guides/ugvw/images/bookmarked-pages/panel-estatio-940.png
----------------------------------------------------------------------
diff --git a/adocs/documentation/src/main/asciidoc/guides/ugvw/images/bookmarked-pages/panel-estatio-940.png b/adocs/documentation/src/main/asciidoc/guides/ugvw/images/bookmarked-pages/panel-estatio-940.png
new file mode 100644
index 0000000..2fad852
Binary files /dev/null and b/adocs/documentation/src/main/asciidoc/guides/ugvw/images/bookmarked-pages/panel-estatio-940.png differ
http://git-wip-us.apache.org/repos/asf/isis/blob/8f18b6f0/adocs/documentation/src/main/asciidoc/guides/ugvw/images/bookmarked-pages/panel-estatio.png
----------------------------------------------------------------------
diff --git a/adocs/documentation/src/main/asciidoc/guides/ugvw/images/bookmarked-pages/panel-estatio.png b/adocs/documentation/src/main/asciidoc/guides/ugvw/images/bookmarked-pages/panel-estatio.png
new file mode 100644
index 0000000..0fa0cfa
Binary files /dev/null and b/adocs/documentation/src/main/asciidoc/guides/ugvw/images/bookmarked-pages/panel-estatio.png differ
http://git-wip-us.apache.org/repos/asf/isis/blob/8f18b6f0/adocs/documentation/src/main/asciidoc/guides/ugvw/images/bookmarked-pages/panel.png
----------------------------------------------------------------------
diff --git a/adocs/documentation/src/main/asciidoc/guides/ugvw/images/bookmarked-pages/panel.png b/adocs/documentation/src/main/asciidoc/guides/ugvw/images/bookmarked-pages/panel.png
new file mode 100644
index 0000000..b0d85f7
Binary files /dev/null and b/adocs/documentation/src/main/asciidoc/guides/ugvw/images/bookmarked-pages/panel.png differ
http://git-wip-us.apache.org/repos/asf/isis/blob/8f18b6f0/adocs/documentation/src/main/asciidoc/guides/ugvw/images/brand-logo/brand-logo-signin.png
----------------------------------------------------------------------
diff --git a/adocs/documentation/src/main/asciidoc/guides/ugvw/images/brand-logo/brand-logo-signin.png b/adocs/documentation/src/main/asciidoc/guides/ugvw/images/brand-logo/brand-logo-signin.png
new file mode 100644
index 0000000..92a022d
Binary files /dev/null and b/adocs/documentation/src/main/asciidoc/guides/ugvw/images/brand-logo/brand-logo-signin.png differ
[5/9] isis git commit: ISIS-1521: moves layout section from
fundamentals guide to wicket viewer guide.
Posted by da...@apache.org.
ISIS-1521: moves layout section from fundamentals guide to wicket viewer guide.
Also:
- simplified subdirs of ugvw/images a little
Project: http://git-wip-us.apache.org/repos/asf/isis/repo
Commit: http://git-wip-us.apache.org/repos/asf/isis/commit/8f18b6f0
Tree: http://git-wip-us.apache.org/repos/asf/isis/tree/8f18b6f0
Diff: http://git-wip-us.apache.org/repos/asf/isis/diff/8f18b6f0
Branch: refs/heads/master
Commit: 8f18b6f0491529f52cea44556a8c30a906c5def7
Parents: cc0eadb
Author: Dan Haywood <da...@haywood-associates.co.uk>
Authored: Fri Apr 14 08:31:13 2017 +0100
Committer: Dan Haywood <da...@haywood-associates.co.uk>
Committed: Fri Apr 14 08:31:13 2017 +0100
----------------------------------------------------------------------
.../guides/dg/_dg_asciidoc-templates.adoc | 4 +-
.../asciidoc/guides/dg/_dg_ide_intellij.adoc | 2 +-
.../guides/rgant/_rgant-ActionLayout.adoc | 2 +-
.../rgant/_rgant-ActionLayout_bookmarking.adoc | 2 +-
.../_rgant-ActionLayout_contributedAs.adoc | 2 +-
.../rgant/_rgant-ActionLayout_cssClass.adoc | 2 +-
.../rgant/_rgant-ActionLayout_cssClassFa.adoc | 2 +-
.../rgant/_rgant-ActionLayout_describedAs.adoc | 2 +-
.../rgant/_rgant-ActionLayout_hidden.adoc | 2 +-
.../guides/rgant/_rgant-ActionLayout_named.adoc | 2 +-
.../rgant/_rgant-ActionLayout_position.adoc | 2 +-
.../guides/rgant/_rgant-Action_hidden.adoc | 2 +-
.../guides/rgant/_rgant-CollectionLayout.adoc | 2 +-
.../rgant/_rgant-CollectionLayout_cssClass.adoc | 2 +-
.../_rgant-CollectionLayout_defaultView.adoc | 2 +-
.../_rgant-CollectionLayout_describedAs.adoc | 2 +-
.../rgant/_rgant-CollectionLayout_hidden.adoc | 2 +-
.../rgant/_rgant-CollectionLayout_named.adoc | 2 +-
.../rgant/_rgant-CollectionLayout_paged.adoc | 2 +-
.../rgant/_rgant-CollectionLayout_render.adoc | 2 +-
.../rgant/_rgant-CollectionLayout_sortedBy.adoc | 2 +-
.../guides/rgant/_rgant-Collection_hidden.adoc | 2 +-
.../guides/rgant/_rgant-DomainObjectLayout.adoc | 2 +-
.../rgant/_rgant-DomainServiceLayout.adoc | 4 +-
.../asciidoc/guides/rgant/_rgant-HomePage.adoc | 2 +-
.../guides/rgant/_rgant-MemberGroupLayout.adoc | 2 +-
.../guides/rgant/_rgant-MemberOrder.adoc | 2 +-
.../guides/rgant/_rgant-ParameterLayout.adoc | 2 +-
.../guides/rgant/_rgant-PropertyLayout.adoc | 2 +-
.../rgant/_rgant-PropertyLayout_cssClass.adoc | 2 +-
.../_rgant-PropertyLayout_describedAs.adoc | 2 +-
.../rgant/_rgant-PropertyLayout_hidden.adoc | 4 +-
.../_rgant-PropertyLayout_labelPosition.adoc | 2 +-
.../rgant/_rgant-PropertyLayout_multiLine.adoc | 2 +-
.../rgant/_rgant-PropertyLayout_named.adoc | 2 +-
...gant-PropertyLayout_renderedAsDayBefore.adoc | 2 +-
.../guides/rgant/_rgant-ViewModelLayout.adoc | 2 +-
.../guides/rgant/_rgant_aaa_deprecated.adoc | 6 +-
.../asciidoc/guides/rgant/_rgant_aaa_jee.adoc | 2 +-
.../asciidoc/guides/rgant/_rgant_aaa_main.adoc | 4 +-
.../asciidoc/guides/rgant/_rgant_aaa_other.adoc | 2 +-
.../guides/rgcfg/_rgcfg_configuring-core.adoc | 2 +-
.../asciidoc/guides/rgcms/_rgcms_classes.adoc | 2 +-
.../rgcms/_rgcms_classes_mixins_Object.adoc | 4 +-
.../main/asciidoc/guides/ugbtb/_ugbtb_i18n.adoc | 2 +-
...rogramming-model_layout-metadata-reader.adoc | 4 +-
.../_ugfun_core-concepts_building-blocks.adoc | 2 +-
.../ugfun/_ugfun_core-concepts_principles.adoc | 2 +-
...ow-tos_class-structure_class-definition.adoc | 2 +-
...fun_how-tos_class-structure_collections.adoc | 2 +-
...gfun_how-tos_class-structure_properties.adoc | 2 +-
...n_how-tos_ui-hints_action-icons-and-css.adoc | 2 +-
.../ugfun/_ugfun_how-tos_ui-hints_layout.adoc | 2 +-
.../guides/ugfun/_ugfun_object-layout.adoc | 19 -
.../_ugfun_object-layout_application-menu.adoc | 171 --------
.../ugfun/_ugfun_object-layout_dynamic.adoc | 151 -------
.../ugfun/_ugfun_object-layout_dynamic_xml.adoc | 400 ------------------
.../_ugfun_object-layout_static-vs-dynamic.adoc | 26 --
.../ugfun/_ugfun_object-layout_static.adoc | 178 --------
.../ugfun/images/reference-layout/4-0-8-0.png | Bin 20662 -> 0 bytes
.../ugfun/images/reference-layout/4-4-4-12.png | Bin 21012 -> 0 bytes
.../ugfun/images/reference-layout/6-6-0-12.png | Bin 21100 -> 0 bytes
.../isis-layout-show-facets.css | 3 -
.../images/reference-layout/isis-layout.css | 253 ------------
.../images/reference-layout/layout-4-0-8-0.html | 198 ---------
.../reference-layout/layout-4-4-4-12.html | 205 ----------
.../reference-layout/layout-6-6-0-12.html | 203 ----------
.../ToDoAppDashboard.png | Bin 124848 -> 0 bytes
.../ToDoItem.png | Bin 91690 -> 0 bytes
.../wicket-viewer/application-menu/dividers.png | Bin 22657 -> 0 bytes
.../application-menu/layout-menus.pdn | Bin 97348 -> 0 bytes
.../application-menu/layout-menus.png | Bin 50330 -> 0 bytes
.../wicket-viewer/application-menu/tertiary.png | Bin 11491 -> 0 bytes
.../src/main/asciidoc/guides/ugfun/ugfun.adoc | 4 +-
...ration-properties_showing-theme-chooser.adoc | 4 +-
...n-properties_suppressing-password-reset.adoc | 4 +-
...tion-properties_suppressing-remember-me.adoc | 4 +-
...guration-properties_suppressing-sign-up.adoc | 4 +-
.../ugvw/_ugvw_customisation_about-page.adoc | 2 +-
.../ugvw/_ugvw_customisation_brand-logo.adoc | 4 +-
...ugvw_customisation_tweaking-css-classes.adoc | 2 +-
.../ugvw/_ugvw_features_blob-attachments.adoc | 14 +-
.../ugvw/_ugvw_features_bookmarked-pages.adoc | 4 +-
.../ugvw/_ugvw_features_hints-and-copy-url.adoc | 10 +-
.../ugvw/_ugvw_features_recent-pages.adoc | 2 +-
.../ugvw/_ugvw_features_user-registration.adoc | 12 +-
.../main/asciidoc/guides/ugvw/_ugvw_layout.adoc | 70 +---
.../ugvw/_ugvw_layout_application-menu.adoc | 171 ++++++++
.../_ugvw_layout_customising-table-columns.adoc | 54 +++
.../guides/ugvw/_ugvw_layout_dynamic.adoc | 151 +++++++
.../guides/ugvw/_ugvw_layout_dynamic_xml.adoc | 402 +++++++++++++++++++
.../ugvw/_ugvw_layout_static-vs-dynamic.adoc | 26 ++
.../guides/ugvw/_ugvw_layout_static.adoc | 178 ++++++++
.../guides/ugvw/_ugvw_request-parameters.adoc | 4 +-
.../ugvw/images/about-page/about-page.png | Bin 0 -> 59612 bytes
.../ugvw/images/application-menu/dividers.png | Bin 0 -> 22657 bytes
.../images/application-menu/layout-menus.pdn | Bin 0 -> 97348 bytes
.../images/application-menu/layout-menus.png | Bin 0 -> 50330 bytes
.../ugvw/images/application-menu/tertiary.png | Bin 0 -> 11491 bytes
.../010-attachment-field-940.png | Bin 0 -> 96945 bytes
.../blob-attachments/010-attachment-field.png | Bin 0 -> 111347 bytes
.../020-edit-choose-file-940.png | Bin 0 -> 98472 bytes
.../blob-attachments/020-edit-choose-file.png | Bin 0 -> 113234 bytes
.../030-choose-file-using-browser-520.png | Bin 0 -> 88615 bytes
.../030-choose-file-using-browser.png | Bin 0 -> 241045 bytes
.../040-edit-chosen-file-indicated-940.png | Bin 0 -> 98163 bytes
.../040-edit-chosen-file-indicated.png | Bin 0 -> 113800 bytes
.../050-ok-if-image-then-rendered-940.png | Bin 0 -> 129718 bytes
.../050-ok-if-image-then-rendered.png | Bin 0 -> 245863 bytes
.../blob-attachments/060-download-940.png | Bin 0 -> 138702 bytes
.../images/blob-attachments/060-download.png | Bin 0 -> 249736 bytes
.../blob-attachments/070-edit-clear-940.png | Bin 0 -> 99377 bytes
.../images/blob-attachments/070-edit-clear.png | Bin 0 -> 114433 bytes
.../ugvw/images/bookmarked-pages/panel-940.png | Bin 0 -> 99602 bytes
.../bookmarked-pages/panel-estatio-940.png | Bin 0 -> 136219 bytes
.../images/bookmarked-pages/panel-estatio.png | Bin 0 -> 172961 bytes
.../ugvw/images/bookmarked-pages/panel.png | Bin 0 -> 121632 bytes
.../images/brand-logo/brand-logo-signin.png | Bin 0 -> 40644 bytes
.../ugvw/images/brand-logo/brand-logo.png | Bin 0 -> 74471 bytes
.../copy-link/010-copy-link-button-940.png | Bin 0 -> 162348 bytes
.../images/copy-link/010-copy-link-button.png | Bin 0 -> 180619 bytes
.../copy-link/020-copy-link-dialog-940.png | Bin 0 -> 137995 bytes
.../images/copy-link/020-copy-link-dialog.png | Bin 0 -> 151995 bytes
.../ugvw/images/copy-link/030-hints-940.png | Bin 0 -> 152386 bytes
.../guides/ugvw/images/copy-link/030-hints.png | Bin 0 -> 170567 bytes
.../copy-link/040-copy-link-with-hints-940.png | Bin 0 -> 132720 bytes
.../copy-link/040-copy-link-with-hints.png | Bin 0 -> 156147 bytes
.../ugvw/images/copy-link/050-title-url-940.png | Bin 0 -> 143541 bytes
.../ugvw/images/copy-link/050-title-url.png | Bin 0 -> 105989 bytes
.../ugvw/images/embedded-view/no-footer.png | Bin 0 -> 72940 bytes
.../embedded-view/no-header-no-footer.png | Bin 0 -> 67630 bytes
.../ugvw/images/embedded-view/no-header.png | Bin 0 -> 70717 bytes
.../ugvw/images/embedded-view/regular.png | Bin 0 -> 76211 bytes
.../layout-dynamic-xml/ToDoAppDashboard.png | Bin 0 -> 124848 bytes
.../ugvw/images/layout-dynamic-xml/ToDoItem.png | Bin 0 -> 91690 bytes
.../ugvw/images/layouts/customer-order.png | Bin 0 -> 6026 bytes
.../ugvw/images/layouts/estatio-Invoice.png | Bin 0 -> 181572 bytes
.../ugvw/images/layouts/estatio-Lease.png | Bin 0 -> 261553 bytes
.../ugvw/images/layouts/estatio-LeaseItem.png | Bin 0 -> 162789 bytes
.../ugvw/images/layouts/todoapp-ToDoItem.png | Bin 0 -> 97649 bytes
.../images/recent-pages/recent-pages-940.png | Bin 0 -> 166966 bytes
.../ugvw/images/recent-pages/recent-pages.png | Bin 0 -> 186541 bytes
.../ugvw/images/reference-layout/4-0-8-0.png | Bin 0 -> 20662 bytes
.../ugvw/images/reference-layout/4-4-4-12.png | Bin 0 -> 21012 bytes
.../ugvw/images/reference-layout/6-6-0-12.png | Bin 0 -> 21100 bytes
.../isis-layout-show-facets.css | 3 +
.../images/reference-layout/isis-layout.css | 253 ++++++++++++
.../images/reference-layout/layout-4-0-8-0.html | 198 +++++++++
.../reference-layout/layout-4-4-4-12.html | 205 ++++++++++
.../reference-layout/layout-6-6-0-12.html | 203 ++++++++++
.../login-page-default.png | Bin 0 -> 11372 bytes
.../login-page-suppress-password-reset.png | Bin 0 -> 10615 bytes
.../suppress-remember-me/login-page-default.png | Bin 0 -> 11372 bytes
.../login-page-suppress-remember-me.png | Bin 0 -> 10935 bytes
.../suppress-sign-up/login-page-default.png | Bin 0 -> 11372 bytes
.../login-page-suppress-sign-up.png | Bin 0 -> 10273 bytes
.../ugvw/images/theme-chooser/example-1.png | Bin 0 -> 88088 bytes
.../ugvw/images/theme-chooser/example-2.png | Bin 0 -> 76430 bytes
.../user-registration/login-page-default.png | Bin 0 -> 11372 bytes
.../sign-up-after-registration.png | Bin 0 -> 45653 bytes
.../sign-up-email-with-verification-link.png | Bin 0 -> 11960 bytes
.../sign-up-login-page-after-sign-up.png | Bin 0 -> 13570 bytes
.../images/user-registration/sign-up-page.png | Bin 0 -> 8911 bytes
.../sign-up-registration-page.png | Bin 0 -> 11446 bytes
.../wicket-viewer/about-page/about-page.png | Bin 59612 -> 0 bytes
.../010-attachment-field-940.png | Bin 96945 -> 0 bytes
.../blob-attachments/010-attachment-field.png | Bin 111347 -> 0 bytes
.../020-edit-choose-file-940.png | Bin 98472 -> 0 bytes
.../blob-attachments/020-edit-choose-file.png | Bin 113234 -> 0 bytes
.../030-choose-file-using-browser-520.png | Bin 88615 -> 0 bytes
.../030-choose-file-using-browser.png | Bin 241045 -> 0 bytes
.../040-edit-chosen-file-indicated-940.png | Bin 98163 -> 0 bytes
.../040-edit-chosen-file-indicated.png | Bin 113800 -> 0 bytes
.../050-ok-if-image-then-rendered-940.png | Bin 129718 -> 0 bytes
.../050-ok-if-image-then-rendered.png | Bin 245863 -> 0 bytes
.../blob-attachments/060-download-940.png | Bin 138702 -> 0 bytes
.../blob-attachments/060-download.png | Bin 249736 -> 0 bytes
.../blob-attachments/070-edit-clear-940.png | Bin 99377 -> 0 bytes
.../blob-attachments/070-edit-clear.png | Bin 114433 -> 0 bytes
.../bookmarked-pages/panel-940.png | Bin 99602 -> 0 bytes
.../bookmarked-pages/panel-estatio-940.png | Bin 136219 -> 0 bytes
.../bookmarked-pages/panel-estatio.png | Bin 172961 -> 0 bytes
.../wicket-viewer/bookmarked-pages/panel.png | Bin 121632 -> 0 bytes
.../brand-logo/brand-logo-signin.png | Bin 40644 -> 0 bytes
.../wicket-viewer/brand-logo/brand-logo.png | Bin 74471 -> 0 bytes
.../copy-link/010-copy-link-button-940.png | Bin 162348 -> 0 bytes
.../copy-link/010-copy-link-button.png | Bin 180619 -> 0 bytes
.../copy-link/020-copy-link-dialog-940.png | Bin 137995 -> 0 bytes
.../copy-link/020-copy-link-dialog.png | Bin 151995 -> 0 bytes
.../wicket-viewer/copy-link/030-hints-940.png | Bin 152386 -> 0 bytes
.../wicket-viewer/copy-link/030-hints.png | Bin 170567 -> 0 bytes
.../copy-link/040-copy-link-with-hints-940.png | Bin 132720 -> 0 bytes
.../copy-link/040-copy-link-with-hints.png | Bin 156147 -> 0 bytes
.../copy-link/050-title-url-940.png | Bin 143541 -> 0 bytes
.../wicket-viewer/copy-link/050-title-url.png | Bin 105989 -> 0 bytes
.../wicket-viewer/embedded-view/no-footer.png | Bin 72940 -> 0 bytes
.../embedded-view/no-header-no-footer.png | Bin 67630 -> 0 bytes
.../wicket-viewer/embedded-view/no-header.png | Bin 70717 -> 0 bytes
.../wicket-viewer/embedded-view/regular.png | Bin 76211 -> 0 bytes
.../wicket-viewer/layouts/customer-order.png | Bin 6026 -> 0 bytes
.../wicket-viewer/layouts/estatio-Invoice.png | Bin 181572 -> 0 bytes
.../wicket-viewer/layouts/estatio-Lease.png | Bin 261553 -> 0 bytes
.../wicket-viewer/layouts/estatio-LeaseItem.png | Bin 162789 -> 0 bytes
.../wicket-viewer/layouts/todoapp-ToDoItem.png | Bin 97649 -> 0 bytes
.../recent-pages/recent-pages-940.png | Bin 166966 -> 0 bytes
.../wicket-viewer/recent-pages/recent-pages.png | Bin 186541 -> 0 bytes
.../login-page-default.png | Bin 11372 -> 0 bytes
.../login-page-suppress-password-reset.png | Bin 10615 -> 0 bytes
.../suppress-remember-me/login-page-default.png | Bin 11372 -> 0 bytes
.../login-page-suppress-remember-me.png | Bin 10935 -> 0 bytes
.../suppress-sign-up/login-page-default.png | Bin 11372 -> 0 bytes
.../login-page-suppress-sign-up.png | Bin 10273 -> 0 bytes
.../wicket-viewer/theme-chooser/example-1.png | Bin 88088 -> 0 bytes
.../wicket-viewer/theme-chooser/example-2.png | Bin 76430 -> 0 bytes
.../user-registration/login-page-default.png | Bin 11372 -> 0 bytes
.../sign-up-after-registration.png | Bin 45653 -> 0 bytes
.../sign-up-email-with-verification-link.png | Bin 11960 -> 0 bytes
.../sign-up-login-page-after-sign-up.png | Bin 13570 -> 0 bytes
.../user-registration/sign-up-page.png | Bin 8911 -> 0 bytes
.../sign-up-registration-page.png | Bin 11446 -> 0 bytes
.../_migration-notes_1.11.0-to-1.12.0.adoc | 4 +-
.../asciidoc/pages/screencasts/screencasts.adoc | 6 +-
.../tg/_tg_stop-scaffolding-start-coding.adoc | 4 +-
.../release-notes/_release-notes_1.12.0.adoc | 8 +-
224 files changed, 1963 insertions(+), 1976 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/isis/blob/8f18b6f0/adocs/documentation/src/main/asciidoc/guides/dg/_dg_asciidoc-templates.adoc
----------------------------------------------------------------------
diff --git a/adocs/documentation/src/main/asciidoc/guides/dg/_dg_asciidoc-templates.adoc b/adocs/documentation/src/main/asciidoc/guides/dg/_dg_asciidoc-templates.adoc
index b8147ce..82fd819 100644
--- a/adocs/documentation/src/main/asciidoc/guides/dg/_dg_asciidoc-templates.adoc
+++ b/adocs/documentation/src/main/asciidoc/guides/dg/_dg_asciidoc-templates.adoc
@@ -590,9 +590,9 @@ embeds specified image, where:
for example:
-`\image:{_imagesdir}wicket-viewer/layouts/estatio-Lease.png[width="300px",link="{_imagesdir}wicket-viewer/layouts/estatio-Lease.png"]`
+`\image:{_imagesdir}layouts/estatio-Lease.png[width="300px",link="{_imagesdir}layouts/estatio-Lease.png"]`
-|image:{_imagesdir}wicket-viewer/layouts/estatio-Lease.png[width="300px",link="{_imagesdir}wicket-viewer/layouts/estatio-Lease.png"]
+|image:{_imagesdir}layouts/estatio-Lease.png[width="300px",link="{_imagesdir}layouts/estatio-Lease.png"]
http://git-wip-us.apache.org/repos/asf/isis/blob/8f18b6f0/adocs/documentation/src/main/asciidoc/guides/dg/_dg_ide_intellij.adoc
----------------------------------------------------------------------
diff --git a/adocs/documentation/src/main/asciidoc/guides/dg/_dg_ide_intellij.adoc b/adocs/documentation/src/main/asciidoc/guides/dg/_dg_ide_intellij.adoc
index ae0047b..1f5aa26 100644
--- a/adocs/documentation/src/main/asciidoc/guides/dg/_dg_ide_intellij.adoc
+++ b/adocs/documentation/src/main/asciidoc/guides/dg/_dg_ide_intellij.adoc
@@ -565,7 +565,7 @@ image::{_imagesdir}appendices/dev-env/intellij-idea/070-advanced/004-gradle-outp
=== Using Gradle for liveReload
Similarly, gradle can be run to reduce the turn-around time when tweaking the UI (defined by the
- xref:ugfun.adoc#_ugfun_object-layout_dynamic_xml[`*.layout.xml`] file for each domain class), when the app is running.
+ xref:ugvw.adoc#_ugvw_layout_dynamic_xml[`*.layout.xml`] file for each domain class), when the app is running.
The framework will automatically notice any changes to `.layout.xml` files, but these are read from the
the classpath (the `target/classes` directory), not the source path. With IntelliJ these can be copied over manually
http://git-wip-us.apache.org/repos/asf/isis/blob/8f18b6f0/adocs/documentation/src/main/asciidoc/guides/rgant/_rgant-ActionLayout.adoc
----------------------------------------------------------------------
diff --git a/adocs/documentation/src/main/asciidoc/guides/rgant/_rgant-ActionLayout.adoc b/adocs/documentation/src/main/asciidoc/guides/rgant/_rgant-ActionLayout.adoc
index ad6faa2..744c67e 100644
--- a/adocs/documentation/src/main/asciidoc/guides/rgant/_rgant-ActionLayout.adoc
+++ b/adocs/documentation/src/main/asciidoc/guides/rgant/_rgant-ActionLayout.adoc
@@ -100,7 +100,7 @@ public class ToDoItems {
-As an alternative to using the `@ActionLayout` annotation, a dynamic layout using xref:ugfun.adoc#_ugfun_object-layout_dynamic[`.layout.json`] file can be specified; for example:
+As an alternative to using the `@ActionLayout` annotation, a dynamic layout using xref:ugvw.adoc#_ugvw_layout_dynamic[`.layout.json`] file can be specified; for example:
[source,javascript]
----
http://git-wip-us.apache.org/repos/asf/isis/blob/8f18b6f0/adocs/documentation/src/main/asciidoc/guides/rgant/_rgant-ActionLayout_bookmarking.adoc
----------------------------------------------------------------------
diff --git a/adocs/documentation/src/main/asciidoc/guides/rgant/_rgant-ActionLayout_bookmarking.adoc b/adocs/documentation/src/main/asciidoc/guides/rgant/_rgant-ActionLayout_bookmarking.adoc
index cd4594a..ef1de18 100644
--- a/adocs/documentation/src/main/asciidoc/guides/rgant/_rgant-ActionLayout_bookmarking.adoc
+++ b/adocs/documentation/src/main/asciidoc/guides/rgant/_rgant-ActionLayout_bookmarking.adoc
@@ -50,7 +50,7 @@ The enum value `AS_CHILD` has no meaning for actions; it relates only to bookmar
-As an alternative to using the annotation, the dynamic xref:ugfun.adoc#_ugfun_object-layout_dynamic[`.layout.json`]
+As an alternative to using the annotation, the dynamic xref:ugvw.adoc#_ugvw_layout_dynamic[`.layout.json`]
can be used instead, eg:
[source,javascript]
http://git-wip-us.apache.org/repos/asf/isis/blob/8f18b6f0/adocs/documentation/src/main/asciidoc/guides/rgant/_rgant-ActionLayout_contributedAs.adoc
----------------------------------------------------------------------
diff --git a/adocs/documentation/src/main/asciidoc/guides/rgant/_rgant-ActionLayout_contributedAs.adoc b/adocs/documentation/src/main/asciidoc/guides/rgant/_rgant-ActionLayout_contributedAs.adoc
index 89d0639..a13011a 100644
--- a/adocs/documentation/src/main/asciidoc/guides/rgant/_rgant-ActionLayout_contributedAs.adoc
+++ b/adocs/documentation/src/main/asciidoc/guides/rgant/_rgant-ActionLayout_contributedAs.adoc
@@ -49,6 +49,6 @@ In such cases, though, it would probably make more sense to annotate the action
[NOTE]
====
-Unlike other `@ActionLayout` attributes, this attribute _cannot_ be specified dynamically in the `.layout.json` xref:ugfun.adoc#_ugfun_object-layout_dynamic[dynamic layout file] because it relates to the contributor domain service, not the contributee domain object.
+Unlike other `@ActionLayout` attributes, this attribute _cannot_ be specified dynamically in the `.layout.json` xref:ugvw.adoc#_ugvw_layout_dynamic[dynamic layout file] because it relates to the contributor domain service, not the contributee domain object.
====
http://git-wip-us.apache.org/repos/asf/isis/blob/8f18b6f0/adocs/documentation/src/main/asciidoc/guides/rgant/_rgant-ActionLayout_cssClass.adoc
----------------------------------------------------------------------
diff --git a/adocs/documentation/src/main/asciidoc/guides/rgant/_rgant-ActionLayout_cssClass.adoc b/adocs/documentation/src/main/asciidoc/guides/rgant/_rgant-ActionLayout_cssClass.adoc
index c18f31e..89cec9a 100644
--- a/adocs/documentation/src/main/asciidoc/guides/rgant/_rgant-ActionLayout_cssClass.adoc
+++ b/adocs/documentation/src/main/asciidoc/guides/rgant/_rgant-ActionLayout_cssClass.adoc
@@ -30,7 +30,7 @@ to apply CSS, specifically to add http://fortawesome.github.io/Font-Awesome/icon
-As an alternative to using the annotation, the dynamic xref:ugfun.adoc#_ugfun_object-layout_dynamic[`.layout.json`]
+As an alternative to using the annotation, the dynamic xref:ugvw.adoc#_ugvw_layout_dynamic[`.layout.json`]
can be used instead, eg:
[source,javascript]
http://git-wip-us.apache.org/repos/asf/isis/blob/8f18b6f0/adocs/documentation/src/main/asciidoc/guides/rgant/_rgant-ActionLayout_cssClassFa.adoc
----------------------------------------------------------------------
diff --git a/adocs/documentation/src/main/asciidoc/guides/rgant/_rgant-ActionLayout_cssClassFa.adoc b/adocs/documentation/src/main/asciidoc/guides/rgant/_rgant-ActionLayout_cssClassFa.adoc
index 95dc7db..b6c35c8 100644
--- a/adocs/documentation/src/main/asciidoc/guides/rgant/_rgant-ActionLayout_cssClassFa.adoc
+++ b/adocs/documentation/src/main/asciidoc/guides/rgant/_rgant-ActionLayout_cssClassFa.adoc
@@ -31,7 +31,7 @@ public class ToDoItem {
There can be multiple "fa-" classes, eg to mirror or rotate the icon. There is no need to include the mandatory `fa` "marker" CSS class; it will be automatically added to the list. The `fa-` prefix can also be omitted from the class names; it will be prepended to each if required.
-As an alternative to using the annotation, the dynamic xref:ugfun.adoc#_ugfun_object-layout_dynamic[`.layout.json`]
+As an alternative to using the annotation, the dynamic xref:ugvw.adoc#_ugvw_layout_dynamic[`.layout.json`]
can be used instead, eg:
[source,javascript]
http://git-wip-us.apache.org/repos/asf/isis/blob/8f18b6f0/adocs/documentation/src/main/asciidoc/guides/rgant/_rgant-ActionLayout_describedAs.adoc
----------------------------------------------------------------------
diff --git a/adocs/documentation/src/main/asciidoc/guides/rgant/_rgant-ActionLayout_describedAs.adoc b/adocs/documentation/src/main/asciidoc/guides/rgant/_rgant-ActionLayout_describedAs.adoc
index a427714..200288a 100644
--- a/adocs/documentation/src/main/asciidoc/guides/rgant/_rgant-ActionLayout_describedAs.adoc
+++ b/adocs/documentation/src/main/asciidoc/guides/rgant/_rgant-ActionLayout_describedAs.adoc
@@ -24,7 +24,7 @@ public class Customer {
-As an alternative to using the annotation, the dynamic xref:ugfun.adoc#_ugfun_object-layout_dynamic[`.layout.json`]
+As an alternative to using the annotation, the dynamic xref:ugvw.adoc#_ugvw_layout_dynamic[`.layout.json`]
can be used instead, eg:
[source,javascript]
http://git-wip-us.apache.org/repos/asf/isis/blob/8f18b6f0/adocs/documentation/src/main/asciidoc/guides/rgant/_rgant-ActionLayout_hidden.adoc
----------------------------------------------------------------------
diff --git a/adocs/documentation/src/main/asciidoc/guides/rgant/_rgant-ActionLayout_hidden.adoc b/adocs/documentation/src/main/asciidoc/guides/rgant/_rgant-ActionLayout_hidden.adoc
index 4fa2a67..5f3d332 100644
--- a/adocs/documentation/src/main/asciidoc/guides/rgant/_rgant-ActionLayout_hidden.adoc
+++ b/adocs/documentation/src/main/asciidoc/guides/rgant/_rgant-ActionLayout_hidden.adoc
@@ -37,7 +37,7 @@ The action should not be hidden.
The other values of the `Where` enum have no meaning for a collection.
-As an alternative to using the annotation, the dynamic xref:ugfun.adoc#_ugfun_object-layout_dynamic[`.layout.json`]
+As an alternative to using the annotation, the dynamic xref:ugvw.adoc#_ugvw_layout_dynamic[`.layout.json`]
can be used instead, eg:
[source,javascript]
http://git-wip-us.apache.org/repos/asf/isis/blob/8f18b6f0/adocs/documentation/src/main/asciidoc/guides/rgant/_rgant-ActionLayout_named.adoc
----------------------------------------------------------------------
diff --git a/adocs/documentation/src/main/asciidoc/guides/rgant/_rgant-ActionLayout_named.adoc b/adocs/documentation/src/main/asciidoc/guides/rgant/_rgant-ActionLayout_named.adoc
index 70dbebd..783220a 100644
--- a/adocs/documentation/src/main/asciidoc/guides/rgant/_rgant-ActionLayout_named.adoc
+++ b/adocs/documentation/src/main/asciidoc/guides/rgant/_rgant-ActionLayout_named.adoc
@@ -25,7 +25,7 @@ public class Customer {
----
-As an alternative to using the annotation, the dynamic xref:ugfun.adoc#_ugfun_object-layout_dynamic[`.layout.json`]
+As an alternative to using the annotation, the dynamic xref:ugvw.adoc#_ugvw_layout_dynamic[`.layout.json`]
can be used instead, eg:
[source,javascript]
http://git-wip-us.apache.org/repos/asf/isis/blob/8f18b6f0/adocs/documentation/src/main/asciidoc/guides/rgant/_rgant-ActionLayout_position.adoc
----------------------------------------------------------------------
diff --git a/adocs/documentation/src/main/asciidoc/guides/rgant/_rgant-ActionLayout_position.adoc b/adocs/documentation/src/main/asciidoc/guides/rgant/_rgant-ActionLayout_position.adoc
index 9fbedb4..2cd3e5e 100644
--- a/adocs/documentation/src/main/asciidoc/guides/rgant/_rgant-ActionLayout_position.adoc
+++ b/adocs/documentation/src/main/asciidoc/guides/rgant/_rgant-ActionLayout_position.adoc
@@ -67,7 +67,7 @@ image::{_imagesdir}reference-annotations/ActionLayout/position-PANEL_DROPDOWN.pn
If there are multiple actions associated with a single property then the positioning can be mix'ed-and-match'ed as required. If the `PANEL` or `PANEL_DROPDOWN` are used, then (as the screenshots above show) the actions from potentially multiple properties grouped by that panel will be shown together.
-As an alternative to using the annotation, the dynamic xref:ugfun.adoc#_ugfun_object-layout_dynamic[`.layout.json`]
+As an alternative to using the annotation, the dynamic xref:ugvw.adoc#_ugvw_layout_dynamic[`.layout.json`]
can be used instead, eg:
[source,javascript]
http://git-wip-us.apache.org/repos/asf/isis/blob/8f18b6f0/adocs/documentation/src/main/asciidoc/guides/rgant/_rgant-Action_hidden.adoc
----------------------------------------------------------------------
diff --git a/adocs/documentation/src/main/asciidoc/guides/rgant/_rgant-Action_hidden.adoc b/adocs/documentation/src/main/asciidoc/guides/rgant/_rgant-Action_hidden.adoc
index 7459e15..11f95b5 100644
--- a/adocs/documentation/src/main/asciidoc/guides/rgant/_rgant-Action_hidden.adoc
+++ b/adocs/documentation/src/main/asciidoc/guides/rgant/_rgant-Action_hidden.adoc
@@ -11,7 +11,7 @@ Actions can be hidden at the domain-level, indicating that they are not visible
[TIP]
====
-It is also possible to use xref:rgant.adoc#_rgant-ActionLayout_hidden[`@ActionLayout#hidden()`] or xref:ugfun.adoc#_ugfun_object-layout_dynamic[dynamic layouts] such that the action can be hidden at the view layer. Both options are provided with a view that in the future the view-layer semantics may be under the control of (expert) users, whereas domain-layer semantics should never be overridden or modified by the user.
+It is also possible to use xref:rgant.adoc#_rgant-ActionLayout_hidden[`@ActionLayout#hidden()`] or xref:ugvw.adoc#_ugvw_layout_dynamic[dynamic layouts] such that the action can be hidden at the view layer. Both options are provided with a view that in the future the view-layer semantics may be under the control of (expert) users, whereas domain-layer semantics should never be overridden or modified by the user.
====
For example:
http://git-wip-us.apache.org/repos/asf/isis/blob/8f18b6f0/adocs/documentation/src/main/asciidoc/guides/rgant/_rgant-CollectionLayout.adoc
----------------------------------------------------------------------
diff --git a/adocs/documentation/src/main/asciidoc/guides/rgant/_rgant-CollectionLayout.adoc b/adocs/documentation/src/main/asciidoc/guides/rgant/_rgant-CollectionLayout.adoc
index 697577f..3a90272 100644
--- a/adocs/documentation/src/main/asciidoc/guides/rgant/_rgant-CollectionLayout.adoc
+++ b/adocs/documentation/src/main/asciidoc/guides/rgant/_rgant-CollectionLayout.adoc
@@ -94,7 +94,7 @@ public class ToDoItem {
-As an alternative to using the `@CollectionLayout` annotation, a dynamic layout using xref:ugfun.adoc#_ugfun_object-layout_dynamic[`.layout.json`] file can be specified; for example:
+As an alternative to using the `@CollectionLayout` annotation, a dynamic layout using xref:ugvw.adoc#_ugvw_layout_dynamic[`.layout.json`] file can be specified; for example:
[source,javascript]
----
http://git-wip-us.apache.org/repos/asf/isis/blob/8f18b6f0/adocs/documentation/src/main/asciidoc/guides/rgant/_rgant-CollectionLayout_cssClass.adoc
----------------------------------------------------------------------
diff --git a/adocs/documentation/src/main/asciidoc/guides/rgant/_rgant-CollectionLayout_cssClass.adoc b/adocs/documentation/src/main/asciidoc/guides/rgant/_rgant-CollectionLayout_cssClass.adoc
index 5da72b1..a0b2200 100644
--- a/adocs/documentation/src/main/asciidoc/guides/rgant/_rgant-CollectionLayout_cssClass.adoc
+++ b/adocs/documentation/src/main/asciidoc/guides/rgant/_rgant-CollectionLayout_cssClass.adoc
@@ -24,7 +24,7 @@ public class ToDoItem {
----
-As an alternative to using the annotation, the dynamic xref:ugfun.adoc#_ugfun_object-layout_dynamic[`.layout.json`]
+As an alternative to using the annotation, the dynamic xref:ugvw.adoc#_ugvw_layout_dynamic[`.layout.json`]
can be used instead, eg:
[source,javascript]
http://git-wip-us.apache.org/repos/asf/isis/blob/8f18b6f0/adocs/documentation/src/main/asciidoc/guides/rgant/_rgant-CollectionLayout_defaultView.adoc
----------------------------------------------------------------------
diff --git a/adocs/documentation/src/main/asciidoc/guides/rgant/_rgant-CollectionLayout_defaultView.adoc b/adocs/documentation/src/main/asciidoc/guides/rgant/_rgant-CollectionLayout_defaultView.adoc
index aebfc52..2eb0094 100644
--- a/adocs/documentation/src/main/asciidoc/guides/rgant/_rgant-CollectionLayout_defaultView.adoc
+++ b/adocs/documentation/src/main/asciidoc/guides/rgant/_rgant-CollectionLayout_defaultView.adoc
@@ -24,7 +24,7 @@ public class BusRoute {
----
-As an alternative to using the annotation, the dynamic xref:ugfun.adoc#_ugfun_object-layout_dynamic[`.layout.json`]
+As an alternative to using the annotation, the dynamic xref:ugvw.adoc#_ugvw_layout_dynamic[`.layout.json`]
can be used instead, eg:
[source,javascript]
http://git-wip-us.apache.org/repos/asf/isis/blob/8f18b6f0/adocs/documentation/src/main/asciidoc/guides/rgant/_rgant-CollectionLayout_describedAs.adoc
----------------------------------------------------------------------
diff --git a/adocs/documentation/src/main/asciidoc/guides/rgant/_rgant-CollectionLayout_describedAs.adoc b/adocs/documentation/src/main/asciidoc/guides/rgant/_rgant-CollectionLayout_describedAs.adoc
index 5e1ae23..746f356 100644
--- a/adocs/documentation/src/main/asciidoc/guides/rgant/_rgant-CollectionLayout_describedAs.adoc
+++ b/adocs/documentation/src/main/asciidoc/guides/rgant/_rgant-CollectionLayout_describedAs.adoc
@@ -24,7 +24,7 @@ public class ToDoItem {
----
-As an alternative to using the annotation, the dynamic xref:ugfun.adoc#_ugfun_object-layout_dynamic[`.layout.json`]
+As an alternative to using the annotation, the dynamic xref:ugvw.adoc#_ugvw_layout_dynamic[`.layout.json`]
can be used instead, eg:
[source,javascript]
http://git-wip-us.apache.org/repos/asf/isis/blob/8f18b6f0/adocs/documentation/src/main/asciidoc/guides/rgant/_rgant-CollectionLayout_hidden.adoc
----------------------------------------------------------------------
diff --git a/adocs/documentation/src/main/asciidoc/guides/rgant/_rgant-CollectionLayout_hidden.adoc b/adocs/documentation/src/main/asciidoc/guides/rgant/_rgant-CollectionLayout_hidden.adoc
index ba89ed4..3416f34 100644
--- a/adocs/documentation/src/main/asciidoc/guides/rgant/_rgant-CollectionLayout_hidden.adoc
+++ b/adocs/documentation/src/main/asciidoc/guides/rgant/_rgant-CollectionLayout_hidden.adoc
@@ -47,7 +47,7 @@ The collection should not be hidden.
The other values of the `Where` enum have no meaning for a collection.
-As an alternative to using the annotation, the dynamic xref:ugfun.adoc#_ugfun_object-layout_dynamic[`.layout.json`]
+As an alternative to using the annotation, the dynamic xref:ugvw.adoc#_ugvw_layout_dynamic[`.layout.json`]
can be used instead, eg:
[source,javascript]
http://git-wip-us.apache.org/repos/asf/isis/blob/8f18b6f0/adocs/documentation/src/main/asciidoc/guides/rgant/_rgant-CollectionLayout_named.adoc
----------------------------------------------------------------------
diff --git a/adocs/documentation/src/main/asciidoc/guides/rgant/_rgant-CollectionLayout_named.adoc b/adocs/documentation/src/main/asciidoc/guides/rgant/_rgant-CollectionLayout_named.adoc
index 0ec434f..0bdcfac 100644
--- a/adocs/documentation/src/main/asciidoc/guides/rgant/_rgant-CollectionLayout_named.adoc
+++ b/adocs/documentation/src/main/asciidoc/guides/rgant/_rgant-CollectionLayout_named.adoc
@@ -33,7 +33,7 @@ public class ToDoItem {
-As an alternative to using the annotation, the dynamic xref:ugfun.adoc#_ugfun_object-layout_dynamic[`.layout.json`]
+As an alternative to using the annotation, the dynamic xref:ugvw.adoc#_ugvw_layout_dynamic[`.layout.json`]
can be used instead, eg:
[source,javascript]
http://git-wip-us.apache.org/repos/asf/isis/blob/8f18b6f0/adocs/documentation/src/main/asciidoc/guides/rgant/_rgant-CollectionLayout_paged.adoc
----------------------------------------------------------------------
diff --git a/adocs/documentation/src/main/asciidoc/guides/rgant/_rgant-CollectionLayout_paged.adoc b/adocs/documentation/src/main/asciidoc/guides/rgant/_rgant-CollectionLayout_paged.adoc
index 5500ca5..3f41188 100644
--- a/adocs/documentation/src/main/asciidoc/guides/rgant/_rgant-CollectionLayout_paged.adoc
+++ b/adocs/documentation/src/main/asciidoc/guides/rgant/_rgant-CollectionLayout_paged.adoc
@@ -31,7 +31,7 @@ It is also possible to specify a global default for the page size of standalone
-As an alternative to using the annotation, the dynamic xref:ugfun.adoc#_ugfun_object-layout_dynamic[`.layout.json`]
+As an alternative to using the annotation, the dynamic xref:ugvw.adoc#_ugvw_layout_dynamic[`.layout.json`]
can be used instead, eg:
[source,javascript]
http://git-wip-us.apache.org/repos/asf/isis/blob/8f18b6f0/adocs/documentation/src/main/asciidoc/guides/rgant/_rgant-CollectionLayout_render.adoc
----------------------------------------------------------------------
diff --git a/adocs/documentation/src/main/asciidoc/guides/rgant/_rgant-CollectionLayout_render.adoc b/adocs/documentation/src/main/asciidoc/guides/rgant/_rgant-CollectionLayout_render.adoc
index e235807..85b7e7c 100644
--- a/adocs/documentation/src/main/asciidoc/guides/rgant/_rgant-CollectionLayout_render.adoc
+++ b/adocs/documentation/src/main/asciidoc/guides/rgant/_rgant-CollectionLayout_render.adoc
@@ -20,7 +20,7 @@ public class Order {
----
-As an alternative to using the annotation, the dynamic xref:ugfun.adoc#_ugfun_object-layout_dynamic[`.layout.json`]
+As an alternative to using the annotation, the dynamic xref:ugvw.adoc#_ugvw_layout_dynamic[`.layout.json`]
can be used instead, eg:
[source,javascript]
http://git-wip-us.apache.org/repos/asf/isis/blob/8f18b6f0/adocs/documentation/src/main/asciidoc/guides/rgant/_rgant-CollectionLayout_sortedBy.adoc
----------------------------------------------------------------------
diff --git a/adocs/documentation/src/main/asciidoc/guides/rgant/_rgant-CollectionLayout_sortedBy.adoc b/adocs/documentation/src/main/asciidoc/guides/rgant/_rgant-CollectionLayout_sortedBy.adoc
index 60bc839..7eac8f1 100644
--- a/adocs/documentation/src/main/asciidoc/guides/rgant/_rgant-CollectionLayout_sortedBy.adoc
+++ b/adocs/documentation/src/main/asciidoc/guides/rgant/_rgant-CollectionLayout_sortedBy.adoc
@@ -46,7 +46,7 @@ Without this annotation, the order would have been inverted (because the natural
-As an alternative to using the annotation, the dynamic xref:ugfun.adoc#_ugfun_object-layout_dynamic[`.layout.json`]
+As an alternative to using the annotation, the dynamic xref:ugvw.adoc#_ugvw_layout_dynamic[`.layout.json`]
can be used instead, eg:
[source,javascript]
http://git-wip-us.apache.org/repos/asf/isis/blob/8f18b6f0/adocs/documentation/src/main/asciidoc/guides/rgant/_rgant-Collection_hidden.adoc
----------------------------------------------------------------------
diff --git a/adocs/documentation/src/main/asciidoc/guides/rgant/_rgant-Collection_hidden.adoc b/adocs/documentation/src/main/asciidoc/guides/rgant/_rgant-Collection_hidden.adoc
index 81ae52d..0bccc9d 100644
--- a/adocs/documentation/src/main/asciidoc/guides/rgant/_rgant-Collection_hidden.adoc
+++ b/adocs/documentation/src/main/asciidoc/guides/rgant/_rgant-Collection_hidden.adoc
@@ -9,7 +9,7 @@ Collections can be hidden at the domain-level, indicating that they are not visi
[TIP]
====
-It is also possible to use xref:rgant.adoc#_rgant-CollectionLayout_hidden[`@CollectionLayout#hidden()`] or xref:ugfun.adoc#_ugfun_object-layout_dynamic[dynamic layouts] such that the collection can be hidden at the view layer. Both options are provided with a view that in the future the view-layer semantics may be under the control of (expert) users, whereas domain-layer semantics should never be overridden or modified by the user.
+It is also possible to use xref:rgant.adoc#_rgant-CollectionLayout_hidden[`@CollectionLayout#hidden()`] or xref:ugvw.adoc#_ugvw_layout_dynamic[dynamic layouts] such that the collection can be hidden at the view layer. Both options are provided with a view that in the future the view-layer semantics may be under the control of (expert) users, whereas domain-layer semantics should never be overridden or modified by the user.
====
For example:
http://git-wip-us.apache.org/repos/asf/isis/blob/8f18b6f0/adocs/documentation/src/main/asciidoc/guides/rgant/_rgant-DomainObjectLayout.adoc
----------------------------------------------------------------------
diff --git a/adocs/documentation/src/main/asciidoc/guides/rgant/_rgant-DomainObjectLayout.adoc b/adocs/documentation/src/main/asciidoc/guides/rgant/_rgant-DomainObjectLayout.adoc
index 5f3d745..f0998e7 100644
--- a/adocs/documentation/src/main/asciidoc/guides/rgant/_rgant-DomainObjectLayout.adoc
+++ b/adocs/documentation/src/main/asciidoc/guides/rgant/_rgant-DomainObjectLayout.adoc
@@ -109,7 +109,7 @@ public class ToDoItem {
[NOTE]
====
-Note that there is (currently) no support for specifying UI hints for domain objects through the dynamic xref:ugfun.adoc#_ugfun_object-layout_dynamic[`.layout.json`] file (only for properties, collections and actions are supported).
+Note that there is (currently) no support for specifying UI hints for domain objects through the dynamic xref:ugvw.adoc#_ugvw_layout_dynamic[`.layout.json`] file (only for properties, collections and actions are supported).
====
http://git-wip-us.apache.org/repos/asf/isis/blob/8f18b6f0/adocs/documentation/src/main/asciidoc/guides/rgant/_rgant-DomainServiceLayout.adoc
----------------------------------------------------------------------
diff --git a/adocs/documentation/src/main/asciidoc/guides/rgant/_rgant-DomainServiceLayout.adoc b/adocs/documentation/src/main/asciidoc/guides/rgant/_rgant-DomainServiceLayout.adoc
index e034dea..e223806 100644
--- a/adocs/documentation/src/main/asciidoc/guides/rgant/_rgant-DomainServiceLayout.adoc
+++ b/adocs/documentation/src/main/asciidoc/guides/rgant/_rgant-DomainServiceLayout.adoc
@@ -10,7 +10,7 @@ The `@DomainServiceLayout` annotation applies to domain services, collecting tog
[TIP]
====
-You will also find some additional material in the xref:ugfun.adoc#_ugfun_object-layout_application-menu[object layout] chapter.
+You will also find some additional material in the xref:ugvw.adoc#_ugvw_layout_application-menu[object layout] chapter.
====
@@ -64,7 +64,7 @@ public class ToDoItems {
[NOTE]
====
-Note that there is (currently) no support for specifying UI hints for domain services through the dynamic xref:ugfun.adoc#_ugfun_object-layout_dynamic[`.layout.json`] file (only for properties, collections and actions are supported).
+Note that there is (currently) no support for specifying UI hints for domain services through the dynamic xref:ugvw.adoc#_ugvw_layout_dynamic[`.layout.json`] file (only for properties, collections and actions are supported).
====
http://git-wip-us.apache.org/repos/asf/isis/blob/8f18b6f0/adocs/documentation/src/main/asciidoc/guides/rgant/_rgant-HomePage.adoc
----------------------------------------------------------------------
diff --git a/adocs/documentation/src/main/asciidoc/guides/rgant/_rgant-HomePage.adoc b/adocs/documentation/src/main/asciidoc/guides/rgant/_rgant-HomePage.adoc
index 2c39974..868d28f 100644
--- a/adocs/documentation/src/main/asciidoc/guides/rgant/_rgant-HomePage.adoc
+++ b/adocs/documentation/src/main/asciidoc/guides/rgant/_rgant-HomePage.adoc
@@ -45,7 +45,7 @@ public class ToDoAppDashboard {
public Blob exportToWordDoc() { ... } // <1>
}
----
-<1> associated using xref:ugfun.adoc#_ugfun_object-layout_dynamic[dynamic layouts] with the `notYetComplete` collection.
+<1> associated using xref:ugvw.adoc#_ugvw_layout_dynamic[dynamic layouts] with the `notYetComplete` collection.
The other two actions shown in the above screenshot -- `exportAsXml` and `downloadLayout` -- are actually contributed to the `ToDoAppDashboard` through various domain services, as is the `downloadLayout` action.
http://git-wip-us.apache.org/repos/asf/isis/blob/8f18b6f0/adocs/documentation/src/main/asciidoc/guides/rgant/_rgant-MemberGroupLayout.adoc
----------------------------------------------------------------------
diff --git a/adocs/documentation/src/main/asciidoc/guides/rgant/_rgant-MemberGroupLayout.adoc b/adocs/documentation/src/main/asciidoc/guides/rgant/_rgant-MemberGroupLayout.adoc
index 1a3aaf5..7ec4935 100644
--- a/adocs/documentation/src/main/asciidoc/guides/rgant/_rgant-MemberGroupLayout.adoc
+++ b/adocs/documentation/src/main/asciidoc/guides/rgant/_rgant-MemberGroupLayout.adoc
@@ -16,5 +16,5 @@ The annotation defines two attributes, `name()` and `sequence()`. Broadly speak
[IMPORTANT]
====
-As this is an important topic, there is a xref:ugfun.adoc#_ugfun_object-layout[separate chapter] that discussed object layout in full.
+As this is an important topic, there is a xref:ugvw.adoc#_ugvw_layout[separate chapter] that discussed object layout in full.
====
http://git-wip-us.apache.org/repos/asf/isis/blob/8f18b6f0/adocs/documentation/src/main/asciidoc/guides/rgant/_rgant-MemberOrder.adoc
----------------------------------------------------------------------
diff --git a/adocs/documentation/src/main/asciidoc/guides/rgant/_rgant-MemberOrder.adoc b/adocs/documentation/src/main/asciidoc/guides/rgant/_rgant-MemberOrder.adoc
index f819fca..1aca506 100644
--- a/adocs/documentation/src/main/asciidoc/guides/rgant/_rgant-MemberOrder.adoc
+++ b/adocs/documentation/src/main/asciidoc/guides/rgant/_rgant-MemberOrder.adoc
@@ -21,7 +21,7 @@ Collections are always rendered in the "last" column. This can appear either be
[IMPORTANT]
====
-As this is an important topic, there is a xref:ugfun.adoc#_ugfun_object-layout[separate chapter] that discussed object layout in full.
+As this is an important topic, there is a xref:ugvw.adoc#_ugvw_layout[separate chapter] that discussed object layout in full.
====
http://git-wip-us.apache.org/repos/asf/isis/blob/8f18b6f0/adocs/documentation/src/main/asciidoc/guides/rgant/_rgant-ParameterLayout.adoc
----------------------------------------------------------------------
diff --git a/adocs/documentation/src/main/asciidoc/guides/rgant/_rgant-ParameterLayout.adoc b/adocs/documentation/src/main/asciidoc/guides/rgant/_rgant-ParameterLayout.adoc
index 055ef24..295150f 100644
--- a/adocs/documentation/src/main/asciidoc/guides/rgant/_rgant-ParameterLayout.adoc
+++ b/adocs/documentation/src/main/asciidoc/guides/rgant/_rgant-ParameterLayout.adoc
@@ -96,7 +96,7 @@ public class ToDoItem {
[NOTE]
====
-Note that there is (currently) no support for specifying UI hints for domain services through the dynamic xref:ugfun.adoc#_ugfun_object-layout_dynamic[`.layout.json`] file (only for properties, collections and actions are supported).
+Note that there is (currently) no support for specifying UI hints for domain services through the dynamic xref:ugvw.adoc#_ugvw_layout_dynamic[`.layout.json`] file (only for properties, collections and actions are supported).
====
http://git-wip-us.apache.org/repos/asf/isis/blob/8f18b6f0/adocs/documentation/src/main/asciidoc/guides/rgant/_rgant-PropertyLayout.adoc
----------------------------------------------------------------------
diff --git a/adocs/documentation/src/main/asciidoc/guides/rgant/_rgant-PropertyLayout.adoc b/adocs/documentation/src/main/asciidoc/guides/rgant/_rgant-PropertyLayout.adoc
index 6ed862f..9815899 100644
--- a/adocs/documentation/src/main/asciidoc/guides/rgant/_rgant-PropertyLayout.adoc
+++ b/adocs/documentation/src/main/asciidoc/guides/rgant/_rgant-PropertyLayout.adoc
@@ -102,7 +102,7 @@ It is also possible to apply the annotation to actions of domain services that a
-As an alternative to using the `@PropertyLayout` annotation, a dynamic layout using xref:ugfun.adoc#_ugfun_object-layout_dynamic[`.layout.json`] file can be specified; for example:
+As an alternative to using the `@PropertyLayout` annotation, a dynamic layout using xref:ugvw.adoc#_ugvw_layout_dynamic[`.layout.json`] file can be specified; for example:
[source,javascript]
----
http://git-wip-us.apache.org/repos/asf/isis/blob/8f18b6f0/adocs/documentation/src/main/asciidoc/guides/rgant/_rgant-PropertyLayout_cssClass.adoc
----------------------------------------------------------------------
diff --git a/adocs/documentation/src/main/asciidoc/guides/rgant/_rgant-PropertyLayout_cssClass.adoc b/adocs/documentation/src/main/asciidoc/guides/rgant/_rgant-PropertyLayout_cssClass.adoc
index a32476b..0146994 100644
--- a/adocs/documentation/src/main/asciidoc/guides/rgant/_rgant-PropertyLayout_cssClass.adoc
+++ b/adocs/documentation/src/main/asciidoc/guides/rgant/_rgant-PropertyLayout_cssClass.adoc
@@ -23,7 +23,7 @@ public class ToDoItem {
-As an alternative to using the annotation, the dynamic xref:ugfun.adoc#_ugfun_object-layout_dynamic[`.layout.json`]
+As an alternative to using the annotation, the dynamic xref:ugvw.adoc#_ugvw_layout_dynamic[`.layout.json`]
can be used instead, eg:
[source,javascript]
http://git-wip-us.apache.org/repos/asf/isis/blob/8f18b6f0/adocs/documentation/src/main/asciidoc/guides/rgant/_rgant-PropertyLayout_describedAs.adoc
----------------------------------------------------------------------
diff --git a/adocs/documentation/src/main/asciidoc/guides/rgant/_rgant-PropertyLayout_describedAs.adoc b/adocs/documentation/src/main/asciidoc/guides/rgant/_rgant-PropertyLayout_describedAs.adoc
index f61e807..41db6f7 100644
--- a/adocs/documentation/src/main/asciidoc/guides/rgant/_rgant-PropertyLayout_describedAs.adoc
+++ b/adocs/documentation/src/main/asciidoc/guides/rgant/_rgant-PropertyLayout_describedAs.adoc
@@ -20,7 +20,7 @@ public class Customer {
----
-As an alternative to using the annotation, the dynamic xref:ugfun.adoc#_ugfun_object-layout_dynamic[`.layout.json`]
+As an alternative to using the annotation, the dynamic xref:ugvw.adoc#_ugvw_layout_dynamic[`.layout.json`]
can be used instead, eg:
[source,javascript]
http://git-wip-us.apache.org/repos/asf/isis/blob/8f18b6f0/adocs/documentation/src/main/asciidoc/guides/rgant/_rgant-PropertyLayout_hidden.adoc
----------------------------------------------------------------------
diff --git a/adocs/documentation/src/main/asciidoc/guides/rgant/_rgant-PropertyLayout_hidden.adoc b/adocs/documentation/src/main/asciidoc/guides/rgant/_rgant-PropertyLayout_hidden.adoc
index 4366517..951e47b 100644
--- a/adocs/documentation/src/main/asciidoc/guides/rgant/_rgant-PropertyLayout_hidden.adoc
+++ b/adocs/documentation/src/main/asciidoc/guides/rgant/_rgant-PropertyLayout_hidden.adoc
@@ -10,7 +10,7 @@ The `hidden()` attribute indicates where (in the UI) the property should be hidd
[TIP]
====
-It is also possible to use xref:rgant.adoc#_rgant-PropertyLayout_hidden[`@PropertyLayout#hidden()`] or xref:ugfun.adoc#_ugfun_object-layout_dynamic[dynamic layouts] such that the property can be hidden at the view layer. Both options are provided with a view that in the future the view-layer semantics may be under the control of (expert) users, whereas domain-layer semantics should never be overridden or modified by the user.
+It is also possible to use xref:rgant.adoc#_rgant-PropertyLayout_hidden[`@PropertyLayout#hidden()`] or xref:ugvw.adoc#_ugvw_layout_dynamic[dynamic layouts] such that the property can be hidden at the view layer. Both options are provided with a view that in the future the view-layer semantics may be under the control of (expert) users, whereas domain-layer semantics should never be overridden or modified by the user.
====
@@ -67,7 +67,7 @@ The xref:ugvro.adoc#[RestfulObjects viewer] has only partial support for these `
====
-As an alternative to using the annotation, the dynamic xref:ugfun.adoc#_ugfun_object-layout_dynamic[`.layout.json`]
+As an alternative to using the annotation, the dynamic xref:ugvw.adoc#_ugvw_layout_dynamic[`.layout.json`]
can be used instead, eg:
[source,javascript]
http://git-wip-us.apache.org/repos/asf/isis/blob/8f18b6f0/adocs/documentation/src/main/asciidoc/guides/rgant/_rgant-PropertyLayout_labelPosition.adoc
----------------------------------------------------------------------
diff --git a/adocs/documentation/src/main/asciidoc/guides/rgant/_rgant-PropertyLayout_labelPosition.adoc b/adocs/documentation/src/main/asciidoc/guides/rgant/_rgant-PropertyLayout_labelPosition.adoc
index 98a64d4..4f282d2 100644
--- a/adocs/documentation/src/main/asciidoc/guides/rgant/_rgant-PropertyLayout_labelPosition.adoc
+++ b/adocs/documentation/src/main/asciidoc/guides/rgant/_rgant-PropertyLayout_labelPosition.adoc
@@ -58,7 +58,7 @@ image::{_imagesdir}reference-annotations/PropertyLayout/labelPosition-boolean-RI
-As an alternative to using the annotation, the dynamic xref:ugfun.adoc#_ugfun_object-layout_dynamic[`.layout.json`]
+As an alternative to using the annotation, the dynamic xref:ugvw.adoc#_ugvw_layout_dynamic[`.layout.json`]
can be used instead, eg:
[source,javascript]
http://git-wip-us.apache.org/repos/asf/isis/blob/8f18b6f0/adocs/documentation/src/main/asciidoc/guides/rgant/_rgant-PropertyLayout_multiLine.adoc
----------------------------------------------------------------------
diff --git a/adocs/documentation/src/main/asciidoc/guides/rgant/_rgant-PropertyLayout_multiLine.adoc b/adocs/documentation/src/main/asciidoc/guides/rgant/_rgant-PropertyLayout_multiLine.adoc
index 0599c47..54a9eeb 100644
--- a/adocs/documentation/src/main/asciidoc/guides/rgant/_rgant-PropertyLayout_multiLine.adoc
+++ b/adocs/documentation/src/main/asciidoc/guides/rgant/_rgant-PropertyLayout_multiLine.adoc
@@ -25,7 +25,7 @@ Here the `stepsToReproduce` will be displayed in a text area of 10 rows.
-As an alternative to using the annotation, the dynamic xref:ugfun.adoc#_ugfun_object-layout_dynamic[`.layout.json`]
+As an alternative to using the annotation, the dynamic xref:ugvw.adoc#_ugvw_layout_dynamic[`.layout.json`]
can be used instead, eg:
[source,javascript]
http://git-wip-us.apache.org/repos/asf/isis/blob/8f18b6f0/adocs/documentation/src/main/asciidoc/guides/rgant/_rgant-PropertyLayout_named.adoc
----------------------------------------------------------------------
diff --git a/adocs/documentation/src/main/asciidoc/guides/rgant/_rgant-PropertyLayout_named.adoc b/adocs/documentation/src/main/asciidoc/guides/rgant/_rgant-PropertyLayout_named.adoc
index 69e687c..682d855 100644
--- a/adocs/documentation/src/main/asciidoc/guides/rgant/_rgant-PropertyLayout_named.adoc
+++ b/adocs/documentation/src/main/asciidoc/guides/rgant/_rgant-PropertyLayout_named.adoc
@@ -31,7 +31,7 @@ public class ToDoItem {
-As an alternative to using the annotation, the dynamic xref:ugfun.adoc#_ugfun_object-layout_dynamic[`.layout.json`]
+As an alternative to using the annotation, the dynamic xref:ugvw.adoc#_ugvw_layout_dynamic[`.layout.json`]
can be used instead, eg:
[source,javascript]
http://git-wip-us.apache.org/repos/asf/isis/blob/8f18b6f0/adocs/documentation/src/main/asciidoc/guides/rgant/_rgant-PropertyLayout_renderedAsDayBefore.adoc
----------------------------------------------------------------------
diff --git a/adocs/documentation/src/main/asciidoc/guides/rgant/_rgant-PropertyLayout_renderedAsDayBefore.adoc b/adocs/documentation/src/main/asciidoc/guides/rgant/_rgant-PropertyLayout_renderedAsDayBefore.adoc
index cab45f1..6860789 100644
--- a/adocs/documentation/src/main/asciidoc/guides/rgant/_rgant-PropertyLayout_renderedAsDayBefore.adoc
+++ b/adocs/documentation/src/main/asciidoc/guides/rgant/_rgant-PropertyLayout_renderedAsDayBefore.adoc
@@ -32,7 +32,7 @@ public class Tenancy {
-As an alternative to using the annotation, the dynamic xref:ugfun.adoc#_ugfun_object-layout_dynamic[`.layout.json`]
+As an alternative to using the annotation, the dynamic xref:ugvw.adoc#_ugvw_layout_dynamic[`.layout.json`]
can be used instead, eg:
[source,javascript]
http://git-wip-us.apache.org/repos/asf/isis/blob/8f18b6f0/adocs/documentation/src/main/asciidoc/guides/rgant/_rgant-ViewModelLayout.adoc
----------------------------------------------------------------------
diff --git a/adocs/documentation/src/main/asciidoc/guides/rgant/_rgant-ViewModelLayout.adoc b/adocs/documentation/src/main/asciidoc/guides/rgant/_rgant-ViewModelLayout.adoc
index 3f46e4f..4e7a1b6 100644
--- a/adocs/documentation/src/main/asciidoc/guides/rgant/_rgant-ViewModelLayout.adoc
+++ b/adocs/documentation/src/main/asciidoc/guides/rgant/_rgant-ViewModelLayout.adoc
@@ -82,7 +82,7 @@ public class CategoryPieChart { ... }
[NOTE]
====
-Note that there is (currently) no support for specifying UI hints for view models through the dynamic xref:ugfun.adoc#_ugfun_object-layout_dynamic[`.layout.json`] file (only for properties, collections and actions are supported).
+Note that there is (currently) no support for specifying UI hints for view models through the dynamic xref:ugvw.adoc#_ugvw_layout_dynamic[`.layout.json`] file (only for properties, collections and actions are supported).
====
http://git-wip-us.apache.org/repos/asf/isis/blob/8f18b6f0/adocs/documentation/src/main/asciidoc/guides/rgant/_rgant_aaa_deprecated.adoc
----------------------------------------------------------------------
diff --git a/adocs/documentation/src/main/asciidoc/guides/rgant/_rgant_aaa_deprecated.adoc b/adocs/documentation/src/main/asciidoc/guides/rgant/_rgant_aaa_deprecated.adoc
index fc05967..6c7127e 100644
--- a/adocs/documentation/src/main/asciidoc/guides/rgant/_rgant_aaa_deprecated.adoc
+++ b/adocs/documentation/src/main/asciidoc/guides/rgant/_rgant_aaa_deprecated.adoc
@@ -20,7 +20,7 @@ The annotations listed in the table below are still supported by Apache Isis, bu
|Purpose
|Use instead
|Layer
-|xref:ugfun.adoc#_ugfun_object-layout_dynamic[Dynamic layout]?
+|xref:ugvw.adoc#_ugvw_layout_dynamic[Dynamic layout]?
|`@ActionOrder`
|Order of buttons and menu items representing actions.
@@ -170,13 +170,13 @@ Actions can still be invoked.
|`@MemberGroups`
|Layout of properties and collections of a domain object or view model object.
-|xref:ugfun.adoc#_ugfun_object-layout_dynamic_xml[dynamic `.layout.xml`] files
+|xref:ugvw.adoc#_ugvw_layout_dynamic_xml[dynamic `.layout.xml`] files
|UI
|Yes
|@MemberGroupLayout`
|Grouping of properties into groups, and organizing of properties, collections into columns.
-|xref:ugfun.adoc#_ugfun_object-layout_dynamic_xml[dynamic `.layout.xml`] files
+|xref:ugvw.adoc#_ugvw_layout_dynamic_xml[dynamic `.layout.xml`] files
|UI
|Yes
http://git-wip-us.apache.org/repos/asf/isis/blob/8f18b6f0/adocs/documentation/src/main/asciidoc/guides/rgant/_rgant_aaa_jee.adoc
----------------------------------------------------------------------
diff --git a/adocs/documentation/src/main/asciidoc/guides/rgant/_rgant_aaa_jee.adoc b/adocs/documentation/src/main/asciidoc/guides/rgant/_rgant_aaa_jee.adoc
index 1860a5d..92e8c6a 100644
--- a/adocs/documentation/src/main/asciidoc/guides/rgant/_rgant_aaa_jee.adoc
+++ b/adocs/documentation/src/main/asciidoc/guides/rgant/_rgant_aaa_jee.adoc
@@ -16,7 +16,7 @@ The table below lists the JEE annotations currently recognized. Expect to see m
|Annotation
|Purpose
|Layer
-|xref:ugfun.adoc#_ugfun_object-layout_dynamic[Dynamic layout]?
+|xref:ugvw.adoc#_ugvw_layout_dynamic[Dynamic layout]?
|xref:rgant.adoc#_rgant-Digits[`@javax.validation.` +
`constraints.` +
http://git-wip-us.apache.org/repos/asf/isis/blob/8f18b6f0/adocs/documentation/src/main/asciidoc/guides/rgant/_rgant_aaa_main.adoc
----------------------------------------------------------------------
diff --git a/adocs/documentation/src/main/asciidoc/guides/rgant/_rgant_aaa_main.adoc b/adocs/documentation/src/main/asciidoc/guides/rgant/_rgant_aaa_main.adoc
index 0564fd0..5c98084 100644
--- a/adocs/documentation/src/main/asciidoc/guides/rgant/_rgant_aaa_main.adoc
+++ b/adocs/documentation/src/main/asciidoc/guides/rgant/_rgant_aaa_main.adoc
@@ -11,7 +11,7 @@ For each of these domain types and members there are two annotations. One cover
[TIP]
====
-Most UI semantics can also be specified using xref:ugfun.adoc#_ugfun_object-layout_dynamic[dynamic object layout].
+Most UI semantics can also be specified using xref:ugvw.adoc#_ugvw_layout_dynamic[dynamic object layout].
====
@@ -24,7 +24,7 @@ The table below summarizes these most commonly used annotations in Apache Isis.
|Annotation
|Purpose
|Layer
-|xref:ugfun.adoc#_ugfun_object-layout_dynamic[Dynamic layout]?
+|xref:ugvw.adoc#_ugvw_layout_dynamic[Dynamic layout]?
|xref:rgant.adoc#_rgant-Action[`@Action`]
|Domain semantics for actions
http://git-wip-us.apache.org/repos/asf/isis/blob/8f18b6f0/adocs/documentation/src/main/asciidoc/guides/rgant/_rgant_aaa_other.adoc
----------------------------------------------------------------------
diff --git a/adocs/documentation/src/main/asciidoc/guides/rgant/_rgant_aaa_other.adoc b/adocs/documentation/src/main/asciidoc/guides/rgant/_rgant_aaa_other.adoc
index 66d4ac9..dadc069 100644
--- a/adocs/documentation/src/main/asciidoc/guides/rgant/_rgant_aaa_other.adoc
+++ b/adocs/documentation/src/main/asciidoc/guides/rgant/_rgant_aaa_other.adoc
@@ -13,7 +13,7 @@ These annotations are also commonly used, but relate _not_ to objects or object
|Annotation
|Purpose
|Layer
-|xref:ugfun.adoc#_ugfun_object-layout_dynamic[Dynamic layout]?
+|xref:ugvw.adoc#_ugvw_layout_dynamic[Dynamic layout]?
|xref:rgant.adoc#_rgant-Facets[`@Facets`]
|Install arbitrary facets within the Apache Isis metamodel.
http://git-wip-us.apache.org/repos/asf/isis/blob/8f18b6f0/adocs/documentation/src/main/asciidoc/guides/rgcfg/_rgcfg_configuring-core.adoc
----------------------------------------------------------------------
diff --git a/adocs/documentation/src/main/asciidoc/guides/rgcfg/_rgcfg_configuring-core.adoc b/adocs/documentation/src/main/asciidoc/guides/rgcfg/_rgcfg_configuring-core.adoc
index af2567f..d835881 100644
--- a/adocs/documentation/src/main/asciidoc/guides/rgcfg/_rgcfg_configuring-core.adoc
+++ b/adocs/documentation/src/main/asciidoc/guides/rgcfg/_rgcfg_configuring-core.adoc
@@ -656,7 +656,7 @@ See xref:ugbtb.adoc#_ugbtb_programming-model_finetuning[finetuning the programmi
|`isis.reflector.` +
`layoutMetadataReaders`
|`FQCN`,`FQCN2`,...
-|Fully qualified class names of classes to be instantiated to read layout metadata, as used in for xref:ugfun.adoc#_ugfun_object-layout_dynamic[dynamic layout]s. +
+|Fully qualified class names of classes to be instantiated to read layout metadata, as used in for xref:ugvw.adoc#_ugvw_layout_dynamic[dynamic layout]s. +
See xref:ugbtb.adoc#_ugbtb_programming-model_layout-metadata-reader[Layout Metadata Reader] for more information.
http://git-wip-us.apache.org/repos/asf/isis/blob/8f18b6f0/adocs/documentation/src/main/asciidoc/guides/rgcms/_rgcms_classes.adoc
----------------------------------------------------------------------
diff --git a/adocs/documentation/src/main/asciidoc/guides/rgcms/_rgcms_classes.adoc b/adocs/documentation/src/main/asciidoc/guides/rgcms/_rgcms_classes.adoc
index 98c843b..3cb8b4f 100644
--- a/adocs/documentation/src/main/asciidoc/guides/rgcms/_rgcms_classes.adoc
+++ b/adocs/documentation/src/main/asciidoc/guides/rgcms/_rgcms_classes.adoc
@@ -5,7 +5,7 @@
:_imagesdir: images/
-This chapter describes the usage of various classes and interfaces that are not otherwise associated with xref:rgsvc.adoc[domain services], xref:ugfun.adoc#_ugfun_object-layout[object layout] or xref:rgcfg.adoc#_rgcfg[configuration].
+This chapter describes the usage of various classes and interfaces that are not otherwise associated with xref:rgsvc.adoc[domain services], xref:ugvw.adoc#_ugvw_layout[object layout] or xref:rgcfg.adoc#_rgcfg[configuration].
include::_rgcms_classes_AppManifest-bootstrapping.adoc[leveloffset=+1]
http://git-wip-us.apache.org/repos/asf/isis/blob/8f18b6f0/adocs/documentation/src/main/asciidoc/guides/rgcms/_rgcms_classes_mixins_Object.adoc
----------------------------------------------------------------------
diff --git a/adocs/documentation/src/main/asciidoc/guides/rgcms/_rgcms_classes_mixins_Object.adoc b/adocs/documentation/src/main/asciidoc/guides/rgcms/_rgcms_classes_mixins_Object.adoc
index 821c9f5..262aa41 100644
--- a/adocs/documentation/src/main/asciidoc/guides/rgcms/_rgcms_classes_mixins_Object.adoc
+++ b/adocs/documentation/src/main/asciidoc/guides/rgcms/_rgcms_classes_mixins_Object.adoc
@@ -47,7 +47,7 @@ each rendered object, per user.
[[__rgcms_classes_mixins_Object_downloadLayoutXml]]
== `downloadLayoutXml()`
-The `Object_downloadLayoutXml` mixin provides an action to download the xref:ugfun.adoc#_ugfun_object-layout_dynamic_xml[layout XML] for the current domain object. It has the following signature:
+The `Object_downloadLayoutXml` mixin provides an action to download the xref:ugvw.adoc#_ugvw_layout_dynamic_xml[layout XML] for the current domain object. It has the following signature:
[source,java]
----
@@ -60,7 +60,7 @@ public Object downloadLayoutXml(
----
<1> either current, complete, normalized or minimal.
-See the documentation on xref:ugfun.adoc#_ugfun_object-layout_dynamic_xml[layout XML] and also
+See the documentation on xref:ugvw.adoc#_ugvw_layout_dynamic_xml[layout XML] and also
the xref:rgsvc.adoc#_rgsvc_api_LayoutService[`LayoutService`] for more information on these styles
http://git-wip-us.apache.org/repos/asf/isis/blob/8f18b6f0/adocs/documentation/src/main/asciidoc/guides/ugbtb/_ugbtb_i18n.adoc
----------------------------------------------------------------------
diff --git a/adocs/documentation/src/main/asciidoc/guides/ugbtb/_ugbtb_i18n.adoc b/adocs/documentation/src/main/asciidoc/guides/ugbtb/_ugbtb_i18n.adoc
index fad5eab..16f8923 100644
--- a/adocs/documentation/src/main/asciidoc/guides/ugbtb/_ugbtb_i18n.adoc
+++ b/adocs/documentation/src/main/asciidoc/guides/ugbtb/_ugbtb_i18n.adoc
@@ -540,7 +540,7 @@ msgstr "<i>Quantit�</i>"
----
For this to work, the `namedEscaped()` attribute must be specified using either the
-xref:ugfun.adoc#_ugfun_object-layout_dynamic[dynamic layout] json file, or using an annotation such as
+xref:ugvw.adoc#_ugvw_layout_dynamic[dynamic layout] json file, or using an annotation such as
xref:rgant.adoc#_rgant-PropertyLayout[`@PropertyLayout`] or xref:rgant.adoc#_rgant-ParameterLayout[`@ParameterLayout`].
For example:
http://git-wip-us.apache.org/repos/asf/isis/blob/8f18b6f0/adocs/documentation/src/main/asciidoc/guides/ugbtb/_ugbtb_programming-model_layout-metadata-reader.adoc
----------------------------------------------------------------------
diff --git a/adocs/documentation/src/main/asciidoc/guides/ugbtb/_ugbtb_programming-model_layout-metadata-reader.adoc b/adocs/documentation/src/main/asciidoc/guides/ugbtb/_ugbtb_programming-model_layout-metadata-reader.adoc
index fdeb684..40d3e9f 100644
--- a/adocs/documentation/src/main/asciidoc/guides/ugbtb/_ugbtb_programming-model_layout-metadata-reader.adoc
+++ b/adocs/documentation/src/main/asciidoc/guides/ugbtb/_ugbtb_programming-model_layout-metadata-reader.adoc
@@ -5,7 +5,7 @@
:_imagesdir: images/
-The metadata for domain objects is obtained both xref:ugfun.adoc#_ugfun_object-layout_static[statically] and xref:ugfun.adoc#_ugfun_object-layout_dynamic[dynamically].
+The metadata for domain objects is obtained both xref:ugvw.adoc#_ugvw_layout_static[statically] and xref:ugvw.adoc#_ugvw_layout_dynamic[dynamically].
The default implementation for reading dynamic layout metadata is `org.apache.isis.core.metamodel.layoutmetadata.json.LayoutMetadataReaderFromJson`, which is responsible for reading from the `Xxx.layout.json` files on the classpath (for each domain entity `Xxx`).
@@ -14,7 +14,7 @@ You can also implement your own metadata readers and plug them into Apache Isis.
[WARNING]
====
-The use of dynamic layouts through the `.layout.json` - and therefore also the `LayoutMetadataReader` - is DEPRECATED. Instead, the xref:ugfun.adoc#_ugfun_object-layout_dynamic_xml[dynamic XML layouts] using ``.layout.xml`` enables much more sophisticated custom layouts than those afforded by ``.layout.json``.
+The use of dynamic layouts through the `.layout.json` - and therefore also the `LayoutMetadataReader` - is DEPRECATED. Instead, the xref:ugvw.adoc#_ugvw_layout_dynamic_xml[dynamic XML layouts] using ``.layout.xml`` enables much more sophisticated custom layouts than those afforded by ``.layout.json``.
By default, custom XML layouts are read from the classpath. This behaviour can be customized by providing an
alternative implementation of the xref:rgsvc.adoc#_rgsvc_spi_GridLoaderService[`GridLoaderService`].
http://git-wip-us.apache.org/repos/asf/isis/blob/8f18b6f0/adocs/documentation/src/main/asciidoc/guides/ugfun/_ugfun_core-concepts_building-blocks.adoc
----------------------------------------------------------------------
diff --git a/adocs/documentation/src/main/asciidoc/guides/ugfun/_ugfun_core-concepts_building-blocks.adoc b/adocs/documentation/src/main/asciidoc/guides/ugfun/_ugfun_core-concepts_building-blocks.adoc
index a3680ad..c93e690 100644
--- a/adocs/documentation/src/main/asciidoc/guides/ugfun/_ugfun_core-concepts_building-blocks.adoc
+++ b/adocs/documentation/src/main/asciidoc/guides/ugfun/_ugfun_core-concepts_building-blocks.adoc
@@ -24,7 +24,7 @@ This is an ORM that implements the JDO and JPA APIs, and which can map domain ob
Apache Isis recognizes a number of the JDO annotations such as `@javax.jdo.annotations.Column(allowsNull=...)`.
In addition, the framework builds up the metamodel for each domain object using
-xref:ugfun.adoc#_ugfun_object-layout[layout hints], such as `Customer.layout.xml`.
+xref:ugvw.adoc#_ugvw_layout[layout hints], such as `Customer.layout.xml`.
These provide metadata such as grouping elements of the UI together, using multi-column layouts, and so on.
The layout file can be modified while the application is still running, and are picked up automatically; a useful way to speed up feedback.
http://git-wip-us.apache.org/repos/asf/isis/blob/8f18b6f0/adocs/documentation/src/main/asciidoc/guides/ugfun/_ugfun_core-concepts_principles.adoc
----------------------------------------------------------------------
diff --git a/adocs/documentation/src/main/asciidoc/guides/ugfun/_ugfun_core-concepts_principles.adoc b/adocs/documentation/src/main/asciidoc/guides/ugfun/_ugfun_core-concepts_principles.adoc
index 26794c4..3784b4c 100644
--- a/adocs/documentation/src/main/asciidoc/guides/ugfun/_ugfun_core-concepts_principles.adoc
+++ b/adocs/documentation/src/main/asciidoc/guides/ugfun/_ugfun_core-concepts_principles.adoc
@@ -7,7 +7,7 @@
Apache Isis is primarily aimed at custom-built "enterprise" applications.
-The UI provided by the xref:ugvw.adoc#[Wicket viewer] is intended to be usable by domain experts, typically end-users within the organization.
+The UI provided by the xref:ugvw.adoc#[Wicket viewer] is intended to be usable by domain experts, typically end-users within the organization.pdf
The REST API exposed by the xref:ugvro.adoc#[RestfulObjects viewer] allows custom apps to be developed -- eg using Angular or similar -- for use by those requiring more guidance; typically end-users outside of the organization.
This section describes some of the core principles and values that the framework aims to honour and support.
http://git-wip-us.apache.org/repos/asf/isis/blob/8f18b6f0/adocs/documentation/src/main/asciidoc/guides/ugfun/_ugfun_how-tos_class-structure_class-definition.adoc
----------------------------------------------------------------------
diff --git a/adocs/documentation/src/main/asciidoc/guides/ugfun/_ugfun_how-tos_class-structure_class-definition.adoc b/adocs/documentation/src/main/asciidoc/guides/ugfun/_ugfun_how-tos_class-structure_class-definition.adoc
index 82aef7b..c18bab4 100644
--- a/adocs/documentation/src/main/asciidoc/guides/ugfun/_ugfun_how-tos_class-structure_class-definition.adoc
+++ b/adocs/documentation/src/main/asciidoc/guides/ugfun/_ugfun_how-tos_class-structure_class-definition.adoc
@@ -22,7 +22,7 @@ Apache Isis recognizes some of the JDO and JAXB annotations and infers domain se
You can generally recognize an Apache Isis domain class because it will be probably be annotated using `@DomainObject` and `@DomainService`.
The framework also defines supplementary annotations, `@DomainObjectLayout` and `@DomainServiceLayout`.
These provide hints relating to the layout of the domain object in the user interface.
-(Alternatively, these UI hints can be defined in a supplementary xref:ugfun.adoc#_ugfun_object-layout[`.layout.xml`] file.
+(Alternatively, these UI hints can be defined in a supplementary xref:ugvw.adoc#_ugvw_layout[`.layout.xml`] file.
We use Maven modules as a way to group related domain objects together; we can then reason about all the classes in that module as a single unit.
By convention there will be a single top-level package corresponding to the module.
http://git-wip-us.apache.org/repos/asf/isis/blob/8f18b6f0/adocs/documentation/src/main/asciidoc/guides/ugfun/_ugfun_how-tos_class-structure_collections.adoc
----------------------------------------------------------------------
diff --git a/adocs/documentation/src/main/asciidoc/guides/ugfun/_ugfun_how-tos_class-structure_collections.adoc b/adocs/documentation/src/main/asciidoc/guides/ugfun/_ugfun_how-tos_class-structure_collections.adoc
index 77bf741..a7d663b 100644
--- a/adocs/documentation/src/main/asciidoc/guides/ugfun/_ugfun_how-tos_class-structure_collections.adoc
+++ b/adocs/documentation/src/main/asciidoc/guides/ugfun/_ugfun_how-tos_class-structure_collections.adoc
@@ -16,7 +16,7 @@ Most collections (those that are modifiable) will also have a setter and (if per
And collections properties will also have a number of annotations:
* Apache Isis defines its own set own `@Collection` annotation for capturing domain semantics.
-It also provides a `@CollectionLayout` for UI hints (though the information in this annotation may instead be provided by a supplementary xref:ugfun.adoc#_ugfun_object-layout[`.layout.xml`] file
+It also provides a `@CollectionLayout` for UI hints (though the information in this annotation may instead be provided by a supplementary xref:ugvw.adoc#_ugvw_layout[`.layout.xml`] file
* the collections of domain entities are often annotated with various JDO/DataNucleus annotations, most notable `javax.jdo.annotations.Persistent`.
This and other annotations can be used to specify if the association is bidirectional, and whether to define a link table or not to hold foreign key columns.
http://git-wip-us.apache.org/repos/asf/isis/blob/8f18b6f0/adocs/documentation/src/main/asciidoc/guides/ugfun/_ugfun_how-tos_class-structure_properties.adoc
----------------------------------------------------------------------
diff --git a/adocs/documentation/src/main/asciidoc/guides/ugfun/_ugfun_how-tos_class-structure_properties.adoc b/adocs/documentation/src/main/asciidoc/guides/ugfun/_ugfun_how-tos_class-structure_properties.adoc
index 1e3f3e0..34851a1 100644
--- a/adocs/documentation/src/main/asciidoc/guides/ugfun/_ugfun_how-tos_class-structure_properties.adoc
+++ b/adocs/documentation/src/main/asciidoc/guides/ugfun/_ugfun_how-tos_class-structure_properties.adoc
@@ -16,7 +16,7 @@ Most properties (those that are editable/modifiable) will also have a setter and
And most properties will also have a number of annotations:
* Apache Isis defines its own set own `@Property` annotation for capturing domain semantics.
-It also provides a `@PropertyLayout` for UI hints (though the information in this annotation may instead be provided by a supplementary xref:ugfun.adoc#_ugfun_object-layout[`.layout.xml`] file
+It also provides a `@PropertyLayout` for UI hints (though the information in this annotation may instead be provided by a supplementary xref:ugvw.adoc#_ugvw_layout[`.layout.xml`] file
* the properties of domain entities are often annotated with the JDO/DataNucleus `@javax.jdo.annotations.Column` annotation.
For property references, there may be other annotations to indicate whether the reference is bidirectional.
http://git-wip-us.apache.org/repos/asf/isis/blob/8f18b6f0/adocs/documentation/src/main/asciidoc/guides/ugfun/_ugfun_how-tos_ui-hints_action-icons-and-css.adoc
----------------------------------------------------------------------
diff --git a/adocs/documentation/src/main/asciidoc/guides/ugfun/_ugfun_how-tos_ui-hints_action-icons-and-css.adoc b/adocs/documentation/src/main/asciidoc/guides/ugfun/_ugfun_how-tos_ui-hints_action-icons-and-css.adoc
index 1558499..e676bec 100644
--- a/adocs/documentation/src/main/asciidoc/guides/ugfun/_ugfun_how-tos_ui-hints_action-icons-and-css.adoc
+++ b/adocs/documentation/src/main/asciidoc/guides/ugfun/_ugfun_how-tos_ui-hints_action-icons-and-css.adoc
@@ -14,7 +14,7 @@ These UI hint can be applied either to individual actions, or can be applied en-
NOTE: TODO - xref:rgant.adoc#_rgant-ActionLayout_cssClass[`@ActionLayout#cssClass()`] and xref:rgant.adoc#_rgant-ActionLayout_cssClassFa[`@ActionLayout#cssClassFa()`]
-Alternatively, you can specify these hints dynamically in the xref:ugfun.adoc#_ugfun_object-layout[`Xxx.layout.json`] for the entity.
+Alternatively, you can specify these hints dynamically in the xref:ugvw.adoc#_ugvw_layout[`Xxx.layout.json`] for the entity.
== Per pattern matching
http://git-wip-us.apache.org/repos/asf/isis/blob/8f18b6f0/adocs/documentation/src/main/asciidoc/guides/ugfun/_ugfun_how-tos_ui-hints_layout.adoc
----------------------------------------------------------------------
diff --git a/adocs/documentation/src/main/asciidoc/guides/ugfun/_ugfun_how-tos_ui-hints_layout.adoc b/adocs/documentation/src/main/asciidoc/guides/ugfun/_ugfun_how-tos_ui-hints_layout.adoc
index 2e05b23..580a564 100644
--- a/adocs/documentation/src/main/asciidoc/guides/ugfun/_ugfun_how-tos_ui-hints_layout.adoc
+++ b/adocs/documentation/src/main/asciidoc/guides/ugfun/_ugfun_how-tos_ui-hints_layout.adoc
@@ -5,5 +5,5 @@
:_imagesdir: images/
-See the xref:ugfun.adoc#_ugfun_object-layout[object layout] chapter.
+See the xref:ugvw.adoc#_ugvw_layout[object layout] chapter.
http://git-wip-us.apache.org/repos/asf/isis/blob/8f18b6f0/adocs/documentation/src/main/asciidoc/guides/ugfun/_ugfun_object-layout.adoc
----------------------------------------------------------------------
diff --git a/adocs/documentation/src/main/asciidoc/guides/ugfun/_ugfun_object-layout.adoc b/adocs/documentation/src/main/asciidoc/guides/ugfun/_ugfun_object-layout.adoc
deleted file mode 100644
index 5b58647..0000000
--- a/adocs/documentation/src/main/asciidoc/guides/ugfun/_ugfun_object-layout.adoc
+++ /dev/null
@@ -1,19 +0,0 @@
-[[_ugfun_object-layout]]
-= Object Layout
-: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 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.
-:_basedir: ../../
-:_imagesdir: images/
-
-
-In implementing the http://en.wikipedia.org/wiki/Naked_objects[naked objects pattern], Apache Isis aims to infer as much information from the domain classes as possible. Nevertheless, some metadata relating solely to the UI is inevitably required.
-
-
-This chapter describes how this is done both for domain objects -- statically or dynamically -- and for the application menu bar (containing domain service' actions).
-
-include::_ugfun_object-layout_static.adoc[leveloffset=+1]
-include::_ugfun_object-layout_dynamic_xml.adoc[leveloffset=+1]
-include::_ugfun_object-layout_dynamic.adoc[leveloffset=+1]
-include::_ugfun_object-layout_application-menu.adoc[leveloffset=+1]
-include::_ugfun_object-layout_static-vs-dynamic.adoc[leveloffset=+1]
-
-
http://git-wip-us.apache.org/repos/asf/isis/blob/8f18b6f0/adocs/documentation/src/main/asciidoc/guides/ugfun/_ugfun_object-layout_application-menu.adoc
----------------------------------------------------------------------
diff --git a/adocs/documentation/src/main/asciidoc/guides/ugfun/_ugfun_object-layout_application-menu.adoc b/adocs/documentation/src/main/asciidoc/guides/ugfun/_ugfun_object-layout_application-menu.adoc
deleted file mode 100644
index b14b726..0000000
--- a/adocs/documentation/src/main/asciidoc/guides/ugfun/_ugfun_object-layout_application-menu.adoc
+++ /dev/null
@@ -1,171 +0,0 @@
-[[_ugfun_object-layout_application-menu]]
-= Application Menu Layout
-: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 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.
-:_basedir: ../../
-:_imagesdir: images/
-
-
-
-The actions of domain services are made available as an application menu bar. By default each domain service
-corresponds to a single menu on this menu bar, with its actions as the drop-down menu items. This is rarely exactly
-what is required, however. The `@MemberOrder` and `@DomainServiceLayout` annotations can be used to rearrange the
-placement of menu items.
-
-The screenshots below are taken from http://github.com/estatio/estatio[Estatio], an open source estate management
-application built using Apache Isis.
-
-== @DomainServiceLayout
-
-Menus for domain services can be placed either on a primary, secondary or tertiary menu bar.
-
-image::{_imagesdir}wicket-viewer/application-menu/layout-menus.png[width="800px",link="{_imagesdir}wicket-viewer/application-menu/layout-menus.png"]
-
-Within a single top-level menu (eg "Fixed Assets") there can be actions from multiple services. The Wicket viewer
-automatically adds a divider between each:
-
-image::{_imagesdir}wicket-viewer/application-menu/dividers.png[width="400px",link="{_imagesdir}wicket-viewer/application-menu/dividers.png"]
-
-In the example above the top-level menu combines the actions from the `Properties`, `Units` and `FixedAssetRegistrations`
-services. The `Properties` service is annotated:
-
-[source,java]
-----
-@DomainServiceLayout(
- named="Fixed Assets",
- menuBar = DomainServiceLayout.MenuBar.PRIMARY,
- menuOrder = "10.1"
-)
-public class Properties ... { ... }
-----
-
-while the `Units` service is annotated:
-
-[source,java]
-----
-@DomainServiceLayout(
- named="Fixed Assets",
- menuBar = DomainServiceLayout.MenuBar.PRIMARY,
- menuOrder = "10.2"
-)
-public class Units ... { ... }
-----
-
-and similarly `FixedAssetRegistrations` is annotated:
-
-[source,java]
-----
-@DomainServiceLayout(
- named="Fixed Assets",
- menuBar = DomainServiceLayout.MenuBar.PRIMARY,
- menuOrder = "10.3"
-)
-public class FixedAssetRegistrations ... { ... }
-----
-
-Note that in all three cases the value of the `named` attribute and the `menuBar` attribute is the same: "Fixed Assets"
-and PRIMARY. This means that all will appear on a "Fixed Assets" menu in the primary menu bar.
-
-Meanwhile the value of `menuOrder` attribute is significant for two reasons:
-
-* for these three services on the same ("Fixed Assets") top-level menu, it determines the relative order of their sections (`Properties` first, then `Units`, then `FixedAssetRegistrations`)
-* it determines the placement of the top-level menu itself ("Fixed Assets") with respect to other top-level menus on the menu bar.
-
-To illustrate this latter point, the next top-level menu on the menu bar, "Parties", is placed after "Fixed Assets"
- because the `menuOrder` of the first of its domain services, namely the `Parties` service, is higher than that for
- "Fixed Assets":
-
-[source,java]
-----
-@DomainServiceLayout(
- named="Parties",
- menuBar = DomainServiceLayout.MenuBar.PRIMARY,
- menuOrder = "20.1"
-)
-public class Parties ... { ... }
-----
-
-Note that only the `menuOrder` of the _first_ domain service is significant in placing the menus along the menu bar;
-thereafter the purpose of the `menuOrder` is to order the menu services sections on the menu itself.
-
-== Ordering menu actions
-
-For a given service, the actions within a section on a menu is determined by the `@MemberOrder` annotation. Thus, for
-the `Units` domain service, its actions are annotated:
-
-[source,java]
-----
-public class Units extends EstatioDomainService<Unit> {
-
- @MemberOrder(sequence = "1")
- public Unit newUnit( ... ) { ... }
-
- @MemberOrder(sequence = "2")
- public List<Unit> findUnits( ... ) { ... }
-
- @ActionLayout( prototype = true )
- @MemberOrder(sequence = "99")
- public List<Unit> allUnits() { ... }
- ...
-}
-----
-
-Note that the last is also a prototype action (meaning it is only displayed in SERVER_PROTOTYPE (=Wicket Development) mode).
-In the UI it is rendered in italics.
-
-(It is possible to override this place of a given action by specifying `@MemberOrder(name="...")` where the name is
-that of a top-level menu. Prior to 1.8.0 this was the only way of doing things, as of 1.8.0 its use
-is not recommended).
-
-== Tertiary menubar
-
-The tertiary menu bar consists of a single unnamed menu, rendered underneath the user's login, top right. This is
-intended primarily for actions pertaining to the user themselves, eg their account, profile or settings:
-
-image::{_imagesdir}wicket-viewer/application-menu/tertiary.png[width="300px",link="{_imagesdir}wicket-viewer/application-menu/tertiary.png"]
-
-Domain services' actions can be associated with the tertiary menu using the same `@DomainServiceLayout` annotation. For
-example, the `updateEpochDate(...)` and `listAllSettings(...)` actions come from the following service:
-
-[source,java]
-----
-@DomainServiceLayout(
- menuBar = DomainServiceLayout.MenuBar.TERTIARY,
- menuOrder = "10.1"
-)
-public class EstatioAdministrationService ... {
-
- @MemberOrder(sequence = "1")
- public void updateEpochDate( ... ) { ... }
-
- @MemberOrder(sequence = "2")
- public List<ApplicationSetting> listAllSettings() { ... }
- ...
-}
-----
-
-Because the number of items on the tertiary menu is expected to be small and most will pertain to the current user, the
-viewer does _not_ place dividers between actions from different services on the tertiary menu.
-
-
-== Isis Add-on modules
-
-Some of the (non-ASF) link:http://isisaddons.org[Isis Addons] modules also provide services whose actions appear in top-level menus.
-
-The http://github.com/isisaddons/isis-module-security[security]'s module places its domain service menus in three
-top-level menus:
-
-* its `ApplicationUsers`, `ApplicationRoles`, `ApplicationPermission`, `ApplicationFeatureViewModels` and
- `ApplicationTenancies` domain services are all grouped together in a single "Security" top-level menu, on the
- SECONDARY menu bar
-
-* its `SecurityModuleAppFixturesService` domain service, which allows the security modules' fixture scripts to be run,
- is placed on a "Prototyping" top-level menu, also on the SECONDARY menu bar
-
-* its `MeService` domain service, which provides the `me()` action, is placed on the TERTIARY menu bar.
-
-Meanwhile the http://github.com/isisaddons/isis-module-devutils[devutils] module places its actions - to download layouts and
-so forth - on a "Prototyping" top-level menu, on the SECONDARY menu bar.
-
-Currently there is no facility to alter the placement of these services. However, their UI can be suppressed
-using security or using a xref:ugbtb.adoc#_ugbtb_decoupling_vetoing-visibility[vetoing subscriber].
-
[8/9] isis git commit: ISIS-1521: changes 'dynamic layout' to
'file-based layout'
Posted by da...@apache.org.
ISIS-1521: changes 'dynamic layout' to 'file-based layout'
Project: http://git-wip-us.apache.org/repos/asf/isis/repo
Commit: http://git-wip-us.apache.org/repos/asf/isis/commit/badd1011
Tree: http://git-wip-us.apache.org/repos/asf/isis/tree/badd1011
Diff: http://git-wip-us.apache.org/repos/asf/isis/diff/badd1011
Branch: refs/heads/master
Commit: badd101143d3ad3e4e00369e5258637e24b5cdd0
Parents: e58b39d
Author: Dan Haywood <da...@haywood-associates.co.uk>
Authored: Fri Apr 14 09:09:26 2017 +0100
Committer: Dan Haywood <da...@haywood-associates.co.uk>
Committed: Fri Apr 14 09:09:35 2017 +0100
----------------------------------------------------------------------
.../asciidoc/guides/dg/_dg_ide_intellij.adoc | 2 +-
.../guides/rgant/_rgant-ActionLayout.adoc | 18 +-
.../rgant/_rgant-ActionLayout_bookmarking.adoc | 2 +-
.../_rgant-ActionLayout_contributedAs.adoc | 2 +-
.../rgant/_rgant-ActionLayout_cssClass.adoc | 2 +-
.../rgant/_rgant-ActionLayout_cssClassFa.adoc | 2 +-
.../rgant/_rgant-ActionLayout_describedAs.adoc | 2 +-
.../rgant/_rgant-ActionLayout_hidden.adoc | 2 +-
.../guides/rgant/_rgant-ActionLayout_named.adoc | 2 +-
.../rgant/_rgant-ActionLayout_position.adoc | 2 +-
.../guides/rgant/_rgant-Action_hidden.adoc | 3 +-
.../guides/rgant/_rgant-CollectionLayout.adoc | 18 +-
.../rgant/_rgant-CollectionLayout_cssClass.adoc | 2 +-
.../_rgant-CollectionLayout_defaultView.adoc | 2 +-
.../_rgant-CollectionLayout_describedAs.adoc | 2 +-
.../rgant/_rgant-CollectionLayout_hidden.adoc | 2 +-
.../rgant/_rgant-CollectionLayout_named.adoc | 2 +-
.../rgant/_rgant-CollectionLayout_paged.adoc | 2 +-
.../rgant/_rgant-CollectionLayout_render.adoc | 2 +-
.../rgant/_rgant-CollectionLayout_sortedBy.adoc | 2 +-
.../guides/rgant/_rgant-Collection_hidden.adoc | 3 +-
.../guides/rgant/_rgant-DomainObjectLayout.adoc | 2 +-
.../rgant/_rgant-DomainServiceLayout.adoc | 2 +-
.../asciidoc/guides/rgant/_rgant-HomePage.adoc | 2 +-
.../guides/rgant/_rgant-ParameterLayout.adoc | 2 +-
.../guides/rgant/_rgant-PropertyLayout.adoc | 16 +-
.../rgant/_rgant-PropertyLayout_cssClass.adoc | 2 +-
.../_rgant-PropertyLayout_describedAs.adoc | 2 +-
.../rgant/_rgant-PropertyLayout_hidden.adoc | 5 +-
.../_rgant-PropertyLayout_labelPosition.adoc | 2 +-
.../rgant/_rgant-PropertyLayout_multiLine.adoc | 2 +-
.../rgant/_rgant-PropertyLayout_named.adoc | 2 +-
...gant-PropertyLayout_renderedAsDayBefore.adoc | 2 +-
.../guides/rgant/_rgant-ViewModelLayout.adoc | 2 +-
.../guides/rgant/_rgant_aaa_deprecated.adoc | 6 +-
.../asciidoc/guides/rgant/_rgant_aaa_jee.adoc | 2 +-
.../asciidoc/guides/rgant/_rgant_aaa_main.adoc | 4 +-
.../asciidoc/guides/rgant/_rgant_aaa_other.adoc | 2 +-
.../guides/rgcfg/_rgcfg_configuring-core.adoc | 2 +-
.../rgcms/_rgcms_classes_mixins_Object.adoc | 4 +-
.../guides/rgsvc/_rgsvc_metadata-api.adoc | 2 +-
.../main/asciidoc/guides/ugbtb/_ugbtb_i18n.adoc | 2 +-
...rogramming-model_layout-metadata-reader.adoc | 16 +-
...ugvw_customisation_tweaking-css-classes.adoc | 11 +-
.../main/asciidoc/guides/ugvw/_ugvw_layout.adoc | 8 +-
.../ugvw/_ugvw_layout_annotation-based.adoc | 177 ++++++++
.../guides/ugvw/_ugvw_layout_dynamic.adoc | 10 +-
.../guides/ugvw/_ugvw_layout_dynamic_xml.adoc | 402 ------------------
.../guides/ugvw/_ugvw_layout_file-based.adoc | 406 +++++++++++++++++++
.../ugvw/_ugvw_layout_static-vs-dynamic.adoc | 21 +-
.../guides/ugvw/_ugvw_layout_static.adoc | 178 --------
.../_migration-notes_1.11.0-to-1.12.0.adoc | 4 +-
.../asciidoc/pages/screencasts/screencasts.adoc | 6 +-
.../tg/_tg_stop-scaffolding-start-coding.adoc | 9 +-
.../release-notes/_release-notes_1.12.0.adoc | 24 +-
.../release-notes/_release-notes_1.13.0.adoc | 2 +-
.../release-notes/_release-notes_1.3.0.adoc | 6 +-
57 files changed, 690 insertions(+), 733 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/isis/blob/badd1011/adocs/documentation/src/main/asciidoc/guides/dg/_dg_ide_intellij.adoc
----------------------------------------------------------------------
diff --git a/adocs/documentation/src/main/asciidoc/guides/dg/_dg_ide_intellij.adoc b/adocs/documentation/src/main/asciidoc/guides/dg/_dg_ide_intellij.adoc
index 1f5aa26..152ddbb 100644
--- a/adocs/documentation/src/main/asciidoc/guides/dg/_dg_ide_intellij.adoc
+++ b/adocs/documentation/src/main/asciidoc/guides/dg/_dg_ide_intellij.adoc
@@ -565,7 +565,7 @@ image::{_imagesdir}appendices/dev-env/intellij-idea/070-advanced/004-gradle-outp
=== Using Gradle for liveReload
Similarly, gradle can be run to reduce the turn-around time when tweaking the UI (defined by the
- xref:ugvw.adoc#_ugvw_layout_dynamic_xml[`*.layout.xml`] file for each domain class), when the app is running.
+ xref:ugvw.adoc#_ugvw_layout_file-based[`*.layout.xml`] file for each domain class), when the app is running.
The framework will automatically notice any changes to `.layout.xml` files, but these are read from the
the classpath (the `target/classes` directory), not the source path. With IntelliJ these can be copied over manually
http://git-wip-us.apache.org/repos/asf/isis/blob/badd1011/adocs/documentation/src/main/asciidoc/guides/rgant/_rgant-ActionLayout.adoc
----------------------------------------------------------------------
diff --git a/adocs/documentation/src/main/asciidoc/guides/rgant/_rgant-ActionLayout.adoc b/adocs/documentation/src/main/asciidoc/guides/rgant/_rgant-ActionLayout.adoc
index 744c67e..e8ed93a 100644
--- a/adocs/documentation/src/main/asciidoc/guides/rgant/_rgant-ActionLayout.adoc
+++ b/adocs/documentation/src/main/asciidoc/guides/rgant/_rgant-ActionLayout.adoc
@@ -98,22 +98,12 @@ public class ToDoItems {
<2> default value, so could be omitted
+[TIP]
+====
+As an alternative to using the `@ActionLayout` annotation, a xref:ugvw.adoc#_ugvw_layout_file-based[file-based layout] can be used (and is generally to be preferred since it is more flexible/powerful).
+====
-As an alternative to using the `@ActionLayout` annotation, a dynamic layout using xref:ugvw.adoc#_ugvw_layout_dynamic[`.layout.json`] file can be specified; for example:
-
-[source,javascript]
-----
-"notYetComplete": {
- "actionLayout": {
- "bookmarking": "AS_ROOT",
- "cssClass": "x-key",
- "cssClassFa": "fa-checkbox",
- "describedAs": "Mark the todo item as not complete after all",
- "hidden": "NOWHERE"
- }
-}
-----
http://git-wip-us.apache.org/repos/asf/isis/blob/badd1011/adocs/documentation/src/main/asciidoc/guides/rgant/_rgant-ActionLayout_bookmarking.adoc
----------------------------------------------------------------------
diff --git a/adocs/documentation/src/main/asciidoc/guides/rgant/_rgant-ActionLayout_bookmarking.adoc b/adocs/documentation/src/main/asciidoc/guides/rgant/_rgant-ActionLayout_bookmarking.adoc
index ef1de18..aa1c159 100644
--- a/adocs/documentation/src/main/asciidoc/guides/rgant/_rgant-ActionLayout_bookmarking.adoc
+++ b/adocs/documentation/src/main/asciidoc/guides/rgant/_rgant-ActionLayout_bookmarking.adoc
@@ -50,7 +50,7 @@ The enum value `AS_CHILD` has no meaning for actions; it relates only to bookmar
-As an alternative to using the annotation, the dynamic xref:ugvw.adoc#_ugvw_layout_dynamic[`.layout.json`]
+As an alternative to using the annotation, the dynamic xref:ugvw.adoc#_ugvw_layout_file-based[`.layout.json`]
can be used instead, eg:
[source,javascript]
http://git-wip-us.apache.org/repos/asf/isis/blob/badd1011/adocs/documentation/src/main/asciidoc/guides/rgant/_rgant-ActionLayout_contributedAs.adoc
----------------------------------------------------------------------
diff --git a/adocs/documentation/src/main/asciidoc/guides/rgant/_rgant-ActionLayout_contributedAs.adoc b/adocs/documentation/src/main/asciidoc/guides/rgant/_rgant-ActionLayout_contributedAs.adoc
index a13011a..0f4c22e 100644
--- a/adocs/documentation/src/main/asciidoc/guides/rgant/_rgant-ActionLayout_contributedAs.adoc
+++ b/adocs/documentation/src/main/asciidoc/guides/rgant/_rgant-ActionLayout_contributedAs.adoc
@@ -49,6 +49,6 @@ In such cases, though, it would probably make more sense to annotate the action
[NOTE]
====
-Unlike other `@ActionLayout` attributes, this attribute _cannot_ be specified dynamically in the `.layout.json` xref:ugvw.adoc#_ugvw_layout_dynamic[dynamic layout file] because it relates to the contributor domain service, not the contributee domain object.
+Unlike other `@ActionLayout` attributes, this attribute _cannot_ be specified using a file-based layout because it relates to the contributor domain service, not the contributee domain object.
====
http://git-wip-us.apache.org/repos/asf/isis/blob/badd1011/adocs/documentation/src/main/asciidoc/guides/rgant/_rgant-ActionLayout_cssClass.adoc
----------------------------------------------------------------------
diff --git a/adocs/documentation/src/main/asciidoc/guides/rgant/_rgant-ActionLayout_cssClass.adoc b/adocs/documentation/src/main/asciidoc/guides/rgant/_rgant-ActionLayout_cssClass.adoc
index 89cec9a..9acba07 100644
--- a/adocs/documentation/src/main/asciidoc/guides/rgant/_rgant-ActionLayout_cssClass.adoc
+++ b/adocs/documentation/src/main/asciidoc/guides/rgant/_rgant-ActionLayout_cssClass.adoc
@@ -30,7 +30,7 @@ to apply CSS, specifically to add http://fortawesome.github.io/Font-Awesome/icon
-As an alternative to using the annotation, the dynamic xref:ugvw.adoc#_ugvw_layout_dynamic[`.layout.json`]
+As an alternative to using the annotation, the dynamic xref:ugvw.adoc#_ugvw_layout_file-based[`.layout.json`]
can be used instead, eg:
[source,javascript]
http://git-wip-us.apache.org/repos/asf/isis/blob/badd1011/adocs/documentation/src/main/asciidoc/guides/rgant/_rgant-ActionLayout_cssClassFa.adoc
----------------------------------------------------------------------
diff --git a/adocs/documentation/src/main/asciidoc/guides/rgant/_rgant-ActionLayout_cssClassFa.adoc b/adocs/documentation/src/main/asciidoc/guides/rgant/_rgant-ActionLayout_cssClassFa.adoc
index b6c35c8..40a609c 100644
--- a/adocs/documentation/src/main/asciidoc/guides/rgant/_rgant-ActionLayout_cssClassFa.adoc
+++ b/adocs/documentation/src/main/asciidoc/guides/rgant/_rgant-ActionLayout_cssClassFa.adoc
@@ -31,7 +31,7 @@ public class ToDoItem {
There can be multiple "fa-" classes, eg to mirror or rotate the icon. There is no need to include the mandatory `fa` "marker" CSS class; it will be automatically added to the list. The `fa-` prefix can also be omitted from the class names; it will be prepended to each if required.
-As an alternative to using the annotation, the dynamic xref:ugvw.adoc#_ugvw_layout_dynamic[`.layout.json`]
+As an alternative to using the annotation, the dynamic xref:ugvw.adoc#_ugvw_layout_file-based[`.layout.json`]
can be used instead, eg:
[source,javascript]
http://git-wip-us.apache.org/repos/asf/isis/blob/badd1011/adocs/documentation/src/main/asciidoc/guides/rgant/_rgant-ActionLayout_describedAs.adoc
----------------------------------------------------------------------
diff --git a/adocs/documentation/src/main/asciidoc/guides/rgant/_rgant-ActionLayout_describedAs.adoc b/adocs/documentation/src/main/asciidoc/guides/rgant/_rgant-ActionLayout_describedAs.adoc
index 200288a..d1fa462 100644
--- a/adocs/documentation/src/main/asciidoc/guides/rgant/_rgant-ActionLayout_describedAs.adoc
+++ b/adocs/documentation/src/main/asciidoc/guides/rgant/_rgant-ActionLayout_describedAs.adoc
@@ -24,7 +24,7 @@ public class Customer {
-As an alternative to using the annotation, the dynamic xref:ugvw.adoc#_ugvw_layout_dynamic[`.layout.json`]
+As an alternative to using the annotation, the dynamic xref:ugvw.adoc#_ugvw_layout_file-based[`.layout.json`]
can be used instead, eg:
[source,javascript]
http://git-wip-us.apache.org/repos/asf/isis/blob/badd1011/adocs/documentation/src/main/asciidoc/guides/rgant/_rgant-ActionLayout_hidden.adoc
----------------------------------------------------------------------
diff --git a/adocs/documentation/src/main/asciidoc/guides/rgant/_rgant-ActionLayout_hidden.adoc b/adocs/documentation/src/main/asciidoc/guides/rgant/_rgant-ActionLayout_hidden.adoc
index 5f3d332..d901a64 100644
--- a/adocs/documentation/src/main/asciidoc/guides/rgant/_rgant-ActionLayout_hidden.adoc
+++ b/adocs/documentation/src/main/asciidoc/guides/rgant/_rgant-ActionLayout_hidden.adoc
@@ -37,7 +37,7 @@ The action should not be hidden.
The other values of the `Where` enum have no meaning for a collection.
-As an alternative to using the annotation, the dynamic xref:ugvw.adoc#_ugvw_layout_dynamic[`.layout.json`]
+As an alternative to using the annotation, the dynamic xref:ugvw.adoc#_ugvw_layout_file-based[`.layout.json`]
can be used instead, eg:
[source,javascript]
http://git-wip-us.apache.org/repos/asf/isis/blob/badd1011/adocs/documentation/src/main/asciidoc/guides/rgant/_rgant-ActionLayout_named.adoc
----------------------------------------------------------------------
diff --git a/adocs/documentation/src/main/asciidoc/guides/rgant/_rgant-ActionLayout_named.adoc b/adocs/documentation/src/main/asciidoc/guides/rgant/_rgant-ActionLayout_named.adoc
index 783220a..c18ba6b 100644
--- a/adocs/documentation/src/main/asciidoc/guides/rgant/_rgant-ActionLayout_named.adoc
+++ b/adocs/documentation/src/main/asciidoc/guides/rgant/_rgant-ActionLayout_named.adoc
@@ -25,7 +25,7 @@ public class Customer {
----
-As an alternative to using the annotation, the dynamic xref:ugvw.adoc#_ugvw_layout_dynamic[`.layout.json`]
+As an alternative to using the annotation, the dynamic xref:ugvw.adoc#_ugvw_layout_file-based[`.layout.json`]
can be used instead, eg:
[source,javascript]
http://git-wip-us.apache.org/repos/asf/isis/blob/badd1011/adocs/documentation/src/main/asciidoc/guides/rgant/_rgant-ActionLayout_position.adoc
----------------------------------------------------------------------
diff --git a/adocs/documentation/src/main/asciidoc/guides/rgant/_rgant-ActionLayout_position.adoc b/adocs/documentation/src/main/asciidoc/guides/rgant/_rgant-ActionLayout_position.adoc
index 2cd3e5e..27d3f68 100644
--- a/adocs/documentation/src/main/asciidoc/guides/rgant/_rgant-ActionLayout_position.adoc
+++ b/adocs/documentation/src/main/asciidoc/guides/rgant/_rgant-ActionLayout_position.adoc
@@ -67,7 +67,7 @@ image::{_imagesdir}reference-annotations/ActionLayout/position-PANEL_DROPDOWN.pn
If there are multiple actions associated with a single property then the positioning can be mix'ed-and-match'ed as required. If the `PANEL` or `PANEL_DROPDOWN` are used, then (as the screenshots above show) the actions from potentially multiple properties grouped by that panel will be shown together.
-As an alternative to using the annotation, the dynamic xref:ugvw.adoc#_ugvw_layout_dynamic[`.layout.json`]
+As an alternative to using the annotation, the dynamic xref:ugvw.adoc#_ugvw_layout_file-based[`.layout.json`]
can be used instead, eg:
[source,javascript]
http://git-wip-us.apache.org/repos/asf/isis/blob/badd1011/adocs/documentation/src/main/asciidoc/guides/rgant/_rgant-Action_hidden.adoc
----------------------------------------------------------------------
diff --git a/adocs/documentation/src/main/asciidoc/guides/rgant/_rgant-Action_hidden.adoc b/adocs/documentation/src/main/asciidoc/guides/rgant/_rgant-Action_hidden.adoc
index 11f95b5..84c53df 100644
--- a/adocs/documentation/src/main/asciidoc/guides/rgant/_rgant-Action_hidden.adoc
+++ b/adocs/documentation/src/main/asciidoc/guides/rgant/_rgant-Action_hidden.adoc
@@ -11,7 +11,8 @@ Actions can be hidden at the domain-level, indicating that they are not visible
[TIP]
====
-It is also possible to use xref:rgant.adoc#_rgant-ActionLayout_hidden[`@ActionLayout#hidden()`] or xref:ugvw.adoc#_ugvw_layout_dynamic[dynamic layouts] such that the action can be hidden at the view layer. Both options are provided with a view that in the future the view-layer semantics may be under the control of (expert) users, whereas domain-layer semantics should never be overridden or modified by the user.
+It is also possible to use xref:rgant.adoc#_rgant-ActionLayout_hidden[`@ActionLayout#hidden()`] or xref:ugvw.adoc#_ugvw_layout_file-based[file-based layouts] such that the action can be hidden at the view layer.
+Both options are provided with a view that in the future the view-layer semantics may be under the control of (expert) users, whereas domain-layer semantics should never be overridden or modified by the user.
====
For example:
http://git-wip-us.apache.org/repos/asf/isis/blob/badd1011/adocs/documentation/src/main/asciidoc/guides/rgant/_rgant-CollectionLayout.adoc
----------------------------------------------------------------------
diff --git a/adocs/documentation/src/main/asciidoc/guides/rgant/_rgant-CollectionLayout.adoc b/adocs/documentation/src/main/asciidoc/guides/rgant/_rgant-CollectionLayout.adoc
index 3a90272..071ed02 100644
--- a/adocs/documentation/src/main/asciidoc/guides/rgant/_rgant-CollectionLayout.adoc
+++ b/adocs/documentation/src/main/asciidoc/guides/rgant/_rgant-CollectionLayout.adoc
@@ -94,21 +94,11 @@ public class ToDoItem {
-As an alternative to using the `@CollectionLayout` annotation, a dynamic layout using xref:ugvw.adoc#_ugvw_layout_dynamic[`.layout.json`] file can be specified; for example:
+[TIP]
+====
+As an alternative to using the `@CollectionLayout` annotation, a xref:ugvw.adoc#_ugvw_layout_file-based[file-based layout] can be used (and is generally to be preferred since it is more flexible/powerful).
+====
-[source,javascript]
-----
-"dependencies": {
- "collectionLayout": {
- "cssClass": "x-key",
- "named": "Todo items that are <i>dependencies</i> of this item.",
- "namedEscaped": false,
- "describedAs": "Other todo items that must be completed before this one",
- "labelPosition": "LEFT",
- "render": "EAGERLY"
- }
-}
-----
http://git-wip-us.apache.org/repos/asf/isis/blob/badd1011/adocs/documentation/src/main/asciidoc/guides/rgant/_rgant-CollectionLayout_cssClass.adoc
----------------------------------------------------------------------
diff --git a/adocs/documentation/src/main/asciidoc/guides/rgant/_rgant-CollectionLayout_cssClass.adoc b/adocs/documentation/src/main/asciidoc/guides/rgant/_rgant-CollectionLayout_cssClass.adoc
index a0b2200..479aea4 100644
--- a/adocs/documentation/src/main/asciidoc/guides/rgant/_rgant-CollectionLayout_cssClass.adoc
+++ b/adocs/documentation/src/main/asciidoc/guides/rgant/_rgant-CollectionLayout_cssClass.adoc
@@ -24,7 +24,7 @@ public class ToDoItem {
----
-As an alternative to using the annotation, the dynamic xref:ugvw.adoc#_ugvw_layout_dynamic[`.layout.json`]
+As an alternative to using the annotation, the dynamic xref:ugvw.adoc#_ugvw_layout_file-based[`.layout.json`]
can be used instead, eg:
[source,javascript]
http://git-wip-us.apache.org/repos/asf/isis/blob/badd1011/adocs/documentation/src/main/asciidoc/guides/rgant/_rgant-CollectionLayout_defaultView.adoc
----------------------------------------------------------------------
diff --git a/adocs/documentation/src/main/asciidoc/guides/rgant/_rgant-CollectionLayout_defaultView.adoc b/adocs/documentation/src/main/asciidoc/guides/rgant/_rgant-CollectionLayout_defaultView.adoc
index 2eb0094..65ff625 100644
--- a/adocs/documentation/src/main/asciidoc/guides/rgant/_rgant-CollectionLayout_defaultView.adoc
+++ b/adocs/documentation/src/main/asciidoc/guides/rgant/_rgant-CollectionLayout_defaultView.adoc
@@ -24,7 +24,7 @@ public class BusRoute {
----
-As an alternative to using the annotation, the dynamic xref:ugvw.adoc#_ugvw_layout_dynamic[`.layout.json`]
+As an alternative to using the annotation, the dynamic xref:ugvw.adoc#_ugvw_layout_file-based[`.layout.json`]
can be used instead, eg:
[source,javascript]
http://git-wip-us.apache.org/repos/asf/isis/blob/badd1011/adocs/documentation/src/main/asciidoc/guides/rgant/_rgant-CollectionLayout_describedAs.adoc
----------------------------------------------------------------------
diff --git a/adocs/documentation/src/main/asciidoc/guides/rgant/_rgant-CollectionLayout_describedAs.adoc b/adocs/documentation/src/main/asciidoc/guides/rgant/_rgant-CollectionLayout_describedAs.adoc
index 746f356..0b20afa 100644
--- a/adocs/documentation/src/main/asciidoc/guides/rgant/_rgant-CollectionLayout_describedAs.adoc
+++ b/adocs/documentation/src/main/asciidoc/guides/rgant/_rgant-CollectionLayout_describedAs.adoc
@@ -24,7 +24,7 @@ public class ToDoItem {
----
-As an alternative to using the annotation, the dynamic xref:ugvw.adoc#_ugvw_layout_dynamic[`.layout.json`]
+As an alternative to using the annotation, the dynamic xref:ugvw.adoc#_ugvw_layout_file-based[`.layout.json`]
can be used instead, eg:
[source,javascript]
http://git-wip-us.apache.org/repos/asf/isis/blob/badd1011/adocs/documentation/src/main/asciidoc/guides/rgant/_rgant-CollectionLayout_hidden.adoc
----------------------------------------------------------------------
diff --git a/adocs/documentation/src/main/asciidoc/guides/rgant/_rgant-CollectionLayout_hidden.adoc b/adocs/documentation/src/main/asciidoc/guides/rgant/_rgant-CollectionLayout_hidden.adoc
index 3416f34..4973e8a 100644
--- a/adocs/documentation/src/main/asciidoc/guides/rgant/_rgant-CollectionLayout_hidden.adoc
+++ b/adocs/documentation/src/main/asciidoc/guides/rgant/_rgant-CollectionLayout_hidden.adoc
@@ -47,7 +47,7 @@ The collection should not be hidden.
The other values of the `Where` enum have no meaning for a collection.
-As an alternative to using the annotation, the dynamic xref:ugvw.adoc#_ugvw_layout_dynamic[`.layout.json`]
+As an alternative to using the annotation, the dynamic xref:ugvw.adoc#_ugvw_layout_file-based[`.layout.json`]
can be used instead, eg:
[source,javascript]
http://git-wip-us.apache.org/repos/asf/isis/blob/badd1011/adocs/documentation/src/main/asciidoc/guides/rgant/_rgant-CollectionLayout_named.adoc
----------------------------------------------------------------------
diff --git a/adocs/documentation/src/main/asciidoc/guides/rgant/_rgant-CollectionLayout_named.adoc b/adocs/documentation/src/main/asciidoc/guides/rgant/_rgant-CollectionLayout_named.adoc
index 0bdcfac..a75e210 100644
--- a/adocs/documentation/src/main/asciidoc/guides/rgant/_rgant-CollectionLayout_named.adoc
+++ b/adocs/documentation/src/main/asciidoc/guides/rgant/_rgant-CollectionLayout_named.adoc
@@ -33,7 +33,7 @@ public class ToDoItem {
-As an alternative to using the annotation, the dynamic xref:ugvw.adoc#_ugvw_layout_dynamic[`.layout.json`]
+As an alternative to using the annotation, the dynamic xref:ugvw.adoc#_ugvw_layout_file-based[`.layout.json`]
can be used instead, eg:
[source,javascript]
http://git-wip-us.apache.org/repos/asf/isis/blob/badd1011/adocs/documentation/src/main/asciidoc/guides/rgant/_rgant-CollectionLayout_paged.adoc
----------------------------------------------------------------------
diff --git a/adocs/documentation/src/main/asciidoc/guides/rgant/_rgant-CollectionLayout_paged.adoc b/adocs/documentation/src/main/asciidoc/guides/rgant/_rgant-CollectionLayout_paged.adoc
index 3f41188..4b0abed 100644
--- a/adocs/documentation/src/main/asciidoc/guides/rgant/_rgant-CollectionLayout_paged.adoc
+++ b/adocs/documentation/src/main/asciidoc/guides/rgant/_rgant-CollectionLayout_paged.adoc
@@ -31,7 +31,7 @@ It is also possible to specify a global default for the page size of standalone
-As an alternative to using the annotation, the dynamic xref:ugvw.adoc#_ugvw_layout_dynamic[`.layout.json`]
+As an alternative to using the annotation, the dynamic xref:ugvw.adoc#_ugvw_layout_file-based[`.layout.json`]
can be used instead, eg:
[source,javascript]
http://git-wip-us.apache.org/repos/asf/isis/blob/badd1011/adocs/documentation/src/main/asciidoc/guides/rgant/_rgant-CollectionLayout_render.adoc
----------------------------------------------------------------------
diff --git a/adocs/documentation/src/main/asciidoc/guides/rgant/_rgant-CollectionLayout_render.adoc b/adocs/documentation/src/main/asciidoc/guides/rgant/_rgant-CollectionLayout_render.adoc
index 85b7e7c..7462a18 100644
--- a/adocs/documentation/src/main/asciidoc/guides/rgant/_rgant-CollectionLayout_render.adoc
+++ b/adocs/documentation/src/main/asciidoc/guides/rgant/_rgant-CollectionLayout_render.adoc
@@ -20,7 +20,7 @@ public class Order {
----
-As an alternative to using the annotation, the dynamic xref:ugvw.adoc#_ugvw_layout_dynamic[`.layout.json`]
+As an alternative to using the annotation, the dynamic xref:ugvw.adoc#_ugvw_layout_file-based[`.layout.json`]
can be used instead, eg:
[source,javascript]
http://git-wip-us.apache.org/repos/asf/isis/blob/badd1011/adocs/documentation/src/main/asciidoc/guides/rgant/_rgant-CollectionLayout_sortedBy.adoc
----------------------------------------------------------------------
diff --git a/adocs/documentation/src/main/asciidoc/guides/rgant/_rgant-CollectionLayout_sortedBy.adoc b/adocs/documentation/src/main/asciidoc/guides/rgant/_rgant-CollectionLayout_sortedBy.adoc
index 7eac8f1..bc01ff1 100644
--- a/adocs/documentation/src/main/asciidoc/guides/rgant/_rgant-CollectionLayout_sortedBy.adoc
+++ b/adocs/documentation/src/main/asciidoc/guides/rgant/_rgant-CollectionLayout_sortedBy.adoc
@@ -46,7 +46,7 @@ Without this annotation, the order would have been inverted (because the natural
-As an alternative to using the annotation, the dynamic xref:ugvw.adoc#_ugvw_layout_dynamic[`.layout.json`]
+As an alternative to using the annotation, the dynamic xref:ugvw.adoc#_ugvw_layout_file-based[`.layout.json`]
can be used instead, eg:
[source,javascript]
http://git-wip-us.apache.org/repos/asf/isis/blob/badd1011/adocs/documentation/src/main/asciidoc/guides/rgant/_rgant-Collection_hidden.adoc
----------------------------------------------------------------------
diff --git a/adocs/documentation/src/main/asciidoc/guides/rgant/_rgant-Collection_hidden.adoc b/adocs/documentation/src/main/asciidoc/guides/rgant/_rgant-Collection_hidden.adoc
index 0bccc9d..e2feb1a 100644
--- a/adocs/documentation/src/main/asciidoc/guides/rgant/_rgant-Collection_hidden.adoc
+++ b/adocs/documentation/src/main/asciidoc/guides/rgant/_rgant-Collection_hidden.adoc
@@ -9,7 +9,8 @@ Collections can be hidden at the domain-level, indicating that they are not visi
[TIP]
====
-It is also possible to use xref:rgant.adoc#_rgant-CollectionLayout_hidden[`@CollectionLayout#hidden()`] or xref:ugvw.adoc#_ugvw_layout_dynamic[dynamic layouts] such that the collection can be hidden at the view layer. Both options are provided with a view that in the future the view-layer semantics may be under the control of (expert) users, whereas domain-layer semantics should never be overridden or modified by the user.
+It is also possible to use xref:rgant.adoc#_rgant-CollectionLayout_hidden[`@CollectionLayout#hidden()`] or using xref:ugvw.adoc#_ugvw_layout_file-based[file-based layout] such that the collection can be hidden at the view layer.
+Both options are provided with a view that in the future the view-layer semantics may be under the control of (expert) users, whereas domain-layer semantics should never be overridden or modified by the user.
====
For example:
http://git-wip-us.apache.org/repos/asf/isis/blob/badd1011/adocs/documentation/src/main/asciidoc/guides/rgant/_rgant-DomainObjectLayout.adoc
----------------------------------------------------------------------
diff --git a/adocs/documentation/src/main/asciidoc/guides/rgant/_rgant-DomainObjectLayout.adoc b/adocs/documentation/src/main/asciidoc/guides/rgant/_rgant-DomainObjectLayout.adoc
index f0998e7..2ce1cf5 100644
--- a/adocs/documentation/src/main/asciidoc/guides/rgant/_rgant-DomainObjectLayout.adoc
+++ b/adocs/documentation/src/main/asciidoc/guides/rgant/_rgant-DomainObjectLayout.adoc
@@ -109,7 +109,7 @@ public class ToDoItem {
[NOTE]
====
-Note that there is (currently) no support for specifying UI hints for domain objects through the dynamic xref:ugvw.adoc#_ugvw_layout_dynamic[`.layout.json`] file (only for properties, collections and actions are supported).
+Note that there is (currently) no support for specifying UI hints for domain objects through the dynamic xref:ugvw.adoc#_ugvw_layout_file-based[`.layout.json`] file (only for properties, collections and actions are supported).
====
http://git-wip-us.apache.org/repos/asf/isis/blob/badd1011/adocs/documentation/src/main/asciidoc/guides/rgant/_rgant-DomainServiceLayout.adoc
----------------------------------------------------------------------
diff --git a/adocs/documentation/src/main/asciidoc/guides/rgant/_rgant-DomainServiceLayout.adoc b/adocs/documentation/src/main/asciidoc/guides/rgant/_rgant-DomainServiceLayout.adoc
index e223806..90e54de 100644
--- a/adocs/documentation/src/main/asciidoc/guides/rgant/_rgant-DomainServiceLayout.adoc
+++ b/adocs/documentation/src/main/asciidoc/guides/rgant/_rgant-DomainServiceLayout.adoc
@@ -64,7 +64,7 @@ public class ToDoItems {
[NOTE]
====
-Note that there is (currently) no support for specifying UI hints for domain services through the dynamic xref:ugvw.adoc#_ugvw_layout_dynamic[`.layout.json`] file (only for properties, collections and actions are supported).
+Note that there is (currently) no support for specifying UI hints for domain services through the dynamic xref:ugvw.adoc#_ugvw_layout_file-based[`.layout.json`] file (only for properties, collections and actions are supported).
====
http://git-wip-us.apache.org/repos/asf/isis/blob/badd1011/adocs/documentation/src/main/asciidoc/guides/rgant/_rgant-HomePage.adoc
----------------------------------------------------------------------
diff --git a/adocs/documentation/src/main/asciidoc/guides/rgant/_rgant-HomePage.adoc b/adocs/documentation/src/main/asciidoc/guides/rgant/_rgant-HomePage.adoc
index 868d28f..8875441 100644
--- a/adocs/documentation/src/main/asciidoc/guides/rgant/_rgant-HomePage.adoc
+++ b/adocs/documentation/src/main/asciidoc/guides/rgant/_rgant-HomePage.adoc
@@ -45,7 +45,7 @@ public class ToDoAppDashboard {
public Blob exportToWordDoc() { ... } // <1>
}
----
-<1> associated using xref:ugvw.adoc#_ugvw_layout_dynamic[dynamic layouts] with the `notYetComplete` collection.
+<1> associated using xref:ugvw.adoc#_ugvw_layout_file-based[file-based layout] with the `notYetComplete` collection.
The other two actions shown in the above screenshot -- `exportAsXml` and `downloadLayout` -- are actually contributed to the `ToDoAppDashboard` through various domain services, as is the `downloadLayout` action.
http://git-wip-us.apache.org/repos/asf/isis/blob/badd1011/adocs/documentation/src/main/asciidoc/guides/rgant/_rgant-ParameterLayout.adoc
----------------------------------------------------------------------
diff --git a/adocs/documentation/src/main/asciidoc/guides/rgant/_rgant-ParameterLayout.adoc b/adocs/documentation/src/main/asciidoc/guides/rgant/_rgant-ParameterLayout.adoc
index 295150f..838d598 100644
--- a/adocs/documentation/src/main/asciidoc/guides/rgant/_rgant-ParameterLayout.adoc
+++ b/adocs/documentation/src/main/asciidoc/guides/rgant/_rgant-ParameterLayout.adoc
@@ -96,7 +96,7 @@ public class ToDoItem {
[NOTE]
====
-Note that there is (currently) no support for specifying UI hints for domain services through the dynamic xref:ugvw.adoc#_ugvw_layout_dynamic[`.layout.json`] file (only for properties, collections and actions are supported).
+Note that there is (currently) no support for specifying UI hints for domain services through the dynamic xref:ugvw.adoc#_ugvw_layout_file-based[`.layout.json`] file (only for properties, collections and actions are supported).
====
http://git-wip-us.apache.org/repos/asf/isis/blob/badd1011/adocs/documentation/src/main/asciidoc/guides/rgant/_rgant-PropertyLayout.adoc
----------------------------------------------------------------------
diff --git a/adocs/documentation/src/main/asciidoc/guides/rgant/_rgant-PropertyLayout.adoc b/adocs/documentation/src/main/asciidoc/guides/rgant/_rgant-PropertyLayout.adoc
index 9815899..1023ea9 100644
--- a/adocs/documentation/src/main/asciidoc/guides/rgant/_rgant-PropertyLayout.adoc
+++ b/adocs/documentation/src/main/asciidoc/guides/rgant/_rgant-PropertyLayout.adoc
@@ -102,19 +102,11 @@ It is also possible to apply the annotation to actions of domain services that a
-As an alternative to using the `@PropertyLayout` annotation, a dynamic layout using xref:ugvw.adoc#_ugvw_layout_dynamic[`.layout.json`] file can be specified; for example:
+[TIP]
+====
+As an alternative to using the `@PropertyLayout` annotation, a xref:ugvw.adoc#_ugvw_layout_file-based[file-based layout] can be used (and is generally to be preferred since it is more flexible/powerful).
+====
-[source,javascript]
-----
-"description": {
- "propertyLayout": {
- "cssClass": "x-key",
- "describedAs": "What needs to be done",
- "labelPosition": "LEFT",
- "typicalLength": 80
- }
-}
-----
http://git-wip-us.apache.org/repos/asf/isis/blob/badd1011/adocs/documentation/src/main/asciidoc/guides/rgant/_rgant-PropertyLayout_cssClass.adoc
----------------------------------------------------------------------
diff --git a/adocs/documentation/src/main/asciidoc/guides/rgant/_rgant-PropertyLayout_cssClass.adoc b/adocs/documentation/src/main/asciidoc/guides/rgant/_rgant-PropertyLayout_cssClass.adoc
index 0146994..4e51fef 100644
--- a/adocs/documentation/src/main/asciidoc/guides/rgant/_rgant-PropertyLayout_cssClass.adoc
+++ b/adocs/documentation/src/main/asciidoc/guides/rgant/_rgant-PropertyLayout_cssClass.adoc
@@ -23,7 +23,7 @@ public class ToDoItem {
-As an alternative to using the annotation, the dynamic xref:ugvw.adoc#_ugvw_layout_dynamic[`.layout.json`]
+As an alternative to using the annotation, the dynamic xref:ugvw.adoc#_ugvw_layout_file-based[`.layout.json`]
can be used instead, eg:
[source,javascript]
http://git-wip-us.apache.org/repos/asf/isis/blob/badd1011/adocs/documentation/src/main/asciidoc/guides/rgant/_rgant-PropertyLayout_describedAs.adoc
----------------------------------------------------------------------
diff --git a/adocs/documentation/src/main/asciidoc/guides/rgant/_rgant-PropertyLayout_describedAs.adoc b/adocs/documentation/src/main/asciidoc/guides/rgant/_rgant-PropertyLayout_describedAs.adoc
index 41db6f7..d67555b 100644
--- a/adocs/documentation/src/main/asciidoc/guides/rgant/_rgant-PropertyLayout_describedAs.adoc
+++ b/adocs/documentation/src/main/asciidoc/guides/rgant/_rgant-PropertyLayout_describedAs.adoc
@@ -20,7 +20,7 @@ public class Customer {
----
-As an alternative to using the annotation, the dynamic xref:ugvw.adoc#_ugvw_layout_dynamic[`.layout.json`]
+As an alternative to using the annotation, the dynamic xref:ugvw.adoc#_ugvw_layout_file-based[`.layout.json`]
can be used instead, eg:
[source,javascript]
http://git-wip-us.apache.org/repos/asf/isis/blob/badd1011/adocs/documentation/src/main/asciidoc/guides/rgant/_rgant-PropertyLayout_hidden.adoc
----------------------------------------------------------------------
diff --git a/adocs/documentation/src/main/asciidoc/guides/rgant/_rgant-PropertyLayout_hidden.adoc b/adocs/documentation/src/main/asciidoc/guides/rgant/_rgant-PropertyLayout_hidden.adoc
index 951e47b..5c794d2 100644
--- a/adocs/documentation/src/main/asciidoc/guides/rgant/_rgant-PropertyLayout_hidden.adoc
+++ b/adocs/documentation/src/main/asciidoc/guides/rgant/_rgant-PropertyLayout_hidden.adoc
@@ -10,7 +10,8 @@ The `hidden()` attribute indicates where (in the UI) the property should be hidd
[TIP]
====
-It is also possible to use xref:rgant.adoc#_rgant-PropertyLayout_hidden[`@PropertyLayout#hidden()`] or xref:ugvw.adoc#_ugvw_layout_dynamic[dynamic layouts] such that the property can be hidden at the view layer. Both options are provided with a view that in the future the view-layer semantics may be under the control of (expert) users, whereas domain-layer semantics should never be overridden or modified by the user.
+It is also possible to use xref:rgant.adoc#_rgant-PropertyLayout_hidden[`@PropertyLayout#hidden()`] or a xref:ugvw.adoc#_ugvw_layout_file-based[file-based layout] such that the property can be hidden at the view layer.
+Both options are provided with a view that in the future the view-layer semantics may be under the control of (expert) users, whereas domain-layer semantics should never be overridden or modified by the user.
====
@@ -67,7 +68,7 @@ The xref:ugvro.adoc#[RestfulObjects viewer] has only partial support for these `
====
-As an alternative to using the annotation, the dynamic xref:ugvw.adoc#_ugvw_layout_dynamic[`.layout.json`]
+As an alternative to using the annotation, the dynamic xref:ugvw.adoc#_ugvw_layout_file-based[`.layout.json`]
can be used instead, eg:
[source,javascript]
http://git-wip-us.apache.org/repos/asf/isis/blob/badd1011/adocs/documentation/src/main/asciidoc/guides/rgant/_rgant-PropertyLayout_labelPosition.adoc
----------------------------------------------------------------------
diff --git a/adocs/documentation/src/main/asciidoc/guides/rgant/_rgant-PropertyLayout_labelPosition.adoc b/adocs/documentation/src/main/asciidoc/guides/rgant/_rgant-PropertyLayout_labelPosition.adoc
index 4f282d2..939ac6d 100644
--- a/adocs/documentation/src/main/asciidoc/guides/rgant/_rgant-PropertyLayout_labelPosition.adoc
+++ b/adocs/documentation/src/main/asciidoc/guides/rgant/_rgant-PropertyLayout_labelPosition.adoc
@@ -58,7 +58,7 @@ image::{_imagesdir}reference-annotations/PropertyLayout/labelPosition-boolean-RI
-As an alternative to using the annotation, the dynamic xref:ugvw.adoc#_ugvw_layout_dynamic[`.layout.json`]
+As an alternative to using the annotation, the dynamic xref:ugvw.adoc#_ugvw_layout_file-based[`.layout.json`]
can be used instead, eg:
[source,javascript]
http://git-wip-us.apache.org/repos/asf/isis/blob/badd1011/adocs/documentation/src/main/asciidoc/guides/rgant/_rgant-PropertyLayout_multiLine.adoc
----------------------------------------------------------------------
diff --git a/adocs/documentation/src/main/asciidoc/guides/rgant/_rgant-PropertyLayout_multiLine.adoc b/adocs/documentation/src/main/asciidoc/guides/rgant/_rgant-PropertyLayout_multiLine.adoc
index 54a9eeb..5400aa9 100644
--- a/adocs/documentation/src/main/asciidoc/guides/rgant/_rgant-PropertyLayout_multiLine.adoc
+++ b/adocs/documentation/src/main/asciidoc/guides/rgant/_rgant-PropertyLayout_multiLine.adoc
@@ -25,7 +25,7 @@ Here the `stepsToReproduce` will be displayed in a text area of 10 rows.
-As an alternative to using the annotation, the dynamic xref:ugvw.adoc#_ugvw_layout_dynamic[`.layout.json`]
+As an alternative to using the annotation, the dynamic xref:ugvw.adoc#_ugvw_layout_file-based[`.layout.json`]
can be used instead, eg:
[source,javascript]
http://git-wip-us.apache.org/repos/asf/isis/blob/badd1011/adocs/documentation/src/main/asciidoc/guides/rgant/_rgant-PropertyLayout_named.adoc
----------------------------------------------------------------------
diff --git a/adocs/documentation/src/main/asciidoc/guides/rgant/_rgant-PropertyLayout_named.adoc b/adocs/documentation/src/main/asciidoc/guides/rgant/_rgant-PropertyLayout_named.adoc
index 682d855..a8516f7 100644
--- a/adocs/documentation/src/main/asciidoc/guides/rgant/_rgant-PropertyLayout_named.adoc
+++ b/adocs/documentation/src/main/asciidoc/guides/rgant/_rgant-PropertyLayout_named.adoc
@@ -31,7 +31,7 @@ public class ToDoItem {
-As an alternative to using the annotation, the dynamic xref:ugvw.adoc#_ugvw_layout_dynamic[`.layout.json`]
+As an alternative to using the annotation, the dynamic xref:ugvw.adoc#_ugvw_layout_file-based[`.layout.json`]
can be used instead, eg:
[source,javascript]
http://git-wip-us.apache.org/repos/asf/isis/blob/badd1011/adocs/documentation/src/main/asciidoc/guides/rgant/_rgant-PropertyLayout_renderedAsDayBefore.adoc
----------------------------------------------------------------------
diff --git a/adocs/documentation/src/main/asciidoc/guides/rgant/_rgant-PropertyLayout_renderedAsDayBefore.adoc b/adocs/documentation/src/main/asciidoc/guides/rgant/_rgant-PropertyLayout_renderedAsDayBefore.adoc
index 6860789..af517f2 100644
--- a/adocs/documentation/src/main/asciidoc/guides/rgant/_rgant-PropertyLayout_renderedAsDayBefore.adoc
+++ b/adocs/documentation/src/main/asciidoc/guides/rgant/_rgant-PropertyLayout_renderedAsDayBefore.adoc
@@ -32,7 +32,7 @@ public class Tenancy {
-As an alternative to using the annotation, the dynamic xref:ugvw.adoc#_ugvw_layout_dynamic[`.layout.json`]
+As an alternative to using the annotation, the dynamic xref:ugvw.adoc#_ugvw_layout_file-based[`.layout.json`]
can be used instead, eg:
[source,javascript]
http://git-wip-us.apache.org/repos/asf/isis/blob/badd1011/adocs/documentation/src/main/asciidoc/guides/rgant/_rgant-ViewModelLayout.adoc
----------------------------------------------------------------------
diff --git a/adocs/documentation/src/main/asciidoc/guides/rgant/_rgant-ViewModelLayout.adoc b/adocs/documentation/src/main/asciidoc/guides/rgant/_rgant-ViewModelLayout.adoc
index 4e7a1b6..8328c21 100644
--- a/adocs/documentation/src/main/asciidoc/guides/rgant/_rgant-ViewModelLayout.adoc
+++ b/adocs/documentation/src/main/asciidoc/guides/rgant/_rgant-ViewModelLayout.adoc
@@ -82,7 +82,7 @@ public class CategoryPieChart { ... }
[NOTE]
====
-Note that there is (currently) no support for specifying UI hints for view models through the dynamic xref:ugvw.adoc#_ugvw_layout_dynamic[`.layout.json`] file (only for properties, collections and actions are supported).
+Note that there is (currently) no support for specifying UI hints for view models through the dynamic xref:ugvw.adoc#_ugvw_layout_file-based[`.layout.json`] file (only for properties, collections and actions are supported).
====
http://git-wip-us.apache.org/repos/asf/isis/blob/badd1011/adocs/documentation/src/main/asciidoc/guides/rgant/_rgant_aaa_deprecated.adoc
----------------------------------------------------------------------
diff --git a/adocs/documentation/src/main/asciidoc/guides/rgant/_rgant_aaa_deprecated.adoc b/adocs/documentation/src/main/asciidoc/guides/rgant/_rgant_aaa_deprecated.adoc
index 6c7127e..47a93d7 100644
--- a/adocs/documentation/src/main/asciidoc/guides/rgant/_rgant_aaa_deprecated.adoc
+++ b/adocs/documentation/src/main/asciidoc/guides/rgant/_rgant_aaa_deprecated.adoc
@@ -20,7 +20,7 @@ The annotations listed in the table below are still supported by Apache Isis, bu
|Purpose
|Use instead
|Layer
-|xref:ugvw.adoc#_ugvw_layout_dynamic[Dynamic layout]?
+|xref:ugvw.adoc#_ugvw_layout_file-based[File-based layout]?
|`@ActionOrder`
|Order of buttons and menu items representing actions.
@@ -170,13 +170,13 @@ Actions can still be invoked.
|`@MemberGroups`
|Layout of properties and collections of a domain object or view model object.
-|xref:ugvw.adoc#_ugvw_layout_dynamic_xml[dynamic `.layout.xml`] files
+|xref:ugvw.adoc#_ugvw_layout_file-based[dynamic `.layout.xml`] files
|UI
|Yes
|@MemberGroupLayout`
|Grouping of properties into groups, and organizing of properties, collections into columns.
-|xref:ugvw.adoc#_ugvw_layout_dynamic_xml[dynamic `.layout.xml`] files
+|xref:ugvw.adoc#_ugvw_layout_file-based[dynamic `.layout.xml`] files
|UI
|Yes
http://git-wip-us.apache.org/repos/asf/isis/blob/badd1011/adocs/documentation/src/main/asciidoc/guides/rgant/_rgant_aaa_jee.adoc
----------------------------------------------------------------------
diff --git a/adocs/documentation/src/main/asciidoc/guides/rgant/_rgant_aaa_jee.adoc b/adocs/documentation/src/main/asciidoc/guides/rgant/_rgant_aaa_jee.adoc
index 92e8c6a..42e1a96 100644
--- a/adocs/documentation/src/main/asciidoc/guides/rgant/_rgant_aaa_jee.adoc
+++ b/adocs/documentation/src/main/asciidoc/guides/rgant/_rgant_aaa_jee.adoc
@@ -16,7 +16,7 @@ The table below lists the JEE annotations currently recognized. Expect to see m
|Annotation
|Purpose
|Layer
-|xref:ugvw.adoc#_ugvw_layout_dynamic[Dynamic layout]?
+|xref:ugvw.adoc#_ugvw_layout_file-based[File-based layout]?
|xref:rgant.adoc#_rgant-Digits[`@javax.validation.` +
`constraints.` +
http://git-wip-us.apache.org/repos/asf/isis/blob/badd1011/adocs/documentation/src/main/asciidoc/guides/rgant/_rgant_aaa_main.adoc
----------------------------------------------------------------------
diff --git a/adocs/documentation/src/main/asciidoc/guides/rgant/_rgant_aaa_main.adoc b/adocs/documentation/src/main/asciidoc/guides/rgant/_rgant_aaa_main.adoc
index 5c98084..7b4bd8b 100644
--- a/adocs/documentation/src/main/asciidoc/guides/rgant/_rgant_aaa_main.adoc
+++ b/adocs/documentation/src/main/asciidoc/guides/rgant/_rgant_aaa_main.adoc
@@ -11,7 +11,7 @@ For each of these domain types and members there are two annotations. One cover
[TIP]
====
-Most UI semantics can also be specified using xref:ugvw.adoc#_ugvw_layout_dynamic[dynamic object layout].
+Most UI semantics can also be specified using xref:ugvw.adoc#_ugvw_layout_file-based[dynamic object layout].
====
@@ -24,7 +24,7 @@ The table below summarizes these most commonly used annotations in Apache Isis.
|Annotation
|Purpose
|Layer
-|xref:ugvw.adoc#_ugvw_layout_dynamic[Dynamic layout]?
+|xref:ugvw.adoc#_ugvw_layout_file-based[File-based layout]?
|xref:rgant.adoc#_rgant-Action[`@Action`]
|Domain semantics for actions
http://git-wip-us.apache.org/repos/asf/isis/blob/badd1011/adocs/documentation/src/main/asciidoc/guides/rgant/_rgant_aaa_other.adoc
----------------------------------------------------------------------
diff --git a/adocs/documentation/src/main/asciidoc/guides/rgant/_rgant_aaa_other.adoc b/adocs/documentation/src/main/asciidoc/guides/rgant/_rgant_aaa_other.adoc
index dadc069..30ecad9 100644
--- a/adocs/documentation/src/main/asciidoc/guides/rgant/_rgant_aaa_other.adoc
+++ b/adocs/documentation/src/main/asciidoc/guides/rgant/_rgant_aaa_other.adoc
@@ -13,7 +13,7 @@ These annotations are also commonly used, but relate _not_ to objects or object
|Annotation
|Purpose
|Layer
-|xref:ugvw.adoc#_ugvw_layout_dynamic[Dynamic layout]?
+|xref:ugvw.adoc#_ugvw_layout_file-based[File-based layout]?
|xref:rgant.adoc#_rgant-Facets[`@Facets`]
|Install arbitrary facets within the Apache Isis metamodel.
http://git-wip-us.apache.org/repos/asf/isis/blob/badd1011/adocs/documentation/src/main/asciidoc/guides/rgcfg/_rgcfg_configuring-core.adoc
----------------------------------------------------------------------
diff --git a/adocs/documentation/src/main/asciidoc/guides/rgcfg/_rgcfg_configuring-core.adoc b/adocs/documentation/src/main/asciidoc/guides/rgcfg/_rgcfg_configuring-core.adoc
index d835881..621d8c5 100644
--- a/adocs/documentation/src/main/asciidoc/guides/rgcfg/_rgcfg_configuring-core.adoc
+++ b/adocs/documentation/src/main/asciidoc/guides/rgcfg/_rgcfg_configuring-core.adoc
@@ -656,7 +656,7 @@ See xref:ugbtb.adoc#_ugbtb_programming-model_finetuning[finetuning the programmi
|`isis.reflector.` +
`layoutMetadataReaders`
|`FQCN`,`FQCN2`,...
-|Fully qualified class names of classes to be instantiated to read layout metadata, as used in for xref:ugvw.adoc#_ugvw_layout_dynamic[dynamic layout]s. +
+|Fully qualified class names of classes to be instantiated to read layout metadata, as used in for xref:ugvw.adoc#_ugvw_layout_file-based[file-based layout]s. +
See xref:ugbtb.adoc#_ugbtb_programming-model_layout-metadata-reader[Layout Metadata Reader] for more information.
http://git-wip-us.apache.org/repos/asf/isis/blob/badd1011/adocs/documentation/src/main/asciidoc/guides/rgcms/_rgcms_classes_mixins_Object.adoc
----------------------------------------------------------------------
diff --git a/adocs/documentation/src/main/asciidoc/guides/rgcms/_rgcms_classes_mixins_Object.adoc b/adocs/documentation/src/main/asciidoc/guides/rgcms/_rgcms_classes_mixins_Object.adoc
index 262aa41..21bed1b 100644
--- a/adocs/documentation/src/main/asciidoc/guides/rgcms/_rgcms_classes_mixins_Object.adoc
+++ b/adocs/documentation/src/main/asciidoc/guides/rgcms/_rgcms_classes_mixins_Object.adoc
@@ -47,7 +47,7 @@ each rendered object, per user.
[[__rgcms_classes_mixins_Object_downloadLayoutXml]]
== `downloadLayoutXml()`
-The `Object_downloadLayoutXml` mixin provides an action to download the xref:ugvw.adoc#_ugvw_layout_dynamic_xml[layout XML] for the current domain object. It has the following signature:
+The `Object_downloadLayoutXml` mixin provides an action to download the xref:ugvw.adoc#_ugvw_layout_file-based[layout XML] for the current domain object. It has the following signature:
[source,java]
----
@@ -60,7 +60,7 @@ public Object downloadLayoutXml(
----
<1> either current, complete, normalized or minimal.
-See the documentation on xref:ugvw.adoc#_ugvw_layout_dynamic_xml[layout XML] and also
+See the documentation on xref:ugvw.adoc#_ugvw_layout_file-based[layout XML] and also
the xref:rgsvc.adoc#_rgsvc_api_LayoutService[`LayoutService`] for more information on these styles
http://git-wip-us.apache.org/repos/asf/isis/blob/badd1011/adocs/documentation/src/main/asciidoc/guides/rgsvc/_rgsvc_metadata-api.adoc
----------------------------------------------------------------------
diff --git a/adocs/documentation/src/main/asciidoc/guides/rgsvc/_rgsvc_metadata-api.adoc b/adocs/documentation/src/main/asciidoc/guides/rgsvc/_rgsvc_metadata-api.adoc
index 4d120dc..aa2b014 100644
--- a/adocs/documentation/src/main/asciidoc/guides/rgsvc/_rgsvc_metadata-api.adoc
+++ b/adocs/documentation/src/main/asciidoc/guides/rgsvc/_rgsvc_metadata-api.adoc
@@ -35,7 +35,7 @@ within the metamodel.
|xref:rgsvc.adoc#_rgsvc_api_LayoutService[`o.a.i.applib.` +
`services.layout` +
`LayoutService`]
-|Provides the ability to download dynamic layout XML files, in various styles.
+|Provides the ability to download `Xxx.layout.xml` files, in various styles.
|`LayoutServiceDefault` +
``o.a.i.core`` +
``isis-core-metamodel``
http://git-wip-us.apache.org/repos/asf/isis/blob/badd1011/adocs/documentation/src/main/asciidoc/guides/ugbtb/_ugbtb_i18n.adoc
----------------------------------------------------------------------
diff --git a/adocs/documentation/src/main/asciidoc/guides/ugbtb/_ugbtb_i18n.adoc b/adocs/documentation/src/main/asciidoc/guides/ugbtb/_ugbtb_i18n.adoc
index 16f8923..af8367d 100644
--- a/adocs/documentation/src/main/asciidoc/guides/ugbtb/_ugbtb_i18n.adoc
+++ b/adocs/documentation/src/main/asciidoc/guides/ugbtb/_ugbtb_i18n.adoc
@@ -540,7 +540,7 @@ msgstr "<i>Quantit�</i>"
----
For this to work, the `namedEscaped()` attribute must be specified using either the
-xref:ugvw.adoc#_ugvw_layout_dynamic[dynamic layout] json file, or using an annotation such as
+xref:ugvw.adoc#_ugvw_layout_file-based[layout file], or using an annotation such as
xref:rgant.adoc#_rgant-PropertyLayout[`@PropertyLayout`] or xref:rgant.adoc#_rgant-ParameterLayout[`@ParameterLayout`].
For example:
http://git-wip-us.apache.org/repos/asf/isis/blob/badd1011/adocs/documentation/src/main/asciidoc/guides/ugbtb/_ugbtb_programming-model_layout-metadata-reader.adoc
----------------------------------------------------------------------
diff --git a/adocs/documentation/src/main/asciidoc/guides/ugbtb/_ugbtb_programming-model_layout-metadata-reader.adoc b/adocs/documentation/src/main/asciidoc/guides/ugbtb/_ugbtb_programming-model_layout-metadata-reader.adoc
index 40d3e9f..432d46d 100644
--- a/adocs/documentation/src/main/asciidoc/guides/ugbtb/_ugbtb_programming-model_layout-metadata-reader.adoc
+++ b/adocs/documentation/src/main/asciidoc/guides/ugbtb/_ugbtb_programming-model_layout-metadata-reader.adoc
@@ -1,25 +1,21 @@
[[_ugbtb_programming-model_layout-metadata-reader]]
-= Layout Metadata Reader
+= Layout Metadata Reader (deprecated)
: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 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.
:_basedir: ../../
:_imagesdir: images/
-The metadata for domain objects is obtained both xref:ugvw.adoc#_ugvw_layout_static[statically] and xref:ugvw.adoc#_ugvw_layout_dynamic[dynamically].
+The metadata for domain objects is obtained both xref:ugvw.adoc#_ugvw_layout_annotation-based[annotations] and xref:ugvw.adoc#_ugvw_layout_file-based[files].
+There is also deprecated support for reading layouts from `.layout.json` files.
+This service provides an SPI (and default implementation) for reading layouts defined in this fashion.
+== Default implementation
+
The default implementation for reading dynamic layout metadata is `org.apache.isis.core.metamodel.layoutmetadata.json.LayoutMetadataReaderFromJson`, which is responsible for reading from the `Xxx.layout.json` files on the classpath (for each domain entity `Xxx`).
You can also implement your own metadata readers and plug them into Apache Isis. These could read from a different file format, or they could, even, read data dynamically from a URL or database. (Indeed, one could imagine an implementation whereby users could share layouts, all stored in some central repository).
-[WARNING]
-====
-The use of dynamic layouts through the `.layout.json` - and therefore also the `LayoutMetadataReader` - is DEPRECATED. Instead, the xref:ugvw.adoc#_ugvw_layout_dynamic_xml[dynamic XML layouts] using ``.layout.xml`` enables much more sophisticated custom layouts than those afforded by ``.layout.json``.
-
-By default, custom XML layouts are read from the classpath. This behaviour can be customized by providing an
-alternative implementation of the xref:rgsvc.adoc#_rgsvc_spi_GridLoaderService[`GridLoaderService`].
-====
-
http://git-wip-us.apache.org/repos/asf/isis/blob/badd1011/adocs/documentation/src/main/asciidoc/guides/ugvw/_ugvw_customisation_tweaking-css-classes.adoc
----------------------------------------------------------------------
diff --git a/adocs/documentation/src/main/asciidoc/guides/ugvw/_ugvw_customisation_tweaking-css-classes.adoc b/adocs/documentation/src/main/asciidoc/guides/ugvw/_ugvw_customisation_tweaking-css-classes.adoc
index 1d0a526..fbe0b55 100644
--- a/adocs/documentation/src/main/asciidoc/guides/ugvw/_ugvw_customisation_tweaking-css-classes.adoc
+++ b/adocs/documentation/src/main/asciidoc/guides/ugvw/_ugvw_customisation_tweaking-css-classes.adoc
@@ -92,16 +92,7 @@ div.x-myapp-highlight span.scalarName {
}
----
-Note also that instead of using `@PropertyLayout(cssClass=...)` annotation, you can also specify the CSS style using a xref:ugvw.adoc#_ugvw_layout_dynamic[dynamic layout] JSON file:
-
-[source,javascript]
-----
-"dueBy": {
- "propertyLayout": {
- "cssClass": "x-myapp-important"
- }
-},
-----
+Note also that instead of using `@PropertyLayout(cssClass=...)` annotation, you can also specify the CSS style using a xref:ugvw.adoc#_ugvw_layout_file-based[layout file].
http://git-wip-us.apache.org/repos/asf/isis/blob/badd1011/adocs/documentation/src/main/asciidoc/guides/ugvw/_ugvw_layout.adoc
----------------------------------------------------------------------
diff --git a/adocs/documentation/src/main/asciidoc/guides/ugvw/_ugvw_layout.adoc b/adocs/documentation/src/main/asciidoc/guides/ugvw/_ugvw_layout.adoc
index 3dc46a1..22b0732 100644
--- a/adocs/documentation/src/main/asciidoc/guides/ugvw/_ugvw_layout.adoc
+++ b/adocs/documentation/src/main/asciidoc/guides/ugvw/_ugvw_layout.adoc
@@ -13,12 +13,10 @@ Nevertheless, some metadata relating solely to the UI is inevitably required.
This chapter describes how this is done both for domain objects -- statically or dynamically -- and for the application menu bar (containing domain service' actions).
-include::_ugvw_layout_static.adoc[leveloffset=+1]
-include::_ugvw_layout_dynamic_xml.adoc[leveloffset=+1]
-include::_ugvw_layout_dynamic.adoc[leveloffset=+1]
-include::_ugvw_layout_application-menu.adoc[leveloffset=+1]
+include::_ugvw_layout_annotation-based.adoc[leveloffset=+1]
+include::_ugvw_layout_file-based.adoc[leveloffset=+1]
include::_ugvw_layout_static-vs-dynamic.adoc[leveloffset=+1]
-include::_ugvw_layout_handling-columns.adoc[leveloffset=+1]
+include::_ugvw_layout_application-menu.adoc[leveloffset=+1]
include::_ugvw_layout_customising-table-columns.adoc[leveloffset=+1]
http://git-wip-us.apache.org/repos/asf/isis/blob/badd1011/adocs/documentation/src/main/asciidoc/guides/ugvw/_ugvw_layout_annotation-based.adoc
----------------------------------------------------------------------
diff --git a/adocs/documentation/src/main/asciidoc/guides/ugvw/_ugvw_layout_annotation-based.adoc b/adocs/documentation/src/main/asciidoc/guides/ugvw/_ugvw_layout_annotation-based.adoc
new file mode 100644
index 0000000..b8ec9e5
--- /dev/null
+++ b/adocs/documentation/src/main/asciidoc/guides/ugvw/_ugvw_layout_annotation-based.adoc
@@ -0,0 +1,177 @@
+[[_ugvw_layout_annotation-based]]
+= Annotation-based Layout
+: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 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.
+:_basedir: ../../
+:_imagesdir: images/
+
+
+Metadata providing UI hints can be specified either using annotations, or using a xref:ugvw.adoc#_ugvw_layout_file-based[`layout.xml`] file.
+
+In most cases you will probably want to use the file-based approach: changes to file layouts are picked up dynamically, and using a file also allows tabs and tab groups to be specified: this is not supported using annotations.
+
+Nevertheless, annotations are still supported and are sometimes useful for very simple objects or just when prototyping.
+This section explains how.
+
+
+== `@MemberOrder`
+
+The xref:rgant.adoc#_rgant-MemberOrder[`@MemberOrder`] annotation is used to specify the relative order of domain class properties, collections and actions.
+
+The annotation defines two attributes, xref:rgant.adoc#_rgant-MemberOrder_name[`name()`] and xref:rgant.adoc#_rgant-MemberOrder_sequence[`sequence()`]. Their usage depends on the member type:
+
+* for properties, the `name()` is used to group properties together into a member group (also called a property group
+or a fieldset. The `sequence()` then orders properties within these groups. If no `name()` is specified then the
+property is placed in a fallback "General" group, called "General". +
++
+The name of these member groups/fieldsets are then referenced by xref:rgant.adoc#_rgant-MemberGroupLayout[`@MemberGroupLayout`].
+
+* for collections, the `name()` attribute is (currently) unused. The `sequence()` orders collections relative to one another
+
+* for actions, the `name()` attribute associates an action with either a property or with a collection. +
+
+** If the `name()` attribute matches a property name, then the action's button is rendered close to the property, according to xref:rgant.adoc#_rgant-ActionLayout_position[`@ActionLayout#position()`] attribute. +
+
+** On the other hand if the `name() attribute matches a collection name, then the action's button is rendered on the collection's header.
+
+** If there is no `name()` value, then the action is considered to pertain to the object as a whole, and its button is rendered close to the object's icon and title.
+
+Within any of these, the `sequence()` then determines the relative ordering of the action with respect to other actions that have been similarly associated with properties/collections or left as "free-standing".
+
+
+
+For example:
+
+[source,java]
+----
+public class ToDoItem {
+ @MemberOrder(sequence="1")
+ public String getDescription() { ... }
+ @MemberOrder(sequence="2")
+ public String getCategory() { ... }
+ @MemberOrder(sequence="3")
+ public boolean isComplete() { ... }
+ @MemberOrder(name="Detail", sequence="1")
+ public LocalDate getDueBy() { ... }
+ @MemberOrder(name="Detail", sequence="2")
+ public BigDecimal getCost() { ... }
+ @MemberOrder(name="Detail", sequence="4")
+ public String getNotes() { ... }
+ @MemberOrder(name="Misc", sequence="99")
+ public Long getVersionSequence() { ... }
+ ...
+}
+----
+
+This defines three property (or member) groups, "General", "Detail" and "Misc"; "General" is the default if no `name` attribute is specified. Properties in the same member group are rendered together, as a fieldset.
+
+In addition, actions can optionally be associated (rendered close to) either properties or actions. This is done by overloading the ``@MemberOrder``'s xref:rgant.adoc#_rgant-MemberOrder_name[`name()`] attribute, holding the value of the property or collection.
+
+For example:
+
+[source,java]
+----
+public class ToDoItem {
+ @MemberOrder(sequence="3")
+ public boolean isComplete() { ... }
+ @MemberOrder(name="complete", sequence="1")
+ public ToDoItem completed() { ...}
+ @MemberOrder(name="complete", sequence="2")
+ public ToDoItem notYetCompleted() { ...}
+
+ @MemberOrder(sequence="1")
+ public SortedSet<ToDoItem> getDependencies() { ... }
+ @MemberOrder(name="dependencies", sequence="1")
+ public ToDoItem add(ToDoItem t) { ...}
+ @MemberOrder(name="dependencies", sequence="2")
+ public ToDoItem remove(ToDoItem t) { ...}
+ ...
+}
+----
+
+will associate the `completed()` and `notYetCompleted()` actions with the `complete` property, and will associate the `add()` and `remove()` actions with the `dependencies` collection.
+
+
+The value of xref:rgant.adoc#_rgant-MemberOrder_sequence[`sequence()`] is a string. The simplest convention (as shown in the example above) is to use numbers -- 1, 2, 3 -- though it is a better idea to leave gaps in the numbers -- 10, 20, 30 perhaps -- such that a new member may be added without having to edit existing numbers.
+
+Even better is to adopt the 'dewey-decimal' notation -- 1, 1.1, 1.2, 2, 3, 5.1.1, 5.2.2, 5.2, 5.3 -- which allows for an indefinite amount of future insertion. It also allows subclasses to insert their class members as required.
+
+
+
+
+== `@MemberGroupLayout`
+
+The xref:rgant.adoc#_rgant-MemberGroupLayout[`@MemberGroupLayout`] annotation specifies the relative positioning of property groups/fieldsets as being either in a left column, a middle column or in a right column. The annotation also specifies the relative width of the columns.
+
+The property groups/fieldsets in this case are those that are inferred from the `@MemberOrder#name()` attribute.
+
+[TIP]
+====
+It is also possible to combine `@MemberOrder` with a xref:ugvw.adoc#_ugvw_layout_xml[file-based layout].
+The layout file defines only the regions of a grid structure (fieldsets/columns etc), but does __not__ specify the properties/collections/actions within those grid regions.
+The `@MemberOrder` annotation in effect "binds" the properties or collections to those regions of the grid.
+
+When file-based layouts are used this way, the xref:rgant.adoc#_rgant-MemberGroupLayout[`@MemberGroupLayout`] annotation is essentially ignored, but the metadata from the xref:rgant.adoc#_rgant-MemberOrder[`@MemberOrder`] annotation (and the other layout annotations, xref:rgant.adoc#_rgant-ActionLayout[`@ActionLayout`], xref:rgant.adoc#_rgant-PropertyLayout[`@PropertyLayout`] and xref:rgant.adoc#_rgant-CollectionLayout[`@CollectionLayout`]) are all still honoured.
+====
+
+For example:
+
+[source,java]
+----
+@MemberGroupLayout(
+ columnSpans={3,3,0,6},
+ left={"General", "Misc"},
+ middle="Detail"
+ )
+public class ToDoItem {
+ ...
+}
+----
+
+Four values are given in the `columnSpans` attribute. The first three are the relative widths of the three columns of property groups. The fourth, meanwhile, indicates the width of a final column that holds all the collections of the object.
+
+The values of these spans are taken as proportions of 12 virtual columns across the page (this taken from the link:http://getbootstrap.com/2.3.2/[Bootstrap] library).
+
+For example:
+
+* `{3,3,0,6}` indicates:
+** a left column of properties taking up 25% of the width
+** a middle column of properties taking up 25% of the width
+** a right column of collections taking up 50% of the width
+* `{2,6,0,4}` indicates:
+** a left column of properties taking up ~16% of the width
+** a middle column of properties taking up 50% of the width
+** a right column of collections taking up ~33% of the width
+* `{2,3,3,4}` indicates:
+** a left column of properties taking up ~16% of the width
+** a middle column of properties taking up 25% of the width
+** a right column of properties taking up 25% of the width
+** a far right column of collections taking up ~33% of the width
+
+If the sum of all the columns exceeds 12, then the collections are placed underneath the properties, taking up the full span. For example:
+
+* {4,4,4,12} indicates:
+** a left column of properties taking up ~33% of the width
+** a middle column of properties taking up ~33% of the width
+** a right column of properties taking up ~33% of the width
+** the collections underneath the property columns, taking up the full width
+
+== Example Layouts
+
+Below are sketches for the layout of the https://github.com/apache/isis/blob/f38fdb92941172eabb12e0943509f239e6d5925f/example/application/quickstart_wicket_restful_jdo/dom/src/main/java/dom/todo/ToDoItem.java[ToDoItem] class of the Isis addons example https://github.com/isisaddons/isis-app-todoapp/[todoapp] (not ASF):
+
+The first divides the properties into two equal sized columns (6-6-0) and puts the collections underneath (12):
+
+image::{_imagesdir}reference-layout/6-6-0-12.png[width="720px",link="{_imagesdir}reference-layout/6-6-0-12.png"]
+
+The next divides the collections into three equal sized columns (4-4-4) and again puts the collections underneath (12):
+
+image::{_imagesdir}reference-layout/4-4-4-12.png[width="720px",link="{_imagesdir}reference-layout/4-4-4-12.png"]
+
+The last puts the properties into a single column (4-0) and places the collections into the other larger column (8-0):
+
+image::{_imagesdir}reference-layout/4-0-8-0.png[width="720px",link="{_imagesdir}reference-layout/4-0-8-0.png"]
+
+
+== Other Annotations
+
+As of 1.8.0, all the layout annotations have been consolidated into the various `XxxLayout` annotations: xref:rgant.adoc#_rgant-ActionLayout, [`@ActionLayout`] xref:rgant.adoc#_rgant-CollectionLayout[`@CollectionLayout`], xref:rgant.adoc#_rgant-DomainObjectLayout[`@DomainObjectLayout`], xref:rgant.adoc#_rgant-DomainServiceLayout[`@DomainServiceLayout`], xref:rgant.adoc#_rgant-ParameterLayout[`@ParameterLayout`], xref:rgant.adoc#_rgant-PropertyLayout[`@PropertyLayout`], and xref:rgant.adoc#_rgant-ViewModelLayout[`@ViewModelLayout`]
http://git-wip-us.apache.org/repos/asf/isis/blob/badd1011/adocs/documentation/src/main/asciidoc/guides/ugvw/_ugvw_layout_dynamic.adoc
----------------------------------------------------------------------
diff --git a/adocs/documentation/src/main/asciidoc/guides/ugvw/_ugvw_layout_dynamic.adoc b/adocs/documentation/src/main/asciidoc/guides/ugvw/_ugvw_layout_dynamic.adoc
index cf02fca..b51f200 100644
--- a/adocs/documentation/src/main/asciidoc/guides/ugvw/_ugvw_layout_dynamic.adoc
+++ b/adocs/documentation/src/main/asciidoc/guides/ugvw/_ugvw_layout_dynamic.adoc
@@ -6,14 +6,18 @@
-Metadata providing UI hints can be specified either xref:ugvw.adoc#_ugvw_layout_static[statically], using annotations, or dynamically, using either a xref:ugvw.adoc#_ugvw_layout_dynamic_xml[``layout.xml``] file or (as described here) a `.layout.json` file.
+Metadata providing UI hints can be specified either xref:ugvw.adoc#_ugvw_layout_annotation-based[statically], using annotations, or dynamically, using either a xref:ugvw.adoc#_ugvw_layout_file-based[``layout.xml``] file or (as described here) a `.layout.json` file.
+
[IMPORTANT]
====
-The use of dynamic layouts through the `.layout.json` is DEPRECATED. Instead, use the
-``.layout.xml`` file, which enables much more sophisticated custom layouts than those provided by ``.layout.json``.
+The use of layouts through the `.layout.json` is DEPRECATED.
+Instead, use the ``.layout.xml`` file, which enables much more sophisticated custom layouts than those provided by ``.layout.json``.
+====
+[TIP]
+====
It is possible to download initial `.layout.xml` files - which will capture all the metadata originally in the `.layout.json` file - using the xref:rgsvc.adoc#_rgsvc_api_LayoutService[`LayoutService`] (exposed as an action on the prototyping menu).
The `.layout.json` file will be ignored once a `.layout.xml` file is present.
====
http://git-wip-us.apache.org/repos/asf/isis/blob/badd1011/adocs/documentation/src/main/asciidoc/guides/ugvw/_ugvw_layout_dynamic_xml.adoc
----------------------------------------------------------------------
diff --git a/adocs/documentation/src/main/asciidoc/guides/ugvw/_ugvw_layout_dynamic_xml.adoc b/adocs/documentation/src/main/asciidoc/guides/ugvw/_ugvw_layout_dynamic_xml.adoc
deleted file mode 100644
index 52eab2d..0000000
--- a/adocs/documentation/src/main/asciidoc/guides/ugvw/_ugvw_layout_dynamic_xml.adoc
+++ /dev/null
@@ -1,402 +0,0 @@
-[[_ugvw_layout_dynamic_xml]]
-= Dynamic (XML) Layout
-: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 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.
-:_basedir: ../../
-:_imagesdir: images/
-
-
-
-Metadata providing UI hints can be specified either xref:ugvw.adoc#_ugvw_layout_static[statically], using annotations, or dynamically using an `Xxx.layout.xml` file (where `Xxx` is the entity or view model object to be rendered).
-
-The `Xxx.layout.xml` file is just the serialized form of a xref:rgcms.adoc#_rgcms_classes_layout[`Grid`] layout class defined within Apache Isis' applib. These are JAXB-annotated classes with corresponding XSD schemas; the upshot of that
-is that IDEs such as IntelliJ and Eclipse can provide "intellisense", making iteasy to author such layout files.
-
-It is also possible to download an initial `.layout.xml` - capturing any existing layout metadata - using the xref:rgsvc.adoc#_rgsvc_api_LayoutService[`LayoutService`] (exposed on the prototyping menu) or using a xref:rgcms.adoc#_rgcms_classes_mixins_Object[mixin action] contributed to every domain object.
-
-[NOTE]
-====
-It is also possible to describe dynamic layouts using a `.layout.json` file, as discussed xref:ugvw.adoc#_ugvw_layout_dynamic[here]. The `.layout.json` file should be considered as deprecated: the ``.layout.xml`` file also enables much more sophisticated layouts than those afforded by ``.layout.json``.
-====
-
-== Grids vs Components
-
-The XML file distinguishes between two types of element:
-
-* those that define a grid structure, of: rows, columns, tab groups and tabs. +
-+
-The rows and columns are closely modelled on link:getbootstrap.com[Bootstrap 3] (used in the implementation of the xref:ugvw.adoc[Wicket viewer]).
-
-* those that defines common components, of: fieldsets (previously called member groups or property groups), properties, collections, actions and also the title/icon of the domain object itself.
-
-More information about these classes can be found in xref:rgcms.adoc#_rgcms_classes_layout[the reference guide]. More information on Bootstrap 3's grid system can be found link:http://getbootstrap.com/css/#grid[here].
-
-
-== Screencast
-
-This link:https://www.youtube.com/watch?v=MxewC5Pve5k[screencast] describes the feature.
-
-
-
-
-== Examples
-
-Probably the easiest way to understand dynamic XML layouts is by example. For this we'll use the `ToDoItem` from the
-(non-ASF) http://github.com/isisaddons/isis-app-todoapp[Isis addons' todoapp]:
-
-image::{_imagesdir}layout-dynamic-xml/ToDoItem.png[width="940px",link="{_imagesdir}layout-dynamic-xml/ToDoItem.png"]
-
-
-=== Namespaces
-
-First things first; every `.layout.xml` file must properly declare the XSD namespaces and schemas. There are two: one for the grid classes, and one for the common component classes:
-
-[source,xml]
-----
-<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<bs3:grid
- xsi:schemaLocation="http://isis.apache.org/applib/layout/component
- http://isis.apache.org/applib/layout/component/component.xsd
- http://isis.apache.org/applib/layout/grid/bootstrap3
- http://isis.apache.org/applib/layout/grid/bootstrap3/bootstrap3.xsd"
- xmlns:bs3="http://isis.apache.org/applib/layout/grid/bootstrap3"
- xmlns:c="http://isis.apache.org/applib/layout/component"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
- ...
-</bs3:grid>
-----
-
-Most IDEs will automatically download the XSD schemas from the specified schema locations, thereby providing
-"intellisense" help as you edit the file.
-
-
-=== Rows, full-width cols, and tabs
-
-The example layout consists of three rows: a row for the object/icon, a row containing a properties, and a row containing collections. In all three cases the row contains a single column spanning the full width of the page. For the property and collection rows, the column contains a tab group.
-
-This corresponds to the following XML:
-
-[source,xml]
-----
- <bs3:row>
- <bs3:col span="12" unreferencedActions="true">
- <c:domainObject bookmarking="AS_ROOT"/>
- </bs3:col>
- </bs3:row>
- <bs3:row>
- <bs3:col span="12">
- <bs3:tabGroup>
- <bs3:tab name="Properties">...</bs3:tab>
- <bs3:tab name="Other">...</bs3:tab>
- <bs3:tab name="Metadata">...</bs3:tab>
- </bs3:tabGroup>
- </bs3:col>
- </bs3:row>
- <bs3:row>
- <bs3:col span="12">
- <bs3:tabGroup unreferencedCollections="true">
- <bs3:tab name="Similar to">...</bs3:tab>
- <bs3:tab name="Dependencies">...</bs3:tab>
- </bs3:tabGroup>
- </bs3:col>
- </bs3:row>
-----
-
-
-You will notice that one of the ``col``umns has an ``unreferencedActions`` attribute, while one of the ``tabGroup``s has a similar ``unreferencedCollections`` attribute. This topic is discussed in more detail xref:ugfun.adoc#__ugvw_layout_dynamic_xml-unreferenced[below].
-
-
-
-=== Fieldsets
-
-The first tab containing properties is divided into two columns, each of which holds a single fieldset of multiple properties. Those properties in turn can have associated actions.
-
-This corresponds to the following XML:
-
-[source,xml]
-----
- <bs3:tab name="Properties">
- <bs3:row>
- <bs3:col span="6">
- <c:fieldSet name="General" id="general" unreferencedProperties="true">
- <c:action id="duplicate" position="PANEL_DROPDOWN"/>
- <c:action id="delete"/>
- <c:property id="description"/>
- <c:property id="category"/>
- <c:property id="subcategory">
- <c:action id="updateCategory"/>
- <c:action id="analyseCategory" position="RIGHT"/>
- </c:property>
- <c:property id="complete">
- <c:action id="completed" cssClassFa="fa-thumbs-up"/>
- <c:action id="notYetCompleted" cssClassFa="fa-thumbs-down"/>
- </c:property>
- </c:fieldSet>
- </bs3:col>
- <bs3:col span="6">
- ...
- </bs3:col>
- </bs3:row>
- </bs3:tab>
-----
-
-The tab defines two columns, each span of 6 (meaning half the width of the page).
-
-In the first column there is a single fieldset. Notice how actions - such as `duplicate` and `delete` - can be associated with this fieldset directly, meaning that they should be rendered on the fieldset's top panel.
-
-Thereafter the fieldset lists the properties in order. Actions can be associated with properties too; here they are rendered underneath or to the right of the field.
-
-Note also the `unreferencedProperties` attribute for the fieldset; this topic is discussed in more detail xref:ugfun.adoc#__ugvw_layout_dynamic_xml-unreferenced[below].
-
-
-=== Collections
-
-In the final row the collections are placed in tabs, simply one collection per tab. This corresponds to the following XML:
-
-[source,xml]
-----
- <bs3:tab name="Similar to">
- <bs3:row>
- <bs3:col span="12">
- <c:collection defaultView="table" id="similarTo"/>
- </bs3:col>
- </bs3:row>
- </bs3:tab>
- <bs3:tab name="Dependencies">
- <bs3:row>
- <bs3:col span="12">
- <c:collection defaultView="table" id="dependencies">
- <c:action id="add"/>
- <c:action id="remove"/>
- </c:collection>
- </bs3:col>
- </bs3:row>
- </bs3:tab>
-----
-
-As with properties, actions can be associated with collections; this indicates that they should be rendered in the collection's header.
-
-
-
-[[__ugvw_layout_dynamic_xml-unreferenced]]
-== Unreferenced Members
-
-As noted in the preceding discussion, several of the grid's regions have either an ``unreferencedActions``, ``unreferencedCollections`` or ``unreferencedProperties`` attribute.
-
-The rules are:
-
-* `unreferencedActions` attribute can be specified either on a column or on a fieldset. +
-+
-It would normally be typical to use the column holding the `<domainObject/>` icon/title, that is as shown in the example. The unreferenced actions then appear as top-level actions for the domain object.
-
-* `unreferencedCollections` attribute can be specified either on a column or on a tabgroup. +
-+
-If specified on a column, then that column will contain each of the unreferenced collections, stacked one on top of the other. If specified on a tab group, then a separate tab will be created for each collection, with that tab containing only that single collection.
-
-* `unreferencedProperties` attribute can be specified only on a fieldset.
-
-The purpose of these attributes is to indicate where in the layout any unreferenced members should be rendered. Every grid _must_ nominate one region for each of these three member types, the reason being that to ensure that the layout can be used even if it is incomplete with respect to the object members inferred from the Java source code. This might be because the developer forgot to update the layout, or it might be because of a new mixin (property, collection or action) contributed to many objects.
-
-
-The framework ensures that in any given grid exactly one region is specified for each of the three `unreferenced...` attributes. If the grid fails this validation, then a warning message will be displayed, and the invalid XML logged. The layout XML will then be ignored.
-
-
-
-== More advanced features
-
-This section decribes a number of more features useful in more complex layouts.
-
-
-=== Multiple references to a feature
-
-One feature worth being aware of is that it is possible to render a single feature more than once.
-
-For example, the dashboard home page for the (non-ASF) http://github.com/isisaddons/isis-app-todoapp[Isis addons' todoapp] shows
-the "not yet complete" collection of todo items twice, once as a table and also as a calendar:
-
-image::{_imagesdir}layout-dynamic-xml/ToDoAppDashboard.png[width="940px",link="{_imagesdir}layout-dynamic-xml/ToDoAppDashboard.png"]
-
-
-This is accomplished using the following (slightly abbreviated) layout:
-
-[source,xml]
-----
-<grid ...>
- <row>
- <col span="2" unreferencedActions="true">
- ...
- </col>
- <col span="5" unreferencedCollections="true" cssClass="custom-padding-top-20">
- <ns2:collection id="notYetComplete" defaultView="calendar"/> <!--1-->
- </col>
- <col span="5" cssClass="custom-padding-top-20">
- <ns2:collection id="notYetComplete" defaultView="table" paged="5"/> <!--2-->
- <ns2:collection id="complete" defaultView="table"/>
- </col>
- <col span="0">
- <ns2:fieldSet name="General" id="general" unreferencedProperties="true"/>
- </col>
- </row>
-</grid>
-----
-<1> render the collection in "calendar" view
-<2> also render the collection in "table" view
-
-In the middle column the `notYetComplete` collection is rendered in "calendar" view, while in the right-most column
-it is rendered in "table" view.
-
-
-It is also possible to reference object properties and actions more than once. This might be useful for a complex
-domain object with multiple tabs; certain properties or actions might appear on a summary tab (that shows the
-most commonly used info), but also on detail tabs.
-
-=== Custom CSS
-
-The ToDoApp's dashboard (above) also shows how custom CSS styles can be associated with specific regions of the layout:
-
-[source,xml]
-----
-<grid ...>
- <row>
- <col span="2" unreferencedActions="true">
- <ns2:domainObject/>
- <row>
- <col span="12" cssClass="custom-width-100"> <!--1-->
- <ns2:action id="exportToWordDoc"/>
- </col>
- </row>
- ...
- </col>
- <col span="5" unreferencedCollections="true" cssClass="custom-padding-top-20"> <!--2-->
- ...
- </col>
- <col span="5" cssClass="custom-padding-top-20"> <!--3-->
- ...
- </col>
- </row>
-</grid>
-----
-<1> Render the column with the `custom-width-100` CSS class.
-<2> Render the column with the `custom-padding-top-20` CSS class.
-<3> Ditto
-
-For example the `custom-width-100` style is used to "stretch" the button for the `exportToWordDoc` action in the
-left-most column. This is accomplished with the following CSS in `application.css`:
-
-[source,css]
-----
-.custom-width-100 ul,
-.custom-width-100 ul li,
-.custom-width-100 ul li a.btn {
- width: 100%;
-}
-----
-
-Similarly, the middle and right columns are rendered using the `custom-padding-top-20` CSS class. This shifts them down
-from the top of the page slightly, using the following CSS:
-
-[source,css]
-----
-.custom-padding-top-20 {
- padding-top: 20px;
-}
-----
-
-
-
-
-== Migrating from earlier versions
-
-As noted earlier on, it is possible to download layout XML files using the xref:rgsvc.adoc#_rgsvc_api_LayoutService[`LayoutService`] (exposed on the prototyping menu); this will download a ZIP file of layout XML files for all domain entities and view models. Alternatively the layout XML for a single domain object can be downloaded using the xref:rgcms.adoc#_rgcms_classes_mixins_Object[mixin action] (contributed to every domain object).
-
-There are four "styles":
-
-* current
-* complete
-* normalized
-* minimal
-
-
-Ignorig the "current" style (which merely downloads the currently cached layout), the other three styles allow the
-developer to choose how much metadata is to be specified in the XML, and how much (if any) will be obtained
-elsewhere, either from annotations in the metamodel or from an earlier `.layout.json` file if present. The table
-below summarises the choices:
-
-.Table caption
-[cols="<.>,^.>,^.>,^.>", options="header"]
-|===
-
-| Style
-|xref:rgant.adoc#_rgant-MemberGroupLayout[`@MemberGroupLayout`]
-| xref:rgant.adoc#_rgant-MemberOrder[`@MemberOrder`]
-| xref:rgant.adoc#_rgant-ActionLayout[`@ActionLayout`], xref:rgant.adoc#_rgant-PropertyLayout[`@PropertyLayout`], xref:rgant.adoc#_rgant-CollectionLayout[`@CollectionLayout`]
-
-
-|`COMPLETE`
-|serialized as XML
-|serialized as XML
-|serialized as XML
-
-
-|`NORMALIZED`
-|serialized as XML
-|serialized as XML
-|not in the XML
-
-
-|`MINIMAL`
-|serialized as XML
-|not in the XML
-|not in the XML
-
-|===
-
-As a developer, you therefore have a choice as to how you provide the metadata required for customised layouts:
-
-* if you want all layout metadata to be read from the `.layout.xml` file, then download the "complete" version, and copy the file alongside the domain class. You can then remove all `@MemberGroupLayout`, `@MemberOrder`, `@ActionLayout`, `@PropertyLayout` and `@CollectionLayout` annotations from the source code of the domain class.
-
-* if you want to use layout XML file to describe the grid (columns, tabs etc) and specify which object members are associated with those regions of the grid, then download the "normalized" version. You can then remove the `@MemberGroupLayout` and `@MemberOrder` annotations from the source code of the domain class, but retain the `@ActionLayout`, `@PropertyLayout` and `@CollectionLayout` annotations.
-
-* if you want to use layout XML file ONLY to describe the grid, then download the "minimal" version. The grid regions will be empty in this version, and the framework will use the `@MemberOrder` annotation to bind object members to those regions. The only annotation that can be safely removed from the source code with this style is the `@MemberGroupLayout` annotation.
-
-
-Download either for a single domain object, or download all domain objects (entities and view models).
-
-
-== Domain Services
-
-For more information about layouts, see:
-
-* xref:rgsvc.adoc#_rgsvc_api_LayoutService[`LayoutService`] (whose functionality is exposed on the prototyping menu as an action) and lso the a xref:rgcms .adoc#_rgcms_classes_mixins_Object[mixin action]
-
-* xref:rgsvc.adoc#_rgsvc_spi_GridService[`GridService`] and its supporting services, xref:rgsvc.adoc#_rgsvc_spi_GridLoaderService[`GridLoaderService`] and xref:rgsvc.adoc#_rgsvc_spi_GridSystemService[`GridSystemService`]
-
-* xref:rgcms.adoc#_rgcms_classes_layout[grid layout classes], defined in the Apache Isis applib
-
-
-
-
-== Required updates to the dom project's pom.xml
-
-Any `.layout.xml` files must be compiled and available in the classpath. Ensure the following is defined in the dom project's `pom.xml`:
-
-[source.xml]
-----
-<resources>
- <resource>
- <filtering>false</filtering>
- <directory>src/main/resources</directory>
- </resource>
- <resource>
- <filtering>false</filtering>
- <directory>src/main/java</directory>
- <includes>
- <include>**</include>
- </includes>
- <excludes>
- <exclude>**/*.java</exclude>
- </excludes>
- </resource>
-</resources>
-----
-
-If using an Apache Isis xref:ugfun.adoc#_ugfun_getting-started_simpleapp-archetype[SimpleApp archetype], then the POM is already correctly configured.
[9/9] isis git commit: ISIS-1521: deletes section on layout.json
layouts
Posted by da...@apache.org.
ISIS-1521: deletes section on layout.json layouts
Project: http://git-wip-us.apache.org/repos/asf/isis/repo
Commit: http://git-wip-us.apache.org/repos/asf/isis/commit/da045b83
Tree: http://git-wip-us.apache.org/repos/asf/isis/tree/da045b83
Diff: http://git-wip-us.apache.org/repos/asf/isis/diff/da045b83
Branch: refs/heads/master
Commit: da045b8309b9fa1b1ef2b71bcacc3be312ba6d68
Parents: badd101
Author: Dan Haywood <da...@haywood-associates.co.uk>
Authored: Fri Apr 14 09:11:27 2017 +0100
Committer: Dan Haywood <da...@haywood-associates.co.uk>
Committed: Fri Apr 14 09:11:27 2017 +0100
----------------------------------------------------------------------
.../guides/ugvw/_ugvw_layout_dynamic.adoc | 155 -------------------
.../guides/ugvw/_ugvw_layout_file-based.adoc | 6 +-
2 files changed, 3 insertions(+), 158 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/isis/blob/da045b83/adocs/documentation/src/main/asciidoc/guides/ugvw/_ugvw_layout_dynamic.adoc
----------------------------------------------------------------------
diff --git a/adocs/documentation/src/main/asciidoc/guides/ugvw/_ugvw_layout_dynamic.adoc b/adocs/documentation/src/main/asciidoc/guides/ugvw/_ugvw_layout_dynamic.adoc
deleted file mode 100644
index b51f200..0000000
--- a/adocs/documentation/src/main/asciidoc/guides/ugvw/_ugvw_layout_dynamic.adoc
+++ /dev/null
@@ -1,155 +0,0 @@
-[[_ugvw_layout_dynamic]]
-= Dynamic (JSON) Layout
-: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 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.
-:_basedir: ../../
-:_imagesdir: images/
-
-
-
-Metadata providing UI hints can be specified either xref:ugvw.adoc#_ugvw_layout_annotation-based[statically], using annotations, or dynamically, using either a xref:ugvw.adoc#_ugvw_layout_file-based[``layout.xml``] file or (as described here) a `.layout.json` file.
-
-
-
-[IMPORTANT]
-====
-The use of layouts through the `.layout.json` is DEPRECATED.
-Instead, use the ``.layout.xml`` file, which enables much more sophisticated custom layouts than those provided by ``.layout.json``.
-====
-
-[TIP]
-====
-It is possible to download initial `.layout.xml` files - which will capture all the metadata originally in the `.layout.json` file - using the xref:rgsvc.adoc#_rgsvc_api_LayoutService[`LayoutService`] (exposed as an action on the prototyping menu).
-The `.layout.json` file will be ignored once a `.layout.xml` file is present.
-====
-
-== JSON layout file
-
-The JSON layout file for class `Xxx` takes the name `Xxx.layout.json`, and resides in the same package as the class.
-
-
-The format of the file is:
-
-[source,javascript]
-----
-{
- "columns": [ // list of columns
- {
- "span": 6, // span of the left-hand property column
- "memberGroups": { // ordered map of member (property) groups
- "General": { // member group name
- "members": {
- "description": { // property, no associated actions, but with UI hint
- "propertyLayout": {
- "typicalLength": 50 // UI hint for size of field (no longer used in ISIS 1.8.0)
- }
- },
- "category": {},
- "complete": { // property, with associated actions
- "propertyLayout": {
- "describedAs": "Whether this todo item has been completed"
- },
- "actions": {
- "completed": {
- "actionLayout": {
- "named": "Done", // naming UI hint
- "cssClass": "x-highlight" // CSS UI hint
- }
- },
- "notYetCompleted": {
- "actionLayout": {
- "named": "Not done"
- }
- }
- }
- }
- },
- "Misc": {
- "members": {
- "notes": {
- "propertyLayout": {
- "multiLine": 5 // UI hint for text area
- }
- },
- "versionSequence": {}
- }
- }
- }
- }
- },
- {
- "span": 6, // span of the middle property column
- "memberGroups": { ... }
- },
- {
- "span": 0 // span of the right property column (if any)
- },
- {
- "span": 6,
- "collections": { // ordered map of collections
- "dependencies": { // collection, with associated actions
- "collectionLayout": {
- "paged": 10, // pagination UI hint
- "render": "EAGERLY" // lazy-loading UI hint
- },
- "actions": {
- "add":{},
- "delete": {}
- },
- },
- "similarItems": {} // collection, no associated actions
- }
- }
- ],
- "actions": { // actions not associated with any member
- "delete": {},
- "duplicate": {
- "actionLayout": {
- "named": {
- "value": "Clone"
- }
- }
- }
- }
-}
-----
-
-Although advisable, it is not necessary to list all class members in this file. Any members not listed with be
-ordered according either to annotations (if present) or fallback/default values.
-
-Note also that the layout file may contain entries for xref:ugfun.adoc#_ugfun_how-tos_contributed-members[contributed associations and actions]; this allows each contributee classes to define their own layout for their contributions, possibly overriding any static metadata on the original domain service contributor.
-
-
-
-== Downloading an initial layout
-
-The fastest way to get started is to use the (non-ASF) link:http://github.com/isisaddons/isis-module-devutils[Isis addons' devutils] module to download the layout file (derived from any existing static metadata defined by annotations).
-
-
-
-== Required updates to the dom project's pom.xml
-
-Any `.layout.json` files must be compiled and available in the classpath. Ensure the following is defined in the dom project's `pom.xml`:
-
-[source.xml]
-----
-<resources>
- <resource>
- <filtering>false</filtering>
- <directory>src/main/resources</directory>
- </resource>
- <resource>
- <filtering>false</filtering>
- <directory>src/main/java</directory>
- <includes>
- <include>**</include>
- </includes>
- <excludes>
- <exclude>**/*.java</exclude>
- </excludes>
- </resource>
-</resources>
-----
-
-If using an Apache Isis xref:ugfun.adoc#_ugfun_getting-started_simpleapp-archetype[SimpleApp archetype], then the POM is already correctly configured.
-
-
http://git-wip-us.apache.org/repos/asf/isis/blob/da045b83/adocs/documentation/src/main/asciidoc/guides/ugvw/_ugvw_layout_file-based.adoc
----------------------------------------------------------------------
diff --git a/adocs/documentation/src/main/asciidoc/guides/ugvw/_ugvw_layout_file-based.adoc b/adocs/documentation/src/main/asciidoc/guides/ugvw/_ugvw_layout_file-based.adoc
index 3b56d84..2b7285d 100644
--- a/adocs/documentation/src/main/asciidoc/guides/ugvw/_ugvw_layout_file-based.adoc
+++ b/adocs/documentation/src/main/asciidoc/guides/ugvw/_ugvw_layout_file-based.adoc
@@ -106,7 +106,7 @@ This corresponds to the following XML:
----
-You will notice that one of the ``col``umns has an ``unreferencedActions`` attribute, while one of the ``tabGroup``s has a similar ``unreferencedCollections`` attribute. This topic is discussed in more detail xref:ugfun.adoc#__ugvw_layout_dynamic_xml-unreferenced[below].
+You will notice that one of the ``col``umns has an ``unreferencedActions`` attribute, while one of the ``tabGroup``s has a similar ``unreferencedCollections`` attribute. This topic is discussed in more detail xref:ugfun.adoc#__ugvw_layout_file-based_unreferenced[below].
@@ -149,7 +149,7 @@ In the first column there is a single fieldset. Notice how actions - such as `d
Thereafter the fieldset lists the properties in order. Actions can be associated with properties too; here they are rendered underneath or to the right of the field.
-Note also the `unreferencedProperties` attribute for the fieldset; this topic is discussed in more detail xref:ugfun.adoc#__ugvw_layout_dynamic_xml-unreferenced[below].
+Note also the `unreferencedProperties` attribute for the fieldset; this topic is discussed in more detail xref:ugfun.adoc#__ugvw_layout_file-based_unreferenced[below].
=== Collections
@@ -181,7 +181,7 @@ As with properties, actions can be associated with collections; this indicates t
-[[__ugvw_layout_dynamic_xml-unreferenced]]
+[[__ugvw_layout_file-based_unreferenced]]
== Unreferenced Members
As noted in the preceding discussion, several of the grid's regions have either an ``unreferencedActions``, ``unreferencedCollections`` or ``unreferencedProperties`` attribute.
[2/9] isis git commit: ISIS-1521: moves layout section from
fundamentals guide to wicket viewer guide.
Posted by da...@apache.org.
http://git-wip-us.apache.org/repos/asf/isis/blob/8f18b6f0/adocs/documentation/src/main/asciidoc/guides/ugvw/images/brand-logo/brand-logo.png
----------------------------------------------------------------------
diff --git a/adocs/documentation/src/main/asciidoc/guides/ugvw/images/brand-logo/brand-logo.png b/adocs/documentation/src/main/asciidoc/guides/ugvw/images/brand-logo/brand-logo.png
new file mode 100644
index 0000000..7ab8ab3
Binary files /dev/null and b/adocs/documentation/src/main/asciidoc/guides/ugvw/images/brand-logo/brand-logo.png differ
http://git-wip-us.apache.org/repos/asf/isis/blob/8f18b6f0/adocs/documentation/src/main/asciidoc/guides/ugvw/images/copy-link/010-copy-link-button-940.png
----------------------------------------------------------------------
diff --git a/adocs/documentation/src/main/asciidoc/guides/ugvw/images/copy-link/010-copy-link-button-940.png b/adocs/documentation/src/main/asciidoc/guides/ugvw/images/copy-link/010-copy-link-button-940.png
new file mode 100644
index 0000000..bf70a84
Binary files /dev/null and b/adocs/documentation/src/main/asciidoc/guides/ugvw/images/copy-link/010-copy-link-button-940.png differ
http://git-wip-us.apache.org/repos/asf/isis/blob/8f18b6f0/adocs/documentation/src/main/asciidoc/guides/ugvw/images/copy-link/010-copy-link-button.png
----------------------------------------------------------------------
diff --git a/adocs/documentation/src/main/asciidoc/guides/ugvw/images/copy-link/010-copy-link-button.png b/adocs/documentation/src/main/asciidoc/guides/ugvw/images/copy-link/010-copy-link-button.png
new file mode 100644
index 0000000..ef64d29
Binary files /dev/null and b/adocs/documentation/src/main/asciidoc/guides/ugvw/images/copy-link/010-copy-link-button.png differ
http://git-wip-us.apache.org/repos/asf/isis/blob/8f18b6f0/adocs/documentation/src/main/asciidoc/guides/ugvw/images/copy-link/020-copy-link-dialog-940.png
----------------------------------------------------------------------
diff --git a/adocs/documentation/src/main/asciidoc/guides/ugvw/images/copy-link/020-copy-link-dialog-940.png b/adocs/documentation/src/main/asciidoc/guides/ugvw/images/copy-link/020-copy-link-dialog-940.png
new file mode 100644
index 0000000..84d050a
Binary files /dev/null and b/adocs/documentation/src/main/asciidoc/guides/ugvw/images/copy-link/020-copy-link-dialog-940.png differ
http://git-wip-us.apache.org/repos/asf/isis/blob/8f18b6f0/adocs/documentation/src/main/asciidoc/guides/ugvw/images/copy-link/020-copy-link-dialog.png
----------------------------------------------------------------------
diff --git a/adocs/documentation/src/main/asciidoc/guides/ugvw/images/copy-link/020-copy-link-dialog.png b/adocs/documentation/src/main/asciidoc/guides/ugvw/images/copy-link/020-copy-link-dialog.png
new file mode 100644
index 0000000..6be3190
Binary files /dev/null and b/adocs/documentation/src/main/asciidoc/guides/ugvw/images/copy-link/020-copy-link-dialog.png differ
http://git-wip-us.apache.org/repos/asf/isis/blob/8f18b6f0/adocs/documentation/src/main/asciidoc/guides/ugvw/images/copy-link/030-hints-940.png
----------------------------------------------------------------------
diff --git a/adocs/documentation/src/main/asciidoc/guides/ugvw/images/copy-link/030-hints-940.png b/adocs/documentation/src/main/asciidoc/guides/ugvw/images/copy-link/030-hints-940.png
new file mode 100644
index 0000000..3a4f690
Binary files /dev/null and b/adocs/documentation/src/main/asciidoc/guides/ugvw/images/copy-link/030-hints-940.png differ
http://git-wip-us.apache.org/repos/asf/isis/blob/8f18b6f0/adocs/documentation/src/main/asciidoc/guides/ugvw/images/copy-link/030-hints.png
----------------------------------------------------------------------
diff --git a/adocs/documentation/src/main/asciidoc/guides/ugvw/images/copy-link/030-hints.png b/adocs/documentation/src/main/asciidoc/guides/ugvw/images/copy-link/030-hints.png
new file mode 100644
index 0000000..5010132
Binary files /dev/null and b/adocs/documentation/src/main/asciidoc/guides/ugvw/images/copy-link/030-hints.png differ
http://git-wip-us.apache.org/repos/asf/isis/blob/8f18b6f0/adocs/documentation/src/main/asciidoc/guides/ugvw/images/copy-link/040-copy-link-with-hints-940.png
----------------------------------------------------------------------
diff --git a/adocs/documentation/src/main/asciidoc/guides/ugvw/images/copy-link/040-copy-link-with-hints-940.png b/adocs/documentation/src/main/asciidoc/guides/ugvw/images/copy-link/040-copy-link-with-hints-940.png
new file mode 100644
index 0000000..29ccf3b
Binary files /dev/null and b/adocs/documentation/src/main/asciidoc/guides/ugvw/images/copy-link/040-copy-link-with-hints-940.png differ
http://git-wip-us.apache.org/repos/asf/isis/blob/8f18b6f0/adocs/documentation/src/main/asciidoc/guides/ugvw/images/copy-link/040-copy-link-with-hints.png
----------------------------------------------------------------------
diff --git a/adocs/documentation/src/main/asciidoc/guides/ugvw/images/copy-link/040-copy-link-with-hints.png b/adocs/documentation/src/main/asciidoc/guides/ugvw/images/copy-link/040-copy-link-with-hints.png
new file mode 100644
index 0000000..da9674f
Binary files /dev/null and b/adocs/documentation/src/main/asciidoc/guides/ugvw/images/copy-link/040-copy-link-with-hints.png differ
http://git-wip-us.apache.org/repos/asf/isis/blob/8f18b6f0/adocs/documentation/src/main/asciidoc/guides/ugvw/images/copy-link/050-title-url-940.png
----------------------------------------------------------------------
diff --git a/adocs/documentation/src/main/asciidoc/guides/ugvw/images/copy-link/050-title-url-940.png b/adocs/documentation/src/main/asciidoc/guides/ugvw/images/copy-link/050-title-url-940.png
new file mode 100644
index 0000000..955e6b2
Binary files /dev/null and b/adocs/documentation/src/main/asciidoc/guides/ugvw/images/copy-link/050-title-url-940.png differ
http://git-wip-us.apache.org/repos/asf/isis/blob/8f18b6f0/adocs/documentation/src/main/asciidoc/guides/ugvw/images/copy-link/050-title-url.png
----------------------------------------------------------------------
diff --git a/adocs/documentation/src/main/asciidoc/guides/ugvw/images/copy-link/050-title-url.png b/adocs/documentation/src/main/asciidoc/guides/ugvw/images/copy-link/050-title-url.png
new file mode 100644
index 0000000..7fbf6d5
Binary files /dev/null and b/adocs/documentation/src/main/asciidoc/guides/ugvw/images/copy-link/050-title-url.png differ
http://git-wip-us.apache.org/repos/asf/isis/blob/8f18b6f0/adocs/documentation/src/main/asciidoc/guides/ugvw/images/embedded-view/no-footer.png
----------------------------------------------------------------------
diff --git a/adocs/documentation/src/main/asciidoc/guides/ugvw/images/embedded-view/no-footer.png b/adocs/documentation/src/main/asciidoc/guides/ugvw/images/embedded-view/no-footer.png
new file mode 100644
index 0000000..48d3a39
Binary files /dev/null and b/adocs/documentation/src/main/asciidoc/guides/ugvw/images/embedded-view/no-footer.png differ
http://git-wip-us.apache.org/repos/asf/isis/blob/8f18b6f0/adocs/documentation/src/main/asciidoc/guides/ugvw/images/embedded-view/no-header-no-footer.png
----------------------------------------------------------------------
diff --git a/adocs/documentation/src/main/asciidoc/guides/ugvw/images/embedded-view/no-header-no-footer.png b/adocs/documentation/src/main/asciidoc/guides/ugvw/images/embedded-view/no-header-no-footer.png
new file mode 100644
index 0000000..4e238f6
Binary files /dev/null and b/adocs/documentation/src/main/asciidoc/guides/ugvw/images/embedded-view/no-header-no-footer.png differ
http://git-wip-us.apache.org/repos/asf/isis/blob/8f18b6f0/adocs/documentation/src/main/asciidoc/guides/ugvw/images/embedded-view/no-header.png
----------------------------------------------------------------------
diff --git a/adocs/documentation/src/main/asciidoc/guides/ugvw/images/embedded-view/no-header.png b/adocs/documentation/src/main/asciidoc/guides/ugvw/images/embedded-view/no-header.png
new file mode 100644
index 0000000..22e245b
Binary files /dev/null and b/adocs/documentation/src/main/asciidoc/guides/ugvw/images/embedded-view/no-header.png differ
http://git-wip-us.apache.org/repos/asf/isis/blob/8f18b6f0/adocs/documentation/src/main/asciidoc/guides/ugvw/images/embedded-view/regular.png
----------------------------------------------------------------------
diff --git a/adocs/documentation/src/main/asciidoc/guides/ugvw/images/embedded-view/regular.png b/adocs/documentation/src/main/asciidoc/guides/ugvw/images/embedded-view/regular.png
new file mode 100644
index 0000000..926fb7d
Binary files /dev/null and b/adocs/documentation/src/main/asciidoc/guides/ugvw/images/embedded-view/regular.png differ
http://git-wip-us.apache.org/repos/asf/isis/blob/8f18b6f0/adocs/documentation/src/main/asciidoc/guides/ugvw/images/layout-dynamic-xml/ToDoAppDashboard.png
----------------------------------------------------------------------
diff --git a/adocs/documentation/src/main/asciidoc/guides/ugvw/images/layout-dynamic-xml/ToDoAppDashboard.png b/adocs/documentation/src/main/asciidoc/guides/ugvw/images/layout-dynamic-xml/ToDoAppDashboard.png
new file mode 100644
index 0000000..69340be
Binary files /dev/null and b/adocs/documentation/src/main/asciidoc/guides/ugvw/images/layout-dynamic-xml/ToDoAppDashboard.png differ
http://git-wip-us.apache.org/repos/asf/isis/blob/8f18b6f0/adocs/documentation/src/main/asciidoc/guides/ugvw/images/layout-dynamic-xml/ToDoItem.png
----------------------------------------------------------------------
diff --git a/adocs/documentation/src/main/asciidoc/guides/ugvw/images/layout-dynamic-xml/ToDoItem.png b/adocs/documentation/src/main/asciidoc/guides/ugvw/images/layout-dynamic-xml/ToDoItem.png
new file mode 100644
index 0000000..c47d52f
Binary files /dev/null and b/adocs/documentation/src/main/asciidoc/guides/ugvw/images/layout-dynamic-xml/ToDoItem.png differ
http://git-wip-us.apache.org/repos/asf/isis/blob/8f18b6f0/adocs/documentation/src/main/asciidoc/guides/ugvw/images/layouts/customer-order.png
----------------------------------------------------------------------
diff --git a/adocs/documentation/src/main/asciidoc/guides/ugvw/images/layouts/customer-order.png b/adocs/documentation/src/main/asciidoc/guides/ugvw/images/layouts/customer-order.png
new file mode 100644
index 0000000..b0aa271
Binary files /dev/null and b/adocs/documentation/src/main/asciidoc/guides/ugvw/images/layouts/customer-order.png differ
http://git-wip-us.apache.org/repos/asf/isis/blob/8f18b6f0/adocs/documentation/src/main/asciidoc/guides/ugvw/images/layouts/estatio-Invoice.png
----------------------------------------------------------------------
diff --git a/adocs/documentation/src/main/asciidoc/guides/ugvw/images/layouts/estatio-Invoice.png b/adocs/documentation/src/main/asciidoc/guides/ugvw/images/layouts/estatio-Invoice.png
new file mode 100644
index 0000000..be7e917
Binary files /dev/null and b/adocs/documentation/src/main/asciidoc/guides/ugvw/images/layouts/estatio-Invoice.png differ
http://git-wip-us.apache.org/repos/asf/isis/blob/8f18b6f0/adocs/documentation/src/main/asciidoc/guides/ugvw/images/layouts/estatio-Lease.png
----------------------------------------------------------------------
diff --git a/adocs/documentation/src/main/asciidoc/guides/ugvw/images/layouts/estatio-Lease.png b/adocs/documentation/src/main/asciidoc/guides/ugvw/images/layouts/estatio-Lease.png
new file mode 100644
index 0000000..e80ecb2
Binary files /dev/null and b/adocs/documentation/src/main/asciidoc/guides/ugvw/images/layouts/estatio-Lease.png differ
http://git-wip-us.apache.org/repos/asf/isis/blob/8f18b6f0/adocs/documentation/src/main/asciidoc/guides/ugvw/images/layouts/estatio-LeaseItem.png
----------------------------------------------------------------------
diff --git a/adocs/documentation/src/main/asciidoc/guides/ugvw/images/layouts/estatio-LeaseItem.png b/adocs/documentation/src/main/asciidoc/guides/ugvw/images/layouts/estatio-LeaseItem.png
new file mode 100644
index 0000000..993d498
Binary files /dev/null and b/adocs/documentation/src/main/asciidoc/guides/ugvw/images/layouts/estatio-LeaseItem.png differ
http://git-wip-us.apache.org/repos/asf/isis/blob/8f18b6f0/adocs/documentation/src/main/asciidoc/guides/ugvw/images/layouts/todoapp-ToDoItem.png
----------------------------------------------------------------------
diff --git a/adocs/documentation/src/main/asciidoc/guides/ugvw/images/layouts/todoapp-ToDoItem.png b/adocs/documentation/src/main/asciidoc/guides/ugvw/images/layouts/todoapp-ToDoItem.png
new file mode 100644
index 0000000..3218651
Binary files /dev/null and b/adocs/documentation/src/main/asciidoc/guides/ugvw/images/layouts/todoapp-ToDoItem.png differ
http://git-wip-us.apache.org/repos/asf/isis/blob/8f18b6f0/adocs/documentation/src/main/asciidoc/guides/ugvw/images/recent-pages/recent-pages-940.png
----------------------------------------------------------------------
diff --git a/adocs/documentation/src/main/asciidoc/guides/ugvw/images/recent-pages/recent-pages-940.png b/adocs/documentation/src/main/asciidoc/guides/ugvw/images/recent-pages/recent-pages-940.png
new file mode 100644
index 0000000..2e55860
Binary files /dev/null and b/adocs/documentation/src/main/asciidoc/guides/ugvw/images/recent-pages/recent-pages-940.png differ
http://git-wip-us.apache.org/repos/asf/isis/blob/8f18b6f0/adocs/documentation/src/main/asciidoc/guides/ugvw/images/recent-pages/recent-pages.png
----------------------------------------------------------------------
diff --git a/adocs/documentation/src/main/asciidoc/guides/ugvw/images/recent-pages/recent-pages.png b/adocs/documentation/src/main/asciidoc/guides/ugvw/images/recent-pages/recent-pages.png
new file mode 100644
index 0000000..8be97de
Binary files /dev/null and b/adocs/documentation/src/main/asciidoc/guides/ugvw/images/recent-pages/recent-pages.png differ
http://git-wip-us.apache.org/repos/asf/isis/blob/8f18b6f0/adocs/documentation/src/main/asciidoc/guides/ugvw/images/reference-layout/4-0-8-0.png
----------------------------------------------------------------------
diff --git a/adocs/documentation/src/main/asciidoc/guides/ugvw/images/reference-layout/4-0-8-0.png b/adocs/documentation/src/main/asciidoc/guides/ugvw/images/reference-layout/4-0-8-0.png
new file mode 100644
index 0000000..1ebb062
Binary files /dev/null and b/adocs/documentation/src/main/asciidoc/guides/ugvw/images/reference-layout/4-0-8-0.png differ
http://git-wip-us.apache.org/repos/asf/isis/blob/8f18b6f0/adocs/documentation/src/main/asciidoc/guides/ugvw/images/reference-layout/4-4-4-12.png
----------------------------------------------------------------------
diff --git a/adocs/documentation/src/main/asciidoc/guides/ugvw/images/reference-layout/4-4-4-12.png b/adocs/documentation/src/main/asciidoc/guides/ugvw/images/reference-layout/4-4-4-12.png
new file mode 100644
index 0000000..fd946bf
Binary files /dev/null and b/adocs/documentation/src/main/asciidoc/guides/ugvw/images/reference-layout/4-4-4-12.png differ
http://git-wip-us.apache.org/repos/asf/isis/blob/8f18b6f0/adocs/documentation/src/main/asciidoc/guides/ugvw/images/reference-layout/6-6-0-12.png
----------------------------------------------------------------------
diff --git a/adocs/documentation/src/main/asciidoc/guides/ugvw/images/reference-layout/6-6-0-12.png b/adocs/documentation/src/main/asciidoc/guides/ugvw/images/reference-layout/6-6-0-12.png
new file mode 100644
index 0000000..369efb7
Binary files /dev/null and b/adocs/documentation/src/main/asciidoc/guides/ugvw/images/reference-layout/6-6-0-12.png differ
http://git-wip-us.apache.org/repos/asf/isis/blob/8f18b6f0/adocs/documentation/src/main/asciidoc/guides/ugvw/images/reference-layout/isis-layout-show-facets.css
----------------------------------------------------------------------
diff --git a/adocs/documentation/src/main/asciidoc/guides/ugvw/images/reference-layout/isis-layout-show-facets.css b/adocs/documentation/src/main/asciidoc/guides/ugvw/images/reference-layout/isis-layout-show-facets.css
new file mode 100644
index 0000000..c6b6334
--- /dev/null
+++ b/adocs/documentation/src/main/asciidoc/guides/ugvw/images/reference-layout/isis-layout-show-facets.css
@@ -0,0 +1,3 @@
+\ufefful.isis-facets {
+ display: initial;
+}
http://git-wip-us.apache.org/repos/asf/isis/blob/8f18b6f0/adocs/documentation/src/main/asciidoc/guides/ugvw/images/reference-layout/isis-layout.css
----------------------------------------------------------------------
diff --git a/adocs/documentation/src/main/asciidoc/guides/ugvw/images/reference-layout/isis-layout.css b/adocs/documentation/src/main/asciidoc/guides/ugvw/images/reference-layout/isis-layout.css
new file mode 100644
index 0000000..acd445d
--- /dev/null
+++ b/adocs/documentation/src/main/asciidoc/guides/ugvw/images/reference-layout/isis-layout.css
@@ -0,0 +1,253 @@
+\ufeff.primary-1 {
+ background-color: #669900;
+}
+
+.primary-2 {
+ background-color: #669900;
+}
+
+.primary-3 {
+ background-color: #669900;
+}
+
+.primary-4 {
+ background-color: #99FF66;
+}
+
+.primary-5 {
+ background-color: #CCFF99;
+}
+
+.secondary-a-1 {
+ background-color: #006666;
+}
+
+.secondary-a-2 {
+ background-color: #006666;
+}
+
+.secondary-a-3 {
+ background-color: #006666;
+}
+
+.secondary-a-4 {
+ background-color: #66CCCC;
+}
+
+.secondary-a-5 {
+ background-color: #99CCCC;
+}
+
+.secondary-b-1 {
+ background-color: #999900;
+}
+
+.secondary-b-2 {
+ background-color: #999900;
+}
+
+.secondary-b-3 {
+ background-color: #999900;
+}
+
+.secondary-b-4 {
+ background-color: #FFFF66;
+}
+
+.secondary-b-5 {
+ background-color: #FFFFCC;
+}
+
+.complement-1 {
+ background-color: #990033;
+}
+
+.complement-2 {
+ background-color: #990033;
+}
+
+.complement-3 {
+ background-color: #990033;
+}
+
+.complement-4 {
+ background-color: #FF6699;
+}
+
+.complement-5 {
+ background-color: #FF99CC;
+}
+
+
+
+legend {
+ background-color: white;
+}
+
+fieldset {
+ padding-bottom: 10px;
+}
+
+span,li {
+ color: white;
+}
+span {
+ font-weight: bold;
+}
+
+li {
+ padding-bottom: 10px;
+ margin-bottom: 10px;
+}
+
+
+
+.isis-header {
+ padding: 20px 80px 20px 40px;
+ margin-right: 100px;
+ background-color: #99CCCC;
+ display: block;
+ width: 100%;
+}
+
+.isis-header span.isis-title {
+ font-size: xx-large;
+ padding: 5px 80px 5px 40px;
+ margin-right: 50px;
+ color: black;
+ background-color: #99FF66;
+ display: inline-table;
+ vertical-align: bottom;
+}
+
+.isis-header div.isis-actions span {
+ font-size: large;
+ padding: 5px 5px 5px 5px;
+ display: inline-table;
+}
+
+.isis-memberGroup, .isis-collection {
+ margin-top: 10px;
+ margin-bottom: 10px;
+ min-height: 100px;
+}
+
+.isis-memberGroup {
+ background-color: #669900;
+}
+
+.isis-collection {
+ background-color: #999900;
+}
+
+
+div.isis-property > span {
+ margin-left: 5%;
+ padding-left: 10px;
+ width: 90%;
+ display: block;
+}
+
+fieldset div.isis-property > span {
+ padding: 5px;
+ margin: 10px;
+ background-color: #006666;
+}
+
+.isis-header div.isis-actions,
+fieldset div.isis-actions {
+ margin-left: 60px;
+}
+
+fieldset.isis-collection div.isis-actions {
+ margin-left: 60px;
+}
+
+.isis-header .isis-actions {
+ display: inline-block;
+}
+
+.isis-header div.isis-action,
+fieldset div.isis-action {
+ display: inline-table;
+ padding: 5px;
+ margin-top: 5px;
+ margin-bottom: 5px;
+ background-color: #990033;
+}
+
+
+fieldset div.isis-action span {
+ background-color: #990033;
+}
+
+.isis-memberGroups {}
+
+.isis-memberGroup.min-height-50,
+.isis-collection.min-height-50 {
+ min-height: 50px;
+}
+
+.isis-memberGroup.min-height-100,
+.isis-collection.min-height-100 {
+ min-height: 100px;
+}
+
+.isis-memberGroup.min-height-150,
+.isis-collection.min-height-150 {
+ min-height: 150px;
+}
+
+.isis-memberGroup.min-height-200,
+.isis-collection.min-height-200 {
+ min-height: 200px;
+}
+
+.isis-memberGroup.min-height-250,
+.isis-collection.min-height-250 {
+ min-height: 250px;
+}
+
+.isis-memberGroup.min-height-300,
+.isis-collection.min-height-300 {
+ min-height: 300px;
+}
+
+.isis-memberGroup.min-height-350,
+.isis-collection.min-height-350 {
+ min-height: 350px;
+}
+
+.isis-memberGroup.min-height-400,
+.isis-collection.min-height-400 {
+ min-height: 400px;
+}
+
+.isis-memberGroup .isis-hidden {
+ display: none;
+}
+
+.isis-action ul.isis-facets li {
+ margin-top: 30px;
+}
+ul.isis-facets li {
+ margin-left: 40px;
+ font-size: small;
+}
+.isis-action ul.isis-facets li {
+ margin-top: 10px;
+ margin-left: 20px;
+}
+.isis-action ul.isis-facets li {
+ font-size: small;
+}
+ul.isis-facets {
+ line-height: 0px;
+}
+ul.isis-facets {
+ margin:0px;
+}
+
+.isis-facets {
+ display: none;
+}
http://git-wip-us.apache.org/repos/asf/isis/blob/8f18b6f0/adocs/documentation/src/main/asciidoc/guides/ugvw/images/reference-layout/layout-4-0-8-0.html
----------------------------------------------------------------------
diff --git a/adocs/documentation/src/main/asciidoc/guides/ugvw/images/reference-layout/layout-4-0-8-0.html b/adocs/documentation/src/main/asciidoc/guides/ugvw/images/reference-layout/layout-4-0-8-0.html
new file mode 100644
index 0000000..4d77ad0
--- /dev/null
+++ b/adocs/documentation/src/main/asciidoc/guides/ugvw/images/reference-layout/layout-4-0-8-0.html
@@ -0,0 +1,198 @@
+\ufeff<!DOCTYPE html>
+<html lang="en">
+<head>
+ <meta charset="utf-8">
+ <meta http-equiv="X-UA-Compatible" content="IE=edge">
+ <meta name="viewport" content="width=device-width, initial-scale=1">
+ <title>colspans={4,0,8,0}</title>
+
+ <!-- Bootstrap -->
+ <!--
+ <link rel="stylesheet" href="//netdna.bootstrapcdn.com/bootstrap/3.1.1/css/bootstrap.min.css">
+ <link rel="stylesheet" href="//netdna.bootstrapcdn.com/bootstrap/3.1.1/css/bootstrap-theme.min.css">
+ <script src="//netdna.bootstrapcdn.com/bootstrap/3.1.1/js/bootstrap.min.js"></script>
+ -->
+
+ <!-- Bootstrap -->
+ <link href="css/bootstrap.min.css" rel="stylesheet">
+
+ <!-- HTML5 Shim and Respond.js IE8 support of HTML5 elements and media queries -->
+ <!-- WARNING: Respond.js doesn't work if you view the page via file:// -->
+ <!--[if lt IE 9]>
+ <script src="https://oss.maxcdn.com/libs/html5shiv/3.7.0/html5shiv.js"></script>
+ <script src="https://oss.maxcdn.com/libs/respond.js/1.4.2/respond.min.js"></script>
+ <![endif]-->
+ <link href="isis-layout.css" rel="stylesheet">
+ <!--<link href="isis-layout-show-facets.css" rel="stylesheet">-->
+</head>
+ <body>
+ <div class="container">
+ <h1>colspans={4,0,8,0}</h1>
+ <div class="row">
+ <div class="col-md-12">
+ <div class="isis-header">
+ <span class="isis-title">Buy bread</span>
+ <div class="isis-actions">
+ <div class="isis-action x-caution">
+ <span>delete</span>
+ </div>
+ <div class="isis-action">
+ <span data-isis-id="duplicate">clone</span>
+ <ul class="isis-facets">
+ <li>describedAs.value="Create a new todo item from this one"</li>
+ </ul>
+ </div>
+ <div class="isis-action">
+ <span>recentChanges</span>
+ </div>
+ <div class="isis-action">
+ <span>recentChanges</span>
+ </div>
+ </div>
+ </div>
+ </div>
+ </div>
+ <div class="row">
+ <div class="col-md-4 isis-memberGroups">
+ <fieldset class="isis-memberGroup min-height-100">
+ <legend>General</legend>
+ <div class="isis-property">
+ <span data-isis-typicallength="50">description</span>
+ <ul class="isis-facets">
+ <li>typicalLength.value=50</li>
+ </ul>
+ </div>
+ <div class="isis-property">
+ <span>category</span>
+ <ul class="isis-facets">
+ <li>disabled.reason="Use action to update both category and subcategory"</li>
+ </ul>
+ </div>
+ <div class="isis-property">
+ <span>subcategory</span>
+ <ul class="isis-facets">
+ <li>disabled.reason="Use action to update both category and subcategory"</li>
+ </ul>
+ <div class="isis-actions">
+ <div class="isis-action">
+ <span data-isis-id="updateCategory">update</span>
+ </div>
+ <div class="isis-action">
+ <span>analyseCategory</span>
+ </div>
+ </div>
+ </div>
+ <div class="isis-property">
+ <span class="isis-hidden">ownedBy</span>
+ </div>
+ <div class="isis-property x-highlight">
+ <span data-isis-id="complete">done</span>
+ <div class="isis-actions">
+ <div class="isis-action">
+ <span data-isis-id="completed">done</span>
+ <ul class="isis-facets">
+ <li>describedAs.value="Mark this todo item as having been completed"</li>
+ </ul>
+ </div>
+ <div class="isis-action">
+ <span>scheduleExplicitly</span>
+ </div>
+ <div class="isis-action">
+ <span>scheduleImplicitly</span>
+ </div>
+ <div class="isis-action">
+ <span data-isis-id="notYetCompleted">not done</span>
+ </div>
+ </div>
+ </div>
+ </fieldset>
+ <fieldset class="isis-memberGroup">
+ <legend>Priority</legend>
+ <div class="isis-property">
+ <span>relativePriority</span>
+ <div class="isis-actions">
+ <div class="isis-action">
+ <span>previous</span>
+ </div>
+ <div class="isis-action">
+ <span>next</span>
+ </div>
+ </div>
+ </div>
+ <div class="isis-property x-key">
+ <span>dueBy</span>
+ </div>
+ <legend>Other</legend>
+ <div class="isis-property">
+ <span>cost</span>
+ <div class="isis-actions">
+ <div class="isis-action">
+ <span data-isis-id="updateCost">update</span>
+ </div>
+ </div>
+ </div>
+ <div class="isis-property">
+ <span>notes</span>
+ <ul class="isis-facets">
+ <li>multiLine.numberOfLines=5</li>
+ <li>hidden.where=ALL_TABLES</li>
+ </ul>
+ </div>
+ <div class="isis-property">
+ <span>attachment</span>
+ <ul class="isis-facets">
+ <li>hidden.where=ALL_TABLES</li>
+ </ul>
+ </div>
+ <div class="isis-property">
+ <span data-isis-id="versionSequence">version</span>
+ <ul class="isis-facets">
+ <li>disabled</li>
+ <li>hidden.where=STANDALONE_TABLES</li>
+ </ul>
+ </div>
+ </fieldset>
+ </div>
+ <div class="col-md-8">
+ <fieldset class="isis-collection min-height-100">
+ <legend>dependencies</legend>
+ <div class="isis-actions">
+ <div class="isis-action">
+ <span>add</span>
+ </div>
+ <div class="isis-action x-caution">
+ <span>remove</span>
+ </div>
+ </div>
+ <ul class="isis-facets">
+ <li>disabled</li>
+ <li>paged.value=5</li>
+ <li>render.value=EAGERLY</li>
+ </ul>
+ </fieldset>
+ <fieldset class="isis-collection min-height-200">
+ <legend>similarTo</legend>
+ <ul class="isis-facets">
+ <li>disabled</li>
+ <li>paged.value=3</li>
+ <li>render.value=LAZILY</li>
+ </ul>
+ </fieldset>
+ </div>
+ </div>
+ <div class="row">
+ <div class="col-md-12">
+ </div>
+ </div>
+ </div>
+
+ <!-- jQuery (necessary for Bootstrap's JavaScript plugins) -->
+ <script src="https://ajax.googleapis.com/ajax/libs/jquery/1.11.0/jquery.min.js"></script>
+ <!-- Include all compiled plugins (below), or include individual files as needed -->
+ <script src="js/bootstrap.min.js"></script>
+ <script>
+ $(document).ready(function () {
+ });
+ </script>
+ </body>
+</html>
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/isis/blob/8f18b6f0/adocs/documentation/src/main/asciidoc/guides/ugvw/images/reference-layout/layout-4-4-4-12.html
----------------------------------------------------------------------
diff --git a/adocs/documentation/src/main/asciidoc/guides/ugvw/images/reference-layout/layout-4-4-4-12.html b/adocs/documentation/src/main/asciidoc/guides/ugvw/images/reference-layout/layout-4-4-4-12.html
new file mode 100644
index 0000000..d95a916
--- /dev/null
+++ b/adocs/documentation/src/main/asciidoc/guides/ugvw/images/reference-layout/layout-4-4-4-12.html
@@ -0,0 +1,205 @@
+\ufeff<!DOCTYPE html>
+<html lang="en">
+<head>
+ <meta charset="utf-8">
+ <meta http-equiv="X-UA-Compatible" content="IE=edge">
+ <meta name="viewport" content="width=device-width, initial-scale=1">
+ <title>colspans={4,4,4,12}</title>
+
+ <!-- Bootstrap -->
+ <!--
+ <link rel="stylesheet" href="//netdna.bootstrapcdn.com/bootstrap/3.1.1/css/bootstrap.min.css">
+ <link rel="stylesheet" href="//netdna.bootstrapcdn.com/bootstrap/3.1.1/css/bootstrap-theme.min.css">
+ <script src="//netdna.bootstrapcdn.com/bootstrap/3.1.1/js/bootstrap.min.js"></script>
+ -->
+
+ <!-- Bootstrap -->
+ <link href="css/bootstrap.min.css" rel="stylesheet">
+
+ <!-- HTML5 Shim and Respond.js IE8 support of HTML5 elements and media queries -->
+ <!-- WARNING: Respond.js doesn't work if you view the page via file:// -->
+ <!--[if lt IE 9]>
+ <script src="https://oss.maxcdn.com/libs/html5shiv/3.7.0/html5shiv.js"></script>
+ <script src="https://oss.maxcdn.com/libs/respond.js/1.4.2/respond.min.js"></script>
+ <![endif]-->
+ <link href="isis-layout.css" rel="stylesheet">
+ <!--<link href="isis-layout-show-facets.css" rel="stylesheet">-->
+</head>
+ <body>
+ <div class="container">
+ <h1>colspans={4,4,4,12}</h1>
+ <div class="row">
+ <div class="col-md-12">
+ <div class="isis-header">
+ <span class="isis-title">Buy bread</span>
+ <div class="isis-actions">
+ <div class="isis-action x-caution">
+ <span>delete</span>
+ </div>
+ <div class="isis-action">
+ <span data-isis-id="duplicate">clone</span>
+ <ul class="isis-facets">
+ <li>describedAs.value="Create a new todo item from this one"</li>
+ </ul>
+ </div>
+ <div class="isis-action">
+ <span>recentChanges</span>
+ </div>
+ <div class="isis-action">
+ <span>recentChanges</span>
+ </div>
+ </div>
+ </div>
+ </div>
+ </div>
+ <div class="row">
+ <div class="col-md-4 isis-memberGroups">
+ <fieldset class="isis-memberGroup min-height-100">
+ <legend>General</legend>
+ <div class="isis-property">
+ <span data-isis-typicallength="50">description</span>
+ <ul class="isis-facets">
+ <li>typicalLength.value=50</li>
+ </ul>
+ </div>
+ <div class="isis-property">
+ <span>category</span>
+ <ul class="isis-facets">
+ <li>disabled.reason="Use action to update both category and subcategory"</li>
+ </ul>
+ </div>
+ <div class="isis-property">
+ <span>subcategory</span>
+ <ul class="isis-facets">
+ <li>disabled.reason="Use action to update both category and subcategory"</li>
+ </ul>
+ <div class="isis-actions">
+ <div class="isis-action">
+ <span data-isis-id="updateCategory">update</span>
+ </div>
+ <div class="isis-action">
+ <span>analyseCategory</span>
+ </div>
+ </div>
+ </div>
+ <div class="isis-property">
+ <span class="isis-hidden">ownedBy</span>
+ </div>
+ <div class="isis-property x-highlight">
+ <span data-isis-id="complete">done</span>
+ <div class="isis-actions">
+ <div class="isis-action">
+ <span data-isis-id="completed">done</span>
+ <ul class="isis-facets">
+ <li>describedAs.value="Mark this todo item as having been completed"</li>
+ </ul>
+ </div>
+ <div class="isis-action">
+ <span>scheduleExplicitly</span>
+ </div>
+ <div class="isis-action">
+ <span>scheduleImplicitly</span>
+ </div>
+ <div class="isis-action">
+ <span data-isis-id="notYetCompleted">not done</span>
+ </div>
+ </div>
+ </div>
+ </fieldset>
+ </div>
+ <div class="col-md-4 isis-memberGroups">
+ <fieldset class="isis-memberGroup">
+ <legend>Priority</legend>
+ <div class="isis-property">
+ <span>relativePriority</span>
+ <div class="isis-actions">
+ <div class="isis-action">
+ <span>previous</span>
+ </div>
+ <div class="isis-action">
+ <span>next</span>
+ </div>
+ </div>
+ </div>
+ <div class="isis-property x-key">
+ <span>dueBy</span>
+ </div>
+ </fieldset>
+ </div>
+ <div class="col-md-4 isis-memberGroups">
+ <fieldset class="isis-memberGroup">
+ <legend>Other</legend>
+ <div class="isis-property">
+ <span>cost</span>
+ <div class="isis-actions">
+ <div class="isis-action">
+ <span data-isis-id="updateCost">update</span>
+ </div>
+ </div>
+ </div>
+ <div class="isis-property">
+ <span>notes</span>
+ <ul class="isis-facets">
+ <li>multiLine.numberOfLines=5</li>
+ <li>hidden.where=ALL_TABLES</li>
+ </ul>
+ </div>
+ <div class="isis-property">
+ <span>attachment</span>
+ <ul class="isis-facets">
+ <li>hidden.where=ALL_TABLES</li>
+ </ul>
+ </div>
+ </fieldset>
+ <fieldset class="isis-memberGroup min-height-100">
+ <legend>Misc</legend>
+ <div class="isis-property">
+ <span data-isis-id="versionSequence">version</span>
+ <ul class="isis-facets">
+ <li>disabled</li>
+ <li>hidden.where=STANDALONE_TABLES</li>
+ </ul>
+ </div>
+ </fieldset>
+ </div>
+ </div>
+ <div class="row">
+ <div class="col-md-12">
+ <fieldset class="isis-collection min-height-100">
+ <legend>dependencies</legend>
+ <div class="isis-actions">
+ <div class="isis-action">
+ <span>add</span>
+ </div>
+ <div class="isis-action x-caution">
+ <span>remove</span>
+ </div>
+ </div>
+ <ul class="isis-facets">
+ <li>disabled</li>
+ <li>paged.value=5</li>
+ <li>render.value=EAGERLY</li>
+ </ul>
+ </fieldset>
+ <fieldset class="isis-collection min-height-200">
+ <legend>similarTo</legend>
+ <ul class="isis-facets">
+ <li>disabled</li>
+ <li>paged.value=3</li>
+ <li>render.value=LAZILY</li>
+ </ul>
+ </fieldset>
+ </div>
+ </div>
+ </div>
+
+ <!-- jQuery (necessary for Bootstrap's JavaScript plugins) -->
+ <script src="https://ajax.googleapis.com/ajax/libs/jquery/1.11.0/jquery.min.js"></script>
+ <!-- Include all compiled plugins (below), or include individual files as needed -->
+ <script src="js/bootstrap.min.js"></script>
+ <script>
+ $(document).ready(function () {
+ });
+ </script>
+ </body>
+</html>
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/isis/blob/8f18b6f0/adocs/documentation/src/main/asciidoc/guides/ugvw/images/reference-layout/layout-6-6-0-12.html
----------------------------------------------------------------------
diff --git a/adocs/documentation/src/main/asciidoc/guides/ugvw/images/reference-layout/layout-6-6-0-12.html b/adocs/documentation/src/main/asciidoc/guides/ugvw/images/reference-layout/layout-6-6-0-12.html
new file mode 100644
index 0000000..c6c4482
--- /dev/null
+++ b/adocs/documentation/src/main/asciidoc/guides/ugvw/images/reference-layout/layout-6-6-0-12.html
@@ -0,0 +1,203 @@
+\ufeff<!DOCTYPE html>
+<html lang="en">
+<head>
+ <meta charset="utf-8">
+ <meta http-equiv="X-UA-Compatible" content="IE=edge">
+ <meta name="viewport" content="width=device-width, initial-scale=1">
+ <title>colspans={6,6,0,12}</title>
+
+ <!-- Bootstrap -->
+ <!--
+ <link rel="stylesheet" href="//netdna.bootstrapcdn.com/bootstrap/3.1.1/css/bootstrap.min.css">
+ <link rel="stylesheet" href="//netdna.bootstrapcdn.com/bootstrap/3.1.1/css/bootstrap-theme.min.css">
+ <script src="//netdna.bootstrapcdn.com/bootstrap/3.1.1/js/bootstrap.min.js"></script>
+ -->
+
+ <!-- Bootstrap -->
+ <link href="css/bootstrap.min.css" rel="stylesheet">
+
+ <!-- HTML5 Shim and Respond.js IE8 support of HTML5 elements and media queries -->
+ <!-- WARNING: Respond.js doesn't work if you view the page via file:// -->
+ <!--[if lt IE 9]>
+ <script src="https://oss.maxcdn.com/libs/html5shiv/3.7.0/html5shiv.js"></script>
+ <script src="https://oss.maxcdn.com/libs/respond.js/1.4.2/respond.min.js"></script>
+ <![endif]-->
+ <link href="isis-layout.css" rel="stylesheet">
+ <!--<link href="isis-layout-show-facets.css" rel="stylesheet">-->
+</head>
+ <body>
+ <div class="container">
+ <h1>colspans={6,6,0,12}</h1>
+ <div class="row">
+ <div class="col-md-12">
+ <div class="isis-header">
+ <span class="isis-title">Buy bread</span>
+ <div class="isis-actions">
+ <div class="isis-action x-caution">
+ <span>delete</span>
+ </div>
+ <div class="isis-action">
+ <span data-isis-id="duplicate">clone</span>
+ <ul class="isis-facets">
+ <li>describedAs.value="Create a new todo item from this one"</li>
+ </ul>
+ </div>
+ <div class="isis-action">
+ <span>recentChanges</span>
+ </div>
+ <div class="isis-action">
+ <span>recentChanges</span>
+ </div>
+ </div>
+ </div>
+ </div>
+ </div>
+ <div class="row">
+ <div class="col-md-6 isis-memberGroups">
+ <fieldset class="isis-memberGroup min-height-100">
+ <legend>General</legend>
+ <div class="isis-property">
+ <span data-isis-typicallength="50">description</span>
+ <ul class="isis-facets">
+ <li>typicalLength.value=50</li>
+ </ul>
+ </div>
+ <div class="isis-property">
+ <span>category</span>
+ <ul class="isis-facets">
+ <li>disabled.reason="Use action to update both category and subcategory"</li>
+ </ul>
+ </div>
+ <div class="isis-property">
+ <span>subcategory</span>
+ <ul class="isis-facets">
+ <li>disabled.reason="Use action to update both category and subcategory"</li>
+ </ul>
+ <div class="isis-actions">
+ <div class="isis-action">
+ <span data-isis-id="updateCategory">update</span>
+ </div>
+ <div class="isis-action">
+ <span>analyseCategory</span>
+ </div>
+ </div>
+ </div>
+ <div class="isis-property">
+ <span class="isis-hidden">ownedBy</span>
+ </div>
+ <div class="isis-property x-highlight">
+ <span data-isis-id="complete">done</span>
+ <div class="isis-actions">
+ <div class="isis-action">
+ <span data-isis-id="completed">done</span>
+ <ul class="isis-facets">
+ <li>describedAs.value="Mark this todo item as having been completed"</li>
+ </ul>
+ </div>
+ <div class="isis-action">
+ <span>scheduleExplicitly</span>
+ </div>
+ <div class="isis-action">
+ <span>scheduleImplicitly</span>
+ </div>
+ <div class="isis-action">
+ <span data-isis-id="notYetCompleted">not done</span>
+ </div>
+ </div>
+ </div>
+ </fieldset>
+ <fieldset class="isis-memberGroup min-height-100">
+ <legend>Misc</legend>
+ <div class="isis-property">
+ <span data-isis-id="versionSequence">version</span>
+ <ul class="isis-facets">
+ <li>disabled</li>
+ <li>hidden.where=STANDALONE_TABLES</li>
+ </ul>
+ </div>
+ </fieldset>
+ </div>
+ <div class="col-md-6 isis-memberGroups">
+ <fieldset class="isis-memberGroup">
+ <legend>Priority</legend>
+ <div class="isis-property">
+ <span>relativePriority</span>
+ <div class="isis-actions">
+ <div class="isis-action">
+ <span>previous</span>
+ </div>
+ <div class="isis-action">
+ <span>next</span>
+ </div>
+ </div>
+ </div>
+ <div class="isis-property x-key">
+ <span>dueBy</span>
+ </div>
+ </fieldset>
+ <fieldset class="isis-memberGroup">
+ <legend>Other</legend>
+ <div class="isis-property">
+ <span>cost</span>
+ <div class="isis-actions">
+ <div class="isis-action">
+ <span data-isis-id="updateCost">update</span>
+ </div>
+ </div>
+ </div>
+ <div class="isis-property">
+ <span>notes</span>
+ <ul class="isis-facets">
+ <li>multiLine.numberOfLines=5</li>
+ <li>hidden.where=ALL_TABLES</li>
+ </ul>
+ </div>
+ <div class="isis-property">
+ <span>attachment</span>
+ <ul class="isis-facets">
+ <li>hidden.where=ALL_TABLES</li>
+ </ul>
+ </div>
+ </fieldset>
+ </div>
+ </div>
+ <div class="row">
+ <div class="col-md-12">
+ <fieldset class="isis-collection min-height-100">
+ <legend>dependencies</legend>
+ <div class="isis-actions">
+ <div class="isis-action">
+ <span>add</span>
+ </div>
+ <div class="isis-action x-caution">
+ <span>remove</span>
+ </div>
+ </div>
+ <ul class="isis-facets">
+ <li>disabled</li>
+ <li>paged.value=5</li>
+ <li>render.value=EAGERLY</li>
+ </ul>
+ </fieldset>
+ <fieldset class="isis-collection min-height-200">
+ <legend>similarTo</legend>
+ <ul class="isis-facets">
+ <li>disabled</li>
+ <li>paged.value=3</li>
+ <li>render.value=LAZILY</li>
+ </ul>
+ </fieldset>
+ </div>
+ </div>
+ </div>
+
+ <!-- jQuery (necessary for Bootstrap's JavaScript plugins) -->
+ <script src="https://ajax.googleapis.com/ajax/libs/jquery/1.11.0/jquery.min.js"></script>
+ <!-- Include all compiled plugins (below), or include individual files as needed -->
+ <script src="js/bootstrap.min.js"></script>
+ <script>
+ $(document).ready(function () {
+ });
+ </script>
+ </body>
+</html>
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/isis/blob/8f18b6f0/adocs/documentation/src/main/asciidoc/guides/ugvw/images/suppress-password-reset/login-page-default.png
----------------------------------------------------------------------
diff --git a/adocs/documentation/src/main/asciidoc/guides/ugvw/images/suppress-password-reset/login-page-default.png b/adocs/documentation/src/main/asciidoc/guides/ugvw/images/suppress-password-reset/login-page-default.png
new file mode 100644
index 0000000..fdf2dee
Binary files /dev/null and b/adocs/documentation/src/main/asciidoc/guides/ugvw/images/suppress-password-reset/login-page-default.png differ
http://git-wip-us.apache.org/repos/asf/isis/blob/8f18b6f0/adocs/documentation/src/main/asciidoc/guides/ugvw/images/suppress-password-reset/login-page-suppress-password-reset.png
----------------------------------------------------------------------
diff --git a/adocs/documentation/src/main/asciidoc/guides/ugvw/images/suppress-password-reset/login-page-suppress-password-reset.png b/adocs/documentation/src/main/asciidoc/guides/ugvw/images/suppress-password-reset/login-page-suppress-password-reset.png
new file mode 100644
index 0000000..b557269
Binary files /dev/null and b/adocs/documentation/src/main/asciidoc/guides/ugvw/images/suppress-password-reset/login-page-suppress-password-reset.png differ
http://git-wip-us.apache.org/repos/asf/isis/blob/8f18b6f0/adocs/documentation/src/main/asciidoc/guides/ugvw/images/suppress-remember-me/login-page-default.png
----------------------------------------------------------------------
diff --git a/adocs/documentation/src/main/asciidoc/guides/ugvw/images/suppress-remember-me/login-page-default.png b/adocs/documentation/src/main/asciidoc/guides/ugvw/images/suppress-remember-me/login-page-default.png
new file mode 100644
index 0000000..fdf2dee
Binary files /dev/null and b/adocs/documentation/src/main/asciidoc/guides/ugvw/images/suppress-remember-me/login-page-default.png differ
http://git-wip-us.apache.org/repos/asf/isis/blob/8f18b6f0/adocs/documentation/src/main/asciidoc/guides/ugvw/images/suppress-remember-me/login-page-suppress-remember-me.png
----------------------------------------------------------------------
diff --git a/adocs/documentation/src/main/asciidoc/guides/ugvw/images/suppress-remember-me/login-page-suppress-remember-me.png b/adocs/documentation/src/main/asciidoc/guides/ugvw/images/suppress-remember-me/login-page-suppress-remember-me.png
new file mode 100644
index 0000000..fe69496
Binary files /dev/null and b/adocs/documentation/src/main/asciidoc/guides/ugvw/images/suppress-remember-me/login-page-suppress-remember-me.png differ
http://git-wip-us.apache.org/repos/asf/isis/blob/8f18b6f0/adocs/documentation/src/main/asciidoc/guides/ugvw/images/suppress-sign-up/login-page-default.png
----------------------------------------------------------------------
diff --git a/adocs/documentation/src/main/asciidoc/guides/ugvw/images/suppress-sign-up/login-page-default.png b/adocs/documentation/src/main/asciidoc/guides/ugvw/images/suppress-sign-up/login-page-default.png
new file mode 100644
index 0000000..fdf2dee
Binary files /dev/null and b/adocs/documentation/src/main/asciidoc/guides/ugvw/images/suppress-sign-up/login-page-default.png differ
http://git-wip-us.apache.org/repos/asf/isis/blob/8f18b6f0/adocs/documentation/src/main/asciidoc/guides/ugvw/images/suppress-sign-up/login-page-suppress-sign-up.png
----------------------------------------------------------------------
diff --git a/adocs/documentation/src/main/asciidoc/guides/ugvw/images/suppress-sign-up/login-page-suppress-sign-up.png b/adocs/documentation/src/main/asciidoc/guides/ugvw/images/suppress-sign-up/login-page-suppress-sign-up.png
new file mode 100644
index 0000000..8ff8bc3
Binary files /dev/null and b/adocs/documentation/src/main/asciidoc/guides/ugvw/images/suppress-sign-up/login-page-suppress-sign-up.png differ
http://git-wip-us.apache.org/repos/asf/isis/blob/8f18b6f0/adocs/documentation/src/main/asciidoc/guides/ugvw/images/theme-chooser/example-1.png
----------------------------------------------------------------------
diff --git a/adocs/documentation/src/main/asciidoc/guides/ugvw/images/theme-chooser/example-1.png b/adocs/documentation/src/main/asciidoc/guides/ugvw/images/theme-chooser/example-1.png
new file mode 100644
index 0000000..4db4b18
Binary files /dev/null and b/adocs/documentation/src/main/asciidoc/guides/ugvw/images/theme-chooser/example-1.png differ
http://git-wip-us.apache.org/repos/asf/isis/blob/8f18b6f0/adocs/documentation/src/main/asciidoc/guides/ugvw/images/theme-chooser/example-2.png
----------------------------------------------------------------------
diff --git a/adocs/documentation/src/main/asciidoc/guides/ugvw/images/theme-chooser/example-2.png b/adocs/documentation/src/main/asciidoc/guides/ugvw/images/theme-chooser/example-2.png
new file mode 100644
index 0000000..435194d
Binary files /dev/null and b/adocs/documentation/src/main/asciidoc/guides/ugvw/images/theme-chooser/example-2.png differ
http://git-wip-us.apache.org/repos/asf/isis/blob/8f18b6f0/adocs/documentation/src/main/asciidoc/guides/ugvw/images/user-registration/login-page-default.png
----------------------------------------------------------------------
diff --git a/adocs/documentation/src/main/asciidoc/guides/ugvw/images/user-registration/login-page-default.png b/adocs/documentation/src/main/asciidoc/guides/ugvw/images/user-registration/login-page-default.png
new file mode 100644
index 0000000..fdf2dee
Binary files /dev/null and b/adocs/documentation/src/main/asciidoc/guides/ugvw/images/user-registration/login-page-default.png differ
http://git-wip-us.apache.org/repos/asf/isis/blob/8f18b6f0/adocs/documentation/src/main/asciidoc/guides/ugvw/images/user-registration/sign-up-after-registration.png
----------------------------------------------------------------------
diff --git a/adocs/documentation/src/main/asciidoc/guides/ugvw/images/user-registration/sign-up-after-registration.png b/adocs/documentation/src/main/asciidoc/guides/ugvw/images/user-registration/sign-up-after-registration.png
new file mode 100644
index 0000000..59902f9
Binary files /dev/null and b/adocs/documentation/src/main/asciidoc/guides/ugvw/images/user-registration/sign-up-after-registration.png differ
http://git-wip-us.apache.org/repos/asf/isis/blob/8f18b6f0/adocs/documentation/src/main/asciidoc/guides/ugvw/images/user-registration/sign-up-email-with-verification-link.png
----------------------------------------------------------------------
diff --git a/adocs/documentation/src/main/asciidoc/guides/ugvw/images/user-registration/sign-up-email-with-verification-link.png b/adocs/documentation/src/main/asciidoc/guides/ugvw/images/user-registration/sign-up-email-with-verification-link.png
new file mode 100644
index 0000000..021b642
Binary files /dev/null and b/adocs/documentation/src/main/asciidoc/guides/ugvw/images/user-registration/sign-up-email-with-verification-link.png differ
http://git-wip-us.apache.org/repos/asf/isis/blob/8f18b6f0/adocs/documentation/src/main/asciidoc/guides/ugvw/images/user-registration/sign-up-login-page-after-sign-up.png
----------------------------------------------------------------------
diff --git a/adocs/documentation/src/main/asciidoc/guides/ugvw/images/user-registration/sign-up-login-page-after-sign-up.png b/adocs/documentation/src/main/asciidoc/guides/ugvw/images/user-registration/sign-up-login-page-after-sign-up.png
new file mode 100644
index 0000000..3402bf6
Binary files /dev/null and b/adocs/documentation/src/main/asciidoc/guides/ugvw/images/user-registration/sign-up-login-page-after-sign-up.png differ
http://git-wip-us.apache.org/repos/asf/isis/blob/8f18b6f0/adocs/documentation/src/main/asciidoc/guides/ugvw/images/user-registration/sign-up-page.png
----------------------------------------------------------------------
diff --git a/adocs/documentation/src/main/asciidoc/guides/ugvw/images/user-registration/sign-up-page.png b/adocs/documentation/src/main/asciidoc/guides/ugvw/images/user-registration/sign-up-page.png
new file mode 100644
index 0000000..8e3bdaa
Binary files /dev/null and b/adocs/documentation/src/main/asciidoc/guides/ugvw/images/user-registration/sign-up-page.png differ
http://git-wip-us.apache.org/repos/asf/isis/blob/8f18b6f0/adocs/documentation/src/main/asciidoc/guides/ugvw/images/user-registration/sign-up-registration-page.png
----------------------------------------------------------------------
diff --git a/adocs/documentation/src/main/asciidoc/guides/ugvw/images/user-registration/sign-up-registration-page.png b/adocs/documentation/src/main/asciidoc/guides/ugvw/images/user-registration/sign-up-registration-page.png
new file mode 100644
index 0000000..189965a
Binary files /dev/null and b/adocs/documentation/src/main/asciidoc/guides/ugvw/images/user-registration/sign-up-registration-page.png differ
http://git-wip-us.apache.org/repos/asf/isis/blob/8f18b6f0/adocs/documentation/src/main/asciidoc/guides/ugvw/images/wicket-viewer/about-page/about-page.png
----------------------------------------------------------------------
diff --git a/adocs/documentation/src/main/asciidoc/guides/ugvw/images/wicket-viewer/about-page/about-page.png b/adocs/documentation/src/main/asciidoc/guides/ugvw/images/wicket-viewer/about-page/about-page.png
deleted file mode 100644
index ae5dfc8..0000000
Binary files a/adocs/documentation/src/main/asciidoc/guides/ugvw/images/wicket-viewer/about-page/about-page.png and /dev/null differ
http://git-wip-us.apache.org/repos/asf/isis/blob/8f18b6f0/adocs/documentation/src/main/asciidoc/guides/ugvw/images/wicket-viewer/blob-attachments/010-attachment-field-940.png
----------------------------------------------------------------------
diff --git a/adocs/documentation/src/main/asciidoc/guides/ugvw/images/wicket-viewer/blob-attachments/010-attachment-field-940.png b/adocs/documentation/src/main/asciidoc/guides/ugvw/images/wicket-viewer/blob-attachments/010-attachment-field-940.png
deleted file mode 100644
index 96cbb31..0000000
Binary files a/adocs/documentation/src/main/asciidoc/guides/ugvw/images/wicket-viewer/blob-attachments/010-attachment-field-940.png and /dev/null differ
http://git-wip-us.apache.org/repos/asf/isis/blob/8f18b6f0/adocs/documentation/src/main/asciidoc/guides/ugvw/images/wicket-viewer/blob-attachments/010-attachment-field.png
----------------------------------------------------------------------
diff --git a/adocs/documentation/src/main/asciidoc/guides/ugvw/images/wicket-viewer/blob-attachments/010-attachment-field.png b/adocs/documentation/src/main/asciidoc/guides/ugvw/images/wicket-viewer/blob-attachments/010-attachment-field.png
deleted file mode 100644
index 013f6e2..0000000
Binary files a/adocs/documentation/src/main/asciidoc/guides/ugvw/images/wicket-viewer/blob-attachments/010-attachment-field.png and /dev/null differ
http://git-wip-us.apache.org/repos/asf/isis/blob/8f18b6f0/adocs/documentation/src/main/asciidoc/guides/ugvw/images/wicket-viewer/blob-attachments/020-edit-choose-file-940.png
----------------------------------------------------------------------
diff --git a/adocs/documentation/src/main/asciidoc/guides/ugvw/images/wicket-viewer/blob-attachments/020-edit-choose-file-940.png b/adocs/documentation/src/main/asciidoc/guides/ugvw/images/wicket-viewer/blob-attachments/020-edit-choose-file-940.png
deleted file mode 100644
index 7f90bea..0000000
Binary files a/adocs/documentation/src/main/asciidoc/guides/ugvw/images/wicket-viewer/blob-attachments/020-edit-choose-file-940.png and /dev/null differ
http://git-wip-us.apache.org/repos/asf/isis/blob/8f18b6f0/adocs/documentation/src/main/asciidoc/guides/ugvw/images/wicket-viewer/blob-attachments/020-edit-choose-file.png
----------------------------------------------------------------------
diff --git a/adocs/documentation/src/main/asciidoc/guides/ugvw/images/wicket-viewer/blob-attachments/020-edit-choose-file.png b/adocs/documentation/src/main/asciidoc/guides/ugvw/images/wicket-viewer/blob-attachments/020-edit-choose-file.png
deleted file mode 100644
index a7e3dc4..0000000
Binary files a/adocs/documentation/src/main/asciidoc/guides/ugvw/images/wicket-viewer/blob-attachments/020-edit-choose-file.png and /dev/null differ
http://git-wip-us.apache.org/repos/asf/isis/blob/8f18b6f0/adocs/documentation/src/main/asciidoc/guides/ugvw/images/wicket-viewer/blob-attachments/030-choose-file-using-browser-520.png
----------------------------------------------------------------------
diff --git a/adocs/documentation/src/main/asciidoc/guides/ugvw/images/wicket-viewer/blob-attachments/030-choose-file-using-browser-520.png b/adocs/documentation/src/main/asciidoc/guides/ugvw/images/wicket-viewer/blob-attachments/030-choose-file-using-browser-520.png
deleted file mode 100644
index 6a32d1b..0000000
Binary files a/adocs/documentation/src/main/asciidoc/guides/ugvw/images/wicket-viewer/blob-attachments/030-choose-file-using-browser-520.png and /dev/null differ
http://git-wip-us.apache.org/repos/asf/isis/blob/8f18b6f0/adocs/documentation/src/main/asciidoc/guides/ugvw/images/wicket-viewer/blob-attachments/030-choose-file-using-browser.png
----------------------------------------------------------------------
diff --git a/adocs/documentation/src/main/asciidoc/guides/ugvw/images/wicket-viewer/blob-attachments/030-choose-file-using-browser.png b/adocs/documentation/src/main/asciidoc/guides/ugvw/images/wicket-viewer/blob-attachments/030-choose-file-using-browser.png
deleted file mode 100644
index 700c325..0000000
Binary files a/adocs/documentation/src/main/asciidoc/guides/ugvw/images/wicket-viewer/blob-attachments/030-choose-file-using-browser.png and /dev/null differ
http://git-wip-us.apache.org/repos/asf/isis/blob/8f18b6f0/adocs/documentation/src/main/asciidoc/guides/ugvw/images/wicket-viewer/blob-attachments/040-edit-chosen-file-indicated-940.png
----------------------------------------------------------------------
diff --git a/adocs/documentation/src/main/asciidoc/guides/ugvw/images/wicket-viewer/blob-attachments/040-edit-chosen-file-indicated-940.png b/adocs/documentation/src/main/asciidoc/guides/ugvw/images/wicket-viewer/blob-attachments/040-edit-chosen-file-indicated-940.png
deleted file mode 100644
index d6bc924..0000000
Binary files a/adocs/documentation/src/main/asciidoc/guides/ugvw/images/wicket-viewer/blob-attachments/040-edit-chosen-file-indicated-940.png and /dev/null differ
http://git-wip-us.apache.org/repos/asf/isis/blob/8f18b6f0/adocs/documentation/src/main/asciidoc/guides/ugvw/images/wicket-viewer/blob-attachments/040-edit-chosen-file-indicated.png
----------------------------------------------------------------------
diff --git a/adocs/documentation/src/main/asciidoc/guides/ugvw/images/wicket-viewer/blob-attachments/040-edit-chosen-file-indicated.png b/adocs/documentation/src/main/asciidoc/guides/ugvw/images/wicket-viewer/blob-attachments/040-edit-chosen-file-indicated.png
deleted file mode 100644
index 60ea5b3..0000000
Binary files a/adocs/documentation/src/main/asciidoc/guides/ugvw/images/wicket-viewer/blob-attachments/040-edit-chosen-file-indicated.png and /dev/null differ
http://git-wip-us.apache.org/repos/asf/isis/blob/8f18b6f0/adocs/documentation/src/main/asciidoc/guides/ugvw/images/wicket-viewer/blob-attachments/050-ok-if-image-then-rendered-940.png
----------------------------------------------------------------------
diff --git a/adocs/documentation/src/main/asciidoc/guides/ugvw/images/wicket-viewer/blob-attachments/050-ok-if-image-then-rendered-940.png b/adocs/documentation/src/main/asciidoc/guides/ugvw/images/wicket-viewer/blob-attachments/050-ok-if-image-then-rendered-940.png
deleted file mode 100644
index 302bbbc..0000000
Binary files a/adocs/documentation/src/main/asciidoc/guides/ugvw/images/wicket-viewer/blob-attachments/050-ok-if-image-then-rendered-940.png and /dev/null differ
http://git-wip-us.apache.org/repos/asf/isis/blob/8f18b6f0/adocs/documentation/src/main/asciidoc/guides/ugvw/images/wicket-viewer/blob-attachments/050-ok-if-image-then-rendered.png
----------------------------------------------------------------------
diff --git a/adocs/documentation/src/main/asciidoc/guides/ugvw/images/wicket-viewer/blob-attachments/050-ok-if-image-then-rendered.png b/adocs/documentation/src/main/asciidoc/guides/ugvw/images/wicket-viewer/blob-attachments/050-ok-if-image-then-rendered.png
deleted file mode 100644
index 50799b2..0000000
Binary files a/adocs/documentation/src/main/asciidoc/guides/ugvw/images/wicket-viewer/blob-attachments/050-ok-if-image-then-rendered.png and /dev/null differ
http://git-wip-us.apache.org/repos/asf/isis/blob/8f18b6f0/adocs/documentation/src/main/asciidoc/guides/ugvw/images/wicket-viewer/blob-attachments/060-download-940.png
----------------------------------------------------------------------
diff --git a/adocs/documentation/src/main/asciidoc/guides/ugvw/images/wicket-viewer/blob-attachments/060-download-940.png b/adocs/documentation/src/main/asciidoc/guides/ugvw/images/wicket-viewer/blob-attachments/060-download-940.png
deleted file mode 100644
index 41b4b27..0000000
Binary files a/adocs/documentation/src/main/asciidoc/guides/ugvw/images/wicket-viewer/blob-attachments/060-download-940.png and /dev/null differ
http://git-wip-us.apache.org/repos/asf/isis/blob/8f18b6f0/adocs/documentation/src/main/asciidoc/guides/ugvw/images/wicket-viewer/blob-attachments/060-download.png
----------------------------------------------------------------------
diff --git a/adocs/documentation/src/main/asciidoc/guides/ugvw/images/wicket-viewer/blob-attachments/060-download.png b/adocs/documentation/src/main/asciidoc/guides/ugvw/images/wicket-viewer/blob-attachments/060-download.png
deleted file mode 100644
index f726d0d..0000000
Binary files a/adocs/documentation/src/main/asciidoc/guides/ugvw/images/wicket-viewer/blob-attachments/060-download.png and /dev/null differ
http://git-wip-us.apache.org/repos/asf/isis/blob/8f18b6f0/adocs/documentation/src/main/asciidoc/guides/ugvw/images/wicket-viewer/blob-attachments/070-edit-clear-940.png
----------------------------------------------------------------------
diff --git a/adocs/documentation/src/main/asciidoc/guides/ugvw/images/wicket-viewer/blob-attachments/070-edit-clear-940.png b/adocs/documentation/src/main/asciidoc/guides/ugvw/images/wicket-viewer/blob-attachments/070-edit-clear-940.png
deleted file mode 100644
index 0eae54e..0000000
Binary files a/adocs/documentation/src/main/asciidoc/guides/ugvw/images/wicket-viewer/blob-attachments/070-edit-clear-940.png and /dev/null differ
http://git-wip-us.apache.org/repos/asf/isis/blob/8f18b6f0/adocs/documentation/src/main/asciidoc/guides/ugvw/images/wicket-viewer/blob-attachments/070-edit-clear.png
----------------------------------------------------------------------
diff --git a/adocs/documentation/src/main/asciidoc/guides/ugvw/images/wicket-viewer/blob-attachments/070-edit-clear.png b/adocs/documentation/src/main/asciidoc/guides/ugvw/images/wicket-viewer/blob-attachments/070-edit-clear.png
deleted file mode 100644
index 57c2a24..0000000
Binary files a/adocs/documentation/src/main/asciidoc/guides/ugvw/images/wicket-viewer/blob-attachments/070-edit-clear.png and /dev/null differ
http://git-wip-us.apache.org/repos/asf/isis/blob/8f18b6f0/adocs/documentation/src/main/asciidoc/guides/ugvw/images/wicket-viewer/bookmarked-pages/panel-940.png
----------------------------------------------------------------------
diff --git a/adocs/documentation/src/main/asciidoc/guides/ugvw/images/wicket-viewer/bookmarked-pages/panel-940.png b/adocs/documentation/src/main/asciidoc/guides/ugvw/images/wicket-viewer/bookmarked-pages/panel-940.png
deleted file mode 100644
index c572707..0000000
Binary files a/adocs/documentation/src/main/asciidoc/guides/ugvw/images/wicket-viewer/bookmarked-pages/panel-940.png and /dev/null differ
http://git-wip-us.apache.org/repos/asf/isis/blob/8f18b6f0/adocs/documentation/src/main/asciidoc/guides/ugvw/images/wicket-viewer/bookmarked-pages/panel-estatio-940.png
----------------------------------------------------------------------
diff --git a/adocs/documentation/src/main/asciidoc/guides/ugvw/images/wicket-viewer/bookmarked-pages/panel-estatio-940.png b/adocs/documentation/src/main/asciidoc/guides/ugvw/images/wicket-viewer/bookmarked-pages/panel-estatio-940.png
deleted file mode 100644
index 2fad852..0000000
Binary files a/adocs/documentation/src/main/asciidoc/guides/ugvw/images/wicket-viewer/bookmarked-pages/panel-estatio-940.png and /dev/null differ
http://git-wip-us.apache.org/repos/asf/isis/blob/8f18b6f0/adocs/documentation/src/main/asciidoc/guides/ugvw/images/wicket-viewer/bookmarked-pages/panel-estatio.png
----------------------------------------------------------------------
diff --git a/adocs/documentation/src/main/asciidoc/guides/ugvw/images/wicket-viewer/bookmarked-pages/panel-estatio.png b/adocs/documentation/src/main/asciidoc/guides/ugvw/images/wicket-viewer/bookmarked-pages/panel-estatio.png
deleted file mode 100644
index 0fa0cfa..0000000
Binary files a/adocs/documentation/src/main/asciidoc/guides/ugvw/images/wicket-viewer/bookmarked-pages/panel-estatio.png and /dev/null differ
http://git-wip-us.apache.org/repos/asf/isis/blob/8f18b6f0/adocs/documentation/src/main/asciidoc/guides/ugvw/images/wicket-viewer/bookmarked-pages/panel.png
----------------------------------------------------------------------
diff --git a/adocs/documentation/src/main/asciidoc/guides/ugvw/images/wicket-viewer/bookmarked-pages/panel.png b/adocs/documentation/src/main/asciidoc/guides/ugvw/images/wicket-viewer/bookmarked-pages/panel.png
deleted file mode 100644
index b0d85f7..0000000
Binary files a/adocs/documentation/src/main/asciidoc/guides/ugvw/images/wicket-viewer/bookmarked-pages/panel.png and /dev/null differ
http://git-wip-us.apache.org/repos/asf/isis/blob/8f18b6f0/adocs/documentation/src/main/asciidoc/guides/ugvw/images/wicket-viewer/brand-logo/brand-logo-signin.png
----------------------------------------------------------------------
diff --git a/adocs/documentation/src/main/asciidoc/guides/ugvw/images/wicket-viewer/brand-logo/brand-logo-signin.png b/adocs/documentation/src/main/asciidoc/guides/ugvw/images/wicket-viewer/brand-logo/brand-logo-signin.png
deleted file mode 100644
index 92a022d..0000000
Binary files a/adocs/documentation/src/main/asciidoc/guides/ugvw/images/wicket-viewer/brand-logo/brand-logo-signin.png and /dev/null differ
http://git-wip-us.apache.org/repos/asf/isis/blob/8f18b6f0/adocs/documentation/src/main/asciidoc/guides/ugvw/images/wicket-viewer/brand-logo/brand-logo.png
----------------------------------------------------------------------
diff --git a/adocs/documentation/src/main/asciidoc/guides/ugvw/images/wicket-viewer/brand-logo/brand-logo.png b/adocs/documentation/src/main/asciidoc/guides/ugvw/images/wicket-viewer/brand-logo/brand-logo.png
deleted file mode 100644
index 7ab8ab3..0000000
Binary files a/adocs/documentation/src/main/asciidoc/guides/ugvw/images/wicket-viewer/brand-logo/brand-logo.png and /dev/null differ
http://git-wip-us.apache.org/repos/asf/isis/blob/8f18b6f0/adocs/documentation/src/main/asciidoc/guides/ugvw/images/wicket-viewer/copy-link/010-copy-link-button-940.png
----------------------------------------------------------------------
diff --git a/adocs/documentation/src/main/asciidoc/guides/ugvw/images/wicket-viewer/copy-link/010-copy-link-button-940.png b/adocs/documentation/src/main/asciidoc/guides/ugvw/images/wicket-viewer/copy-link/010-copy-link-button-940.png
deleted file mode 100644
index bf70a84..0000000
Binary files a/adocs/documentation/src/main/asciidoc/guides/ugvw/images/wicket-viewer/copy-link/010-copy-link-button-940.png and /dev/null differ
http://git-wip-us.apache.org/repos/asf/isis/blob/8f18b6f0/adocs/documentation/src/main/asciidoc/guides/ugvw/images/wicket-viewer/copy-link/010-copy-link-button.png
----------------------------------------------------------------------
diff --git a/adocs/documentation/src/main/asciidoc/guides/ugvw/images/wicket-viewer/copy-link/010-copy-link-button.png b/adocs/documentation/src/main/asciidoc/guides/ugvw/images/wicket-viewer/copy-link/010-copy-link-button.png
deleted file mode 100644
index ef64d29..0000000
Binary files a/adocs/documentation/src/main/asciidoc/guides/ugvw/images/wicket-viewer/copy-link/010-copy-link-button.png and /dev/null differ
http://git-wip-us.apache.org/repos/asf/isis/blob/8f18b6f0/adocs/documentation/src/main/asciidoc/guides/ugvw/images/wicket-viewer/copy-link/020-copy-link-dialog-940.png
----------------------------------------------------------------------
diff --git a/adocs/documentation/src/main/asciidoc/guides/ugvw/images/wicket-viewer/copy-link/020-copy-link-dialog-940.png b/adocs/documentation/src/main/asciidoc/guides/ugvw/images/wicket-viewer/copy-link/020-copy-link-dialog-940.png
deleted file mode 100644
index 84d050a..0000000
Binary files a/adocs/documentation/src/main/asciidoc/guides/ugvw/images/wicket-viewer/copy-link/020-copy-link-dialog-940.png and /dev/null differ
http://git-wip-us.apache.org/repos/asf/isis/blob/8f18b6f0/adocs/documentation/src/main/asciidoc/guides/ugvw/images/wicket-viewer/copy-link/020-copy-link-dialog.png
----------------------------------------------------------------------
diff --git a/adocs/documentation/src/main/asciidoc/guides/ugvw/images/wicket-viewer/copy-link/020-copy-link-dialog.png b/adocs/documentation/src/main/asciidoc/guides/ugvw/images/wicket-viewer/copy-link/020-copy-link-dialog.png
deleted file mode 100644
index 6be3190..0000000
Binary files a/adocs/documentation/src/main/asciidoc/guides/ugvw/images/wicket-viewer/copy-link/020-copy-link-dialog.png and /dev/null differ
http://git-wip-us.apache.org/repos/asf/isis/blob/8f18b6f0/adocs/documentation/src/main/asciidoc/guides/ugvw/images/wicket-viewer/copy-link/030-hints-940.png
----------------------------------------------------------------------
diff --git a/adocs/documentation/src/main/asciidoc/guides/ugvw/images/wicket-viewer/copy-link/030-hints-940.png b/adocs/documentation/src/main/asciidoc/guides/ugvw/images/wicket-viewer/copy-link/030-hints-940.png
deleted file mode 100644
index 3a4f690..0000000
Binary files a/adocs/documentation/src/main/asciidoc/guides/ugvw/images/wicket-viewer/copy-link/030-hints-940.png and /dev/null differ
http://git-wip-us.apache.org/repos/asf/isis/blob/8f18b6f0/adocs/documentation/src/main/asciidoc/guides/ugvw/images/wicket-viewer/copy-link/030-hints.png
----------------------------------------------------------------------
diff --git a/adocs/documentation/src/main/asciidoc/guides/ugvw/images/wicket-viewer/copy-link/030-hints.png b/adocs/documentation/src/main/asciidoc/guides/ugvw/images/wicket-viewer/copy-link/030-hints.png
deleted file mode 100644
index 5010132..0000000
Binary files a/adocs/documentation/src/main/asciidoc/guides/ugvw/images/wicket-viewer/copy-link/030-hints.png and /dev/null differ
http://git-wip-us.apache.org/repos/asf/isis/blob/8f18b6f0/adocs/documentation/src/main/asciidoc/guides/ugvw/images/wicket-viewer/copy-link/040-copy-link-with-hints-940.png
----------------------------------------------------------------------
diff --git a/adocs/documentation/src/main/asciidoc/guides/ugvw/images/wicket-viewer/copy-link/040-copy-link-with-hints-940.png b/adocs/documentation/src/main/asciidoc/guides/ugvw/images/wicket-viewer/copy-link/040-copy-link-with-hints-940.png
deleted file mode 100644
index 29ccf3b..0000000
Binary files a/adocs/documentation/src/main/asciidoc/guides/ugvw/images/wicket-viewer/copy-link/040-copy-link-with-hints-940.png and /dev/null differ
http://git-wip-us.apache.org/repos/asf/isis/blob/8f18b6f0/adocs/documentation/src/main/asciidoc/guides/ugvw/images/wicket-viewer/copy-link/040-copy-link-with-hints.png
----------------------------------------------------------------------
diff --git a/adocs/documentation/src/main/asciidoc/guides/ugvw/images/wicket-viewer/copy-link/040-copy-link-with-hints.png b/adocs/documentation/src/main/asciidoc/guides/ugvw/images/wicket-viewer/copy-link/040-copy-link-with-hints.png
deleted file mode 100644
index da9674f..0000000
Binary files a/adocs/documentation/src/main/asciidoc/guides/ugvw/images/wicket-viewer/copy-link/040-copy-link-with-hints.png and /dev/null differ
http://git-wip-us.apache.org/repos/asf/isis/blob/8f18b6f0/adocs/documentation/src/main/asciidoc/guides/ugvw/images/wicket-viewer/copy-link/050-title-url-940.png
----------------------------------------------------------------------
diff --git a/adocs/documentation/src/main/asciidoc/guides/ugvw/images/wicket-viewer/copy-link/050-title-url-940.png b/adocs/documentation/src/main/asciidoc/guides/ugvw/images/wicket-viewer/copy-link/050-title-url-940.png
deleted file mode 100644
index 955e6b2..0000000
Binary files a/adocs/documentation/src/main/asciidoc/guides/ugvw/images/wicket-viewer/copy-link/050-title-url-940.png and /dev/null differ
http://git-wip-us.apache.org/repos/asf/isis/blob/8f18b6f0/adocs/documentation/src/main/asciidoc/guides/ugvw/images/wicket-viewer/copy-link/050-title-url.png
----------------------------------------------------------------------
diff --git a/adocs/documentation/src/main/asciidoc/guides/ugvw/images/wicket-viewer/copy-link/050-title-url.png b/adocs/documentation/src/main/asciidoc/guides/ugvw/images/wicket-viewer/copy-link/050-title-url.png
deleted file mode 100644
index 7fbf6d5..0000000
Binary files a/adocs/documentation/src/main/asciidoc/guides/ugvw/images/wicket-viewer/copy-link/050-title-url.png and /dev/null differ
http://git-wip-us.apache.org/repos/asf/isis/blob/8f18b6f0/adocs/documentation/src/main/asciidoc/guides/ugvw/images/wicket-viewer/embedded-view/no-footer.png
----------------------------------------------------------------------
diff --git a/adocs/documentation/src/main/asciidoc/guides/ugvw/images/wicket-viewer/embedded-view/no-footer.png b/adocs/documentation/src/main/asciidoc/guides/ugvw/images/wicket-viewer/embedded-view/no-footer.png
deleted file mode 100644
index 48d3a39..0000000
Binary files a/adocs/documentation/src/main/asciidoc/guides/ugvw/images/wicket-viewer/embedded-view/no-footer.png and /dev/null differ
http://git-wip-us.apache.org/repos/asf/isis/blob/8f18b6f0/adocs/documentation/src/main/asciidoc/guides/ugvw/images/wicket-viewer/embedded-view/no-header-no-footer.png
----------------------------------------------------------------------
diff --git a/adocs/documentation/src/main/asciidoc/guides/ugvw/images/wicket-viewer/embedded-view/no-header-no-footer.png b/adocs/documentation/src/main/asciidoc/guides/ugvw/images/wicket-viewer/embedded-view/no-header-no-footer.png
deleted file mode 100644
index 4e238f6..0000000
Binary files a/adocs/documentation/src/main/asciidoc/guides/ugvw/images/wicket-viewer/embedded-view/no-header-no-footer.png and /dev/null differ
http://git-wip-us.apache.org/repos/asf/isis/blob/8f18b6f0/adocs/documentation/src/main/asciidoc/guides/ugvw/images/wicket-viewer/embedded-view/no-header.png
----------------------------------------------------------------------
diff --git a/adocs/documentation/src/main/asciidoc/guides/ugvw/images/wicket-viewer/embedded-view/no-header.png b/adocs/documentation/src/main/asciidoc/guides/ugvw/images/wicket-viewer/embedded-view/no-header.png
deleted file mode 100644
index 22e245b..0000000
Binary files a/adocs/documentation/src/main/asciidoc/guides/ugvw/images/wicket-viewer/embedded-view/no-header.png and /dev/null differ
http://git-wip-us.apache.org/repos/asf/isis/blob/8f18b6f0/adocs/documentation/src/main/asciidoc/guides/ugvw/images/wicket-viewer/embedded-view/regular.png
----------------------------------------------------------------------
diff --git a/adocs/documentation/src/main/asciidoc/guides/ugvw/images/wicket-viewer/embedded-view/regular.png b/adocs/documentation/src/main/asciidoc/guides/ugvw/images/wicket-viewer/embedded-view/regular.png
deleted file mode 100644
index 926fb7d..0000000
Binary files a/adocs/documentation/src/main/asciidoc/guides/ugvw/images/wicket-viewer/embedded-view/regular.png and /dev/null differ
http://git-wip-us.apache.org/repos/asf/isis/blob/8f18b6f0/adocs/documentation/src/main/asciidoc/guides/ugvw/images/wicket-viewer/layouts/customer-order.png
----------------------------------------------------------------------
diff --git a/adocs/documentation/src/main/asciidoc/guides/ugvw/images/wicket-viewer/layouts/customer-order.png b/adocs/documentation/src/main/asciidoc/guides/ugvw/images/wicket-viewer/layouts/customer-order.png
deleted file mode 100644
index b0aa271..0000000
Binary files a/adocs/documentation/src/main/asciidoc/guides/ugvw/images/wicket-viewer/layouts/customer-order.png and /dev/null differ
http://git-wip-us.apache.org/repos/asf/isis/blob/8f18b6f0/adocs/documentation/src/main/asciidoc/guides/ugvw/images/wicket-viewer/layouts/estatio-Invoice.png
----------------------------------------------------------------------
diff --git a/adocs/documentation/src/main/asciidoc/guides/ugvw/images/wicket-viewer/layouts/estatio-Invoice.png b/adocs/documentation/src/main/asciidoc/guides/ugvw/images/wicket-viewer/layouts/estatio-Invoice.png
deleted file mode 100644
index be7e917..0000000
Binary files a/adocs/documentation/src/main/asciidoc/guides/ugvw/images/wicket-viewer/layouts/estatio-Invoice.png and /dev/null differ
http://git-wip-us.apache.org/repos/asf/isis/blob/8f18b6f0/adocs/documentation/src/main/asciidoc/guides/ugvw/images/wicket-viewer/layouts/estatio-Lease.png
----------------------------------------------------------------------
diff --git a/adocs/documentation/src/main/asciidoc/guides/ugvw/images/wicket-viewer/layouts/estatio-Lease.png b/adocs/documentation/src/main/asciidoc/guides/ugvw/images/wicket-viewer/layouts/estatio-Lease.png
deleted file mode 100644
index e80ecb2..0000000
Binary files a/adocs/documentation/src/main/asciidoc/guides/ugvw/images/wicket-viewer/layouts/estatio-Lease.png and /dev/null differ
http://git-wip-us.apache.org/repos/asf/isis/blob/8f18b6f0/adocs/documentation/src/main/asciidoc/guides/ugvw/images/wicket-viewer/layouts/estatio-LeaseItem.png
----------------------------------------------------------------------
diff --git a/adocs/documentation/src/main/asciidoc/guides/ugvw/images/wicket-viewer/layouts/estatio-LeaseItem.png b/adocs/documentation/src/main/asciidoc/guides/ugvw/images/wicket-viewer/layouts/estatio-LeaseItem.png
deleted file mode 100644
index 993d498..0000000
Binary files a/adocs/documentation/src/main/asciidoc/guides/ugvw/images/wicket-viewer/layouts/estatio-LeaseItem.png and /dev/null differ
http://git-wip-us.apache.org/repos/asf/isis/blob/8f18b6f0/adocs/documentation/src/main/asciidoc/guides/ugvw/images/wicket-viewer/layouts/todoapp-ToDoItem.png
----------------------------------------------------------------------
diff --git a/adocs/documentation/src/main/asciidoc/guides/ugvw/images/wicket-viewer/layouts/todoapp-ToDoItem.png b/adocs/documentation/src/main/asciidoc/guides/ugvw/images/wicket-viewer/layouts/todoapp-ToDoItem.png
deleted file mode 100644
index 3218651..0000000
Binary files a/adocs/documentation/src/main/asciidoc/guides/ugvw/images/wicket-viewer/layouts/todoapp-ToDoItem.png and /dev/null differ
http://git-wip-us.apache.org/repos/asf/isis/blob/8f18b6f0/adocs/documentation/src/main/asciidoc/guides/ugvw/images/wicket-viewer/recent-pages/recent-pages-940.png
----------------------------------------------------------------------
diff --git a/adocs/documentation/src/main/asciidoc/guides/ugvw/images/wicket-viewer/recent-pages/recent-pages-940.png b/adocs/documentation/src/main/asciidoc/guides/ugvw/images/wicket-viewer/recent-pages/recent-pages-940.png
deleted file mode 100644
index 2e55860..0000000
Binary files a/adocs/documentation/src/main/asciidoc/guides/ugvw/images/wicket-viewer/recent-pages/recent-pages-940.png and /dev/null differ
http://git-wip-us.apache.org/repos/asf/isis/blob/8f18b6f0/adocs/documentation/src/main/asciidoc/guides/ugvw/images/wicket-viewer/recent-pages/recent-pages.png
----------------------------------------------------------------------
diff --git a/adocs/documentation/src/main/asciidoc/guides/ugvw/images/wicket-viewer/recent-pages/recent-pages.png b/adocs/documentation/src/main/asciidoc/guides/ugvw/images/wicket-viewer/recent-pages/recent-pages.png
deleted file mode 100644
index 8be97de..0000000
Binary files a/adocs/documentation/src/main/asciidoc/guides/ugvw/images/wicket-viewer/recent-pages/recent-pages.png and /dev/null differ
http://git-wip-us.apache.org/repos/asf/isis/blob/8f18b6f0/adocs/documentation/src/main/asciidoc/guides/ugvw/images/wicket-viewer/suppress-password-reset/login-page-default.png
----------------------------------------------------------------------
diff --git a/adocs/documentation/src/main/asciidoc/guides/ugvw/images/wicket-viewer/suppress-password-reset/login-page-default.png b/adocs/documentation/src/main/asciidoc/guides/ugvw/images/wicket-viewer/suppress-password-reset/login-page-default.png
deleted file mode 100644
index fdf2dee..0000000
Binary files a/adocs/documentation/src/main/asciidoc/guides/ugvw/images/wicket-viewer/suppress-password-reset/login-page-default.png and /dev/null differ