Author: jleroux
Date: Sun Jul 27 03:41:47 2008
New Revision: 680088
URL: http://svn.apache.org/viewvc?rev=680088&view=rev
Log:
An enhancing patch from Bruno Busco "Using screenlets in Content Application"
(https://issues.apache.org/jira/browse/OFBIZ-1881) - OFBIZ-1881
Modified:
ofbiz/trunk/applications/content/webapp/content/cms/CMSForms.xml
ofbiz/trunk/applications/content/widget/CommonScreens.xml
ofbiz/trunk/applications/content/widget/cms/CMSScreens.xml
ofbiz/trunk/applications/content/widget/compdoc/CompDocScreens.xml
ofbiz/trunk/applications/content/widget/content/ContentScreens.xml
ofbiz/trunk/applications/content/widget/content/DataResourceScreens.xml
ofbiz/trunk/applications/content/widget/layout/LayoutScreens.xml
Modified: ofbiz/trunk/applications/content/webapp/content/cms/CMSForms.xml
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/applications/content/webapp/content/cms/CMSForms.xml?rev=680088&r1=680087&r2=680088&view=diff
==============================================================================
--- ofbiz/trunk/applications/content/webapp/content/cms/CMSForms.xml (original)
+++ ofbiz/trunk/applications/content/webapp/content/cms/CMSForms.xml Sun Jul 27
03:41:47 2008
@@ -30,10 +30,6 @@
<field name="dataResourceId"><text-find/></field>
<field name="contentName"><text-find/></field>
<field name="submitButton" title="${uiLabelMap.CommonFind}"
widget-style="smallSubmit"><submit button-type="button"/></field>
- <field name="createLink" title="${uiLabelMap.CommonEmptyHeader}"
widget-style="buttontext">
- <hyperlink also-hidden="false"
description="${uiLabelMap.CommonCreateNew}" target="EditAddContent"/>
- </field>
-
</form>
<form name="listFindContent" type="list" target=""
paginate-target="/CMSContentFind" view-size="20"
@@ -631,4 +627,4 @@
<submit button-type="button"/>
</field>
</form>
-</forms>
\ No newline at end of file
+</forms>
Modified: ofbiz/trunk/applications/content/widget/CommonScreens.xml
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/applications/content/widget/CommonScreens.xml?rev=680088&r1=680087&r2=680088&view=diff
==============================================================================
--- ofbiz/trunk/applications/content/widget/CommonScreens.xml (original)
+++ ofbiz/trunk/applications/content/widget/CommonScreens.xml Sun Jul 27
03:41:47 2008
@@ -181,10 +181,8 @@
</widgets>
<fail-widgets>
<include-menu
name="dataresourceTopMenu"
location="component://content/widget/content/DataResourceMenus.xml"/>
- <label style="h1"
text="${uiLabelMap.${titleProperty}}"/>
</fail-widgets>
</section>
- <link text="${uiLabelMap.CommonNew}"
target="editDataResource" style="buttontext"/>
<decorator-section-include name="body"/>
</widgets>
<fail-widgets>
Modified: ofbiz/trunk/applications/content/widget/cms/CMSScreens.xml
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/applications/content/widget/cms/CMSScreens.xml?rev=680088&r1=680087&r2=680088&view=diff
==============================================================================
--- ofbiz/trunk/applications/content/widget/cms/CMSScreens.xml (original)
+++ ofbiz/trunk/applications/content/widget/cms/CMSScreens.xml Sun Jul 27
03:41:47 2008
@@ -36,34 +36,21 @@
<widgets>
<decorator-screen name="commonCmsDecorator"
location="${parameters.mainDecoratorLocation}">
<decorator-section name="body">
- <container style="screenlet">
- <container style="screenlet-title-bar">
- <container style="h3">
- <label
text="${uiLabelMap.PageTitleFindCMSContent}"/>
- </container>
- </container>
- <container style="screenlet-body">
- <section>
- <widgets>
+ <section>
+ <widgets>
+ <decorator-screen name="FindScreenDecorator"
location="component://common/widget/CommonScreens.xml">
+ <decorator-section name="menu-bar">
+ <container style="button-bar"><link
target="EditAddContent" text="${uiLabelMap.CommonCreateNew}"
style="buttontext"/></container>
+ </decorator-section>
+ <decorator-section name="search-options">
<include-form name="findContent"
location="component://content/webapp/content/cms/CMSForms.xml"/>
- </widgets>
- </section>
- </container>
- </container>
- <container style="screenlet">
- <container style="screenlet-title-bar">
- <container style="h3">
- <label
text="${uiLabelMap.PageTitleFindCMSContent}"/>
- </container>
- </container>
- <container style="screenlet-body">
- <section>
- <widgets>
+ </decorator-section>
+ <decorator-section name="search-results">
<include-form name="listFindContent"
location="component://content/webapp/content/cms/CMSForms.xml"/>
- </widgets>
- </section>
- </container>
- </container>
+ </decorator-section>
+ </decorator-screen>
+ </widgets>
+ </section>
</decorator-section>
</decorator-screen>
</widgets>
@@ -412,4 +399,4 @@
</widgets>
</section>
</screen>
-</screens>
\ No newline at end of file
+</screens>
Modified: ofbiz/trunk/applications/content/widget/compdoc/CompDocScreens.xml
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/applications/content/widget/compdoc/CompDocScreens.xml?rev=680088&r1=680087&r2=680088&view=diff
==============================================================================
--- ofbiz/trunk/applications/content/widget/compdoc/CompDocScreens.xml
(original)
+++ ofbiz/trunk/applications/content/widget/compdoc/CompDocScreens.xml Sun Jul
27 03:41:47 2008
@@ -375,38 +375,24 @@
<widgets>
<decorator-screen name="commonCompDocDecorator"
location="component://content/widget/CommonScreens.xml">
<decorator-section name="body">
- <container style="screenlet">
- <container style="screenlet-title-bar">
- <container style="h3">
- <label
text="${uiLabelMap.PageTitleFindCompDoc}"/>
- </container>
- </container>
- <container style="screenlet-body">
- <section>
- <widgets>
- <container>
- <container><link
target="AddRootCompDocTemplate"
text="${uiLabelMap.PageTitleCreateNewRootCompDocTemplate}"
style="buttontext"/></container>
- <container><link
target="ListWaitingContentApproval"
text="${uiLabelMap.ContentCompDocViewWaitingApprovals}"
style="buttontext"/></container>
+ <section>
+ <widgets>
+ <decorator-screen name="FindScreenDecorator"
location="component://common/widget/CommonScreens.xml">
+ <decorator-section name="menu-bar">
+ <container style="button-bar">
+ <link
target="AddRootCompDocTemplate"
text="${uiLabelMap.PageTitleCreateNewRootCompDocTemplate}" style="buttontext"/>
+ <link
target="ListWaitingContentApproval"
text="${uiLabelMap.ContentCompDocViewWaitingApprovals}" style="buttontext"/>
</container>
+ </decorator-section>
+ <decorator-section name="search-options">
<include-form name="FindCompDoc"
location="component://content/widget/compdoc/CompDocForms.xml"/>
- </widgets>
- </section>
- </container>
- </container>
- <container style="screenlet">
- <container style="screenlet-title-bar">
- <container style="h3">
- <label
text="${uiLabelMap.PageTitleFindCompDoc}"/>
- </container>
- </container>
- <container style="screenlet-body">
- <section>
- <widgets>
+ </decorator-section>
+ <decorator-section name="search-results">
<include-form name="ListCompDoc"
location="component://content/widget/compdoc/CompDocForms.xml"/>
- </widgets>
- </section>
- </container>
- </container>
+ </decorator-section>
+ </decorator-screen>
+ </widgets>
+ </section>
</decorator-section>
</decorator-screen>
</widgets>
@@ -1354,4 +1340,4 @@
</widgets>
</section>
</screen>
-</screens>
\ No newline at end of file
+</screens>
Modified: ofbiz/trunk/applications/content/widget/content/ContentScreens.xml
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/applications/content/widget/content/ContentScreens.xml?rev=680088&r1=680087&r2=680088&view=diff
==============================================================================
--- ofbiz/trunk/applications/content/widget/content/ContentScreens.xml
(original)
+++ ofbiz/trunk/applications/content/widget/content/ContentScreens.xml Sun Jul
27 03:41:47 2008
@@ -37,35 +37,21 @@
<widgets>
<decorator-screen name="main-decorator"
location="${parameters.mainDecoratorLocation}">
<decorator-section name="body">
- <container style="screenlet">
- <container style="screenlet-title-bar">
- <container style="h3">
- <label
text="${uiLabelMap.PageTitleFindContent}"/>
- </container>
- </container>
- <container style="screenlet-body">
- <section>
- <widgets>
- <container><link target="EditContent"
text="${uiLabelMap.CommonCreateNew}" style="buttontext"/></container>
+ <section>
+ <widgets>
+ <decorator-screen name="FindScreenDecorator"
location="component://common/widget/CommonScreens.xml">
+ <decorator-section name="menu-bar">
+ <container style="button-bar"><link
target="EditContent" text="${uiLabelMap.CommonCreateNew}"
style="buttontext"/></container>
+ </decorator-section>
+ <decorator-section name="search-options">
<include-form name="FindContent"
location="component://content/widget/content/ContentForms.xml"/>
- </widgets>
- </section>
- </container>
- </container>
- <container style="screenlet">
- <container style="screenlet-title-bar">
- <container style="h3">
- <label
text="${uiLabelMap.PageTitleListContent}"/>
- </container>
- </container>
- <container style="screenlet-body">
- <section>
- <widgets>
+ </decorator-section>
+ <decorator-section name="search-results">
<include-form name="ListContent"
location="component://content/widget/content/ContentForms.xml"/>
- </widgets>
- </section>
- </container>
- </container>
+ </decorator-section>
+ </decorator-screen>
+ </widgets>
+ </section>
</decorator-section>
</decorator-screen>
</widgets>
Modified:
ofbiz/trunk/applications/content/widget/content/DataResourceScreens.xml
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/applications/content/widget/content/DataResourceScreens.xml?rev=680088&r1=680087&r2=680088&view=diff
==============================================================================
--- ofbiz/trunk/applications/content/widget/content/DataResourceScreens.xml
(original)
+++ ofbiz/trunk/applications/content/widget/content/DataResourceScreens.xml Sun
Jul 27 03:41:47 2008
@@ -31,34 +31,17 @@
<widgets>
<decorator-screen name="commonDataResourceDecorator"
location="${parameters.mainDecoratorLocation}">
<decorator-section name="body">
- <container style="screenlet">
- <container style="screenlet-title-bar">
- <container style="h3">
- <label
text="${uiLabelMap.PageTitleFindDataResource}"/>
- </container>
- </container>
- <container style="screenlet-body">
- <section>
- <widgets>
- <include-form name="FindDataResource"
location="component://content/widget/content/DataResourceForms.xml"/>
- </widgets>
- </section>
- </container>
- </container>
- <container style="screenlet">
- <container style="screenlet-title-bar">
- <container style="h3">
- <label
text="${uiLabelMap.PageTitleListDataResource}"/>
- </container>
- </container>
- <container style="screenlet-body">
- <section>
- <widgets>
- <include-form name="ListDataResource"
location="component://content/widget/content/DataResourceForms.xml"/>
- </widgets>
- </section>
- </container>
- </container>
+ <decorator-screen name="FindScreenDecorator"
location="component://common/widget/CommonScreens.xml">
+ <decorator-section name="menu-bar">
+ <container style="button-bar"><link
target="editDataResource" text="${uiLabelMap.CommonCreateNew}"
style="buttontext"/></container>
+ </decorator-section>
+ <decorator-section name="search-options">
+ <include-form name="FindDataResource"
location="component://content/widget/content/DataResourceForms.xml"/>
+ </decorator-section>
+ <decorator-section name="search-results">
+ <include-form name="ListDataResource"
location="component://content/widget/content/DataResourceForms.xml"/>
+ </decorator-section>
+ </decorator-screen>
</decorator-section>
</decorator-screen>
</widgets>
Modified: ofbiz/trunk/applications/content/widget/layout/LayoutScreens.xml
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/applications/content/widget/layout/LayoutScreens.xml?rev=680088&r1=680087&r2=680088&view=diff
==============================================================================
--- ofbiz/trunk/applications/content/widget/layout/LayoutScreens.xml (original)
+++ ofbiz/trunk/applications/content/widget/layout/LayoutScreens.xml Sun Jul 27
03:41:47 2008
@@ -32,37 +32,21 @@
<widgets>
<decorator-screen name="commonLayoutDecorator"
location="${parameters.mainDecoratorLocation}">
<decorator-section name="body">
- <container style="screenlet">
- <container style="screenlet-title-bar">
- <container style="h3">
- <label
text="${uiLabelMap.PageTitleFindLayout}"/>
- </container>
- </container>
- <container style="screenlet-body">
- <section>
- <widgets>
- <container>
- <link
target="EditLayoutSubContent?mode=add&contentIdTo=TEMPLATE_MASTER"
text="${uiLabelMap.CommonCreateNew}" style="buttontext"/>
- </container>
+ <section>
+ <widgets>
+ <decorator-screen name="FindScreenDecorator"
location="component://common/widget/CommonScreens.xml">
+ <decorator-section name="menu-bar">
+ <container style="button-bar"><link
target="EditLayoutSubContent?mode=add&contentIdTo=TEMPLATE_MASTER"
text="${uiLabelMap.CommonCreateNew}" style="buttontext"/></container>
+ </decorator-section>
+ <decorator-section name="search-options">
<include-form name="findLayout"
location="component://content/webapp/content/layout/LayoutForms.xml"/>
- </widgets>
- </section>
- </container>
- </container>
- <container style="screenlet">
- <container style="screenlet-title-bar">
- <container style="h3">
- <label
text="${uiLabelMap.PageTitleFindLayout}"/>
- </container>
- </container>
- <container style="screenlet-body">
- <section>
- <widgets>
+ </decorator-section>
+ <decorator-section name="search-results">
<include-form name="listFindLayout"
location="component://content/webapp/content/layout/LayoutForms.xml"/>
- </widgets>
- </section>
- </container>
- </container>
+ </decorator-section>
+ </decorator-screen>
+ </widgets>
+ </section>
</decorator-section>
</decorator-screen>
</widgets>
@@ -288,4 +272,4 @@
</widgets>
</section>
</screen>
-</screens>
\ No newline at end of file
+</screens>
