From ec72b8040ade0d0921eecea5d022db36d2b1497e Mon Sep 17 00:00:00 2001
From: Michael Jones <acetousk@gmail.com>
Date: Wed, 17 Nov 2021 23:02:02 -0700
Subject: [PATCH 1/3] Clean up component, add dashboard screen, update to
 sensible menu includes

---
 screen/ExampleApp.xml                         | 13 +++----
 screen/ExampleApp/Example.xml                 | 10 +++---
 .../Example/DynamicExampleItems.xml           |  6 ++--
 .../Example/DynamicExampleItemsVue.xml        |  6 ++--
 screen/ExampleApp/Example/EditExample.xml     |  2 +-
 .../ExampleApp/Example/EditExampleContent.xml |  6 ++--
 .../Example/EditExampleFeatureAppls.xml       |  6 ++--
 .../Example/EditExampleItemList.xml           |  4 +--
 .../ExampleApp/Example/EditExampleItems.xml   |  6 ++--
 screen/ExampleApp/Example/FindExample.xml     | 16 ++++-----
 .../EditExampleFeatureExampleAppls.xml        |  6 ++--
 .../ExampleApp/Feature/FindExampleFeature.xml |  4 +--
 screen/ExampleApp/dashboard.xml               | 36 +++++++++++++++++++
 13 files changed, 80 insertions(+), 41 deletions(-)
 create mode 100644 screen/ExampleApp/dashboard.xml

diff --git a/screen/ExampleApp.xml b/screen/ExampleApp.xml
index 5f4ca30..16608c9 100644
--- a/screen/ExampleApp.xml
+++ b/screen/ExampleApp.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
-This software is in the public domain under CC0 1.0 Universal plus a 
+This software is in the public domain under CC0 1.0 Universal plus a
 Grant of Patent License.
 
 To the extent possible under law, the author(s) have dedicated all
@@ -123,12 +123,13 @@ along with this software (see the LICENSE.md file). If not, see
         <default-response type="none"/>
     </transition>
 
-    <subscreens default-item="Example">
+    <subscreens default-item="dashboard">
         <!-- these are actually links to content to add to the menu since content is not automatically added to the menu -->
-        <subscreens-item name="ExamplePolicies" menu-index="4" menu-title="Policies"/>
-        <subscreens-item name="ExampleTerms" menu-index="5" menu-title="Terms"/>
-        <subscreens-item name="ExampleWiki" menu-index="6" menu-title="Wiki"/>
-        <subscreens-item name="ExampleMarkdown" menu-index="7" menu-title="Markdown"/>
+<!--        <subscreens-item name="Example" menu-index="8" menu-title="Example"/>-->
+<!--        <subscreens-item name="ExamplePolicies" menu-index="4" menu-title="Policies"/>-->
+<!--        <subscreens-item name="ExampleTerms" menu-index="5" menu-title="Terms"/>-->
+<!--        <subscreens-item name="ExampleWiki" menu-index="6" menu-title="Wiki"/>-->
+<!--        <subscreens-item name="ExampleMarkdown" menu-index="7" menu-title="Markdown"/>-->
     </subscreens>
 
     <widgets>
diff --git a/screen/ExampleApp/Example.xml b/screen/ExampleApp/Example.xml
index a1b26f3..a639144 100644
--- a/screen/ExampleApp/Example.xml
+++ b/screen/ExampleApp/Example.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
-This software is in the public domain under CC0 1.0 Universal plus a 
+This software is in the public domain under CC0 1.0 Universal plus a
 Grant of Patent License.
 
 To the extent possible under law, the author(s) have dedicated all
@@ -14,14 +14,16 @@ along with this software (see the LICENSE.md file). If not, see
 -->
 <screen xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
         xsi:noNamespaceSchemaLocation="http://moqui.org/xsd/xml-screen-2.1.xsd"
-        default-menu-title="Example" default-menu-index="1">
+        default-menu-include="true" default-menu-title="Example" default-menu-index="1">
 
     <!-- this is a test, and example, of overriding the default FTL macro template to use for this screen -->
     <macro-template type="vuet" location="component://example/template/screen-macro/ExampleScreenMacros.vuet.ftl"/>
 
-    <subscreens default-item="FindExample"/>
+    <subscreens default-item="FindExample">
+<!--        <subscreens-item location="../FindExample" menu-index="1" name="FindExample"/>-->
+    </subscreens>
 
     <widgets>
-        <subscreens-panel id="example-panel" type="tab"/>
+        <subscreens-panel id="example-panel" type="popup"/>
     </widgets>
 </screen>
diff --git a/screen/ExampleApp/Example/DynamicExampleItems.xml b/screen/ExampleApp/Example/DynamicExampleItems.xml
index 85058b7..401dd0a 100644
--- a/screen/ExampleApp/Example/DynamicExampleItems.xml
+++ b/screen/ExampleApp/Example/DynamicExampleItems.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
-This software is in the public domain under CC0 1.0 Universal plus a 
+This software is in the public domain under CC0 1.0 Universal plus a
 Grant of Patent License.
 
 To the extent possible under law, the author(s) have dedicated all
@@ -13,8 +13,8 @@ along with this software (see the LICENSE.md file). If not, see
 <http://creativecommons.org/publicdomain/zero/1.0/>.
 -->
 <screen xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://moqui.org/xsd/xml-screen-2.1.xsd"
-        default-menu-title="Dynamic Items" default-menu-index="9" render-modes="js,vuet" server-static="js,vuet">
-    
+        default-menu-include="false" default-menu-title="Dynamic Items" default-menu-index="9" render-modes="js,vuet" server-static="js,vuet">
+
     <parameter name="exampleId"/>
 
     <transition name="getExampleItemList" read-only="true">
diff --git a/screen/ExampleApp/Example/DynamicExampleItemsVue.xml b/screen/ExampleApp/Example/DynamicExampleItemsVue.xml
index 8ce4f20..e82e580 100644
--- a/screen/ExampleApp/Example/DynamicExampleItemsVue.xml
+++ b/screen/ExampleApp/Example/DynamicExampleItemsVue.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
-This software is in the public domain under CC0 1.0 Universal plus a 
+This software is in the public domain under CC0 1.0 Universal plus a
 Grant of Patent License.
 
 To the extent possible under law, the author(s) have dedicated all
@@ -13,8 +13,8 @@ along with this software (see the LICENSE.md file). If not, see
 <http://creativecommons.org/publicdomain/zero/1.0/>.
 -->
 <screen xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://moqui.org/xsd/xml-screen-2.1.xsd"
-        default-menu-title="Dynamic Items Vue" default-menu-index="10" render-modes="vue,qvue" server-static="vue,qvue">
-    
+        default-menu-include="true" default-menu-title="Dynamic Items Vue" default-menu-index="10" render-modes="vue,qvue" server-static="vue,qvue">
+
     <parameter name="exampleId"/>
 
     <transition-include name="getExampleItemList" location="component://example/screen/ExampleApp/Example/DynamicExampleItems.xml"/>
diff --git a/screen/ExampleApp/Example/EditExample.xml b/screen/ExampleApp/Example/EditExample.xml
index 37a9b60..9732dee 100644
--- a/screen/ExampleApp/Example/EditExample.xml
+++ b/screen/ExampleApp/Example/EditExample.xml
@@ -13,7 +13,7 @@ along with this software (see the LICENSE.md file). If not, see
 <http://creativecommons.org/publicdomain/zero/1.0/>.
 -->
 <screen xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://moqui.org/xsd/xml-screen-2.1.xsd"
-        default-menu-title="Example" default-menu-index="1">
+        default-menu-include="true" default-menu-title="Example" default-menu-index="1">
 
     <parameter name="exampleId" required="true"/>
 
diff --git a/screen/ExampleApp/Example/EditExampleContent.xml b/screen/ExampleApp/Example/EditExampleContent.xml
index 33168ce..9eda11a 100644
--- a/screen/ExampleApp/Example/EditExampleContent.xml
+++ b/screen/ExampleApp/Example/EditExampleContent.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
-This software is in the public domain under CC0 1.0 Universal plus a 
+This software is in the public domain under CC0 1.0 Universal plus a
 Grant of Patent License.
 
 To the extent possible under law, the author(s) have dedicated all
@@ -14,8 +14,8 @@ along with this software (see the LICENSE.md file). If not, see
 -->
 <screen xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
         xsi:noNamespaceSchemaLocation="http://moqui.org/xsd/xml-screen-2.1.xsd"
-        default-menu-title="Content" default-menu-index="4">
-    
+        default-menu-include="true" default-menu-title="Content" default-menu-index="4">
+
     <parameter name="exampleId" required="true"/>
 
     <transition name="createExampleContent"><service-call name="create#moqui.example.ExampleContent"/>
diff --git a/screen/ExampleApp/Example/EditExampleFeatureAppls.xml b/screen/ExampleApp/Example/EditExampleFeatureAppls.xml
index 6bdd772..a9c1a76 100644
--- a/screen/ExampleApp/Example/EditExampleFeatureAppls.xml
+++ b/screen/ExampleApp/Example/EditExampleFeatureAppls.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
-This software is in the public domain under CC0 1.0 Universal plus a 
+This software is in the public domain under CC0 1.0 Universal plus a
 Grant of Patent License.
 
 To the extent possible under law, the author(s) have dedicated all
@@ -14,8 +14,8 @@ along with this software (see the LICENSE.md file). If not, see
 -->
 <screen xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
         xsi:noNamespaceSchemaLocation="http://moqui.org/xsd/xml-screen-2.1.xsd"
-        default-menu-title="Features" default-menu-index="3">
-    
+        default-menu-include="true" default-menu-title="Features" default-menu-index="3">
+
     <parameter name="exampleId" required="true"/>
 
     <transition name="editExampleFeature"><default-response url="../../Feature/EditExampleFeature"/></transition>
diff --git a/screen/ExampleApp/Example/EditExampleItemList.xml b/screen/ExampleApp/Example/EditExampleItemList.xml
index 92200d3..5031363 100644
--- a/screen/ExampleApp/Example/EditExampleItemList.xml
+++ b/screen/ExampleApp/Example/EditExampleItemList.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
-This software is in the public domain under CC0 1.0 Universal plus a 
+This software is in the public domain under CC0 1.0 Universal plus a
 Grant of Patent License.
 
 To the extent possible under law, the author(s) have dedicated all
@@ -15,7 +15,7 @@ along with this software (see the LICENSE.md file). If not, see
 <screen xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
         xsi:noNamespaceSchemaLocation="http://moqui.org/xsd/xml-screen-2.1.xsd"
         default-menu-include="false" standalone="true">
-    
+
     <parameter name="exampleId"/>
 
     <transition name="updateExampleItem"><service-call name="update#moqui.example.ExampleItem"/>
diff --git a/screen/ExampleApp/Example/EditExampleItems.xml b/screen/ExampleApp/Example/EditExampleItems.xml
index cf51782..af9faac 100644
--- a/screen/ExampleApp/Example/EditExampleItems.xml
+++ b/screen/ExampleApp/Example/EditExampleItems.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
-This software is in the public domain under CC0 1.0 Universal plus a 
+This software is in the public domain under CC0 1.0 Universal plus a
 Grant of Patent License.
 
 To the extent possible under law, the author(s) have dedicated all
@@ -14,8 +14,8 @@ along with this software (see the LICENSE.md file). If not, see
 -->
 <screen xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
         xsi:noNamespaceSchemaLocation="http://moqui.org/xsd/xml-screen-2.1.xsd"
-        default-menu-title="Items" default-menu-index="2">
-    
+        default-menu-include="true" default-menu-title="Items" default-menu-index="2">
+
     <parameter name="exampleId" required="true"/>
 
     <transition name="createExampleItem">
diff --git a/screen/ExampleApp/Example/FindExample.xml b/screen/ExampleApp/Example/FindExample.xml
index 326f493..3557fff 100644
--- a/screen/ExampleApp/Example/FindExample.xml
+++ b/screen/ExampleApp/Example/FindExample.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
-This software is in the public domain under CC0 1.0 Universal plus a 
+This software is in the public domain under CC0 1.0 Universal plus a
 Grant of Patent License.
 
 To the extent possible under law, the author(s) have dedicated all
@@ -13,7 +13,7 @@ along with this software (see the LICENSE.md file). If not, see
 <http://creativecommons.org/publicdomain/zero/1.0/>.
 -->
 <screen xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://moqui.org/xsd/xml-screen-2.1.xsd"
-        default-menu-include="false">
+        default-menu-include="true" default-menu-title="Find Example">
 
     <transition name="findExample"><default-response url="."/></transition>
     <transition name="editExample"><default-response url="../EditExample"/></transition>
@@ -32,12 +32,12 @@ along with this software (see the LICENSE.md file). If not, see
         <default-response type="none"/>
     </transition>
 
-    <pre-actions>
-        <set field="html_title" value="Find Example"/>
-        <set field="html_description" value="A page for finding Examples"/>
-        <set field="html_keywords" value="moqui,find,example,status,edit,new"/>
-    </pre-actions>
-    
+<!--    <pre-actions>-->
+<!--        <set field="html_title" value="Find Example"/>-->
+<!--        <set field="html_description" value="A page for finding Examples"/>-->
+<!--        <set field="html_keywords" value="moqui,find,example,status,edit,new"/>-->
+<!--    </pre-actions>-->
+
     <actions>
         <entity-find entity-name="moqui.example.Example" list="exampleList">
             <search-form-inputs default-order-by="^exampleName"/></entity-find>
diff --git a/screen/ExampleApp/Feature/EditExampleFeatureExampleAppls.xml b/screen/ExampleApp/Feature/EditExampleFeatureExampleAppls.xml
index 646db85..b9e0bac 100644
--- a/screen/ExampleApp/Feature/EditExampleFeatureExampleAppls.xml
+++ b/screen/ExampleApp/Feature/EditExampleFeatureExampleAppls.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
-This software is in the public domain under CC0 1.0 Universal plus a 
+This software is in the public domain under CC0 1.0 Universal plus a
 Grant of Patent License.
 
 To the extent possible under law, the author(s) have dedicated all
@@ -14,8 +14,8 @@ along with this software (see the LICENSE.md file). If not, see
 -->
 <screen xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
         xsi:noNamespaceSchemaLocation="http://moqui.org/xsd/xml-screen-2.1.xsd"
-        default-menu-title="Examples" default-menu-index="2">
-    
+        default-menu-include="false" default-menu-title="Examples" default-menu-index="2">
+
     <parameter name="exampleFeatureId" required="true"/>
 
     <transition name="editExample"><default-response url="../../Example/EditExample"/></transition>
diff --git a/screen/ExampleApp/Feature/FindExampleFeature.xml b/screen/ExampleApp/Feature/FindExampleFeature.xml
index 1a276af..bb86bf5 100644
--- a/screen/ExampleApp/Feature/FindExampleFeature.xml
+++ b/screen/ExampleApp/Feature/FindExampleFeature.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
-This software is in the public domain under CC0 1.0 Universal plus a 
+This software is in the public domain under CC0 1.0 Universal plus a
 Grant of Patent License.
 
 To the extent possible under law, the author(s) have dedicated all
@@ -14,7 +14,7 @@ along with this software (see the LICENSE.md file). If not, see
 -->
 <screen xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
         xsi:noNamespaceSchemaLocation="http://moqui.org/xsd/xml-screen-2.1.xsd"
-        default-menu-include="false">
+        default-menu-include="true">
 
     <transition name="newExampleFeature"><default-response url="../EditExampleFeature"/></transition>
     <transition name="findExampleFeature"><default-response url="."/></transition>
diff --git a/screen/ExampleApp/dashboard.xml b/screen/ExampleApp/dashboard.xml
new file mode 100644
index 0000000..a1d88e8
--- /dev/null
+++ b/screen/ExampleApp/dashboard.xml
@@ -0,0 +1,36 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+This software is in the public domain under CC0 1.0 Universal plus a
+Grant of Patent License.
+
+To the extent possible under law, the author(s) have dedicated all
+copyright and related and neighboring rights to this software to the
+public domain worldwide. This software is distributed without any
+warranty.
+
+You should have received a copy of the CC0 Public Domain Dedication
+along with this software (see the LICENSE.md file). If not, see
+<http://creativecommons.org/publicdomain/zero/1.0/>.
+-->
+<screen xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://moqui.org/xsd/xml-screen-2.1.xsd"
+        default-menu-include="true" menu-image="fa fa-dashboard" menu-image-type="icon" >
+
+    <widgets>
+        <container type="div">
+            <link url="/site" text="Example Site" url-type="plain"/>
+        </container>
+        <container-row><row-col lg="6" md="6">
+
+            <container-box>
+                <box-header title="Example App Sections"/>
+                <box-body>
+                    <link url="../Example" text="Example"/>
+                    <link url="../Survey" text="Survey"/>
+                    <link url="../Feature" text="Feature"/>
+                </box-body>
+            </container-box>
+        </row-col></container-row>
+
+        <!-- <link url="reloadEcfi" text="Reload Framework" link-type="anchor" confirmation="Are you sure? This is for development and emergency use only."/> -->
+    </widgets>
+</screen>

From 20ef3873280a98f3203898242f1cd2d1ef5dd988 Mon Sep 17 00:00:00 2001
From: Michael Jones <acetousk@gmail.com>
Date: Wed, 17 Nov 2021 23:06:11 -0700
Subject: [PATCH 2/3] Clean up comments

---
 screen/ExampleApp.xml                     |  9 ++++-----
 screen/ExampleApp/Example.xml             |  4 +---
 screen/ExampleApp/Example/FindExample.xml | 10 +++++-----
 3 files changed, 10 insertions(+), 13 deletions(-)

diff --git a/screen/ExampleApp.xml b/screen/ExampleApp.xml
index 16608c9..aa10659 100644
--- a/screen/ExampleApp.xml
+++ b/screen/ExampleApp.xml
@@ -125,11 +125,10 @@ along with this software (see the LICENSE.md file). If not, see
 
     <subscreens default-item="dashboard">
         <!-- these are actually links to content to add to the menu since content is not automatically added to the menu -->
-<!--        <subscreens-item name="Example" menu-index="8" menu-title="Example"/>-->
-<!--        <subscreens-item name="ExamplePolicies" menu-index="4" menu-title="Policies"/>-->
-<!--        <subscreens-item name="ExampleTerms" menu-index="5" menu-title="Terms"/>-->
-<!--        <subscreens-item name="ExampleWiki" menu-index="6" menu-title="Wiki"/>-->
-<!--        <subscreens-item name="ExampleMarkdown" menu-index="7" menu-title="Markdown"/>-->
+        <subscreens-item name="ExamplePolicies" menu-index="4" menu-title="Policies"/>
+        <subscreens-item name="ExampleTerms" menu-index="5" menu-title="Terms"/>
+        <subscreens-item name="ExampleWiki" menu-index="6" menu-title="Wiki"/>
+        <subscreens-item name="ExampleMarkdown" menu-index="7" menu-title="Markdown"/>
     </subscreens>
 
     <widgets>
diff --git a/screen/ExampleApp/Example.xml b/screen/ExampleApp/Example.xml
index a639144..059e41a 100644
--- a/screen/ExampleApp/Example.xml
+++ b/screen/ExampleApp/Example.xml
@@ -19,9 +19,7 @@ along with this software (see the LICENSE.md file). If not, see
     <!-- this is a test, and example, of overriding the default FTL macro template to use for this screen -->
     <macro-template type="vuet" location="component://example/template/screen-macro/ExampleScreenMacros.vuet.ftl"/>
 
-    <subscreens default-item="FindExample">
-<!--        <subscreens-item location="../FindExample" menu-index="1" name="FindExample"/>-->
-    </subscreens>
+    <subscreens default-item="FindExample"/>
 
     <widgets>
         <subscreens-panel id="example-panel" type="popup"/>
diff --git a/screen/ExampleApp/Example/FindExample.xml b/screen/ExampleApp/Example/FindExample.xml
index 3557fff..a737877 100644
--- a/screen/ExampleApp/Example/FindExample.xml
+++ b/screen/ExampleApp/Example/FindExample.xml
@@ -32,11 +32,11 @@ along with this software (see the LICENSE.md file). If not, see
         <default-response type="none"/>
     </transition>
 
-<!--    <pre-actions>-->
-<!--        <set field="html_title" value="Find Example"/>-->
-<!--        <set field="html_description" value="A page for finding Examples"/>-->
-<!--        <set field="html_keywords" value="moqui,find,example,status,edit,new"/>-->
-<!--    </pre-actions>-->
+    <pre-actions>
+        <set field="html_title" value="Find Example"/>
+        <set field="html_description" value="A page for finding Examples"/>
+        <set field="html_keywords" value="moqui,find,example,status,edit,new"/>
+    </pre-actions>
 
     <actions>
         <entity-find entity-name="moqui.example.Example" list="exampleList">

From 4f339784e33228c0da6a50f644e37efb55bcebd5 Mon Sep 17 00:00:00 2001
From: Michael Jones <acetousk@gmail.com>
Date: Thu, 18 Nov 2021 23:05:33 -0700
Subject: [PATCH 3/3] Remove redunant code

---
 screen/ExampleApp/Example.xml                         | 2 +-
 screen/ExampleApp/Example/DynamicExampleItemsVue.xml  | 2 +-
 screen/ExampleApp/Example/EditExample.xml             | 2 +-
 screen/ExampleApp/Example/EditExampleContent.xml      | 2 +-
 screen/ExampleApp/Example/EditExampleFeatureAppls.xml | 2 +-
 screen/ExampleApp/Example/EditExampleItems.xml        | 2 +-
 screen/ExampleApp/Example/FindExample.xml             | 2 +-
 screen/ExampleApp/dashboard.xml                       | 7 +++----
 8 files changed, 10 insertions(+), 11 deletions(-)

diff --git a/screen/ExampleApp/Example.xml b/screen/ExampleApp/Example.xml
index 059e41a..dc25798 100644
--- a/screen/ExampleApp/Example.xml
+++ b/screen/ExampleApp/Example.xml
@@ -14,7 +14,7 @@ along with this software (see the LICENSE.md file). If not, see
 -->
 <screen xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
         xsi:noNamespaceSchemaLocation="http://moqui.org/xsd/xml-screen-2.1.xsd"
-        default-menu-include="true" default-menu-title="Example" default-menu-index="1">
+        default-menu-title="Example" default-menu-index="1">
 
     <!-- this is a test, and example, of overriding the default FTL macro template to use for this screen -->
     <macro-template type="vuet" location="component://example/template/screen-macro/ExampleScreenMacros.vuet.ftl"/>
diff --git a/screen/ExampleApp/Example/DynamicExampleItemsVue.xml b/screen/ExampleApp/Example/DynamicExampleItemsVue.xml
index e82e580..1427f66 100644
--- a/screen/ExampleApp/Example/DynamicExampleItemsVue.xml
+++ b/screen/ExampleApp/Example/DynamicExampleItemsVue.xml
@@ -13,7 +13,7 @@ along with this software (see the LICENSE.md file). If not, see
 <http://creativecommons.org/publicdomain/zero/1.0/>.
 -->
 <screen xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://moqui.org/xsd/xml-screen-2.1.xsd"
-        default-menu-include="true" default-menu-title="Dynamic Items Vue" default-menu-index="10" render-modes="vue,qvue" server-static="vue,qvue">
+        default-menu-title="Dynamic Items Vue" default-menu-index="10" render-modes="vue,qvue" server-static="vue,qvue">
 
     <parameter name="exampleId"/>
 
diff --git a/screen/ExampleApp/Example/EditExample.xml b/screen/ExampleApp/Example/EditExample.xml
index 9732dee..37a9b60 100644
--- a/screen/ExampleApp/Example/EditExample.xml
+++ b/screen/ExampleApp/Example/EditExample.xml
@@ -13,7 +13,7 @@ along with this software (see the LICENSE.md file). If not, see
 <http://creativecommons.org/publicdomain/zero/1.0/>.
 -->
 <screen xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://moqui.org/xsd/xml-screen-2.1.xsd"
-        default-menu-include="true" default-menu-title="Example" default-menu-index="1">
+        default-menu-title="Example" default-menu-index="1">
 
     <parameter name="exampleId" required="true"/>
 
diff --git a/screen/ExampleApp/Example/EditExampleContent.xml b/screen/ExampleApp/Example/EditExampleContent.xml
index 9eda11a..f415997 100644
--- a/screen/ExampleApp/Example/EditExampleContent.xml
+++ b/screen/ExampleApp/Example/EditExampleContent.xml
@@ -14,7 +14,7 @@ along with this software (see the LICENSE.md file). If not, see
 -->
 <screen xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
         xsi:noNamespaceSchemaLocation="http://moqui.org/xsd/xml-screen-2.1.xsd"
-        default-menu-include="true" default-menu-title="Content" default-menu-index="4">
+        default-menu-title="Content" default-menu-index="4">
 
     <parameter name="exampleId" required="true"/>
 
diff --git a/screen/ExampleApp/Example/EditExampleFeatureAppls.xml b/screen/ExampleApp/Example/EditExampleFeatureAppls.xml
index a9c1a76..a203380 100644
--- a/screen/ExampleApp/Example/EditExampleFeatureAppls.xml
+++ b/screen/ExampleApp/Example/EditExampleFeatureAppls.xml
@@ -14,7 +14,7 @@ along with this software (see the LICENSE.md file). If not, see
 -->
 <screen xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
         xsi:noNamespaceSchemaLocation="http://moqui.org/xsd/xml-screen-2.1.xsd"
-        default-menu-include="true" default-menu-title="Features" default-menu-index="3">
+        default-menu-title="Features" default-menu-index="3">
 
     <parameter name="exampleId" required="true"/>
 
diff --git a/screen/ExampleApp/Example/EditExampleItems.xml b/screen/ExampleApp/Example/EditExampleItems.xml
index af9faac..4834b0f 100644
--- a/screen/ExampleApp/Example/EditExampleItems.xml
+++ b/screen/ExampleApp/Example/EditExampleItems.xml
@@ -14,7 +14,7 @@ along with this software (see the LICENSE.md file). If not, see
 -->
 <screen xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
         xsi:noNamespaceSchemaLocation="http://moqui.org/xsd/xml-screen-2.1.xsd"
-        default-menu-include="true" default-menu-title="Items" default-menu-index="2">
+        default-menu-title="Items" default-menu-index="2">
 
     <parameter name="exampleId" required="true"/>
 
diff --git a/screen/ExampleApp/Example/FindExample.xml b/screen/ExampleApp/Example/FindExample.xml
index a737877..ea40229 100644
--- a/screen/ExampleApp/Example/FindExample.xml
+++ b/screen/ExampleApp/Example/FindExample.xml
@@ -13,7 +13,7 @@ along with this software (see the LICENSE.md file). If not, see
 <http://creativecommons.org/publicdomain/zero/1.0/>.
 -->
 <screen xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://moqui.org/xsd/xml-screen-2.1.xsd"
-        default-menu-include="true" default-menu-title="Find Example">
+        default-menu-title="Find Example">
 
     <transition name="findExample"><default-response url="."/></transition>
     <transition name="editExample"><default-response url="../EditExample"/></transition>
diff --git a/screen/ExampleApp/dashboard.xml b/screen/ExampleApp/dashboard.xml
index a1d88e8..21d1f14 100644
--- a/screen/ExampleApp/dashboard.xml
+++ b/screen/ExampleApp/dashboard.xml
@@ -13,14 +13,13 @@ along with this software (see the LICENSE.md file). If not, see
 <http://creativecommons.org/publicdomain/zero/1.0/>.
 -->
 <screen xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://moqui.org/xsd/xml-screen-2.1.xsd"
-        default-menu-include="true" menu-image="fa fa-dashboard" menu-image-type="icon" >
+        menu-image="fa fa-dashboard" menu-image-type="icon" >
 
     <widgets>
-        <container type="div">
+        <container-row><row-col>
             <link url="/site" text="Example Site" url-type="plain"/>
-        </container>
+        </row-col></container-row>
         <container-row><row-col lg="6" md="6">
-
             <container-box>
                 <box-header title="Example App Sections"/>
                 <box-body>