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 2019/07/08 13:07:04 UTC

[isis] 14/18: ISIS-2148: updates helloworld, brings more into line with the new fallback layout (ISIS-2147)

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

danhaywood pushed a commit to branch ISIS-2062-antora
in repository https://gitbox.apache.org/repos/asf/isis.git

commit 19009799e1cd502d7e82d555e0d04d1ce6f8a854
Author: danhaywood <da...@haywood-associates.co.uk>
AuthorDate: Mon Jul 8 14:04:10 2019 +0100

    ISIS-2148: updates helloworld, brings more into line with the new fallback layout (ISIS-2147)
---
 .../domainapp/dom/impl/HelloWorldObject.layout.xml | 76 ++++++++++++----------
 1 file changed, 41 insertions(+), 35 deletions(-)

diff --git a/examples/apps/helloworld/src/main/java/domainapp/dom/impl/HelloWorldObject.layout.xml b/examples/apps/helloworld/src/main/java/domainapp/dom/impl/HelloWorldObject.layout.xml
index 1554649..648ca86 100644
--- a/examples/apps/helloworld/src/main/java/domainapp/dom/impl/HelloWorldObject.layout.xml
+++ b/examples/apps/helloworld/src/main/java/domainapp/dom/impl/HelloWorldObject.layout.xml
@@ -26,41 +26,47 @@
     </bs3:row>
     <bs3:row>
         <bs3:col span="6">
-            <bs3:tabGroup>
-                <bs3:tab name="General">
-                    <bs3:row>
-                        <bs3:col span="12">
-                            <c:fieldSet name="Name">
-                                <c:action id="delete">
-                                    <c:describedAs>Deletes this object from the persistent datastore</c:describedAs>
-                                </c:action>
-                                <c:property id="name" namedEscaped="true">
-                                    <c:action id="updateName">
-                                        <c:describedAs>Updates the object's name</c:describedAs>
-                                    </c:action>
-                                </c:property>
-                                <c:property id="notes" namedEscaped="true" multiLine="10" hidden="ALL_TABLES"/>
-                            </c:fieldSet>
-                        </bs3:col>
-                    </bs3:row>
-                </bs3:tab>
-                <bs3:tab name="Other">
-                    <bs3:row>
-                        <bs3:col span="12">
-                            <c:fieldSet name="Other" unreferencedProperties="true"/>
-                        </bs3:col>
-                    </bs3:row>
-                </bs3:tab>
-                <bs3:tab name="Metadata">
-                    <bs3:row>
-                        <bs3:col span="12">
-                            <c:fieldSet name="Metadata"/>
-                        </bs3:col>
-                    </bs3:row>
-                </bs3:tab>
-            </bs3:tabGroup>
-            <bs3:tabGroup>
-            </bs3:tabGroup>
+            <bs3:row>
+                <bs3:col span="12">
+                    <bs3:tabGroup>
+                        <bs3:tab name="Identity">
+                            <bs3:row>
+                                <bs3:col span="12">
+                                    <c:fieldSet name="Identity" id="identity">
+                                        <c:action id="delete">
+                                            <c:describedAs>Deletes this object from the persistent datastore</c:describedAs>
+                                        </c:action>
+                                        <c:property id="name" namedEscaped="true">
+                                            <c:action id="updateName">
+                                                <c:describedAs>Updates the object's name</c:describedAs>
+                                            </c:action>
+                                        </c:property>
+                                    </c:fieldSet>
+                                </bs3:col>
+                            </bs3:row>
+                        </bs3:tab>
+                        <bs3:tab name="Other">
+                            <bs3:row>
+                                <bs3:col span="12">
+                                    <c:fieldSet name="Other" id="other" unreferencedProperties="true"/>
+                                </bs3:col>
+                            </bs3:row>
+                        </bs3:tab>
+                        <bs3:tab name="Metadata">
+                            <bs3:row>
+                                <bs3:col span="12">
+                                    <c:fieldSet name="Metadata" id="metadata"/>
+                                </bs3:col>
+                            </bs3:row>
+                        </bs3:tab>
+                    </bs3:tabGroup>
+                </bs3:col>
+                <bs3:col span="12">
+                    <c:fieldSet name="" id="details">
+                        <c:property id="notes" namedEscaped="true" multiLine="10" hidden="ALL_TABLES"/>
+                    </c:fieldSet>
+                </bs3:col>
+            </bs3:row>
         </bs3:col>
         <bs3:col span="6">
             <bs3:tabGroup  unreferencedCollections="true">