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 2015/06/04 14:55:47 UTC

[2/3] isis git commit: ISIS-1133: reorganizing material on layouts (static and dynamic)

http://git-wip-us.apache.org/repos/asf/isis/blob/e9ccddbe/adocs/documentation/src/main/asciidoc/user-guide/_ug_wicket-viewer_layout.adoc
----------------------------------------------------------------------
diff --git a/adocs/documentation/src/main/asciidoc/user-guide/_ug_wicket-viewer_layout.adoc b/adocs/documentation/src/main/asciidoc/user-guide/_ug_wicket-viewer_layout.adoc
index 89b18b2..4fb4e56 100644
--- a/adocs/documentation/src/main/asciidoc/user-guide/_ug_wicket-viewer_layout.adoc
+++ b/adocs/documentation/src/main/asciidoc/user-guide/_ug_wicket-viewer_layout.adoc
@@ -5,28 +5,93 @@
 :_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 section describes how this is done both for domain objects -- statically or dynamically -- and for the application menu bar (containing domain service' actions).
+The wicket viewer has full support for the various methods of specifying the xref:_ug_reference-object-layout[layout of objects], either statically or dynamically.
 
-include::_ug_wicket-viewer_layout_static-object-layout.adoc[leveloffset=+1]
+Dynamic reloading is automatically supported when running in xref:_ug_runtime_configuration-files_deployment-types[prototype (development) mode], the Wicket viewer automatically rebuilds the metamodel for each class as it is rendered.    Conversely, do note that the Wicket viewer will _not_ pick up new metadata if running in production/server mode.
 
-include::_ug_wicket-viewer_layout_dynamic-object-layout.adoc[leveloffset=+1]
 
-include::_ug_wicket-viewer_layout_application-menu-layout.adoc[leveloffset=+1]
+[TIP]
+====
+To pick up a change, edit the `.layout.json` file in the IDE and rebuild.  Then click on the title of the object _*twice*_.
 
+The first click will cause Isis to pick up the new metadata, but too late in the process to adjust the rendering.  The second click will re-render the object with the new metadata.
+====
 
 
-== Static vs Dynamic Layouts
+The screenshots below show some of the effects that can be accomplished, for the open source link:https://github.com/estatio/estatio[Estatio] app.
 
-Using xref:_ug_wicket-viewer_layout_dynamic-object-layout[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:_ug_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.
+First, an `Invoice`.  This places the properties in three equal-sized columns, with collections underneath:
 
-=== Best of both worlds?
+image::{_imagesdir}wicket-viewer/layouts/estatio-Invoice.png[width="800px",link="{_imagesdir}wicket-viewer/layouts/estatio-Invoice.png"]
+
+
+
+Next, `Lease`.  This places its properties in two columns (one wide, one narrow), with its collections shown in the right-most column:
+
+image::{_imagesdir}wicket-viewer/layouts/estatio-Lease.png[width="800px",link="{_imagesdir}wicket-viewer/layouts/estatio-Lease.png"]
+
+
+
+Next, `LeaseItem`.  This is similar to `Lease`, with two columns for properties and the third column for collections:
+
+image::{_imagesdir}wicket-viewer/layouts/estatio-LeaseItem.png[width="800px",link="{_imagesdir}wicket-viewer/layouts/estatio-LeaseItem.png"]
+
+
+
+And finally, from the (non-ASF) http://github.com/isisaddons/isis-app-todoapp[Isis addons' todoapp], its `ToDoItem`.  This puts its properties in two columns; the collections (not visible in the screenshot below) are underneath (like Estatio's `Invoice`):
+
+image::{_imagesdir}wicket-viewer/layouts/todoapp-ToDoItem.png[width="800px",link="{_imagesdir}wicket-viewer/layouts/todoapp-ToDoItem.png"]
+
+
+To learn more about how to configure these types of layout, see the xref:_ug_reference-object-layout[object layout] chapter.
+
+
+
+== Screencast
+
+How to layout properties and collections dynamically, in the Wicket viewer.
+
+video::zmrg49WeEPc[youtube,width="530px",height="354px"]
+
+
+
+[NOTE]
+====
+Note that this screencast shows an earlier version of the xref:_ug_wicket-viewer[Wicket viewer] UI (specifically, pre 1.8.0).
+====
+
+
+
+
+== Required updates to the dom project's pom.xml
+
+If using the `.layout.json` files, these must be compiled and available in the classpath. When using an IDE such as Eclipse+M2E, any `.layout.json` files in `src/main/java` or `src/main/resources` will be part of the classpath automatically. However, unless the `pom.xml` is changed, these will not be part of the compiled WAR.
+
+Therefore, make sure the following is added to 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 Isis xref:_ug_getting-started_simpleapp-archetype[SimpleApp archetype], then the POM is already correctly configured.
 
-Using the (third-party) link:http://github.com/isisaddons/isis-jrebel-plugin[Isis addons' jrebel] plugin (non-ASF) 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.
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/isis/blob/e9ccddbe/adocs/documentation/src/main/asciidoc/user-guide/_ug_wicket-viewer_layout_application-menu-layout.adoc
----------------------------------------------------------------------
diff --git a/adocs/documentation/src/main/asciidoc/user-guide/_ug_wicket-viewer_layout_application-menu-layout.adoc b/adocs/documentation/src/main/asciidoc/user-guide/_ug_wicket-viewer_layout_application-menu-layout.adoc
deleted file mode 100644
index 9abda4b..0000000
--- a/adocs/documentation/src/main/asciidoc/user-guide/_ug_wicket-viewer_layout_application-menu-layout.adoc
+++ /dev/null
@@ -1,171 +0,0 @@
-[[_ug_wicket-viewer_layout_application-menu-layout]]
-= 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 of a service's actions within a menu
-
-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=&quot;...&quot;)` 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 Isis add-ons 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:_ug_more-advanced_assembling_vetoing-visibility[vetoing subscriber].
-

http://git-wip-us.apache.org/repos/asf/isis/blob/e9ccddbe/adocs/documentation/src/main/asciidoc/user-guide/_ug_wicket-viewer_layout_dynamic-object-layout.adoc
----------------------------------------------------------------------
diff --git a/adocs/documentation/src/main/asciidoc/user-guide/_ug_wicket-viewer_layout_dynamic-object-layout.adoc b/adocs/documentation/src/main/asciidoc/user-guide/_ug_wicket-viewer_layout_dynamic-object-layout.adoc
deleted file mode 100644
index 838cf7b..0000000
--- a/adocs/documentation/src/main/asciidoc/user-guide/_ug_wicket-viewer_layout_dynamic-object-layout.adoc
+++ /dev/null
@@ -1,161 +0,0 @@
-[[_ug_wicket-viewer_layout_dynamic-object-layout]]
-= Dynamic 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/
-
-
-Because Isis implements the http://en.wikipedia.org/wiki/Naked_objects[naked objects pattern], the domain objects are rendered in the UI based only metadata gleaned from the domain classes themselves. Traditionally this metadata has been specified statically, using annotations such as xref:_ug_reference-annotations_manpage-MemberOrder[`@MemberOrder`] and xref:_ug_reference-annotations_manpage-MemberGroupLayout[`@MemberGroupLayout`]. However, it is also possible to specify the layout data using a JSON file. This brings the advantage that the layout can be refreshed dynamically, without recompiling/redeploying the app.
-
-== Screencast
-
-How to layout properties and collections dynamically, in the Wicket viewer.
-
-video::zmrg49WeEPc[youtube,width="530px",height="354px"]
-
-
-
-== 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:_ug_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 file
-
-The fastest way to get started is to use the http://github.com/isisaddons/isis-module-devutils[Isis addons' devutils] module (non-ASF) to download the layout file (derived from any existing static metadata defined by annotations).
-
-
-
-== Picking up new metadata
-
-When running in xref:_ug_runtime_configuration-files_deployment-types[prototype (development) mode], the Wicket viewer automatically rebuilds the metamodel for each class as it is rendered.
-
-[NOTE]
-====
-Conversely, do note that the Wicket viewer will _not_ pick up new metadata if running in production/server mode.
-====
-
-
-
-== Required updates to the dom project's pom.xml
-
-If using the `.layout.json` files, these must be compiled and available in the classpath. When using an IDE such as Eclipse+M2E, any `.layout.json` files in `src/main/java` or `src/main/resources` will be part of the classpath automatically. However, unless the `pom.xml` is changed, these will not be part of the compiled WAR.
-
-Therefore, make sure the following is added to 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 Isis xref:_ug_getting-started_simpleapp-archetype[SimpleApp archetype], then the POM is already correctly configured.
-
-
-
-

http://git-wip-us.apache.org/repos/asf/isis/blob/e9ccddbe/adocs/documentation/src/main/asciidoc/user-guide/_ug_wicket-viewer_layout_static-object-layout.adoc
----------------------------------------------------------------------
diff --git a/adocs/documentation/src/main/asciidoc/user-guide/_ug_wicket-viewer_layout_static-object-layout.adoc b/adocs/documentation/src/main/asciidoc/user-guide/_ug_wicket-viewer_layout_static-object-layout.adoc
deleted file mode 100644
index b33ac94..0000000
--- a/adocs/documentation/src/main/asciidoc/user-guide/_ug_wicket-viewer_layout_static-object-layout.adoc
+++ /dev/null
@@ -1,167 +0,0 @@
-[[_ug_wicket-viewer_layout_static-object-layout]]
-= 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/
-
-
-Because Isis implements the http://en.wikipedia.org/wiki/Naked_objects[naked objects pattern], the domain objects are rendered in the UI based only metadata gleaned from the domain classes themselves. Traditionally this metadata has been specified statically using annotations.
-
-
-== `@MemberOrder`
-
-To specify the relative order of domain class properties and classes, the `@MemberOrder` annotation is used.
-
-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 `name` attribute, holding the value of the property or collection.
-
-For example:
-
-[source,java]
-----
-public class ToDoItem {
-
-    @MemberOrder(sequence="3")
-    public boolean isComplete() { ... }
-
-    @MemberOrder(sequence="1")
-    public SortedSet<ToDoItem> getDependencies() { ... }
-
-    // actions ...
-    @MemberOrder(name="complete", sequence="1")
-    public ToDoItem completed() { ...}
-
-    @MemberOrder(name="complete", sequence="2")
-    public ToDoItem notYetCompleted() { ...}
-
-    // more actions ...
-    @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.
-
-If the `name` attribute is omitted, then the action is rendered near the header. Note also that the `@MemberOrder`'s `name` attribute has no meaning for collections.
-
-== `@MemberGroupLayout`
-
-The `@MemberGroupLayout` annotation specifies the relative positioning of property groups as being either in a left column, a middle column or in a right column. It also specifies the relative width.
-
-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}wicket-viewer/layouts/6-6-0-12.png[width="720px",link="{_imagesdir}wicket-viewer/layouts/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}wicket-viewer/layouts/4-4-4-12.png[width="720px",link="{_imagesdir}wicket-viewer/layouts/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}wicket-viewer/layouts/4-0-8-0.png[width="720px",link="{_imagesdir}wicket-viewer/layouts/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:_ug_reference-annotations_manpage-DomainServiceLayout[`@DomainServiceLayout`]
-* xref:_ug_reference-annotations_manpage-DomainObjectLayout[`@DomainObjectLayout`]
-* xref:_ug_reference-annotations_manpage-ViewModelLayout[`@ViewModelLayout`]
-* xref:_ug_reference-annotations_manpage-PropertyLayout[`@PropertyLayout`]
-* xref:_ug_reference-annotations_manpage-CollectionLayout[`@CollectionLayout`]
-* xref:_ug_reference-annotations_manpage-ActionLayout[`@ActionLayout`]
-* xref:_ug_reference-annotations_manpage-ParameterLayout[`@ParameterLayout`]
-
-Prior to 1.8.0 a variety of annotations (now deprecated) are available, including:
-
-* `@Named`
-* `@DescribedAs`
-* `@MultiLine`
-* `@TypicalLength`
-* `@Render`
-* `@CssClass`
-* `@CssClassFa`
-

http://git-wip-us.apache.org/repos/asf/isis/blob/e9ccddbe/adocs/documentation/src/main/asciidoc/user-guide/images/reference-layout/4-0-8-0.png
----------------------------------------------------------------------
diff --git a/adocs/documentation/src/main/asciidoc/user-guide/images/reference-layout/4-0-8-0.png b/adocs/documentation/src/main/asciidoc/user-guide/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/user-guide/images/reference-layout/4-0-8-0.png differ

http://git-wip-us.apache.org/repos/asf/isis/blob/e9ccddbe/adocs/documentation/src/main/asciidoc/user-guide/images/reference-layout/4-4-4-12.png
----------------------------------------------------------------------
diff --git a/adocs/documentation/src/main/asciidoc/user-guide/images/reference-layout/4-4-4-12.png b/adocs/documentation/src/main/asciidoc/user-guide/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/user-guide/images/reference-layout/4-4-4-12.png differ

http://git-wip-us.apache.org/repos/asf/isis/blob/e9ccddbe/adocs/documentation/src/main/asciidoc/user-guide/images/reference-layout/6-6-0-12.png
----------------------------------------------------------------------
diff --git a/adocs/documentation/src/main/asciidoc/user-guide/images/reference-layout/6-6-0-12.png b/adocs/documentation/src/main/asciidoc/user-guide/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/user-guide/images/reference-layout/6-6-0-12.png differ

http://git-wip-us.apache.org/repos/asf/isis/blob/e9ccddbe/adocs/documentation/src/main/asciidoc/user-guide/images/reference-layout/isis-layout-show-facets.css
----------------------------------------------------------------------
diff --git a/adocs/documentation/src/main/asciidoc/user-guide/images/reference-layout/isis-layout-show-facets.css b/adocs/documentation/src/main/asciidoc/user-guide/images/reference-layout/isis-layout-show-facets.css
new file mode 100644
index 0000000..c6b6334
--- /dev/null
+++ b/adocs/documentation/src/main/asciidoc/user-guide/images/reference-layout/isis-layout-show-facets.css
@@ -0,0 +1,3 @@
+ul.isis-facets {
+    display: initial;
+}

http://git-wip-us.apache.org/repos/asf/isis/blob/e9ccddbe/adocs/documentation/src/main/asciidoc/user-guide/images/reference-layout/isis-layout.css
----------------------------------------------------------------------
diff --git a/adocs/documentation/src/main/asciidoc/user-guide/images/reference-layout/isis-layout.css b/adocs/documentation/src/main/asciidoc/user-guide/images/reference-layout/isis-layout.css
new file mode 100644
index 0000000..acd445d
--- /dev/null
+++ b/adocs/documentation/src/main/asciidoc/user-guide/images/reference-layout/isis-layout.css
@@ -0,0 +1,253 @@
+.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/e9ccddbe/adocs/documentation/src/main/asciidoc/user-guide/images/reference-layout/layout-4-0-8-0.html
----------------------------------------------------------------------
diff --git a/adocs/documentation/src/main/asciidoc/user-guide/images/reference-layout/layout-4-0-8-0.html b/adocs/documentation/src/main/asciidoc/user-guide/images/reference-layout/layout-4-0-8-0.html
new file mode 100644
index 0000000..eeeb185
--- /dev/null
+++ b/adocs/documentation/src/main/asciidoc/user-guide/images/reference-layout/layout-4-0-8-0.html
@@ -0,0 +1,198 @@
+f<!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/e9ccddbe/adocs/documentation/src/main/asciidoc/user-guide/images/reference-layout/layout-4-4-4-12.html
----------------------------------------------------------------------
diff --git a/adocs/documentation/src/main/asciidoc/user-guide/images/reference-layout/layout-4-4-4-12.html b/adocs/documentation/src/main/asciidoc/user-guide/images/reference-layout/layout-4-4-4-12.html
new file mode 100644
index 0000000..cd508dc
--- /dev/null
+++ b/adocs/documentation/src/main/asciidoc/user-guide/images/reference-layout/layout-4-4-4-12.html
@@ -0,0 +1,205 @@
+f<!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/e9ccddbe/adocs/documentation/src/main/asciidoc/user-guide/images/reference-layout/layout-6-6-0-12.html
----------------------------------------------------------------------
diff --git a/adocs/documentation/src/main/asciidoc/user-guide/images/reference-layout/layout-6-6-0-12.html b/adocs/documentation/src/main/asciidoc/user-guide/images/reference-layout/layout-6-6-0-12.html
new file mode 100644
index 0000000..02a8e0d
--- /dev/null
+++ b/adocs/documentation/src/main/asciidoc/user-guide/images/reference-layout/layout-6-6-0-12.html
@@ -0,0 +1,203 @@
+f<!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/e9ccddbe/adocs/documentation/src/main/asciidoc/user-guide/images/wicket-viewer/layouts/4-0-8-0.png
----------------------------------------------------------------------
diff --git a/adocs/documentation/src/main/asciidoc/user-guide/images/wicket-viewer/layouts/4-0-8-0.png b/adocs/documentation/src/main/asciidoc/user-guide/images/wicket-viewer/layouts/4-0-8-0.png
deleted file mode 100644
index 1ebb062..0000000
Binary files a/adocs/documentation/src/main/asciidoc/user-guide/images/wicket-viewer/layouts/4-0-8-0.png and /dev/null differ

http://git-wip-us.apache.org/repos/asf/isis/blob/e9ccddbe/adocs/documentation/src/main/asciidoc/user-guide/images/wicket-viewer/layouts/4-4-4-12.png
----------------------------------------------------------------------
diff --git a/adocs/documentation/src/main/asciidoc/user-guide/images/wicket-viewer/layouts/4-4-4-12.png b/adocs/documentation/src/main/asciidoc/user-guide/images/wicket-viewer/layouts/4-4-4-12.png
deleted file mode 100644
index fd946bf..0000000
Binary files a/adocs/documentation/src/main/asciidoc/user-guide/images/wicket-viewer/layouts/4-4-4-12.png and /dev/null differ

http://git-wip-us.apache.org/repos/asf/isis/blob/e9ccddbe/adocs/documentation/src/main/asciidoc/user-guide/images/wicket-viewer/layouts/6-6-0-12.png
----------------------------------------------------------------------
diff --git a/adocs/documentation/src/main/asciidoc/user-guide/images/wicket-viewer/layouts/6-6-0-12.png b/adocs/documentation/src/main/asciidoc/user-guide/images/wicket-viewer/layouts/6-6-0-12.png
deleted file mode 100644
index 369efb7..0000000
Binary files a/adocs/documentation/src/main/asciidoc/user-guide/images/wicket-viewer/layouts/6-6-0-12.png and /dev/null differ

http://git-wip-us.apache.org/repos/asf/isis/blob/e9ccddbe/adocs/documentation/src/main/asciidoc/user-guide/images/wicket-viewer/layouts/estatio-Invoice.png
----------------------------------------------------------------------
diff --git a/adocs/documentation/src/main/asciidoc/user-guide/images/wicket-viewer/layouts/estatio-Invoice.png b/adocs/documentation/src/main/asciidoc/user-guide/images/wicket-viewer/layouts/estatio-Invoice.png
new file mode 100644
index 0000000..be7e917
Binary files /dev/null and b/adocs/documentation/src/main/asciidoc/user-guide/images/wicket-viewer/layouts/estatio-Invoice.png differ

http://git-wip-us.apache.org/repos/asf/isis/blob/e9ccddbe/adocs/documentation/src/main/asciidoc/user-guide/images/wicket-viewer/layouts/estatio-Lease.png
----------------------------------------------------------------------
diff --git a/adocs/documentation/src/main/asciidoc/user-guide/images/wicket-viewer/layouts/estatio-Lease.png b/adocs/documentation/src/main/asciidoc/user-guide/images/wicket-viewer/layouts/estatio-Lease.png
new file mode 100644
index 0000000..e80ecb2
Binary files /dev/null and b/adocs/documentation/src/main/asciidoc/user-guide/images/wicket-viewer/layouts/estatio-Lease.png differ

http://git-wip-us.apache.org/repos/asf/isis/blob/e9ccddbe/adocs/documentation/src/main/asciidoc/user-guide/images/wicket-viewer/layouts/estatio-LeaseItem.png
----------------------------------------------------------------------
diff --git a/adocs/documentation/src/main/asciidoc/user-guide/images/wicket-viewer/layouts/estatio-LeaseItem.png b/adocs/documentation/src/main/asciidoc/user-guide/images/wicket-viewer/layouts/estatio-LeaseItem.png
new file mode 100644
index 0000000..993d498
Binary files /dev/null and b/adocs/documentation/src/main/asciidoc/user-guide/images/wicket-viewer/layouts/estatio-LeaseItem.png differ

http://git-wip-us.apache.org/repos/asf/isis/blob/e9ccddbe/adocs/documentation/src/main/asciidoc/user-guide/images/wicket-viewer/layouts/isis-layout-show-facets.css
----------------------------------------------------------------------
diff --git a/adocs/documentation/src/main/asciidoc/user-guide/images/wicket-viewer/layouts/isis-layout-show-facets.css b/adocs/documentation/src/main/asciidoc/user-guide/images/wicket-viewer/layouts/isis-layout-show-facets.css
deleted file mode 100644
index c6b6334..0000000
--- a/adocs/documentation/src/main/asciidoc/user-guide/images/wicket-viewer/layouts/isis-layout-show-facets.css
+++ /dev/null
@@ -1,3 +0,0 @@
-ul.isis-facets {
-    display: initial;
-}

http://git-wip-us.apache.org/repos/asf/isis/blob/e9ccddbe/adocs/documentation/src/main/asciidoc/user-guide/images/wicket-viewer/layouts/isis-layout.css
----------------------------------------------------------------------
diff --git a/adocs/documentation/src/main/asciidoc/user-guide/images/wicket-viewer/layouts/isis-layout.css b/adocs/documentation/src/main/asciidoc/user-guide/images/wicket-viewer/layouts/isis-layout.css
deleted file mode 100644
index acd445d..0000000
--- a/adocs/documentation/src/main/asciidoc/user-guide/images/wicket-viewer/layouts/isis-layout.css
+++ /dev/null
@@ -1,253 +0,0 @@
-.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/e9ccddbe/adocs/documentation/src/main/asciidoc/user-guide/images/wicket-viewer/layouts/layout-4-0-8-0.html
----------------------------------------------------------------------
diff --git a/adocs/documentation/src/main/asciidoc/user-guide/images/wicket-viewer/layouts/layout-4-0-8-0.html b/adocs/documentation/src/main/asciidoc/user-guide/images/wicket-viewer/layouts/layout-4-0-8-0.html
deleted file mode 100644
index eeeb185..0000000
--- a/adocs/documentation/src/main/asciidoc/user-guide/images/wicket-viewer/layouts/layout-4-0-8-0.html
+++ /dev/null
@@ -1,198 +0,0 @@
-f<!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