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 2016/06/03 15:58:39 UTC

[8/8] isis git commit: ISIS-1335: adding missing/updating existing layout.xml files for applib view models.

ISIS-1335: adding missing/updating existing layout.xml files for applib view models.


Project: http://git-wip-us.apache.org/repos/asf/isis/repo
Commit: http://git-wip-us.apache.org/repos/asf/isis/commit/5522f4bd
Tree: http://git-wip-us.apache.org/repos/asf/isis/tree/5522f4bd
Diff: http://git-wip-us.apache.org/repos/asf/isis/diff/5522f4bd

Branch: refs/heads/master
Commit: 5522f4bd512b2c7d6c98dd6f3c9948329e7f3660
Parents: a322518
Author: Dan Haywood <da...@haywood-associates.co.uk>
Authored: Fri Jun 3 15:29:50 2016 +0100
Committer: Dan Haywood <da...@haywood-associates.co.uk>
Committed: Fri Jun 3 16:44:03 2016 +0100

----------------------------------------------------------------------
 .../fixturescripts/FixtureResult.layout.xml     | 22 +++++
 .../config/ConfigurationProperty.layout.xml     | 95 ++++++++------------
 2 files changed, 60 insertions(+), 57 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/isis/blob/5522f4bd/core/applib/src/main/java/org/apache/isis/applib/fixturescripts/FixtureResult.layout.xml
----------------------------------------------------------------------
diff --git a/core/applib/src/main/java/org/apache/isis/applib/fixturescripts/FixtureResult.layout.xml b/core/applib/src/main/java/org/apache/isis/applib/fixturescripts/FixtureResult.layout.xml
new file mode 100644
index 0000000..b41805b
--- /dev/null
+++ b/core/applib/src/main/java/org/apache/isis/applib/fixturescripts/FixtureResult.layout.xml
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
+<bs3:grid xsi:schemaLocation="http://isis.apache.org/applib/layout/component http://isis.apache.org/applib/layout/component/component.xsd http://isis.apache.org/applib/layout/grid/bootstrap3 http://isis.apache.org/applib/layout/grid/bootstrap3/bootstrap3.xsd" xmlns:bs3="http://isis.apache.org/applib/layout/grid/bootstrap3" xmlns:cpt="http://isis.apache.org/applib/layout/component" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+    <bs3:row>
+        <bs3:col span="12" unreferencedActions="true">
+            <cpt:domainObject/>
+            <cpt:action id="clearHints"/>
+            <cpt:action id="downloadLayoutXml"/>
+            <cpt:action id="rebuildMetamodel"/>
+        </bs3:col>
+    </bs3:row>
+    <bs3:row>
+        <bs3:col span="4">
+            <cpt:fieldSet name="General" id="general" unreferencedProperties="true">
+                <cpt:property id="className"/>
+                <cpt:property id="fixtureScriptClassName"/>
+                <cpt:property id="key"/>
+                <cpt:property id="object"/>
+            </cpt:fieldSet>
+        </bs3:col>
+        <bs3:col span="8" unreferencedCollections="true"/>
+    </bs3:row>
+</bs3:grid>

http://git-wip-us.apache.org/repos/asf/isis/blob/5522f4bd/core/applib/src/main/java/org/apache/isis/applib/services/config/ConfigurationProperty.layout.xml
----------------------------------------------------------------------
diff --git a/core/applib/src/main/java/org/apache/isis/applib/services/config/ConfigurationProperty.layout.xml b/core/applib/src/main/java/org/apache/isis/applib/services/config/ConfigurationProperty.layout.xml
index dbf6b31..259180a 100644
--- a/core/applib/src/main/java/org/apache/isis/applib/services/config/ConfigurationProperty.layout.xml
+++ b/core/applib/src/main/java/org/apache/isis/applib/services/config/ConfigurationProperty.layout.xml
@@ -1,58 +1,39 @@
 <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<!--
-  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.
--->
-<grid xsi:schemaLocation="http://isis.apache.org/applib/layout/component http://isis.apache.org/applib/layout/component/component.xsd http://isis.apache.org/applib/layout/grid/bootstrap3 http://isis.apache.org/applib/layout/grid/bootstrap3/bootstrap3.xsd" xmlns="http://isis.apache.org/applib/layout/grid/bootstrap3" xmlns:ns2="http://isis.apache.org/applib/layout/component" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-    <row>
-        <col span="12" unreferencedActions="true">
-            <ns2:domainObject/>
-            <ns2:action id="clearHints" hidden="EVERYWHERE"/>
-        </col>
-    </row>
-    <row>
-        <col span="12">
-            <tabGroup>
-                <tab name="General">
-                    <row>
-                        <col span="8">
-                            <ns2:fieldSet name="Property" id="key">
-                                <ns2:action id="downloadLayoutXml" position="PANEL_DROPDOWN"/>
-                                <ns2:action id="rebuildMetamodel" position="PANEL_DROPDOWN"/>
-                                <ns2:property id="key"/>
-                                <ns2:property id="value" multiLine="5"/>
-                            </ns2:fieldSet>
-                        </col>
-                    </row>
-                </tab>
-                <tab name="Other">
-                    <row>
-                        <col span="12">
-                            <ns2:fieldSet name="Other" id="other" unreferencedProperties="true">
-                            </ns2:fieldSet>
-                        </col>
-                    </row>
-                </tab>
-            </tabGroup>
-        </col>
-    </row>
-    <row>
-        <col span="12">
-            <tabGroup unreferencedCollections="true"/>
-        </col>
-    </row>
-</grid>
\ No newline at end of file
+<bs3:grid xsi:schemaLocation="http://isis.apache.org/applib/layout/component http://isis.apache.org/applib/layout/component/component.xsd http://isis.apache.org/applib/layout/grid/bootstrap3 http://isis.apache.org/applib/layout/grid/bootstrap3/bootstrap3.xsd" xmlns:bs3="http://isis.apache.org/applib/layout/grid/bootstrap3" xmlns:cpt="http://isis.apache.org/applib/layout/component" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+    <bs3:row>
+        <bs3:col span="12" unreferencedActions="true">
+            <cpt:domainObject/>
+            <cpt:action hidden="EVERYWHERE" id="clearHints"/>
+        </bs3:col>
+    </bs3:row>
+    <bs3:row>
+        <bs3:col span="12">
+            <bs3:tabGroup>
+                <bs3:tab name="General">
+                    <bs3:row>
+                        <bs3:col span="8">
+                            <cpt:fieldSet name="Property" id="key">
+                                <cpt:action id="downloadLayoutXml" position="PANEL_DROPDOWN"/>
+                                <cpt:action id="rebuildMetamodel" position="PANEL_DROPDOWN"/>
+                                <cpt:property id="key"/>
+                                <cpt:property id="value" multiLine="5"/>
+                            </cpt:fieldSet>
+                        </bs3:col>
+                    </bs3:row>
+                </bs3:tab>
+                <bs3:tab name="Other">
+                    <bs3:row>
+                        <bs3:col span="12">
+                            <cpt:fieldSet name="Other" id="other" unreferencedProperties="true"/>
+                        </bs3:col>
+                    </bs3:row>
+                </bs3:tab>
+            </bs3:tabGroup>
+        </bs3:col>
+    </bs3:row>
+    <bs3:row>
+        <bs3:col span="12">
+            <bs3:tabGroup unreferencedCollections="true"/>
+        </bs3:col>
+    </bs3:row>
+</bs3:grid>