You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@causeway.apache.org by da...@apache.org on 2023/02/16 09:27:38 UTC
[causeway-app-simpleapp] branch jpa-SNAPSHOT updated: further updates
This is an automated email from the ASF dual-hosted git repository.
danhaywood pushed a commit to branch jpa-SNAPSHOT
in repository https://gitbox.apache.org/repos/asf/causeway-app-simpleapp.git
The following commit(s) were added to refs/heads/jpa-SNAPSHOT by this push:
new e3495fe further updates
e3495fe is described below
commit e3495fe41f5145da12b94b53974dc05aa4e95e15
Author: danhaywood <da...@haywood-associates.co.uk>
AuthorDate: Thu Feb 16 09:27:32 2023 +0000
further updates
---
.../modules/simple/dom/so/SimpleObject.layout.xml | 19 ++++++++------
.../services/homepage/HomePageViewModel.layout.xml | 30 ++++++++++++----------
webapp/src/main/resources/menubars.layout.xml | 1 +
3 files changed, 29 insertions(+), 21 deletions(-)
diff --git a/module-simple/src/main/java/domainapp/modules/simple/dom/so/SimpleObject.layout.xml b/module-simple/src/main/java/domainapp/modules/simple/dom/so/SimpleObject.layout.xml
index 5a78f2b..6a393d4 100644
--- a/module-simple/src/main/java/domainapp/modules/simple/dom/so/SimpleObject.layout.xml
+++ b/module-simple/src/main/java/domainapp/modules/simple/dom/so/SimpleObject.layout.xml
@@ -1,9 +1,12 @@
<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<bs3:grid xsi:schemaLocation="https://causeway.apache.org/applib/layout/component https://causeway.apache.org/applib/layout/component/component.xsd https://causeway.apache.org/applib/layout/grid/bootstrap3 https://causeway.apache.org/applib/layout/grid/bootstrap3/bootstrap3.xsd" xmlns:c="https://causeway.apache.org/applib/layout/component" xmlns:bs3="https://causeway.apache.org/applib/layout/grid/bootstrap3" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-
+<bs3:grid
+ xsi:schemaLocation="https://causeway.apache.org/applib/layout/component https://causeway.apache.org/applib/layout/component/component.xsd https://causeway.apache.org/applib/layout/grid/bootstrap3 https://causeway.apache.org/applib/layout/grid/bootstrap3/bootstrap3.xsd"
+ xmlns:cpt="https://causeway.apache.org/applib/layout/component"
+ xmlns:bs3="https://causeway.apache.org/applib/layout/grid/bootstrap3"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
<bs3:row>
<bs3:col span="12" unreferencedActions="true">
- <c:domainObject bookmarking="AS_ROOT"/>
+ <cpt:domainObject bookmarking="AS_ROOT"/>
</bs3:col>
</bs3:row>
<bs3:row>
@@ -14,35 +17,35 @@
<bs3:tab name="Identity">
<bs3:row>
<bs3:col span="12">
- <c:fieldSet name="Identity" id="identity"/>
+ <cpt:fieldSet name="Identity" id="identity"/>
</bs3:col>
</bs3:row>
</bs3:tab>
<bs3:tab name="Other">
<bs3:row>
<bs3:col span="12">
- <c:fieldSet name="Other" id="other" unreferencedProperties="true"/>
+ <cpt: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"/>
+ <cpt:fieldSet name="Metadata" id="metadata"/>
</bs3:col>
</bs3:row>
</bs3:tab>
</bs3:tabGroup>
</bs3:col>
<bs3:col span="12">
- <c:fieldSet name="Details" id="details"/>
+ <cpt:fieldSet name="Details" id="details"/>
</bs3:col>
</bs3:row>
</bs3:col>
<bs3:col span="6">
<bs3:row>
<bs3:col span="12">
- <c:fieldSet name="Content" id="content"/>
+ <cpt:fieldSet name="Content" id="content"/>
</bs3:col>
</bs3:row>
<bs3:tabGroup unreferencedCollections="true">
diff --git a/webapp/src/main/java/domainapp/webapp/application/services/homepage/HomePageViewModel.layout.xml b/webapp/src/main/java/domainapp/webapp/application/services/homepage/HomePageViewModel.layout.xml
index 3dabf13..eefb868 100644
--- a/webapp/src/main/java/domainapp/webapp/application/services/homepage/HomePageViewModel.layout.xml
+++ b/webapp/src/main/java/domainapp/webapp/application/services/homepage/HomePageViewModel.layout.xml
@@ -1,26 +1,30 @@
<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<bs3:grid xsi:schemaLocation="https://causeway.apache.org/applib/layout/component https://causeway.apache.org/applib/layout/component/component.xsd https://causeway.apache.org/applib/layout/grid/bootstrap3 https://causeway.apache.org/applib/layout/grid/bootstrap3/bootstrap3.xsd" xmlns="https://causeway.apache.org/applib/layout/component" xmlns:bs3="https://causeway.apache.org/applib/layout/grid/bootstrap3" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+<bs3:grid
+ xsi:schemaLocation="https://causeway.apache.org/applib/layout/component https://causeway.apache.org/applib/layout/component/component.xsd https://causeway.apache.org/applib/layout/grid/bootstrap3 https://causeway.apache.org/applib/layout/grid/bootstrap3/bootstrap3.xsd"
+ xmlns:cpt="https://causeway.apache.org/applib/layout/component"
+ xmlns:bs3="https://causeway.apache.org/applib/layout/grid/bootstrap3"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
<bs3:row>
<bs3:col span="3">
<bs3:row>
<bs3:col span="12" unreferencedActions="true">
- <domainObject/>
- <action id="clearHints" hidden="EVERYWHERE"/>
- <action id="impersonate" hidden="EVERYWHERE"/>
- <action id="impersonateWithRoles" hidden="EVERYWHERE"/>
- <action id="stopImpersonating" hidden="EVERYWHERE"/>
- <action id="downloadLayoutXml" hidden="EVERYWHERE"/>
- <action id="inspectMetamodel" hidden="EVERYWHERE"/>
- <action id="rebuildMetamodel" hidden="EVERYWHERE"/>
- <action id="downloadMetamodelXml" hidden="EVERYWHERE"/>
- <action id="openRestApi" hidden="EVERYWHERE"/>
+ <cpt:domainObject/>
+ <cpt:action id="clearHints" hidden="EVERYWHERE"/>
+ <cpt:action id="impersonate" hidden="EVERYWHERE"/>
+ <cpt:action id="impersonateWithRoles" hidden="EVERYWHERE"/>
+ <cpt:action id="stopImpersonating" hidden="EVERYWHERE"/>
+ <cpt:action id="downloadLayoutXml" hidden="EVERYWHERE"/>
+ <cpt:action id="inspectMetamodel" hidden="EVERYWHERE"/>
+ <cpt:action id="rebuildMetamodel" hidden="EVERYWHERE"/>
+ <cpt:action id="downloadMetamodelXml" hidden="EVERYWHERE"/>
+ <cpt:action id="openRestApi" hidden="EVERYWHERE"/>
</bs3:col>
</bs3:row>
</bs3:col>
<bs3:col span="6" unreferencedCollections="true">
<bs3:row>
<bs3:col span="12">
- <collection id="objects" defaultView="table"/>
+ <cpt:collection id="objects" defaultView="table"/>
</bs3:col>
</bs3:row>
</bs3:col>
@@ -32,7 +36,7 @@
</bs3:row>
<bs3:row>
<bs3:col span="0">
- <fieldSet name="General" id="general" unreferencedProperties="true"/>
+ <cpt:fieldSet name="General" id="general" unreferencedProperties="true"/>
</bs3:col>
</bs3:row>
</bs3:grid>
diff --git a/webapp/src/main/resources/menubars.layout.xml b/webapp/src/main/resources/menubars.layout.xml
index f416cd9..3344737 100644
--- a/webapp/src/main/resources/menubars.layout.xml
+++ b/webapp/src/main/resources/menubars.layout.xml
@@ -1,5 +1,6 @@
<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
<mb3:menuBars
+ xsi:schemaLocation="https://causeway.apache.org/applib/layout/menubars/bootstrap3 https://causeway.apache.org/applib/layout/menubars/bootstrap3/menubars.xsd https://causeway.apache.org/applib/layout/component https://causeway.apache.org/applib/layout/component/component.xsd"
xmlns:cpt="https://causeway.apache.org/applib/layout/component"
xmlns:mb3="https://causeway.apache.org/applib/layout/menubars/bootstrap3"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">