OFBiz › OFBiz - Commits

svn commit: r667013 [1/2] - in /ofbiz/trunk/applications/content: config/ webapp/content/contentsetup/ webapp/content/datasetup/ webapp/content/survey/ webapp/content/website/ widget/ widget/content/ widget/contentsetup/ widget/datasetup/ widget/forum/

_‹ Previous Topic Next Topic _›

Classic

List

Threaded

1 message

ashish-18

svn commit: r667013 [1/2] - in /ofbiz/trunk/applications/content: config/ webapp/content/contentsetup/ webapp/content/datasetup/ webapp/content/survey/ webapp/content/website/ widget/ widget/content/ widget/contentsetup/ widget/datasetup/ widget/forum/

Author: ashish
Date: Thu Jun 12 02:34:05 2008
New Revision: 667013

URL: http://svn.apache.org/viewvc?rev=667013&view=rev
Log:
Patch from JIRA issue # https://issues.apache.org/jira/browse/OFBIZ-1839.
Container to Screenlet conversion is done on Content component.

Thanks Awdesh Singh Parihar for your patch.

Modified:
ofbiz/trunk/applications/content/config/ContentUiLabels.xml
ofbiz/trunk/applications/content/webapp/content/contentsetup/ContentSetupForms.xml
ofbiz/trunk/applications/content/webapp/content/datasetup/DataSetupForms.xml
ofbiz/trunk/applications/content/webapp/content/survey/SurveyForms.xml
ofbiz/trunk/applications/content/webapp/content/website/WebSiteForms.xml
ofbiz/trunk/applications/content/widget/SurveyScreens.xml
ofbiz/trunk/applications/content/widget/WebSiteScreens.xml
ofbiz/trunk/applications/content/widget/content/ContentForms.xml
ofbiz/trunk/applications/content/widget/content/ContentScreens.xml
ofbiz/trunk/applications/content/widget/content/DataResourceForms.xml
ofbiz/trunk/applications/content/widget/content/DataResourceScreens.xml
ofbiz/trunk/applications/content/widget/contentsetup/ContentSetupScreens.xml
ofbiz/trunk/applications/content/widget/datasetup/DataResourceSetupScreens.xml
ofbiz/trunk/applications/content/widget/forum/ForumForms.xml
ofbiz/trunk/applications/content/widget/forum/ForumScreens.xml

Modified: ofbiz/trunk/applications/content/config/ContentUiLabels.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/content/config/ContentUiLabels.xml?rev=667013&r1=667012&r2=667013&view=diff
==============================================================================
--- ofbiz/trunk/applications/content/config/ContentUiLabels.xml (original)
+++ ofbiz/trunk/applications/content/config/ContentUiLabels.xml Thu Jun 12 02:34:05 2008
@@ -2199,14 +2199,6 @@
<value xml:lang="th">à¹à¸à¹à¹à¸à¸«à¸±à¸§à¸à¹à¸à¸à¸¸à¸à¸ªà¸¡à¸à¸±à¸à¸´</value>
<value xml:lang="zh">ç¼è¾åå®¹å±æ§</value>
</property>
- <property key="PageTitleEditContentMetadata">
- <value xml:lang="ar">ØªØ¹Ø±ÙØ± ÙÙØªØ§ ÙØ¹ÙÙÙØ§Øª ÙØØªÙÙ</value>
- <value xml:lang="en">Edit Content Metadata</value>
- <value xml:lang="it">Aggiorna Metadata Contenuto</value>
- <value xml:lang="ro">Actualizeaza Metadata Continut</value>
- <value xml:lang="th">à¹à¸à¹à¹à¸à¸«à¸±à¸§à¸à¹à¸à¸à¹à¸à¸¡à¸¹à¸¥</value>
- <value xml:lang="zh">ç¼è¾åå®¹åæ°æ®</value>
- </property>
<property key="PageTitleEditContentOperation">
<value xml:lang="ar">ØªØ¹Ø±ÙØ± Ø¹ÙÙÙØ© ÙØØªÙÙ</value>
<value xml:lang="en">Edit Content Operation</value>
@@ -2238,14 +2230,6 @@
<value xml:lang="th">à¹à¸à¹à¹à¸à¸«à¸±à¸§à¸à¹à¸à¸à¸£à¸°à¹à¸ à¸à¸§à¸±à¸à¸à¸¸à¸à¸£à¸°à¸ªà¸à¸à¹</value>
<value xml:lang="zh">ç¼è¾åå®¹ç®çç±»å</value>
</property>
- <property key="PageTitleEditContentRole">
- <value xml:lang="ar">ØªØ¹Ø±ÙØ± Ø¯ÙØ± ÙØØªÙÙ</value>
- <value xml:lang="en">Edit Content Role</value>
- <value xml:lang="it">Aggiorna Ruolo Contenuto</value>
- <value xml:lang="ro">Actualizeaza Drept Continut</value>
- <value xml:lang="th">à¹à¸à¹à¹à¸à¸«à¸±à¸§à¸à¹à¸à¸ªà¸à¸²à¸à¸°</value>
- <value xml:lang="zh">ç¼è¾åå®¹è§è²</value>
- </property>
<property key="PageTitleEditContentType">
<value xml:lang="ar">ØªØ¹Ø±ÙØ± ÙÙØ¹ ÙØØªÙÙ</value>
<value xml:lang="en">Edit Content Type</value>
@@ -2269,13 +2253,6 @@
<value xml:lang="th">à¸à¸à¸¸à¸à¸²à¸</value>
<value xml:lang="zh">æé</value>
</property>
- <property key="PageTitleEditContentWorkEffort">
- <value xml:lang="ar">ØªØ¹Ø±ÙØ± ÙØ¬ÙÙØ¯ Ø¹ÙÙ ÙØØªÙÙ</value>
- <value xml:lang="en">Edit Content WorkEffort</value>
- <value xml:lang="it">Aggiorna Contenuto Impegni di Lavoro</value>
- <value xml:lang="th">à¹à¸à¹à¹à¸à¸«à¸±à¸§à¸à¹à¸ WorkEffort</value>
- <value xml:lang="zh">ç¼è¾åå®¹äººå·¥æå¡</value>
- </property>
<property key="PageTitleEditDataResource">
<value xml:lang="ar">ØªØ¹Ø±ÙØ± ÙÙØ±Ø¯ ÙØ¹ÙÙÙØ§Øª</value>
<value xml:lang="en">Edit Data Resource</value>
@@ -2481,14 +2458,6 @@
<value xml:lang="it">Aggiorna Contenuto Sito Web</value>
<value xml:lang="th">à¹à¸à¹à¹à¸à¸«à¸±à¸§à¸à¹à¸ WebSite</value>
</property>
- <property key="PageTitleEditWebSiteParties">
- <value xml:lang="ar">ØªØØ±ÙØ± Ø£Ø·Ø±Ø§Ù ÙÙÙØ¹ Ø§ÙÙÙØ¨</value>
- <value xml:lang="en">Edit WebSite Parties</value>
- <value xml:lang="it">Aggiorna Soggetti Sito Web</value>
- <value xml:lang="ro">Actualizeaza Subiecti Sit Web</value>
- <value xml:lang="th">à¹à¸à¹à¹à¸à¸à¸¥à¸¸à¹à¸¡à¸à¸¹à¹à¹à¸à¹ WebSite</value>
- <value xml:lang="zh">ç¼è¾ç½ç«ä¼å</value>
- </property>
<property key="PageTitleFindCMSContent">
<value xml:lang="en">CMS Content Find</value>
<value xml:lang="it">Ricerca Contenuto CMS</value>
@@ -2623,12 +2592,6 @@
<value xml:lang="it">Lista Layout</value>
<value xml:lang="th">à¸£à¸²à¸¢à¸à¸²à¸£ Layout</value>
</property>
- <property key="PageTitleListSurveyPages">
- <value xml:lang="en">List Survey Pages</value>
- <value xml:lang="fr">Liste des pages de sondage</value>
- <value xml:lang="it">Lista Pagine Sondaggio</value>
- <value xml:lang="th">à¸£à¸²à¸¢à¸à¸²à¸£à¸«à¸à¹à¸²à¸à¸²à¸£à¸ªà¸³à¸£à¸§à¸</value>
- </property>
<property key="PageTitleListSurveyResponse">
<value xml:lang="en">List Survey Response</value>
<value xml:lang="fr">Liste des rÃ©ponses au sondage</value>

Modified: ofbiz/trunk/applications/content/webapp/content/contentsetup/ContentSetupForms.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/content/webapp/content/contentsetup/ContentSetupForms.xml?rev=667013&r1=667012&r2=667013&view=diff
==============================================================================
--- ofbiz/trunk/applications/content/webapp/content/contentsetup/ContentSetupForms.xml (original)
+++ ofbiz/trunk/applications/content/webapp/content/contentsetup/ContentSetupForms.xml Thu Jun 12 02:34:05 2008
@@ -29,7 +29,7 @@
</field>
</form>
<form name="UpdateContentType" list-name="contentList" target="updateContentType" title="" type="list"
- odd-row-style="alternate-row" default-table-style="basic-table hover-bar">
+ odd-row-style="alternate-row" header-row-style="header-row-2" default-table-style="basic-table hover-bar">
<actions>
<entity-condition entity-name="ContentType" use-cache="false"/>
</actions>
@@ -60,7 +60,7 @@
</field>
</form>
<form name="UpdateContentTypeAttr" list-name="contentList" target="updateContentTypeAttr" title="" type="list"
- odd-row-style="alternate-row" default-table-style="basic-table hover-bar">
+ odd-row-style="alternate-row" header-row-style="header-row-2" default-table-style="basic-table hover-bar">
<actions>
<entity-condition entity-name="ContentTypeAttr" use-cache="false"/>
</actions>
@@ -85,7 +85,7 @@
</field>
</form>
<form name="UpdateContentAssocType" list-name="contentList" target="updateContentAssocType" title="" type="list"
- odd-row-style="alternate-row" default-table-style="basic-table hover-bar">
+ odd-row-style="alternate-row" header-row-style="header-row-2" default-table-style="basic-table hover-bar">
<actions>
<entity-condition entity-name="ContentAssocType" use-cache="false"/>
</actions>
@@ -110,7 +110,7 @@
</field>
</form>
<form name="UpdateContentPurposeType" list-name="contentList" target="updateContentPurposeType" title="" type="list"
- odd-row-style="alternate-row" default-table-style="basic-table hover-bar">
+ odd-row-style="alternate-row" header-row-style="header-row-2" default-table-style="basic-table hover-bar">
<actions>
<entity-condition entity-name="ContentPurposeType" use-cache="false"/>
</actions>
@@ -135,7 +135,7 @@
</field>
</form>
<form name="UpdateContentAssocPredicate" list-name="contentList" target="updateContentAssocPredicate" title="" type="list"
- odd-row-style="alternate-row" default-table-style="basic-table hover-bar">
+ odd-row-style="alternate-row" header-row-style="header-row-2" default-table-style="basic-table hover-bar">
<actions>
<entity-condition entity-name="ContentAssocPredicate" use-cache="false"/>
</actions>
@@ -160,7 +160,7 @@
</field>
</form>
<form name="UpdateContentOperation" list-name="contentList" target="updateContentOperation" title="" type="list"
- odd-row-style="alternate-row" default-table-style="basic-table hover-bar">
+ odd-row-style="alternate-row" header-row-style="header-row-2" default-table-style="basic-table hover-bar">
<actions>
<entity-condition entity-name="ContentOperation" use-cache="false"/>
</actions>
@@ -202,7 +202,7 @@
</field>
</form>
<form name="UpdateContentPurposeOperation" target="" title="" type="list" list-name="contentList"
- odd-row-style="alternate-row" default-table-style="basic-table hover-bar">
+ odd-row-style="alternate-row" header-row-style="header-row-2" default-table-style="basic-table hover-bar">
<actions>
<entity-and entity-name="ContentPurposeOperation" use-cache="false"/>
</actions>

Modified: ofbiz/trunk/applications/content/webapp/content/datasetup/DataSetupForms.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/content/webapp/content/datasetup/DataSetupForms.xml?rev=667013&r1=667012&r2=667013&view=diff
==============================================================================
--- ofbiz/trunk/applications/content/webapp/content/datasetup/DataSetupForms.xml (original)
+++ ofbiz/trunk/applications/content/webapp/content/datasetup/DataSetupForms.xml Thu Jun 12 02:34:05 2008
@@ -29,7 +29,7 @@
</field>
</form>
<form name="UpdateDataResourceType" list-name="contentList" target="updateDataResourceType" title="" type="list" paginate-target="EditDataResourceType"
- odd-row-style="alternate-row" default-table-style="basic-table hover-bar">
+ odd-row-style="alternate-row" header-row-style="header-row-2" default-table-style="basic-table hover-bar">
<actions>
<entity-condition entity-name="DataResourceType" use-cache="false"/>
</actions>
@@ -60,7 +60,7 @@
</field>
</form>
<form name="UpdateDataResourceTypeAttr" list-name="contentList" target="updateDataResourceTypeAttr" title="" type="list"
- odd-row-style="alternate-row" default-table-style="basic-table hover-bar" paginate-target="EditDataResourceTypeAttr">
+ odd-row-style="alternate-row" header-row-style="header-row-2" default-table-style="basic-table hover-bar" paginate-target="EditDataResourceTypeAttr">
<actions>
<entity-condition entity-name="DataResourceTypeAttr" use-cache="false"/>
</actions>
@@ -85,7 +85,7 @@
</field>
</form>
<form name="UpdateCharacterSet" list-name="contentList" target="updateCharacterSet" title="" type="list" paginate-target="EditCharacterSet"
- odd-row-style="alternate-row" default-table-style="basic-table hover-bar">
+ odd-row-style="alternate-row" header-row-style="header-row-2" default-table-style="basic-table hover-bar">
<actions>
<entity-condition entity-name="CharacterSet" use-cache="false"/>
</actions>
@@ -115,7 +115,7 @@
</field>
</form>
<form name="UpdateDataCategory" list-name="dataCategoryList" target="updateDataCategory" title="" type="list" paginate-target="EditDataCategory"
- odd-row-style="alternate-row" default-table-style="basic-table hover-bar">
+ odd-row-style="alternate-row" header-row-style="header-row-2" default-table-style="basic-table hover-bar">
<actions>
<entity-condition entity-name="DataCategory" use-cache="false"/>
</actions>
@@ -153,7 +153,7 @@
</field>
</form>
<form name="UpdateFileExtension" list-name="contentList" target="updateFileExtension" title="" type="list" paginate-target="EditFileExtension"
- odd-row-style="alternate-row" default-table-style="basic-table hover-bar">
+ odd-row-style="alternate-row" header-row-style="header-row-2" default-table-style="basic-table hover-bar">
<actions>
<entity-condition entity-name="FileExtension" use-cache="false"/>
</actions>
@@ -184,7 +184,7 @@
</field>
</form>
<form name="UpdateMetaDataPredicate" list-name="contentList" target="updateMetaDataPredicate" title="" type="list"
- odd-row-style="alternate-row" default-table-style="basic-table hover-bar" paginate-target="EditMetaDataPredicate">
+ odd-row-style="alternate-row" header-row-style="header-row-2" default-table-style="basic-table hover-bar" paginate-target="EditMetaDataPredicate">
<actions>
<entity-condition entity-name="MetaDataPredicate" use-cache="false"/>
</actions>
@@ -209,7 +209,7 @@
</field>
</form>
<form name="UpdateMimeType" list-name="contentList" target="updateMimeType" title="" type="list" paginate-target="EditMimeType"
- odd-row-style="alternate-row" default-table-style="basic-table hover-bar">
+ odd-row-style="alternate-row" header-row-style="header-row-2" default-table-style="basic-table hover-bar">
<actions>
<entity-condition entity-name="MimeType" use-cache="false"/>
</actions>
@@ -240,7 +240,7 @@
</form>

<form name="UpdateMimeTypeHtmlTemplate" target="updateMimeTypeHtmlTemplate" title="" type="list" list-name="contentList" paginate-target="EditMimeTypeHtmlTemplate"
- odd-row-style="alternate-row" default-table-style="basic-table hover-bar">
+ odd-row-style="alternate-row" header-row-style="header-row-2" default-table-style="basic-table hover-bar">
<actions>
<entity-condition entity-name="MimeTypeHtmlTemplate" use-cache="false"/>
</actions>

Modified: ofbiz/trunk/applications/content/webapp/content/survey/SurveyForms.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/content/webapp/content/survey/SurveyForms.xml?rev=667013&r1=667012&r2=667013&view=diff
==============================================================================
--- ofbiz/trunk/applications/content/webapp/content/survey/SurveyForms.xml (original)
+++ ofbiz/trunk/applications/content/webapp/content/survey/SurveyForms.xml Thu Jun 12 02:34:05 2008
@@ -139,7 +139,7 @@


<form name="ListSurveyPages" type="list" target="updateSurveyPage" title="" list-name="surveyPageList"
- odd-row-style="alternate-row" default-table-style="basic-table hover-bar">
+ odd-row-style="alternate-row" header-row-style="header-row-2" default-table-style="basic-table hover-bar">
<actions>
<entity-condition entity-name="SurveyPage">
<condition-expr field-name="surveyId" env-name="surveyId"/>

Modified: ofbiz/trunk/applications/content/webapp/content/website/WebSiteForms.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/content/webapp/content/website/WebSiteForms.xml?rev=667013&r1=667012&r2=667013&view=diff
==============================================================================
--- ofbiz/trunk/applications/content/webapp/content/website/WebSiteForms.xml (original)
+++ ofbiz/trunk/applications/content/webapp/content/website/WebSiteForms.xml Thu Jun 12 02:34:05 2008
@@ -127,7 +127,7 @@
<field name="submitButton" title="${uiLabelMap.CommonAdd}"><submit button-type="button"/></field>
</form>
<form name="UpdateWebSiteRole" type="list" target="updateWebSiteRole" title="" list-name="webSiteRoleDatas"
- odd-row-style="alternate-row" default-table-style="basic-table hover-bar">
+ odd-row-style="alternate-row" header-row-style="header-row-2" default-table-style="basic-table hover-bar">
<auto-fields-service service-name="updateWebSiteRole" map-name="webSiteRole"/>
<field name="webSiteId"><hidden/></field>


Modified: ofbiz/trunk/applications/content/widget/SurveyScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/content/widget/SurveyScreens.xml?rev=667013&r1=667012&r2=667013&view=diff
==============================================================================
--- ofbiz/trunk/applications/content/widget/SurveyScreens.xml (original)
+++ ofbiz/trunk/applications/content/widget/SurveyScreens.xml Thu Jun 12 02:34:05 2008
@@ -257,35 +257,11 @@
<include-form name="ListSurveyQuestions" location="component://content/webapp/content/survey/SurveyForms.xml"/>
<include-form name="CreateSurveyQuestion" location="component://content/webapp/content/survey/SurveyForms.xml"/>
-->
-
- <container style="screenlet">
- <container style="screenlet-title-bar">
- <container style="h3">
- <label text="${uiLabelMap.PageTitleListSurveyPages} ${uiLabelMap.SurveySurveyId} ${surveyId}"/>
- </container>
- </container>
- <container style="screenlet-body">
- <section>
- <widgets>
- <include-form name="ListSurveyPages" location="component://content/webapp/content/survey/SurveyForms.xml"/>
- </widgets>
- </section>
- </container>
- </container>
- <container style="screenlet">
- <container style="screenlet-title-bar">
- <container style="h3">
- <label text="${uiLabelMap.PageTitleEditSurveyPages} ${uiLabelMap.SurveySurveyId} ${surveyId}"/>
- </container>
- </container>
- <container style="screenlet-body">
- <section>
- <widgets>
- <include-form name="AddSurveyPage" location="component://content/webapp/content/survey/SurveyForms.xml"/>
- </widgets>
- </section>
- </container>
- </container>
+
+ <screenlet id="SurveyPagePanel" title="${uiLabelMap.PageTitleEditSurveyPages} ${uiLabelMap.SurveySurveyId} ${surveyId}" collapsible="true">
+ <include-form name="AddSurveyPage" location="component://content/webapp/content/survey/SurveyForms.xml"/>
+ </screenlet>
+ <include-form name="ListSurveyPages" location="component://content/webapp/content/survey/SurveyForms.xml"/>
</decorator-section>
</decorator-screen>
</widgets>

Modified: ofbiz/trunk/applications/content/widget/WebSiteScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/content/widget/WebSiteScreens.xml?rev=667013&r1=667012&r2=667013&view=diff
==============================================================================
--- ofbiz/trunk/applications/content/widget/WebSiteScreens.xml (original)
+++ ofbiz/trunk/applications/content/widget/WebSiteScreens.xml Thu Jun 12 02:34:05 2008
@@ -201,9 +201,9 @@
<screen name="EditWebSiteParties">
<section>
<actions>
- <set field="titleProperty" value="PageTitleEditWebSiteParties"/>
+ <set field="titleProperty" value="PageTitleCreateWebSiteParties"/>
<set field="tabButtonItem" value="EditWebSiteParties"/>
- <set field="labelTitleProperty" value="PageTitleEditWebSiteParties"/>
+ <set field="labelTitleProperty" value="PageTitleCreateWebSiteParties"/>
<set field="webSiteId" from-field="parameters.webSiteId"/>
<entity-one entity-name="WebSite" value-name="webSite"/>
<script location="component://content/webapp/content/WEB-INF/actions/website/EditWebSiteParties.bsh"/>
@@ -213,34 +213,10 @@
<decorator-section name="body">
<section>
<widgets>
- <container style="screenlet">
- <container style="screenlet-title-bar">
- <container style="h3">
- <label text="${uiLabelMap.PageTitleEditWebSiteParties}"/>
- </container>
- </container>
- <container style="screenlet-body">
- <section>
- <widgets>
- <include-form name="UpdateWebSiteRole" location="component://content/webapp/content/website/WebSiteForms.xml"/>
- </widgets>
- </section>
- </container>
- </container>
- <container style="screenlet">
- <container style="screenlet-title-bar">
- <container style="h3">
- <label text="${uiLabelMap.PageTitleCreateWebSiteParties}"/>
- </container>
- </container>
- <container style="screenlet-body">
- <section>
- <widgets>
- <include-form name="CreateWebSiteRole" location="component://content/webapp/content/website/WebSiteForms.xml"/>
- </widgets>
- </section>
- </container>
- </container>
+ <screenlet id="WebSiteRolePanel" title="${uiLabelMap.PageTitleCreateWebSiteParties}" collapsible="true">
+ <include-form name="CreateWebSiteRole" location="component://content/webapp/content/website/WebSiteForms.xml"/>
+ </screenlet>
+ <include-form name="UpdateWebSiteRole" location="component://content/webapp/content/website/WebSiteForms.xml"/>
</widgets>
</section>
</decorator-section>

Modified: ofbiz/trunk/applications/content/widget/content/ContentForms.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/content/widget/content/ContentForms.xml?rev=667013&r1=667012&r2=667013&view=diff
==============================================================================
--- ofbiz/trunk/applications/content/widget/content/ContentForms.xml (original)
+++ ofbiz/trunk/applications/content/widget/content/ContentForms.xml Thu Jun 12 02:34:05 2008
@@ -312,7 +312,7 @@
<field name="submitButton" title="${uiLabelMap.CommonUpdate}" widget-style="smallSubmit"><submit button-type="button"/></field>
</form>
<form name="ListContentRole" target="update${contentRoleTarget}ContentRole" title="" type="list"
- odd-row-style="alternate-row" default-table-style="basic-table hover-bar">
+ odd-row-style="alternate-row" header-row-style="header-row-2" default-table-style="basic-table hover-bar">
<actions>
<entity-and entity-name="ContentRole" use-cache="true">
<field-map env-name="contentId" field-name="contentId" />
@@ -342,7 +342,7 @@
<field name="submitButton" title="${uiLabelMap.CommonAdd}" widget-style="smallSubmit"><submit button-type="button"/></field>
</form>
<form name="ListContentPurpose" target="updateContentPurpose" title="" type="list"
- odd-row-style="alternate-row" default-table-style="basic-table hover-bar">
+ odd-row-style="alternate-row" header-row-style="header-row-2" default-table-style="basic-table hover-bar">
<actions>
<entity-and entity-name="ContentPurpose" use-cache="true">
<field-map env-name="contentId" field-name="contentId" />
@@ -365,7 +365,7 @@
<field name="submitButton" title="${uiLabelMap.CommonAdd}" widget-style="smallSubmit"><submit button-type="button"/></field>
</form>
<form name="ListContentAttribute" target="updateContentAttribute" title="" type="list"
- odd-row-style="alternate-row" default-table-style="basic-table hover-bar">
+ odd-row-style="alternate-row" header-row-style="header-row-2" default-table-style="basic-table hover-bar">
<actions>
<entity-and entity-name="ContentAttribute" use-cache="true">
<field-map env-name="contentId" field-name="contentId" />
@@ -394,7 +394,7 @@
<field name="submitButton" title="${uiLabelMap.CommonAdd}" widget-style="smallSubmit"><submit button-type="button"/></field>
</form>
<form name="ListContentMetaData" target="updateContentMetaData" title="" type="list"
- odd-row-style="alternate-row" default-table-style="basic-table hover-bar">
+ odd-row-style="alternate-row" header-row-style="header-row-2" default-table-style="basic-table hover-bar">
<actions>
<entity-and entity-name="ContentMetaData" use-cache="true">
<field-map env-name="contentId" field-name="contentId" />
@@ -445,7 +445,7 @@
<field name="submitButton" title="${uiLabelMap.CommonAdd}" widget-style="smallSubmit"><submit button-type="button"/></field>
</form>
<form name="ListWorkEffortContents" type="list" target="updateWorkEffortContent" list-name="workEffortContents"
- odd-row-style="alternate-row" default-table-style="basic-table hover-bar">
+ odd-row-style="alternate-row" header-row-style="header-row-2" default-table-style="basic-table hover-bar">
<actions>
<entity-and entity-name="WorkEffortContent" use-cache="true" list-name="workEffortContents">
<field-map env-name="contentId" field-name="contentId" />

Modified: ofbiz/trunk/applications/content/widget/content/ContentScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/content/widget/content/ContentScreens.xml?rev=667013&r1=667012&r2=667013&view=diff
==============================================================================
--- ofbiz/trunk/applications/content/widget/content/ContentScreens.xml (original)
+++ ofbiz/trunk/applications/content/widget/content/ContentScreens.xml Thu Jun 12 02:34:05 2008
@@ -234,7 +234,7 @@
<section>
<actions>
<script location="component://content/widget/getMenuContext.bsh"/>
- <set field="titleProperty" value="PageTitleEditContentRole"/>
+ <set field="titleProperty" value="PageTitleAddRole"/>
<set field="tabButtonItem" value="role"/>

<set field="contentId" from-field="parameters.contentId" />
@@ -246,34 +246,10 @@
<widgets>
<decorator-screen name="commonContentDecorator" location="${parameters.mainDecoratorLocation}">
<decorator-section name="body">
- <container style="screenlet">
- <container style="screenlet-title-bar">
- <container style="h3">
- <label text="${uiLabelMap.PageTitleEditContentRole}"/>
- </container>
- </container>
- <container style="screenlet-body">
- <section>
- <widgets>
- <include-form name="ListContentRole" 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.PageTitleAddRole}"/>
- </container>
- </container>
- <container style="screenlet-body">
- <section>
- <widgets>
- <include-form name="AddContentRole" location="component://content/widget/content/ContentForms.xml"/>
- </widgets>
- </section>
- </container>
- </container>
+ <screenlet id="ContentRolePanel" 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"/>
</decorator-section>
</decorator-screen>
</widgets>
@@ -284,7 +260,7 @@
<section>
<actions>
<script location="component://content/widget/getMenuContext.bsh"/>
- <set field="titleProperty" value="PageTitleEditContentPurpose"/>
+ <set field="titleProperty" value="PageTitleAddPurpose"/>
<set field="tabButtonItem" value="purpose"/>
<set field="contentId" from-field="parameters.contentId" />
<entity-one entity-name="Content" value-name="currentValue">
@@ -294,34 +270,10 @@
<widgets>
<decorator-screen name="commonContentDecorator" location="${parameters.mainDecoratorLocation}">
<decorator-section name="body">
- <container style="screenlet">
- <container style="screenlet-title-bar">
- <container style="h3">
- <label text="${uiLabelMap.PageTitleEditContentPurpose}"/>
- </container>
- </container>
- <container style="screenlet-body">
- <section>
- <widgets>
- <include-form name="ListContentPurpose" 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.PageTitleAddPurpose}"/>
- </container>
- </container>
- <container style="screenlet-body">
- <section>
- <widgets>
- <include-form name="AddContentPurpose" location="component://content/widget/content/ContentForms.xml"/>
- </widgets>
- </section>
- </container>
- </container>
+ <screenlet id="ContentPurposePanel" 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"/>
</decorator-section>
</decorator-screen>
</widgets>
@@ -332,7 +284,7 @@
<section>
<actions>
<script location="component://content/widget/getMenuContext.bsh"/>
- <set field="titleProperty" value="PageTitleEditContentAttribute"/>
+ <set field="titleProperty" value="PageTitleAddAttribute"/>
<set field="tabButtonItem" value="attribute"/>
<set field="contentId" from-field="parameters.contentId" />
<entity-one entity-name="Content" value-name="currentValue">
@@ -342,34 +294,10 @@
<widgets>
<decorator-screen name="commonContentDecorator" location="${parameters.mainDecoratorLocation}">
<decorator-section name="body">
- <container style="screenlet">
- <container style="screenlet-title-bar">
- <container style="h3">
- <label text="${uiLabelMap.PageTitleEditContentAttribute}"/>
- </container>
- </container>
- <container style="screenlet-body">
- <section>
- <widgets>
- <include-form name="ListContentAttribute" 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.PageTitleAddAttribute}"/>
- </container>
- </container>
- <container style="screenlet-body">
- <section>
- <widgets>
- <include-form name="AddContentAttribute" location="component://content/widget/content/ContentForms.xml"/>
- </widgets>
- </section>
- </container>
- </container>
+ <screenlet id="ContentAttributePanel" 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"/>
</decorator-section>
</decorator-screen>
</widgets>
@@ -381,7 +309,7 @@
<section>
<actions>
<script location="component://content/widget/getMenuContext.bsh"/>
- <set field="titleProperty" value="PageTitleEditContentMetadata"/>
+ <set field="titleProperty" value="PageTitleAddMetaData"/>
<set field="tabButtonItem" value="metaData"/>
<set field="contentId" from-field="parameters.contentId" />
<entity-one entity-name="Content" value-name="currentValue">
@@ -391,34 +319,10 @@
<widgets>
<decorator-screen name="commonContentDecorator" location="${parameters.mainDecoratorLocation}">
<decorator-section name="body">
- <container style="screenlet">
- <container style="screenlet-title-bar">
- <container style="h3">
- <label text="${uiLabelMap.PageTitleEditContentMetadata}"/>
- </container>
- </container>
- <container style="screenlet-body">
- <section>
- <widgets>
- <include-form name="ListContentMetaData" 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.PageTitleAddMetaData}"/>
- </container>
- </container>
- <container style="screenlet-body">
- <section>
- <widgets>
- <include-form name="AddContentMetaData" location="component://content/widget/content/ContentForms.xml"/>
- </widgets>
- </section>
- </container>
- </container>
+ <screenlet id="ContentMetaDataPanel" 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"/>
</decorator-section>
</decorator-screen>
</widgets>
@@ -429,7 +333,7 @@
<section>
<actions>
<script location="component://content/widget/getMenuContext.bsh"/>
- <set field="titleProperty" value="PageTitleEditContentWorkEffort"/>
+ <set field="titleProperty" value="PageTitleAddWorkEffort"/>
<set field="tabButtonItem" value="workEffort"/>
<set field="contentId" from-field="parameters.contentId" />
<entity-one entity-name="Content" value-name="currentValue">
@@ -439,34 +343,10 @@
<widgets>
<decorator-screen name="commonContentDecorator" location="${parameters.mainDecoratorLocation}">
<decorator-section name="body">
- <container style="screenlet">
- <container style="screenlet-title-bar">
- <container style="h3">
- <label text="${uiLabelMap.PageTitleEditContentWorkEffort}"/>
- </container>
- </container>
- <container style="screenlet-body">
- <section>
- <widgets>
- <include-form name="ListWorkEffortContents" 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.PageTitleAddWorkEffort}"/>
- </container>
- </container>
- <container style="screenlet-body">
- <section>
- <widgets>
- <include-form name="AddWorkEffortContent" location="component://content/widget/content/ContentForms.xml"/>
- </widgets>
- </section>
- </container>
- </container>
+ <screenlet id="WorkEffortContentPanel" 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"/>
</decorator-section>
</decorator-screen>
</widgets>

Modified: ofbiz/trunk/applications/content/widget/content/DataResourceForms.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/content/widget/content/DataResourceForms.xml?rev=667013&r1=667012&r2=667013&view=diff
==============================================================================
--- ofbiz/trunk/applications/content/widget/content/DataResourceForms.xml (original)
+++ ofbiz/trunk/applications/content/widget/content/DataResourceForms.xml Thu Jun 12 02:34:05 2008
@@ -283,7 +283,7 @@
<field name="submitButton" title="${uiLabelMap.CommonAdd}" widget-style="smallSubmit"><submit button-type="button"/></field>
</form>
<form name="ListDataResourceAttribute" list-name="dataResourceAttribute" target="updateDataResourceAttribute" title="" type="list"
- odd-row-style="alternate-row" default-table-style="basic-table hover-bar">
+ odd-row-style="alternate-row" header-row-style="header-row-2" default-table-style="basic-table hover-bar">
<actions>
<service service-name="performFind" result-map-list-name="listIt">
<field-map field-name="inputFields" env-name="parameters"/>
@@ -312,7 +312,7 @@
<field name="submitButton" title="${uiLabelMap.CommonAdd}" widget-style="smallSubmit"><submit button-type="button"/></field>
</form>
<form name="ListDataResourceRole" list-name="dataResourceRole" target="updateDataResourceRole" title="" type="list"
- odd-row-style="alternate-row" default-table-style="basic-table hover-bar">
+ odd-row-style="alternate-row" header-row-style="header-row-2" default-table-style="basic-table hover-bar">
<actions>
<service service-name="performFind" result-map-list-name="listIt">
<field-map field-name="inputFields" env-name="parameters"/>
@@ -336,7 +336,7 @@
<field name="submitButton" title="${uiLabelMap.CommonAdd}" widget-style="smallSubmit"><submit button-type="button"/></field>
</form>
<form name="ListDataResourceProductFeature" list-name="productFeatureDataResource" target="" title="" type="list"
- odd-row-style="alternate-row" default-table-style="basic-table hover-bar">
+ odd-row-style="alternate-row" header-row-style="header-row-2" default-table-style="basic-table hover-bar">
<actions>
<service service-name="performFind" result-map-list-name="listIt">
<field-map field-name="inputFields" env-name="parameters"/>

Modified: ofbiz/trunk/applications/content/widget/content/DataResourceScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/content/widget/content/DataResourceScreens.xml?rev=667013&r1=667012&r2=667013&view=diff
==============================================================================
--- ofbiz/trunk/applications/content/widget/content/DataResourceScreens.xml (original)
+++ ofbiz/trunk/applications/content/widget/content/DataResourceScreens.xml Thu Jun 12 02:34:05 2008
@@ -391,34 +391,10 @@
<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.PageTitleEditDataResourceAttribute}"/>
- </container>
- </container>
- <container style="screenlet-body">
- <section>
- <widgets>
- <include-form name="ListDataResourceAttribute" 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.PageTitleEditDataResourceAttribute}"/>
- </container>
- </container>
- <container style="screenlet-body">
- <section>
- <widgets>
- <include-form name="AddDataResourceAttribute" location="component://content/widget/content/DataResourceForms.xml"/>
- </widgets>
- </section>
- </container>
- </container>
+ <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"/>
</decorator-section>
</decorator-screen>
</widgets>
@@ -438,34 +414,10 @@
<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.PageTitleEditDataResourceRole}"/>
- </container>
- </container>
- <container style="screenlet-body">
- <section>
- <widgets>
- <include-form name="ListDataResourceRole" 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.PageTitleEditDataResourceRole}"/>
- </container>
- </container>
- <container style="screenlet-body">
- <section>
- <widgets>
- <include-form name="AddDataResourceRole" location="component://content/widget/content/DataResourceForms.xml"/>
- </widgets>
- </section>
- </container>
- </container>
+ <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"/>
</decorator-section>
</decorator-screen>
</widgets>
@@ -485,34 +437,10 @@
<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.PageTitleEditDataResourceProductFeatures}"/>
- </container>
- </container>
- <container style="screenlet-body">
- <section>
- <widgets>
- <include-form name="ListDataResourceProductFeature" 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.PageTitleEditDataResourceProductFeatures}"/>
- </container>
- </container>
- <container style="screenlet-body">
- <section>
- <widgets>
- <include-form name="AddDataResourceProductFeature" location="component://content/widget/content/DataResourceForms.xml"/>
- </widgets>
- </section>
- </container>
- </container>
+ <screenlet id="DataResourceProductFeaturePanel" title="${uiLabelMap.PageTitleEditDataResourceProductFeatures}" collapsible="true">
+ <include-form name="AddDataResourceProductFeatures" location="component://content/widget/content/DataResourceForms.xml"/>
+ </screenlet>
+ <include-form name="ListDataResourceProductFeature" location="component://content/widget/content/DataResourceForms.xml"/>
</decorator-section>
</decorator-screen>
</widgets>

Modified: ofbiz/trunk/applications/content/widget/contentsetup/ContentSetupScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/content/widget/contentsetup/ContentSetupScreens.xml?rev=667013&r1=667012&r2=667013&view=diff
==============================================================================
--- ofbiz/trunk/applications/content/widget/contentsetup/ContentSetupScreens.xml (original)
+++ ofbiz/trunk/applications/content/widget/contentsetup/ContentSetupScreens.xml Thu Jun 12 02:34:05 2008
@@ -32,34 +32,10 @@
<widgets>
<decorator-screen name="commonContentSetupDecorator" location="${parameters.mainDecoratorLocation}">
<decorator-section name="body">
- <container style="screenlet">
- <container style="screenlet-title-bar">
- <container style="h3">
- <label text="${uiLabelMap.PageTitleEditContentType}"/>
- </container>
- </container>
- <container style="screenlet-body">
- <section>
- <widgets>
- <include-form name="UpdateContentType" location="component://content/webapp/content/contentsetup/ContentSetupForms.xml"/>
- </widgets>
- </section>
- </container>
- </container>
- <container style="screenlet">
- <container style="screenlet-title-bar">
- <container style="h3">
- <label text="${uiLabelMap.PageTitleEditContentType}"/>
- </container>
- </container>
- <container style="screenlet-body">
- <section>
- <widgets>
- <include-form name="AddContentType" location="component://content/webapp/content/contentsetup/ContentSetupForms.xml"/>
- </widgets>
- </section>
- </container>
- </container>
+ <screenlet id="ContentTypePanel" title="${uiLabelMap.PageTitleEditContentType}" collapsible="true">
+ <include-form name="AddContentType" location="component://content/webapp/content/contentsetup/ContentSetupForms.xml"/>
+ </screenlet>
+ <include-form name="UpdateContentType" location="component://content/webapp/content/contentsetup/ContentSetupForms.xml"/>
</decorator-section>
</decorator-screen>
</widgets>
@@ -76,34 +52,10 @@
<widgets>
<decorator-screen name="commonContentSetupDecorator" location="${parameters.mainDecoratorLocation}">
<decorator-section name="body">
- <container style="screenlet">
- <container style="screenlet-title-bar">
- <container style="h3">
- <label text="${uiLabelMap.PageTitleEditContentAttribute}"/>
- </container>
- </container>
- <container style="screenlet-body">
- <section>
- <widgets>
- <include-form name="UpdateContentTypeAttr" location="component://content/webapp/content/contentsetup/ContentSetupForms.xml"/>
- </widgets>
- </section>
- </container>
- </container>
- <container style="screenlet">
- <container style="screenlet-title-bar">
- <container style="h3">
- <label text="${uiLabelMap.PageTitleEditContentAttribute}"/>
- </container>
- </container>
- <container style="screenlet-body">
- <section>
- <widgets>
- <include-form name="AddContentTypeAttr" location="component://content/webapp/content/contentsetup/ContentSetupForms.xml"/>
- </widgets>
- </section>
- </container>
- </container>
+ <screenlet id="ContentTypeAttrPanel" title="${uiLabelMap.PageTitleEditContentAttribute}" collapsible="true">
+ <include-form name="AddContentTypeAttr" location="component://content/webapp/content/contentsetup/ContentSetupForms.xml"/>
+ </screenlet>
+ <include-form name="UpdateContentTypeAttr" location="component://content/webapp/content/contentsetup/ContentSetupForms.xml"/>
</decorator-section>
</decorator-screen>
</widgets>
@@ -120,34 +72,10 @@
<widgets>
<decorator-screen name="commonContentSetupDecorator" location="${parameters.mainDecoratorLocation}">
<decorator-section name="body">
- <container style="screenlet">
- <container style="screenlet-title-bar">
- <container style="h3">
- <label text="${uiLabelMap.PageTitleEditContentAssoc}"/>
- </container>
- </container>
- <container style="screenlet-body">
- <section>
- <widgets>
- <include-form name="UpdateContentAssocType" location="component://content/webapp/content/contentsetup/ContentSetupForms.xml"/>
- </widgets>
- </section>
- </container>
- </container>
- <container style="screenlet">
- <container style="screenlet-title-bar">
- <container style="h3">
- <label text="${uiLabelMap.PageTitleEditContentAssoc}"/>
- </container>
- </container>
- <container style="screenlet-body">
- <section>
- <widgets>
- <include-form name="AddContentAssocType" location="component://content/webapp/content/contentsetup/ContentSetupForms.xml"/>
- </widgets>
- </section>
- </container>
- </container>
+ <screenlet id="ContentAssocTypePanel" title="${uiLabelMap.PageTitleEditContentAssoc}" collapsible="true">
+ <include-form name="AddContentAssocType" location="component://content/webapp/content/contentsetup/ContentSetupForms.xml"/>
+ </screenlet>
+ <include-form name="UpdateContentAssocType" location="component://content/webapp/content/contentsetup/ContentSetupForms.xml"/>
</decorator-section>
</decorator-screen>
</widgets>
@@ -164,34 +92,10 @@
<widgets>
<decorator-screen name="commonContentSetupDecorator" location="${parameters.mainDecoratorLocation}">
<decorator-section name="body">
- <container style="screenlet">
- <container style="screenlet-title-bar">
- <container style="h3">
- <label text="${uiLabelMap.PageTitleEditContentPurpose}"/>
- </container>
- </container>
- <container style="screenlet-body">
- <section>
- <widgets>
- <include-form name="UpdateContentPurposeType" location="component://content/webapp/content/contentsetup/ContentSetupForms.xml"/>
- </widgets>
- </section>
- </container>
- </container>
- <container style="screenlet">
- <container style="screenlet-title-bar">
- <container style="h3">
- <label text="${uiLabelMap.PageTitleEditContentPurpose}"/>
- </container>
- </container>
- <container style="screenlet-body">
- <section>
- <widgets>
- <include-form name="AddContentPurposeType" location="component://content/webapp/content/contentsetup/ContentSetupForms.xml"/>
- </widgets>
- </section>
- </container>
- </container>
+ <screenlet id="ContentPurposeTypePanel" title="${uiLabelMap.PageTitleEditContentPurpose}" collapsible="true">
+ <include-form name="AddContentPurposeType" location="component://content/webapp/content/contentsetup/ContentSetupForms.xml"/>
+ </screenlet>
+ <include-form name="UpdateContentPurposeType" location="component://content/webapp/content/contentsetup/ContentSetupForms.xml"/>
</decorator-section>
</decorator-screen>
</widgets>
@@ -208,34 +112,10 @@
<widgets>
<decorator-screen name="commonContentSetupDecorator" location="${parameters.mainDecoratorLocation}">
<decorator-section name="body">
- <container style="screenlet">
- <container style="screenlet-title-bar">
- <container style="h3">
- <label text="${uiLabelMap.PageTitleEditContentAssocPredicate}"/>
- </container>
- </container>
- <container style="screenlet-body">
- <section>
- <widgets>
- <include-form name="UpdateContentAssocPredicate" location="component://content/webapp/content/contentsetup/ContentSetupForms.xml"/>
- </widgets>
- </section>
- </container>
- </container>
- <container style="screenlet">
- <container style="screenlet-title-bar">
- <container style="h3">
- <label text="${uiLabelMap.PageTitleEditContentAssocPredicate}"/>
- </container>
- </container>
- <container style="screenlet-body">
- <section>
- <widgets>
- <include-form name="AddContentAssocPredicate" location="component://content/webapp/content/contentsetup/ContentSetupForms.xml"/>
- </widgets>
- </section>
- </container>
- </container>
+ <screenlet id="ContentAssocPredicatePanel" title="${uiLabelMap.PageTitleEditContentAssocPredicate}" collapsible="true">
+ <include-form name="AddContentAssocPredicate" location="component://content/webapp/content/contentsetup/ContentSetupForms.xml"/>
+ </screenlet>
+ <include-form name="UpdateContentAssocPredicate" location="component://content/webapp/content/contentsetup/ContentSetupForms.xml"/>
</decorator-section>
</decorator-screen>
</widgets>
@@ -252,34 +132,10 @@
<widgets>
<decorator-screen name="commonContentSetupDecorator" location="${parameters.mainDecoratorLocation}">
<decorator-section name="body">
- <container style="screenlet">
- <container style="screenlet-title-bar">
- <container style="h3">
- <label text="${uiLabelMap.PageTitleEditContentPurposeOperation}"/>
- </container>
- </container>
- <container style="screenlet-body">
- <section>
- <widgets>
- <include-form name="UpdateContentPurposeOperation" location="component://content/webapp/content/contentsetup/ContentSetupForms.xml"/>
- </widgets>
- </section>
- </container>
- </container>
- <container style="screenlet">
- <container style="screenlet-title-bar">
- <container style="h3">
- <label text="${uiLabelMap.PageTitleEditContentPurposeOperation}"/>
- </container>
- </container>
- <container style="screenlet-body">
- <section>
- <widgets>
- <include-form name="AddContentPurposeOperation" location="component://content/webapp/content/contentsetup/ContentSetupForms.xml"/>
- </widgets>
- </section>
- </container>
- </container>
+ <screenlet id="ContentPurposeOperationPanel" title="${uiLabelMap.PageTitleEditContentPurposeOperation}" collapsible="true">
+ <include-form name="AddContentPurposeOperation" location="component://content/webapp/content/contentsetup/ContentSetupForms.xml"/>
+ </screenlet>
+ <include-form name="UpdateContentPurposeOperation" location="component://content/webapp/content/contentsetup/ContentSetupForms.xml"/>
</decorator-section>
</decorator-screen>
</widgets>
@@ -318,34 +174,10 @@
<widgets>
<decorator-screen name="commonContentSetupDecorator" location="${parameters.mainDecoratorLocation}">
<decorator-section name="body">
- <container style="screenlet">
- <container style="screenlet-title-bar">
- <container style="h3">
- <label text="${uiLabelMap.PageTitleEditContentOperation}"/>
- </container>
- </container>
- <container style="screenlet-body">
- <section>
- <widgets>
- <include-form name="UpdateContentOperation" location="component://content/webapp/content/contentsetup/ContentSetupForms.xml"/>
- </widgets>
- </section>
- </container>
- </container>
- <container style="screenlet">
- <container style="screenlet-title-bar">
- <container style="h3">
- <label text="${uiLabelMap.PageTitleEditContentOperation}"/>
- </container>
- </container>
- <container style="screenlet-body">
- <section>
- <widgets>
- <include-form name="AddContentOperation" location="component://content/webapp/content/contentsetup/ContentSetupForms.xml"/>
- </widgets>
- </section>
- </container>
- </container>
+ <screenlet id="ContentOperationPanel" title="${uiLabelMap.PageTitleEditContentOperation}" collapsible="true">
+ <include-form name="AddContentOperation" location="component://content/webapp/content/contentsetup/ContentSetupForms.xml"/>
+ </screenlet>
+ <include-form name="UpdateContentOperation" location="component://content/webapp/content/contentsetup/ContentSetupForms.xml"/>
</decorator-section>
</decorator-screen>
</widgets>