You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ofbiz.apache.org by as...@apache.org on 2008/06/12 14:47:25 UTC

svn commit: r667062 - in /ofbiz/trunk/applications/workeffort: config/ widget/

Author: ashish
Date: Thu Jun 12 05:47:25 2008
New Revision: 667062

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

Thanks Awdesh Singh Parihar for your patch.

Modified:
    ofbiz/trunk/applications/workeffort/config/WorkEffortUiLabels.xml
    ofbiz/trunk/applications/workeffort/widget/WorkEffortCommEventForms.xml
    ofbiz/trunk/applications/workeffort/widget/WorkEffortForms.xml
    ofbiz/trunk/applications/workeffort/widget/WorkEffortOrderHeaderForms.xml
    ofbiz/trunk/applications/workeffort/widget/WorkEffortPartyAssignForms.xml
    ofbiz/trunk/applications/workeffort/widget/WorkEffortQuoteForms.xml
    ofbiz/trunk/applications/workeffort/widget/WorkEffortRequestForms.xml
    ofbiz/trunk/applications/workeffort/widget/WorkEffortRequirementForms.xml
    ofbiz/trunk/applications/workeffort/widget/WorkEffortScreens.xml
    ofbiz/trunk/applications/workeffort/widget/WorkEffortShopListForms.xml

Modified: ofbiz/trunk/applications/workeffort/config/WorkEffortUiLabels.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/workeffort/config/WorkEffortUiLabels.xml?rev=667062&r1=667061&r2=667062&view=diff
==============================================================================
--- ofbiz/trunk/applications/workeffort/config/WorkEffortUiLabels.xml (original)
+++ ofbiz/trunk/applications/workeffort/config/WorkEffortUiLabels.xml Thu Jun 12 05:47:25 2008
@@ -1027,21 +1027,6 @@
         <value xml:lang="th">อัตราการมอบหมายงาน</value>
         <value xml:lang="zh">人工服务指派费率</value>
     </property>
-    <property key="PageTitleListWorkEffortCommEvents">
-        <value xml:lang="en">Work Effort Communication Events</value>
-        <value xml:lang="es">Eventos de comunicación</value>
-        <value xml:lang="it">Lista Impegno di Lavoro Eventi Comunicazioni</value>
-        <value xml:lang="nl">Communicatie evenementen</value>
-        <value xml:lang="ro">Lista Sarcina de Lucru Evenimente Comunicatii</value>
-        <value xml:lang="th">ผลที่ได้จากการติดต่องาน</value>
-        <value xml:lang="zh">人工服务沟通事件</value>
-    </property>
-    <property key="PageTitleListWorkEffortKeyword">
-        <value xml:lang="en">Work Effort Keywords</value>
-        <value xml:lang="it">Chiavi Impegno di Lavoro</value>
-        <value xml:lang="th">คีย์เวิร์ดงาน</value>
-        <value xml:lang="zh">人工服务关键字</value>
-    </property>
     <property key="PageTitleListWorkEffortNotes">
         <value xml:lang="en">Work Effort Notes</value>
         <value xml:lang="it">Note Impegno di Lavoro</value>
@@ -1066,33 +1051,6 @@
         <value xml:lang="th">กลุ่มงานที่ได้รับมอบหมาย</value>
         <value xml:lang="zh">人工服务会员指派</value>
     </property>
-    <property key="PageTitleListWorkEffortQuoteItems">
-        <value xml:lang="en">Work Effort QuoteItems</value>
-        <value xml:lang="es">Ítems de cotización</value>
-        <value xml:lang="it">Lista Impegno di Lavoro Righe Preventivo</value>
-        <value xml:lang="nl">Activiteit QuoteItems</value>
-        <value xml:lang="ro">Lista Sarcina de Lucru Linie Preventiv</value>
-        <value xml:lang="th">รายการการอ้างอิงงาน</value>
-        <value xml:lang="zh">人工服务询价明细</value>
-    </property>
-    <property key="PageTitleListWorkEffortQuotes">
-        <value xml:lang="en">Work Effort Quotes</value>
-        <value xml:lang="es">Cotizaciones</value>
-        <value xml:lang="it">Lista Impegno di Lavoro Preventivi</value>
-        <value xml:lang="nl">Activiteit Quotes</value>
-        <value xml:lang="ro">Lista Sarcini de Lucru Preventive</value>
-        <value xml:lang="th">การอ้างอิงงาน</value>
-        <value xml:lang="zh">人工服务询价</value>
-    </property>
-    <property key="PageTitleListWorkEffortRequestItems">
-        <value xml:lang="en">Work Effort RequestItems</value>
-        <value xml:lang="es">Ítems de pedido</value>
-        <value xml:lang="it">Lista Impegno di Lavoro Righe Richieste</value>
-        <value xml:lang="nl">Activiteit RequestItems</value>
-        <value xml:lang="ro">Lista Sarcina de Lucru Linie Cerere</value>
-        <value xml:lang="th">รายการคำร้องงาน</value>
-        <value xml:lang="zh">人工服务请求明细</value>
-    </property>
     <property key="PageTitleListWorkEffortRequests">
         <value xml:lang="en">Work Effort Requests</value>
         <value xml:lang="es">Pedidos</value>
@@ -1102,30 +1060,6 @@
         <value xml:lang="th">คำร้องงาน</value>
         <value xml:lang="zh">人工服务请求</value>
     </property>
-    <property key="PageTitleListWorkEffortRequirements">
-        <value xml:lang="en">Work Effort Requirements</value>
-        <value xml:lang="es">Requerimientos</value>
-        <value xml:lang="it">Lista Impegno di Lavoro Fabbisogni</value>
-        <value xml:lang="nl">Activiteit Requirements</value>
-        <value xml:lang="ro">Lista Sarcini de Lucru Necesar</value>
-        <value xml:lang="th">ความต้องการงาน</value>
-        <value xml:lang="zh">人工服务需求</value>
-    </property>
-    <property key="PageTitleListWorkEffortReviews">
-        <value xml:lang="en">Work Effort Reviews</value>
-        <value xml:lang="it">Recensioni Impegno di Lavoro</value>
-        <value xml:lang="th">ตรวจสอบงาน</value>
-        <value xml:lang="zh">人工服务检查</value>
-    </property>
-    <property key="PageTitleListWorkEffortShopLists">
-        <value xml:lang="en">Work Effort Shopping Lists</value>
-        <value xml:lang="es">Listas de compras</value>
-        <value xml:lang="it">Lista Liste Acquisto Impegno di Lavoro</value>
-        <value xml:lang="nl">Activiteit Shopping Lists</value>
-        <value xml:lang="ro">Lista Listelor de Cumparari Prestari Servicii </value>
-        <value xml:lang="th">งานรายการซื้อสินค้า</value>
-        <value xml:lang="zh">人工服务购买列表</value>
-    </property>
     <property key="PageTitleListWorkEffortTimeEntries">
         <value xml:lang="en">Work Effort Time Entries</value>
         <value xml:lang="es">Entradas de tiempo</value>
@@ -2939,9 +2873,9 @@
         <value xml:lang="th">กลุ่มผู้ใช้</value>
         <value xml:lang="zh">会员</value>
     </property>
-    <property key="WorkEffortPartyAssignmentError">
-        <value xml:lang="en">Party ${parameters.partyId} with role ${parameters.roleTypeId} is already assigned to work effort Id ${parameters.workEffortId}, not adding again</value>
-    </property>
+    <property key="WorkEffortPartyAssignmentError">
+        <value xml:lang="en">Party ${parameters.partyId} with role ${parameters.roleTypeId} is already assigned to work effort Id ${parameters.workEffortId}, not adding again</value>
+    </property>
     <property key="WorkEffortPartyId">
         <value xml:lang="en">Party Id</value>
         <value xml:lang="es">Código del participante</value>
@@ -3785,7 +3719,7 @@
     </property>
     <property key="WorkEffortWorkEfforts">
         <value xml:lang="en">Work Efforts</value>
-        <value xml:lang="es">Hojas de trabajo</value>
+        <value xml:lang="es">Hojas de trabajo</value>
         <value xml:lang="it">Impegni di Lavoro</value>
         <value xml:lang="nl">Acties</value>
         <value xml:lang="ro">Sarcini de Lucru </value>

Modified: ofbiz/trunk/applications/workeffort/widget/WorkEffortCommEventForms.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/workeffort/widget/WorkEffortCommEventForms.xml?rev=667062&r1=667061&r2=667062&view=diff
==============================================================================
--- ofbiz/trunk/applications/workeffort/widget/WorkEffortCommEventForms.xml (original)
+++ ofbiz/trunk/applications/workeffort/widget/WorkEffortCommEventForms.xml Thu Jun 12 05:47:25 2008
@@ -20,7 +20,7 @@
 
 <forms xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://ofbiz.apache.org/dtds/widget-form.xsd">
     <form name="ListWorkEffortCommEvents" separate-columns="false" target="updateCommunicationEventWorkEff" 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="WorkEffortCommunicationEventView">
                 <condition-list combine="and">

Modified: ofbiz/trunk/applications/workeffort/widget/WorkEffortForms.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/workeffort/widget/WorkEffortForms.xml?rev=667062&r1=667061&r2=667062&view=diff
==============================================================================
--- ofbiz/trunk/applications/workeffort/widget/WorkEffortForms.xml (original)
+++ ofbiz/trunk/applications/workeffort/widget/WorkEffortForms.xml Thu Jun 12 05:47:25 2008
@@ -667,7 +667,7 @@
 
     <!-- WorkEffortAssignmentRate -->
     <form name="ListWorkEffortAssignmentRates" type="list" list-name="workEffortAssignmentRates" target="updateWorkEffortAssignmentRate"
-        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="WorkEffortAssignmentRate">
                 <condition-expr field-name="workEffortId" env-name="workEffortId"/>
@@ -845,7 +845,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="workEffortId" field-name="workEffortId" />
@@ -892,7 +892,7 @@
         <field name="submitButton" title="${uiLabelMap.CommonAdd}" widget-style="smallSubmit"><submit button-type="button"/></field>
     </form>
     <form name="ListWorkEffortGoodStandards" type="list" target="updateWorkEffortGoodStandard" list-name="workEffortGoodStandards"
-        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="WorkEffortGoodStandard" use-cache="true" list-name="workEffortGoodStandards">
                 <field-map env-name="workEffortId" field-name="workEffortId" />
@@ -942,7 +942,7 @@
         <field name="submitButton" title="${uiLabelMap.CommonAdd}" widget-style="smallSubmit"><submit button-type="button"/></field>
     </form>
     <form name="ListWorkEffortReviews" type="list" target="updateWorkEffortReview" list-name="productWorkEfforts"  separate-columns="true"
-        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="WorkEffortReview" use-cache="true" list-name="workEffortReviews">
                 <field-map env-name="workEffortId" field-name="workEffortId" />
@@ -979,7 +979,7 @@
         <field name="submitButton" title="${uiLabelMap.CommonAdd}" widget-style="smallSubmit"><submit button-type="button"/></field>
     </form>
     <form name="ListWorkEffortKeywords" type="list" target="" list-name="listWorkEffortKeywords"
-        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="WorkEffortKeyword" use-cache="true" list-name="workEffortkeywords">
                 <field-map env-name="workEffortId" field-name="workEffortId" />
@@ -1002,7 +1002,7 @@
         <field name="submitButton" title="${uiLabelMap.CommonAdd}"><submit button-type="button"/></field>
     </form>
     <form name="ListWorkEffortContactMechs" type="list" target="" list-name="workEffortContactMechs"
-        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="WorkEffortContactMech" list-name="workEffortContactMechs">
                 <field-map env-name="workEffortId" field-name="workEffortId" />
@@ -1036,7 +1036,7 @@
         <field name="submitButton" title="${uiLabelMap.CommonAdd}" widget-style="smallSubmit"><submit button-type="button"/></field>
     </form>
     <form name="ListAgreementWorkEffortAppls" type="list" target="updateAgreementWorkEffortAppl" list-name="agreementWorkEffortAppls"
-        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="AgreementWorkEffortAppl" use-cache="true" list-name="agreementWorkEffortAppls">
                 <field-map env-name="workEffortId" field-name="workEffortId" />

Modified: ofbiz/trunk/applications/workeffort/widget/WorkEffortOrderHeaderForms.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/workeffort/widget/WorkEffortOrderHeaderForms.xml?rev=667062&r1=667061&r2=667062&view=diff
==============================================================================
--- ofbiz/trunk/applications/workeffort/widget/WorkEffortOrderHeaderForms.xml (original)
+++ ofbiz/trunk/applications/workeffort/widget/WorkEffortOrderHeaderForms.xml Thu Jun 12 05:47:25 2008
@@ -21,7 +21,7 @@
 <forms xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://ofbiz.apache.org/dtds/widget-form.xsd">
   
     <form name="ListWorkEffortOrderHeaders" separate-columns="true" 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>
             <entity-and entity-name="WorkEffortOrderHeaderView">
                 <field-map field-name="workEffortId"/>

Modified: ofbiz/trunk/applications/workeffort/widget/WorkEffortPartyAssignForms.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/workeffort/widget/WorkEffortPartyAssignForms.xml?rev=667062&r1=667061&r2=667062&view=diff
==============================================================================
--- ofbiz/trunk/applications/workeffort/widget/WorkEffortPartyAssignForms.xml (original)
+++ ofbiz/trunk/applications/workeffort/widget/WorkEffortPartyAssignForms.xml Thu Jun 12 05:47:25 2008
@@ -21,7 +21,7 @@
 <forms xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://ofbiz.apache.org/dtds/widget-form.xsd">
   
     <form name="ListWorkEffortPartyAssigns" separate-columns="false" target="updateWorkEffortPartyAssign" 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="WorkEffortPartyAssignment">
                 <condition-expr field-name="workEffortId" operator="equals" env-name="workEffortId"/>

Modified: ofbiz/trunk/applications/workeffort/widget/WorkEffortQuoteForms.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/workeffort/widget/WorkEffortQuoteForms.xml?rev=667062&r1=667061&r2=667062&view=diff
==============================================================================
--- ofbiz/trunk/applications/workeffort/widget/WorkEffortQuoteForms.xml (original)
+++ ofbiz/trunk/applications/workeffort/widget/WorkEffortQuoteForms.xml Thu Jun 12 05:47:25 2008
@@ -21,7 +21,7 @@
 <forms xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://ofbiz.apache.org/dtds/widget-form.xsd">
   
     <form name="ListWorkEffortQuotes" separate-columns="true" target="ListWorkEffortQuotes" 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="WorkEffortQuoteView">
                 <field-map field-name="workEffortId"/>
@@ -45,7 +45,7 @@
     </form>
 
     <form name="ListWorkEffortQuoteItems" separate-columns="true" target="ListWorkEffortQuoteItems" 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="QuoteItem">
                 <field-map field-name="workEffortId"/>

Modified: ofbiz/trunk/applications/workeffort/widget/WorkEffortRequestForms.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/workeffort/widget/WorkEffortRequestForms.xml?rev=667062&r1=667061&r2=667062&view=diff
==============================================================================
--- ofbiz/trunk/applications/workeffort/widget/WorkEffortRequestForms.xml (original)
+++ ofbiz/trunk/applications/workeffort/widget/WorkEffortRequestForms.xml Thu Jun 12 05:47:25 2008
@@ -21,7 +21,7 @@
 <forms xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://ofbiz.apache.org/dtds/widget-form.xsd">
   
     <form name="ListWorkEffortRequests" separate-columns="true" target="ListWorkEffortRequests" 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="WorkEffortCustRequestView">
                 <field-map field-name="workEffortId"/>
@@ -46,7 +46,7 @@
     </form>
     
     <form name="ListWorkEffortRequestItems" separate-columns="true" target="ListWorkEffortRequestItems" 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="WorkEffortCustRequestItemView">
                 <field-map field-name="workEffortId"/>

Modified: ofbiz/trunk/applications/workeffort/widget/WorkEffortRequirementForms.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/workeffort/widget/WorkEffortRequirementForms.xml?rev=667062&r1=667061&r2=667062&view=diff
==============================================================================
--- ofbiz/trunk/applications/workeffort/widget/WorkEffortRequirementForms.xml (original)
+++ ofbiz/trunk/applications/workeffort/widget/WorkEffortRequirementForms.xml Thu Jun 12 05:47:25 2008
@@ -21,7 +21,7 @@
 <forms xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://ofbiz.apache.org/dtds/widget-form.xsd">
   
     <form name="ListWorkEffortRequirements" separate-columns="true" 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>
             <entity-and entity-name="WorkEffortRequirementView">
                 <field-map field-name="workEffortId"/>

Modified: ofbiz/trunk/applications/workeffort/widget/WorkEffortScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/workeffort/widget/WorkEffortScreens.xml?rev=667062&r1=667061&r2=667062&view=diff
==============================================================================
--- ofbiz/trunk/applications/workeffort/widget/WorkEffortScreens.xml (original)
+++ ofbiz/trunk/applications/workeffort/widget/WorkEffortScreens.xml Thu Jun 12 05:47:25 2008
@@ -457,34 +457,10 @@
             <widgets>
                 <decorator-screen name="CommonWorkEffortDecorator" location="${parameters.mainDecoratorLocation}">
                     <decorator-section name="body">
-                        <container style="screenlet">
-                            <container style="screenlet-title-bar">
-                                <container style="h3">
-                                    <label text="${uiLabelMap.PageTitleListWorkEffortPartyAssigns}"/>
-                                </container>
-                            </container>
-                            <container style="screenlet-body">
-                                <section>
-                                    <widgets>    
-                                        <include-form name="ListWorkEffortPartyAssigns" location="component://workeffort/widget/WorkEffortPartyAssignForms.xml"/>
-                                    </widgets>
-                                </section>
-                            </container>
-                        </container>
-                        <container style="screenlet">
-                            <container style="screenlet-title-bar">
-                                <container style="h3">
-                                    <label text="${uiLabelMap.PageTitleAddWorkEffortPartyAssign}"/>
-                                </container>
-                            </container>
-                            <container style="screenlet-body">
-                                <section>
-                                    <widgets>    
-                                        <include-form name="EditWorkEffortPartyAssign" location="component://workeffort/widget/WorkEffortPartyAssignForms.xml"/>
-                                    </widgets>
-                                </section>
-                            </container>
-                        </container>
+                        <screenlet id="WorkEffortPartyAssignsPanel" title="${uiLabelMap.PageTitleAddWorkEffortPartyAssign}" collapsible="true">
+                            <include-form name="EditWorkEffortPartyAssign" location="component://workeffort/widget/WorkEffortPartyAssignForms.xml"/>
+                        </screenlet>
+                        <include-form name="ListWorkEffortPartyAssigns" location="component://workeffort/widget/WorkEffortPartyAssignForms.xml"/>
                     </decorator-section>
                 </decorator-screen>
             </widgets>
@@ -502,34 +478,10 @@
             <widgets>
                 <decorator-screen name="CommonWorkEffortDecorator" location="${parameters.mainDecoratorLocation}">
                     <decorator-section name="body">
-                        <container style="screenlet">
-                            <container style="screenlet-title-bar">
-                                <container style="h3">
-                                    <label text="${uiLabelMap.PageTitleListWorkEffortAssignmentRates}"/>
-                                </container>
-                            </container>
-                            <container style="screenlet-body">
-                                <section>
-                                    <widgets>    
-                                           <include-form name="ListWorkEffortAssignmentRates" location="component://workeffort/widget/WorkEffortForms.xml"/>
-                                    </widgets>
-                                </section>
-                            </container>
-                        </container>
-                        <container style="screenlet">
-                            <container style="screenlet-title-bar">
-                                <container style="h3">
-                                    <label text="${uiLabelMap.PageTitleAddWorkEffortAssignmentRate}"/>
-                                </container>
-                            </container>
-                            <container style="screenlet-body">
-                                <section>
-                                    <widgets>    
-                                           <include-form name="AddWorkEffortAssignmentRate" location="component://workeffort/widget/WorkEffortForms.xml"/>
-                                    </widgets>
-                                </section>
-                            </container>
-                        </container>
+                        <screenlet id="WorkEffortAssignmentRatesPanel" title="${uiLabelMap.PageTitleAddWorkEffortAssignmentRate}" collapsible="true">
+                            <include-form name="AddWorkEffortAssignmentRate" location="component://workeffort/widget/WorkEffortForms.xml"/>
+                        </screenlet>
+                        <include-form name="ListWorkEffortAssignmentRates" location="component://workeffort/widget/WorkEffortForms.xml"/>
                     </decorator-section>
                 </decorator-screen>
             </widgets>
@@ -538,43 +490,19 @@
     <screen name="ListWorkEffortCommEvents">
         <section>
             <actions>
-                <set field="titleProperty" value="PageTitleListWorkEffortCommEvents"/>
+                <set field="titleProperty" value="PageTitleAddWorkEffortCommEvent"/>
                 <set field="tabButtonItem" value="WorkEffortCommEvents"/>
-                <set field="labelTitleProperty" value="PageTitleListWorkEffortCommEvents"/>
+                <set field="labelTitleProperty" value="PageTitleAddWorkEffortCommEvent"/>
                 
                 <set field="workEffortId" from-field="parameters.workEffortId"/>
             </actions>
             <widgets>
                 <decorator-screen name="CommonWorkEffortDecorator" location="${parameters.mainDecoratorLocation}">
                     <decorator-section name="body">
-                        <container style="screenlet">
-                            <container style="screenlet-title-bar">
-                                <container style="h3">
-                                    <label text="${uiLabelMap.PageTitleListWorkEffortCommEvents}"/>
-                                </container>
-                            </container>
-                            <container style="screenlet-body">
-                                <section>
-                                    <widgets>    
-                                           <include-form name="ListWorkEffortCommEvents" location="component://workeffort/widget/WorkEffortCommEventForms.xml"/>
-                                    </widgets>
-                                </section>
-                            </container>
-                        </container>
-                        <container style="screenlet">
-                            <container style="screenlet-title-bar">
-                                <container style="h3">
-                                    <label text="${uiLabelMap.PageTitleAddWorkEffortCommEvent}"/>
-                                </container>
-                            </container>
-                            <container style="screenlet-body">
-                                <section>
-                                    <widgets>    
-                                           <include-form name="AddWorkEffortCommEvent" location="component://workeffort/widget/WorkEffortCommEventForms.xml"/>
-                                    </widgets>
-                                </section>
-                            </container>
-                        </container>
+                        <screenlet id="WorkEffortCommEventsPanel" title="${uiLabelMap.PageTitleAddWorkEffortCommEvent}" collapsible="true">
+                            <include-form name="AddWorkEffortCommEvent" location="component://workeffort/widget/WorkEffortCommEventForms.xml"/>
+                        </screenlet>
+                        <include-form name="ListWorkEffortCommEvents" location="component://workeffort/widget/WorkEffortCommEventForms.xml"/>
                     </decorator-section>
                 </decorator-screen>
             </widgets>
@@ -583,43 +511,19 @@
     <screen name="ListWorkEffortShopLists">
         <section>
             <actions>
-                <set field="titleProperty" value="PageTitleListWorkEffortShopLists"/>
+                <set field="titleProperty" value="PageTitleAddWorkEffortShopList"/>
                 <set field="tabButtonItem" value="WorkEffortShopLists"/>
-                <set field="labelTitleProperty" value="PageTitleListWorkEffortShopLists"/>
+                <set field="labelTitleProperty" value="PageTitleAddWorkEffortShopList"/>
                 
                 <set field="workEffortId" from-field="parameters.workEffortId"/>
             </actions>
             <widgets>
                 <decorator-screen name="CommonWorkEffortDecorator" location="${parameters.mainDecoratorLocation}">
                     <decorator-section name="body">
-                        <container style="screenlet">
-                            <container style="screenlet-title-bar">
-                                <container style="h3">
-                                    <label text="${uiLabelMap.PageTitleListWorkEffortShopLists}"/>
-                                </container>
-                            </container>
-                            <container style="screenlet-body">
-                                <section>
-                                    <widgets>    
-                                           <include-form name="ListWorkEffortShopLists" location="component://workeffort/widget/WorkEffortShopListForms.xml"/>
-                                    </widgets>
-                                </section>
-                            </container>
-                        </container>
-                        <container style="screenlet">
-                            <container style="screenlet-title-bar">
-                                <container style="h3">
-                                    <label text="${uiLabelMap.PageTitleAddWorkEffortShopList}"/>
-                                </container>
-                            </container>
-                            <container style="screenlet-body">
-                                <section>
-                                    <widgets>    
-                                           <include-form name="AddWorkEffortShopList" location="component://workeffort/widget/WorkEffortShopListForms.xml"/>
-                                    </widgets>
-                                </section>
-                            </container>
-                        </container>
+                        <screenlet id="WorkEffortShopListsPanel" title="${uiLabelMap.PageTitleAddWorkEffortShopList}" collapsible="true">
+                            <include-form name="AddWorkEffortShopList" location="component://workeffort/widget/WorkEffortShopListForms.xml"/>
+                        </screenlet>
+                        <include-form name="ListWorkEffortShopLists" location="component://workeffort/widget/WorkEffortShopListForms.xml"/>
                     </decorator-section>
                 </decorator-screen>
             </widgets>
@@ -638,62 +542,14 @@
             <widgets>
                 <decorator-screen name="CommonWorkEffortDecorator" location="${parameters.mainDecoratorLocation}">
                     <decorator-section name="body">
-                        <container style="screenlet">
-                            <container style="screenlet-title-bar">
-                                <container style="h3">
-                                    <label text="${uiLabelMap.PageTitleListWorkEffortRequests}"/>
-                                </container>
-                            </container>
-                            <container style="screenlet-body">
-                                <section>
-                                    <widgets>    
-                                           <include-form name="ListWorkEffortRequests" location="component://workeffort/widget/WorkEffortRequestForms.xml"/>
-                                    </widgets>
-                                </section>
-                            </container>
-                        </container>
-                        <container style="screenlet">
-                            <container style="screenlet-title-bar">
-                                <container style="h3">
-                                    <label text="${uiLabelMap.PageTitleAddWorkEffortRequest}"/>
-                                </container>
-                            </container>
-                            <container style="screenlet-body">
-                                <section>
-                                    <widgets>    
-                                           <include-form name="AddWorkEffortRequest" location="component://workeffort/widget/WorkEffortRequestForms.xml"/>
-                                    </widgets>
-                                </section>
-                            </container>
-                        </container>                        
-                        <container style="screenlet">
-                            <container style="screenlet-title-bar">
-                                <container style="h3">
-                                    <label text="${uiLabelMap.PageTitleListWorkEffortRequestItems}"/>
-                                </container>
-                            </container>
-                            <container style="screenlet-body">
-                                <section>
-                                    <widgets>    
-                                           <include-form name="ListWorkEffortRequestItems" location="component://workeffort/widget/WorkEffortRequestForms.xml"/>
-                                    </widgets>
-                                </section>
-                            </container>
-                        </container>
-                        <container style="screenlet">
-                            <container style="screenlet-title-bar">
-                                <container style="h3">
-                                    <label text="${uiLabelMap.PageTitleAddWorkEffortRequestItem}"/>
-                                </container>
-                            </container>
-                            <container style="screenlet-body">
-                                <section>
-                                    <widgets>    
-                                           <include-form name="AddWorkEffortRequestItem" location="component://workeffort/widget/WorkEffortRequestForms.xml"/>
-                                    </widgets>
-                                </section>
-                            </container>
-                        </container>
+                        <screenlet id="WorkEffortRequestsPanel" title="${uiLabelMap.PageTitleAddWorkEffortRequest}" collapsible="true">
+                            <include-form name="AddWorkEffortRequest" location="component://workeffort/widget/WorkEffortRequestForms.xml"/>
+                        </screenlet>
+                        <include-form name="ListWorkEffortRequests" location="component://workeffort/widget/WorkEffortRequestForms.xml"/>
+                        <screenlet id="WorkEffortRequestItemPanel" title="${uiLabelMap.PageTitleAddWorkEffortRequestItem}" collapsible="true">
+                            <include-form name="AddWorkEffortRequestItem" location="component://workeffort/widget/WorkEffortRequestForms.xml"/>
+                        </screenlet>
+                        <include-form name="ListWorkEffortRequestItems" location="component://workeffort/widget/WorkEffortRequestForms.xml"/>
                     </decorator-section>
                 </decorator-screen>
             </widgets>
@@ -702,9 +558,9 @@
     <screen name="ListWorkEffortRequirements">
         <section>
             <actions>
-                <set field="titleProperty" value="PageTitleListWorkEffortRequirements"/>
+                <set field="titleProperty" value="PageTitleAddWorkEffortRequirement}"/>
                 <set field="tabButtonItem" value="WorkEffortRequirements"/>
-                <set field="labelTitleProperty" value="PageTitleListWorkEffortRequirements"/>
+                <set field="labelTitleProperty" value="PageTitleAddWorkEffortRequirement}"/>
                 
                 <set field="donePage" from-field="parameters.DONE_PAGE" default-value="/workeffort/control/ListWorkEfforts"/>
                 <set field="workEffortId" from-field="parameters.workEffortId"/>
@@ -712,34 +568,10 @@
             <widgets>
                 <decorator-screen name="CommonWorkEffortDecorator" location="${parameters.mainDecoratorLocation}">
                     <decorator-section name="body">
-                        <container style="screenlet">
-                            <container style="screenlet-title-bar">
-                                <container style="h3">
-                                    <label text="${uiLabelMap.PageTitleListWorkEffortRequirements}"/>
-                                </container>
-                            </container>
-                            <container style="screenlet-body">
-                                <section>
-                                    <widgets>    
-                                           <include-form name="ListWorkEffortRequirements" location="component://workeffort/widget/WorkEffortRequirementForms.xml"/>
-                                    </widgets>
-                                </section>
-                            </container>
-                        </container>
-                        <container style="screenlet">
-                            <container style="screenlet-title-bar">
-                                <container style="h3">
-                                    <label text="${uiLabelMap.PageTitleAddWorkEffortRequirement}"/>
-                                </container>
-                            </container>
-                            <container style="screenlet-body">
-                                <section>
-                                    <widgets>    
-                                           <include-form name="AddWorkEffortRequirement" location="component://workeffort/widget/WorkEffortRequirementForms.xml"/>
-                                    </widgets>
-                                </section>
-                            </container>
-                        </container>
+                        <screenlet id="WorkEffortRequirementsPanel" title="${uiLabelMap.PageTitleAddWorkEffortRequirement}" collapsible="true">
+                            <include-form name="AddWorkEffortRequirement" location="component://workeffort/widget/WorkEffortRequirementForms.xml"/>
+                        </screenlet>
+                        <include-form name="ListWorkEffortRequirements" location="component://workeffort/widget/WorkEffortRequirementForms.xml"/>
                     </decorator-section>
                 </decorator-screen>
             </widgets>
@@ -749,72 +581,23 @@
     <screen name="ListWorkEffortQuotes">
         <section>
             <actions>
-                <set field="titleProperty" value="PageTitleListWorkEffortQuotes"/>
+                <set field="titleProperty" value="PageTitleAddWorkEffortQuote"/>
                 <set field="tabButtonItem" value="WorkEffortQuotes"/>
-                <set field="labelTitleProperty" value="PageTitleListWorkEffortQuotes"/>
+                <set field="labelTitleProperty" value="PageTitleAddWorkEffortQuote"/>
                 
                 <set field="workEffortId" from-field="parameters.workEffortId"/>
             </actions>
             <widgets>
                 <decorator-screen name="CommonWorkEffortDecorator" location="${parameters.mainDecoratorLocation}">
                     <decorator-section name="body">
-                        <container style="screenlet">
-                            <container style="screenlet-title-bar">
-                                <container style="h3">
-                                    <label text="${uiLabelMap.PageTitleListWorkEffortQuotes}"/>
-                                </container>
-                            </container>
-                            <container style="screenlet-body">
-                                <section>
-                                    <widgets>    
-                                           <include-form name="ListWorkEffortQuotes" location="component://workeffort/widget/WorkEffortQuoteForms.xml"/>
-                                    </widgets>
-                                </section>
-                            </container>
-                        </container>
-                        <container style="screenlet">
-                            <container style="screenlet-title-bar">
-                                <container style="h3">
-                                    <label text="${uiLabelMap.PageTitleAddWorkEffortQuote}"/>
-                                </container>
-                            </container>
-                            <container style="screenlet-body">
-                                <section>
-                                    <widgets>    
-                                           <include-form name="AddWorkEffortQuote" location="component://workeffort/widget/WorkEffortQuoteForms.xml"/>
-                                    </widgets>
-                                </section>
-                            </container>
-                        </container>
-                        
-                        <container style="screenlet">
-                            <container style="screenlet-title-bar">
-                                <container style="h3">
-                                    <label text="${uiLabelMap.PageTitleListWorkEffortQuoteItems}"/>
-                                </container>
-                            </container>
-                            <container style="screenlet-body">
-                                <section>
-                                    <widgets>    
-                                           <include-form name="ListWorkEffortQuoteItems" location="component://workeffort/widget/WorkEffortQuoteForms.xml"/>
-                                    </widgets>
-                                </section>
-                            </container>
-                        </container>
-                        <container style="screenlet">
-                            <container style="screenlet-title-bar">
-                                <container style="h3">
-                                    <label text="${uiLabelMap.PageTitleAddWorkEffortQuoteItem}"/>
-                                </container>
-                            </container>
-                            <container style="screenlet-body">
-                                <section>
-                                    <widgets>    
-                                           <include-form name="AddWorkEffortQuoteItem" location="component://workeffort/widget/WorkEffortQuoteForms.xml"/>
-                                    </widgets>
-                                </section>
-                            </container>
-                        </container>
+                        <screenlet id="WorkEffortQuotesPanel" title="${uiLabelMap.PageTitleAddWorkEffortQuote}" collapsible="true">
+                            <include-form name="AddWorkEffortQuote" location="component://workeffort/widget/WorkEffortQuoteForms.xml"/>
+                        </screenlet>
+                        <include-form name="ListWorkEffortQuotes" location="component://workeffort/widget/WorkEffortQuoteForms.xml"/>
+                        <screenlet id="WorkEffortQuoteItemPanel" title="${uiLabelMap.PageTitleAddWorkEffortQuoteItem}" collapsible="true">
+                            <include-form name="AddWorkEffortQuoteItem" location="component://workeffort/widget/WorkEffortQuoteForms.xml"/>
+                        </screenlet>
+                        <include-form name="ListWorkEffortQuoteItems" location="component://workeffort/widget/WorkEffortQuoteForms.xml"/>
                     </decorator-section>
                 </decorator-screen>
             </widgets>
@@ -832,34 +615,10 @@
             <widgets>
                 <decorator-screen name="CommonWorkEffortDecorator" location="${parameters.mainDecoratorLocation}">
                     <decorator-section name="body">
-                        <container style="screenlet">
-                            <container style="screenlet-title-bar">
-                                <container style="h3">
-                                    <label text="${uiLabelMap.PageTitleListWorkEffortOrderHeaders}"/>
-                                </container>
-                            </container>
-                            <container style="screenlet-body">
-                                <section>
-                                    <widgets>    
-                                        <include-form name="ListWorkEffortOrderHeaders" location="component://workeffort/widget/WorkEffortOrderHeaderForms.xml"/>
-                                    </widgets>
-                                </section>
-                            </container>
-                        </container>
-                        <container style="screenlet">
-                            <container style="screenlet-title-bar">
-                                <container style="h3">
-                                    <label text="${uiLabelMap.PageTitleAddWorkEffortOrderHeader}"/>
-                                </container>
-                            </container>
-                            <container style="screenlet-body">
-                                <section>
-                                    <widgets>    
-                                        <include-form name="AddWorkEffortOrderHeader" location="component://workeffort/widget/WorkEffortOrderHeaderForms.xml"/>
-                                    </widgets>
-                                </section>
-                            </container>
-                        </container>
+                        <screenlet id="WorkEffortOrderHeadersPanel" title="${uiLabelMap.PageTitleAddWorkEffortOrderHeader}" collapsible="true">
+                            <include-form name="AddWorkEffortOrderHeader" location="component://workeffort/widget/WorkEffortOrderHeaderForms.xml"/>
+                        </screenlet>
+                        <include-form name="ListWorkEffortOrderHeaders" location="component://workeffort/widget/WorkEffortOrderHeaderForms.xml"/>
                     </decorator-section>
                 </decorator-screen>
             </widgets>
@@ -960,34 +719,10 @@
             <widgets>
                 <decorator-screen name="CommonWorkEffortDecorator" location="${parameters.mainDecoratorLocation}">
                     <decorator-section name="body">
-                        <container style="screenlet">
-                            <container style="screenlet-title-bar">
-                                <container style="h3">
-                                    <label text="${uiLabelMap.PageTitleListContent}"/>
-                                </container>
-                            </container>
-                            <container style="screenlet-body">
-                                <section>
-                                    <widgets>    
-                                        <include-form name="ListWorkEffortContents" location="component://workeffort/widget/WorkEffortForms.xml"/>
-                                    </widgets>
-                                </section>
-                            </container>
-                        </container>
-                        <container style="screenlet">
-                            <container style="screenlet-title-bar">
-                                <container style="h3">
-                                    <label text="${uiLabelMap.PageTitleAddContent}"/>
-                                </container>
-                            </container>
-                            <container style="screenlet-body">
-                                <section>
-                                    <widgets>    
-                                        <include-form name="AddWorkEffortContent" location="component://workeffort/widget/WorkEffortForms.xml"/>
-                                    </widgets>
-                                </section>
-                            </container>
-                        </container>
+                        <screenlet id="WorkEffortContentsPanel" title="${uiLabelMap.PageTitleAddContent}" collapsible="true">
+                            <include-form name="AddWorkEffortContent" location="component://workeffort/widget/WorkEffortForms.xml"/>
+                        </screenlet>
+                        <include-form name="ListWorkEffortContents" location="component://workeffort/widget/WorkEffortForms.xml"/>
                     </decorator-section>
                 </decorator-screen>
             </widgets>
@@ -1004,34 +739,10 @@
             <widgets>
                 <decorator-screen name="CommonWorkEffortDecorator" location="${parameters.mainDecoratorLocation}">
                     <decorator-section name="body">
-                        <container style="screenlet">
-                            <container style="screenlet-title-bar">
-                                <container style="h3">
-                                    <label text="${uiLabelMap.WorkEffortListGoodStandard}"/>
-                                </container>
-                            </container>
-                            <container style="screenlet-body">
-                                <section>
-                                    <widgets>    
-                                        <include-form name="ListWorkEffortGoodStandards" location="component://workeffort/widget/WorkEffortForms.xml"/>
-                                    </widgets>
-                                </section>
-                            </container>
-                        </container>
-                        <container style="screenlet">
-                            <container style="screenlet-title-bar">
-                                <container style="h3">
-                                    <label text="${uiLabelMap.WorkEffortAddGoodStandard}"/>
-                                </container>
-                            </container>
-                            <container style="screenlet-body">
-                                <section>
-                                    <widgets>    
-                                        <include-form name="AddWorkEffortGoodStandard" location="component://workeffort/widget/WorkEffortForms.xml"/>
-                                    </widgets>
-                                </section>
-                            </container>
-                        </container>  
+                        <screenlet id="WorkEffortGoodStandardsPanel" title="${uiLabelMap.WorkEffortAddGoodStandard}" collapsible="true">
+                            <include-form name="AddWorkEffortGoodStandard" location="component://workeffort/widget/WorkEffortForms.xml"/>
+                        </screenlet>
+                        <include-form name="ListWorkEffortGoodStandards" location="component://workeffort/widget/WorkEffortForms.xml"/>
                     </decorator-section>
                 </decorator-screen>
             </widgets>
@@ -1041,9 +752,9 @@
     <screen name="EditWorkEffortReviews">
         <section>
             <actions>
-                <set field="titleProperty" value="PageTitleListWorkEffortReviews"/>
+                <set field="titleProperty" value="PageTitleAddWorkEffortReviews"/>
                 <set field="tabButtonItem" value="WorkEffortReviews"/>
-                <set field="labelTitleProperty" value="PageTitleListWorkEffortReviews"/>
+                <set field="labelTitleProperty" value="PageTitleAddWorkEffortReviews"/>
                 <set field="workEffortId" from-field="parameters.workEffortId"/>
                 <set field="defaultUserLoginId" from-field="parameters.userLogin.userLoginId"/>
                 <set field="partyId" from-field="parameters.userLogin.partyId"/>
@@ -1051,34 +762,10 @@
             <widgets>
                 <decorator-screen name="CommonWorkEffortDecorator" location="${parameters.mainDecoratorLocation}">
                     <decorator-section name="body">
-                        <container style="screenlet">
-                            <container style="screenlet-title-bar">
-                                <container style="h3">
-                                    <label text="${uiLabelMap.PageTitleListWorkEffortReviews}"/>
-                                </container>
-                            </container>
-                            <container style="screenlet-body">
-                                <section>
-                                    <widgets>    
-                                        <include-form name="ListWorkEffortReviews" location="component://workeffort/widget/WorkEffortForms.xml"/>
-                                    </widgets>
-                                </section>
-                            </container>
-                        </container>
-                        <container style="screenlet">
-                            <container style="screenlet-title-bar">
-                                <container style="h3">
-                                    <label text="${uiLabelMap.PageTitleAddWorkEffortReviews}"/>
-                                </container>
-                            </container>
-                            <container style="screenlet-body">
-                                <section>
-                                    <widgets>    
-                                        <include-form name="AddWorkEffortReview" location="component://workeffort/widget/WorkEffortForms.xml"/>
-                                    </widgets>
-                                </section>
-                            </container>
-                        </container>            
+                        <screenlet id="WorkEffortReviewsPanel" title="${uiLabelMap.PageTitleAddWorkEffortReviews}" collapsible="true">
+                            <include-form name="AddWorkEffortReview" location="component://workeffort/widget/WorkEffortForms.xml"/>
+                        </screenlet>
+                        <include-form name="ListWorkEffortReviews" location="component://workeffort/widget/WorkEffortForms.xml"/>
                     </decorator-section>
                 </decorator-screen>
             </widgets>
@@ -1087,42 +774,18 @@
     <screen name="EditWorkEffortKeywords">
         <section>
             <actions>
-                <set field="titleProperty" value="PageTitleListWorkEffortKeyword"/>
+                <set field="titleProperty" value="PageTitleAddWorkEffortKeyword"/>
                 <set field="tabButtonItem" value="WorkEffortKeywords"/>
-                <set field="labelTitleProperty" value="PageTitleListWorkEffortKeyword"/>
+                <set field="labelTitleProperty" value="PageTitleAddWorkEffortKeyword"/>
                 <set field="workEffortId" from-field="parameters.workEffortId"/>
             </actions>
             <widgets>
                 <decorator-screen name="CommonWorkEffortDecorator" location="${parameters.mainDecoratorLocation}">
                     <decorator-section name="body">
-                        <container style="screenlet">
-                            <container style="screenlet-title-bar">
-                                <container style="h3">
-                                    <label text="${uiLabelMap.PageTitleAddWorkEffortKeyword}"/>
-                                </container>
-                            </container>
-                            <container style="screenlet-body">
-                                <section>
-                                    <widgets>    
-                                        <include-form name="AddWorkEffortKeyword" location="component://workeffort/widget/WorkEffortForms.xml"/>
-                                    </widgets>
-                                </section>
-                            </container>
-                        </container>
-                        <container style="screenlet">
-                            <container style="screenlet-title-bar">
-                                <container style="h3">
-                                    <label text="${uiLabelMap.PageTitleListWorkEffortKeyword}"/>
-                                </container>
-                            </container>
-                            <container style="screenlet-body">
-                                <section>
-                                    <widgets>    
-                                        <include-form name="ListWorkEffortKeywords" location="component://workeffort/widget/WorkEffortForms.xml"/>
-                                    </widgets>
-                                </section>
-                            </container>
-                        </container>                        
+                        <screenlet id="WorkEffortKeywordsPanel" title="${uiLabelMap.PageTitleAddWorkEffortKeyword}" collapsible="true">
+                            <include-form name="AddWorkEffortKeyword" location="component://workeffort/widget/WorkEffortForms.xml"/>
+                        </screenlet>
+                        <include-form name="ListWorkEffortKeywords" location="component://workeffort/widget/WorkEffortForms.xml"/>
                     </decorator-section>
                 </decorator-screen>
             </widgets>
@@ -1139,34 +802,10 @@
             <widgets>
                 <decorator-screen name="CommonWorkEffortDecorator" location="${parameters.mainDecoratorLocation}">
                     <decorator-section name="body">
-                        <container style="screenlet">
-                            <container style="screenlet-title-bar">
-                                <container style="h3">
-                                    <label text="${uiLabelMap.CommonCreate}"/>
-                                </container>
-                            </container>
-                            <container style="screenlet-body">
-                                <section>
-                                    <widgets>    
-                                        <include-form name="AddWorkEffortContactMech" location="component://workeffort/widget/WorkEffortForms.xml"/>
-                                    </widgets>
-                                </section>
-                            </container>
-                        </container>
-                        <container style="screenlet">
-                            <container style="screenlet-title-bar">
-                                <container style="h3">
-                                    <label text="${uiLabelMap.WorkEffortContactMechs}"/>
-                                </container>
-                            </container>
-                            <container style="screenlet-body">
-                                <section>
-                                    <widgets>    
-                                        <include-form name="ListWorkEffortContactMechs" location="component://workeffort/widget/WorkEffortForms.xml"/>
-                                    </widgets>
-                                </section>
-                            </container>
-                        </container>                        
+                        <screenlet id="WorkEffortContactMechsPanel" title="${uiLabelMap.CommonCreate}" collapsible="true">
+                            <include-form name="AddWorkEffortContactMech" location="component://workeffort/widget/WorkEffortForms.xml"/>
+                        </screenlet>
+                        <include-form name="ListWorkEffortContactMechs" location="component://workeffort/widget/WorkEffortForms.xml"/>
                     </decorator-section>
                 </decorator-screen>
             </widgets>
@@ -1218,34 +857,10 @@
             <widgets>
                 <decorator-screen name="CommonWorkEffortDecorator" location="${parameters.mainDecoratorLocation}">
                     <decorator-section name="body">
-                        <container style="screenlet">
-                            <container style="screenlet-title-bar">
-                                <container style="h3">
-                                    <label text="${uiLabelMap.AccountingAgreementWorkEffortAppls}"/>
-                                </container>
-                            </container>
-                            <container style="screenlet-body">
-                                <section>
-                                    <widgets>    
-                                        <include-form name="ListAgreementWorkEffortAppls" location="component://workeffort/widget/WorkEffortForms.xml"/>
-                                    </widgets>
-                                </section>
-                            </container>
-                        </container>
-                        <container style="screenlet">
-                            <container style="screenlet-title-bar">
-                                <container style="h3">
-                                    <label text="${uiLabelMap.AccountingAddAgreementWorkEffortAppl}"/>
-                                </container>
-                            </container>
-                            <container style="screenlet-body">
-                                <section>
-                                    <widgets>    
-                                        <include-form name="AddAgreementWorkEffortAppl" location="component://workeffort/widget/WorkEffortForms.xml"/>
-                                    </widgets>
-                                </section>
-                            </container>
-                        </container>  
+                        <screenlet id="AccountingAgreementWorkEffortApplsPanel" title="${uiLabelMap.AccountingAddAgreementWorkEffortAppl}" collapsible="true">
+                            <include-form name="AddAgreementWorkEffortAppl" location="component://workeffort/widget/WorkEffortForms.xml"/>
+                        </screenlet>
+                        <include-form name="ListAgreementWorkEffortAppls" location="component://workeffort/widget/WorkEffortForms.xml"/>
                     </decorator-section>
                 </decorator-screen>
             </widgets>

Modified: ofbiz/trunk/applications/workeffort/widget/WorkEffortShopListForms.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/workeffort/widget/WorkEffortShopListForms.xml?rev=667062&r1=667061&r2=667062&view=diff
==============================================================================
--- ofbiz/trunk/applications/workeffort/widget/WorkEffortShopListForms.xml (original)
+++ ofbiz/trunk/applications/workeffort/widget/WorkEffortShopListForms.xml Thu Jun 12 05:47:25 2008
@@ -20,7 +20,7 @@
 
 <forms xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://ofbiz.apache.org/dtds/widget-form.xsd">
     <form name="ListWorkEffortShopLists" target="" title="" type="list" separate-columns="false"
-        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="WorkEffortShoppingListView">
                 <field-map field-name="workEffortId" />