You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ofbiz.apache.org by mb...@apache.org on 2018/03/17 11:37:40 UTC
svn commit: r1827074 - in
/ofbiz/ofbiz-framework/trunk/applications/content/widget:
compdoc/CompDocScreens.xml content/ContentScreens.xml
content/DataResourceScreens.xml contentsetup/ContentSetupScreens.xml
datasetup/DataResourceSetupScreens.xml
Author: mbrohl
Date: Sat Mar 17 11:37:40 2018
New Revision: 1827074
URL: http://svn.apache.org/viewvc?rev=1827074&view=rev
Log:
Improved: Standardise Layout throughout Applications.
(OFBIZ-10242)
This contains the improvements for the content manager.
Thanks Julian Leichert for reporting and providing the patch.
Modified:
ofbiz/ofbiz-framework/trunk/applications/content/widget/compdoc/CompDocScreens.xml
ofbiz/ofbiz-framework/trunk/applications/content/widget/content/ContentScreens.xml
ofbiz/ofbiz-framework/trunk/applications/content/widget/content/DataResourceScreens.xml
ofbiz/ofbiz-framework/trunk/applications/content/widget/contentsetup/ContentSetupScreens.xml
ofbiz/ofbiz-framework/trunk/applications/content/widget/datasetup/DataResourceSetupScreens.xml
Modified: ofbiz/ofbiz-framework/trunk/applications/content/widget/compdoc/CompDocScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/applications/content/widget/compdoc/CompDocScreens.xml?rev=1827074&r1=1827073&r2=1827074&view=diff
==============================================================================
--- ofbiz/ofbiz-framework/trunk/applications/content/widget/compdoc/CompDocScreens.xml (original)
+++ ofbiz/ofbiz-framework/trunk/applications/content/widget/compdoc/CompDocScreens.xml Sat Mar 17 11:37:40 2018
@@ -382,7 +382,7 @@ under the License.
<decorator-screen name="commonCompDocDecorator" location="component://content/widget/CommonScreens.xml">
<decorator-section name="body">
<screenlet title="${uiLabelMap.ContentCompDocViewInstances}">
- <container>
+ <container style="button-bar">
<link target="AddRootCompDocTemplate" text="${uiLabelMap.PageTitleCreateNewRootCompDocTemplate}" style="buttontext">
<parameter param-name="contentId"/>
<parameter param-name="contentRevisionSeqId"/>
Modified: ofbiz/ofbiz-framework/trunk/applications/content/widget/content/ContentScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/applications/content/widget/content/ContentScreens.xml?rev=1827074&r1=1827073&r2=1827074&view=diff
==============================================================================
--- ofbiz/ofbiz-framework/trunk/applications/content/widget/content/ContentScreens.xml (original)
+++ ofbiz/ofbiz-framework/trunk/applications/content/widget/content/ContentScreens.xml Sat Mar 17 11:37:40 2018
@@ -299,7 +299,9 @@ under the License.
<screenlet id="AddContentRolePanel" title="${uiLabelMap.PageTitleAddRole}" collapsible="true">
<include-form name="AddContentRole" location="component://content/widget/content/ContentForms.xml"/>
</screenlet>
- <include-form name="ListContentRole" location="component://content/widget/content/ContentForms.xml"/>
+ <screenlet>
+ <include-form name="ListContentRole" location="component://content/widget/content/ContentForms.xml"/>
+ </screenlet>
</decorator-section>
</decorator-screen>
</widgets>
@@ -323,7 +325,9 @@ under the License.
<screenlet id="AddContentPurposePanel" title="${uiLabelMap.PageTitleAddPurpose}" collapsible="true">
<include-form name="AddContentPurpose" location="component://content/widget/content/ContentForms.xml"/>
</screenlet>
- <include-form name="ListContentPurpose" location="component://content/widget/content/ContentForms.xml"/>
+ <screenlet>
+ <include-form name="ListContentPurpose" location="component://content/widget/content/ContentForms.xml"/>
+ </screenlet>
</decorator-section>
</decorator-screen>
</widgets>
@@ -347,7 +351,9 @@ under the License.
<screenlet id="AddContentAttributePanel" title="${uiLabelMap.PageTitleAddAttribute}" collapsible="true">
<include-form name="AddContentAttribute" location="component://content/widget/content/ContentForms.xml"/>
</screenlet>
- <include-form name="ListContentAttribute" location="component://content/widget/content/ContentForms.xml"/>
+ <screenlet>
+ <include-form name="ListContentAttribute" location="component://content/widget/content/ContentForms.xml"/>
+ </screenlet>
</decorator-section>
</decorator-screen>
</widgets>
@@ -407,7 +413,9 @@ under the License.
<screenlet id="AddContentMetaDataPanel" title="${uiLabelMap.PageTitleAddMetaData}" collapsible="true">
<include-form name="AddContentMetaData" location="component://content/widget/content/ContentForms.xml"/>
</screenlet>
- <include-form name="ListContentMetaData" location="component://content/widget/content/ContentForms.xml"/>
+ <screenlet>
+ <include-form name="ListContentMetaData" location="component://content/widget/content/ContentForms.xml"/>
+ </screenlet>
</decorator-section>
</decorator-screen>
</widgets>
@@ -431,7 +439,9 @@ under the License.
<screenlet id="AddWorkEffortContentPanel" title="${uiLabelMap.PageTitleAddWorkEffort}" collapsible="true">
<include-form name="AddWorkEffortContent" location="component://content/widget/content/ContentForms.xml"/>
</screenlet>
- <include-form name="ListWorkEffortContents" location="component://content/widget/content/ContentForms.xml"/>
+ <screenlet>
+ <include-form name="ListWorkEffortContents" location="component://content/widget/content/ContentForms.xml"/>
+ </screenlet>
</decorator-section>
</decorator-screen>
</widgets>
Modified: ofbiz/ofbiz-framework/trunk/applications/content/widget/content/DataResourceScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/applications/content/widget/content/DataResourceScreens.xml?rev=1827074&r1=1827073&r2=1827074&view=diff
==============================================================================
--- ofbiz/ofbiz-framework/trunk/applications/content/widget/content/DataResourceScreens.xml (original)
+++ ofbiz/ofbiz-framework/trunk/applications/content/widget/content/DataResourceScreens.xml Sat Mar 17 11:37:40 2018
@@ -272,7 +272,9 @@ under the License.
<widgets>
<decorator-screen name="commonDataResourceDecorator" location="${parameters.mainDecoratorLocation}">
<decorator-section name="body">
- <include-form name="AddDataResourceUrl" location="component://content/widget/content/DataResourceForms.xml"/>
+ <screenlet>
+ <include-form name="AddDataResourceUrl" location="component://content/widget/content/DataResourceForms.xml"/>
+ </screenlet>
</decorator-section>
</decorator-screen>
@@ -307,7 +309,9 @@ under the License.
<widgets>
<decorator-screen name="commonDataResourceDecorator" location="${parameters.mainDecoratorLocation}">
<decorator-section name="body">
- <include-form name="AddDataResourceFromContent" location="component://content/widget/content/DataResourceForms.xml"/>
+ <screenlet>
+ <include-form name="AddDataResourceFromContent" location="component://content/widget/content/DataResourceForms.xml"/>
+ </screenlet>
</decorator-section>
</decorator-screen>
</widgets>
@@ -324,7 +328,9 @@ under the License.
<widgets>
<decorator-screen name="commonDataResourceDecorator" location="${parameters.mainDecoratorLocation}">
<decorator-section name="body">
- <include-form name="EditDataResourceText" location="component://content/widget/content/DataResourceForms.xml"/>
+ <screenlet>
+ <include-form name="EditDataResourceText" location="component://content/widget/content/DataResourceForms.xml"/>
+ </screenlet>
</decorator-section>
</decorator-screen>
</widgets>
@@ -341,7 +347,9 @@ under the License.
<widgets>
<decorator-screen name="commonDataResourceDecorator" location="${parameters.mainDecoratorLocation}">
<decorator-section name="body">
- <include-form name="EditDataResourceUrl" location="component://content/widget/content/DataResourceForms.xml"/>
+ <screenlet>
+ <include-form name="EditDataResourceUrl" location="component://content/widget/content/DataResourceForms.xml"/>
+ </screenlet>
</decorator-section>
</decorator-screen>
</widgets>
@@ -358,7 +366,9 @@ under the License.
<widgets>
<decorator-screen name="commonDataResourceDecorator" location="${parameters.mainDecoratorLocation}">
<decorator-section name="body">
- <include-form name="EditDataResourceUpload" location="component://content/widget/content/DataResourceForms.xml"/>
+ <screenlet>
+ <include-form name="EditDataResourceUpload" location="component://content/widget/content/DataResourceForms.xml"/>
+ </screenlet>
</decorator-section>
</decorator-screen>
</widgets>
@@ -402,7 +412,9 @@ under the License.
<screenlet id="DataResourceAttributePanel" title="${uiLabelMap.PageTitleEditDataResourceAttribute}" collapsible="true">
<include-form name="AddDataResourceAttribute" location="component://content/widget/content/DataResourceForms.xml"/>
</screenlet>
- <include-form name="ListDataResourceAttribute" location="component://content/widget/content/DataResourceForms.xml"/>
+ <screenlet>
+ <include-form name="ListDataResourceAttribute" location="component://content/widget/content/DataResourceForms.xml"/>
+ </screenlet>
</decorator-section>
</decorator-screen>
</widgets>
@@ -426,7 +438,9 @@ under the License.
<screenlet id="DataResourceRolePanel" title="${uiLabelMap.PageTitleEditDataResourceRole}" collapsible="true">
<include-form name="AddDataResourceRole" location="component://content/widget/content/DataResourceForms.xml"/>
</screenlet>
- <include-form name="ListDataResourceRole" location="component://content/widget/content/DataResourceForms.xml"/>
+ <screenlet>
+ <include-form name="ListDataResourceRole" location="component://content/widget/content/DataResourceForms.xml"/>
+ </screenlet>
</decorator-section>
</decorator-screen>
</widgets>
Modified: ofbiz/ofbiz-framework/trunk/applications/content/widget/contentsetup/ContentSetupScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/applications/content/widget/contentsetup/ContentSetupScreens.xml?rev=1827074&r1=1827073&r2=1827074&view=diff
==============================================================================
--- ofbiz/ofbiz-framework/trunk/applications/content/widget/contentsetup/ContentSetupScreens.xml (original)
+++ ofbiz/ofbiz-framework/trunk/applications/content/widget/contentsetup/ContentSetupScreens.xml Sat Mar 17 11:37:40 2018
@@ -35,7 +35,9 @@ under the License.
<screenlet id="ContentTypePanel" title="${uiLabelMap.PageTitleEditContentType}" collapsible="true">
<include-form name="AddContentType" location="component://content/widget/contentsetup/ContentSetupForms.xml"/>
</screenlet>
- <include-form name="UpdateContentType" location="component://content/widget/contentsetup/ContentSetupForms.xml"/>
+ <screenlet>
+ <include-form name="UpdateContentType" location="component://content/widget/contentsetup/ContentSetupForms.xml"/>
+ </screenlet>
</decorator-section>
</decorator-screen>
</widgets>
@@ -55,7 +57,9 @@ under the License.
<screenlet id="ContentTypeAttrPanel" title="${uiLabelMap.PageTitleEditContentAttribute}" collapsible="true">
<include-form name="AddContentTypeAttr" location="component://content/widget/contentsetup/ContentSetupForms.xml"/>
</screenlet>
- <include-form name="UpdateContentTypeAttr" location="component://content/widget/contentsetup/ContentSetupForms.xml"/>
+ <screenlet>
+ <include-form name="UpdateContentTypeAttr" location="component://content/widget/contentsetup/ContentSetupForms.xml"/>
+ </screenlet>
</decorator-section>
</decorator-screen>
</widgets>
@@ -75,7 +79,9 @@ under the License.
<screenlet id="ContentAssocTypePanel" title="${uiLabelMap.PageTitleEditContentAssoc}" collapsible="true">
<include-form name="AddContentAssocType" location="component://content/widget/contentsetup/ContentSetupForms.xml"/>
</screenlet>
- <include-form name="UpdateContentAssocType" location="component://content/widget/contentsetup/ContentSetupForms.xml"/>
+ <screenlet>
+ <include-form name="UpdateContentAssocType" location="component://content/widget/contentsetup/ContentSetupForms.xml"/>
+ </screenlet>
</decorator-section>
</decorator-screen>
</widgets>
@@ -95,7 +101,9 @@ under the License.
<screenlet id="ContentPurposeTypePanel" title="${uiLabelMap.PageTitleEditContentPurpose}" collapsible="true">
<include-form name="AddContentPurposeType" location="component://content/widget/contentsetup/ContentSetupForms.xml"/>
</screenlet>
- <include-form name="UpdateContentPurposeType" location="component://content/widget/contentsetup/ContentSetupForms.xml"/>
+ <screenlet>
+ <include-form name="UpdateContentPurposeType" location="component://content/widget/contentsetup/ContentSetupForms.xml"/>
+ </screenlet>
</decorator-section>
</decorator-screen>
</widgets>
@@ -115,7 +123,9 @@ under the License.
<screenlet id="ContentAssocPredicatePanel" title="${uiLabelMap.PageTitleEditContentAssocPredicate}" collapsible="true">
<include-form name="AddContentAssocPredicate" location="component://content/widget/contentsetup/ContentSetupForms.xml"/>
</screenlet>
- <include-form name="UpdateContentAssocPredicate" location="component://content/widget/contentsetup/ContentSetupForms.xml"/>
+ <screenlet>
+ <include-form name="UpdateContentAssocPredicate" location="component://content/widget/contentsetup/ContentSetupForms.xml"/>
+ </screenlet>
</decorator-section>
</decorator-screen>
</widgets>
@@ -135,7 +145,9 @@ under the License.
<screenlet id="ContentPurposeOperationPanel" title="${uiLabelMap.PageTitleEditContentPurposeOperation}" collapsible="true">
<include-form name="AddContentPurposeOperation" location="component://content/widget/contentsetup/ContentSetupForms.xml"/>
</screenlet>
- <include-form name="UpdateContentPurposeOperation" location="component://content/widget/contentsetup/ContentSetupForms.xml"/>
+ <screenlet>
+ <include-form name="UpdateContentPurposeOperation" location="component://content/widget/contentsetup/ContentSetupForms.xml"/>
+ </screenlet>
</decorator-section>
</decorator-screen>
</widgets>
@@ -177,7 +189,9 @@ under the License.
<screenlet id="ContentOperationPanel" title="${uiLabelMap.PageTitleEditContentOperation}" collapsible="true">
<include-form name="AddContentOperation" location="component://content/widget/contentsetup/ContentSetupForms.xml"/>
</screenlet>
- <include-form name="UpdateContentOperation" location="component://content/widget/contentsetup/ContentSetupForms.xml"/>
+ <screenlet>
+ <include-form name="UpdateContentOperation" location="component://content/widget/contentsetup/ContentSetupForms.xml"/>
+ </screenlet>
</decorator-section>
</decorator-screen>
</widgets>
Modified: ofbiz/ofbiz-framework/trunk/applications/content/widget/datasetup/DataResourceSetupScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/applications/content/widget/datasetup/DataResourceSetupScreens.xml?rev=1827074&r1=1827073&r2=1827074&view=diff
==============================================================================
--- ofbiz/ofbiz-framework/trunk/applications/content/widget/datasetup/DataResourceSetupScreens.xml (original)
+++ ofbiz/ofbiz-framework/trunk/applications/content/widget/datasetup/DataResourceSetupScreens.xml Sat Mar 17 11:37:40 2018
@@ -36,7 +36,9 @@ under the License.
<screenlet id="DataResourceTypePanel" title="${uiLabelMap.PageTitleEditDataResourceType}" collapsible="true">
<include-form name="AddDataResourceType" location="component://content/widget/datasetup/DataSetupForms.xml"/>
</screenlet>
- <include-form name="UpdateDataResourceType" location="component://content/widget/datasetup/DataSetupForms.xml"/>
+ <screenlet>
+ <include-form name="UpdateDataResourceType" location="component://content/widget/datasetup/DataSetupForms.xml"/>
+ </screenlet>
</decorator-section>
</decorator-screen>
</widgets>
@@ -58,7 +60,9 @@ under the License.
<screenlet id="DataResourceCharacterSetPanel" title="${uiLabelMap.PageTitleEditDataResourceCharacterSet}" collapsible="true">
<include-form name="AddCharacterSet" location="component://content/widget/datasetup/DataSetupForms.xml"/>
</screenlet>
- <include-form name="UpdateCharacterSet" location="component://content/widget/datasetup/DataSetupForms.xml"/>
+ <screenlet>
+ <include-form name="UpdateCharacterSet" location="component://content/widget/datasetup/DataSetupForms.xml"/>
+ </screenlet>
</decorator-section>
</decorator-screen>
</widgets>
@@ -80,7 +84,9 @@ under the License.
<screenlet id="DataResourceTypeAttrPanel" title="${uiLabelMap.PageTitleEditDataResourceTypeAttr}" collapsible="true">
<include-form name="AddDataResourceTypeAttr" location="component://content/widget/datasetup/DataSetupForms.xml"/>
</screenlet>
- <include-form name="UpdateDataResourceTypeAttr" location="component://content/widget/datasetup/DataSetupForms.xml"/>
+ <screenlet>
+ <include-form name="UpdateDataResourceTypeAttr" location="component://content/widget/datasetup/DataSetupForms.xml"/>
+ </screenlet>
</decorator-section>
</decorator-screen>
</widgets>
@@ -102,7 +108,9 @@ under the License.
<screenlet id="FileExtensionPanel" title="${uiLabelMap.PageTitleEditDataResourceFileExtension}" collapsible="true">
<include-form name="AddFileExtension" location="component://content/widget/datasetup/DataSetupForms.xml"/>
</screenlet>
- <include-form name="UpdateFileExtension" location="component://content/widget/datasetup/DataSetupForms.xml"/>
+ <screenlet>
+ <include-form name="UpdateFileExtension" location="component://content/widget/datasetup/DataSetupForms.xml"/>
+ </screenlet>
</decorator-section>
</decorator-screen>
</widgets>
@@ -124,7 +132,9 @@ under the License.
<screenlet id="MetaDataPredicatePanel" title="${uiLabelMap.PageTitleEditDataResourceMetaDataPredicate}" collapsible="true">
<include-form name="AddMetaDataPredicate" location="component://content/widget/datasetup/DataSetupForms.xml"/>
</screenlet>
- <include-form name="UpdateMetaDataPredicate" location="component://content/widget/datasetup/DataSetupForms.xml"/>
+ <screenlet>
+ <include-form name="UpdateMetaDataPredicate" location="component://content/widget/datasetup/DataSetupForms.xml"/>
+ </screenlet>
</decorator-section>
</decorator-screen>
</widgets>
@@ -146,7 +156,9 @@ under the License.
<screenlet id="DataResourceMimeTypePanel" title="${uiLabelMap.PageTitleEditDataResourceMimeType}" collapsible="true">
<include-form name="AddMimeType" location="component://content/widget/datasetup/DataSetupForms.xml"/>
</screenlet>
- <include-form name="UpdateMimeType" location="component://content/widget/datasetup/DataSetupForms.xml"/>
+ <screenlet>
+ <include-form name="UpdateMimeType" location="component://content/widget/datasetup/DataSetupForms.xml"/>
+ </screenlet>
</decorator-section>
</decorator-screen>
</widgets>
@@ -168,7 +180,9 @@ under the License.
<screenlet id="MimeTypeHtmlTemplatePanel" title="${uiLabelMap.PageTitleEditDataResourceMimeTypeHtmlTemplate}" collapsible="true">
<include-form name="CreateMimeTypeHtmlTemplate" location="component://content/widget/datasetup/DataSetupForms.xml"/>
</screenlet>
- <include-form name="UpdateMimeTypeHtmlTemplate" location="component://content/widget/datasetup/DataSetupForms.xml"/>
+ <screenlet>
+ <include-form name="UpdateMimeTypeHtmlTemplate" location="component://content/widget/datasetup/DataSetupForms.xml"/>
+ </screenlet>
</decorator-section>
</decorator-screen>
</widgets>
@@ -191,7 +205,9 @@ under the License.
<screenlet id="DataResourceCategoryPanel" title="${uiLabelMap.PageTitleEditDataResourceCategory}" collapsible="true">
<include-form name="AddDataCategory" location="component://content/widget/datasetup/DataSetupForms.xml"/>
</screenlet>
- <include-form name="UpdateDataCategory" location="component://content/widget/datasetup/DataSetupForms.xml"/>
+ <screenlet>
+ <include-form name="UpdateDataCategory" location="component://content/widget/datasetup/DataSetupForms.xml"/>
+ </screenlet>
</decorator-section>
</decorator-screen>
</widgets>