You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@isis.apache.org by ah...@apache.org on 2021/04/21 10:34:29 UTC
[isis] branch master updated: ISIS-2615: layout: move meta-data
field-set to the bottom
This is an automated email from the ASF dual-hosted git repository.
ahuber pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/isis.git
The following commit(s) were added to refs/heads/master by this push:
new 4960957 ISIS-2615: layout: move meta-data field-set to the bottom
4960957 is described below
commit 496095713e86f2e0c4f2a7f2d501b1a52b092e96
Author: Andi Huber <ah...@apache.org>
AuthorDate: Wed Apr 21 12:34:17 2021 +0200
ISIS-2615: layout: move meta-data field-set to the bottom
also further rename built-in layout files to xxx.fallback.xml so can be
properly overruled by devs if desired
---
...l => ConfigurationProperty.layout.fallback.xml} | 0
.../ConfigurationViewmodel.layout.fallback.xml | 66 +++++++++++++++++++
.../confview/ConfigurationViewmodel.layout.xml | 76 ----------------------
...faultGrid.layout.xml => GridFallbackLayout.xml} | 0
.../grid/bootstrap3/GridSystemServiceBS3.java | 2 +-
...l => ApplicationPermission.layout.fallback.xml} | 0
6 files changed, 67 insertions(+), 77 deletions(-)
diff --git a/api/applib/src/main/java/org/apache/isis/applib/services/confview/ConfigurationProperty.layout.xml b/api/applib/src/main/java/org/apache/isis/applib/services/confview/ConfigurationProperty.layout.fallback.xml
similarity index 100%
rename from api/applib/src/main/java/org/apache/isis/applib/services/confview/ConfigurationProperty.layout.xml
rename to api/applib/src/main/java/org/apache/isis/applib/services/confview/ConfigurationProperty.layout.fallback.xml
diff --git a/api/applib/src/main/java/org/apache/isis/applib/services/confview/ConfigurationViewmodel.layout.fallback.xml b/api/applib/src/main/java/org/apache/isis/applib/services/confview/ConfigurationViewmodel.layout.fallback.xml
new file mode 100644
index 0000000..3300d64
--- /dev/null
+++ b/api/applib/src/main/java/org/apache/isis/applib/services/confview/ConfigurationViewmodel.layout.fallback.xml
@@ -0,0 +1,66 @@
+<?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. -->
+<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 />
+ </bs3:col>
+ </bs3:row>
+ <bs3:row>
+ <bs3:col span="12">
+ <bs3:tabGroup unreferencedCollections="true">
+ <bs3:tab name="Environment">
+ <bs3:row>
+ <bs3:col span="12" size="MD" />
+ </bs3:row>
+ </bs3:tab>
+ <bs3:tab name="Configuration">
+ <bs3:row>
+ <bs3:col span="12" size="MD" />
+ </bs3:row>
+ </bs3:tab>
+ </bs3:tabGroup>
+ </bs3:col>
+ </bs3:row>
+ <bs3:row>
+ <bs3:col span="12">
+ <bs3:tabGroup>
+ <bs3:tab name="Identity">
+ <bs3:row>
+ <bs3:col span="12">
+ <cpt:fieldSet name="Identity" id="identity" />
+ </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:tab name="Metadata">
+ <bs3:row>
+ <bs3:col span="12">
+ <cpt:fieldSet name="Metadata" id="metadata" />
+ </bs3:col>
+ </bs3:row>
+ </bs3:tab>
+ </bs3:tabGroup>
+ </bs3:col>
+ </bs3:row>
+</bs3:grid>
diff --git a/api/applib/src/main/java/org/apache/isis/applib/services/confview/ConfigurationViewmodel.layout.xml b/api/applib/src/main/java/org/apache/isis/applib/services/confview/ConfigurationViewmodel.layout.xml
deleted file mode 100644
index 77b65ee..0000000
--- a/api/applib/src/main/java/org/apache/isis/applib/services/confview/ConfigurationViewmodel.layout.xml
+++ /dev/null
@@ -1,76 +0,0 @@
-<?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.
--->
-<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/>
- </bs3:col>
- </bs3:row>
- <bs3:row>
- <bs3:col span="2">
- <bs3:row>
- <bs3:col span="12">
- <bs3:tabGroup>
- <bs3:tab name="Identity">
- <bs3:row>
- <bs3:col span="12">
- <cpt:fieldSet name="Identity" id="identity"/>
- </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:tab name="Metadata">
- <bs3:row>
- <bs3:col span="12">
- <cpt:fieldSet name="Metadata" id="metadata"/>
- </bs3:col>
- </bs3:row>
- </bs3:tab>
- </bs3:tabGroup>
- </bs3:col>
- </bs3:row>
- <bs3:row>
- <bs3:col span="12">
- <cpt:fieldSet name="Details" id="details"/>
- </bs3:col>
- </bs3:row>
- </bs3:col>
- <bs3:col span="10">
- <bs3:tabGroup unreferencedCollections="true">
- <bs3:tab name="Environment">
- <bs3:row>
- <bs3:col span="12" size="MD"/>
- </bs3:row>
- </bs3:tab>
- <bs3:tab name="Configuration">
- <bs3:row>
- <bs3:col span="12" size="MD"/>
- </bs3:row>
- </bs3:tab>
- </bs3:tabGroup>
- </bs3:col>
- </bs3:row>
-</bs3:grid>
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/services/grid/bootstrap3/DefaultGrid.layout.xml b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/services/grid/bootstrap3/GridFallbackLayout.xml
similarity index 100%
rename from core/metamodel/src/main/java/org/apache/isis/core/metamodel/services/grid/bootstrap3/DefaultGrid.layout.xml
rename to core/metamodel/src/main/java/org/apache/isis/core/metamodel/services/grid/bootstrap3/GridFallbackLayout.xml
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/services/grid/bootstrap3/GridSystemServiceBS3.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/services/grid/bootstrap3/GridSystemServiceBS3.java
index bed6818..f3ca834 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/services/grid/bootstrap3/GridSystemServiceBS3.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/services/grid/bootstrap3/GridSystemServiceBS3.java
@@ -95,7 +95,7 @@ public class GridSystemServiceBS3 extends GridSystemServiceAbstract<BS3Grid> {
public BS3Grid defaultGrid(final Class<?> domainClass) {
try {
- final String content = _Resources.loadAsStringUtf8(getClass(), "DefaultGrid.layout.xml");
+ final String content = _Resources.loadAsStringUtf8(getClass(), "GridFallbackLayout.xml");
return Optional.ofNullable(content)
.map(xml -> gridReader.loadGrid(xml))
.filter(BS3Grid.class::isInstance)
diff --git a/extensions/security/secman/api/src/main/java/org/apache/isis/extensions/secman/api/permission/ApplicationPermission.layout.xml b/extensions/security/secman/api/src/main/java/org/apache/isis/extensions/secman/api/permission/ApplicationPermission.layout.fallback.xml
similarity index 100%
rename from extensions/security/secman/api/src/main/java/org/apache/isis/extensions/secman/api/permission/ApplicationPermission.layout.xml
rename to extensions/security/secman/api/src/main/java/org/apache/isis/extensions/secman/api/permission/ApplicationPermission.layout.fallback.xml