svn commit: r1786984 - in /ofbiz/ofbiz-framework/trunk/applications/marketing/widget: TrackingCodeForms.xml TrackingCodeScreens.xml

Author: jleroux
Date: Wed Mar 15 06:33:20 2017
New Revision: 1786984

URL: http://svn.apache.org/viewvc?rev=1786984&view=rev
Log:
Improved: refactor list related forms in Manufacturing widgets
(OFBIZ-9236)

Refactoring various list forms into grids
Refactoring various list form references in screen widgets


Thanks: Pierre Smits

Modified:
    ofbiz/ofbiz-framework/trunk/applications/marketing/widget/TrackingCodeForms.xml
    ofbiz/ofbiz-framework/trunk/applications/marketing/widget/TrackingCodeScreens.xml

Modified: ofbiz/ofbiz-framework/trunk/applications/marketing/widget/TrackingCodeForms.xml
URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/applications/marketing/widget/TrackingCodeForms.xml?rev=1786984&r1=1786983&r2=1786984&view=diff
==============================================================================
--- ofbiz/ofbiz-framework/trunk/applications/marketing/widget/TrackingCodeForms.xml (original)
+++ ofbiz/ofbiz-framework/trunk/applications/marketing/widget/TrackingCodeForms.xml Wed Mar 15 06:33:20 2017
@@ -67,7 +67,7 @@ under the License.
         <!-- <field name="cancelLink" title=" " widget-style="buttontext"><hyperlink description="${uiLabelMap.CommonCancelDone}" target="${donePage}" also-hidden="false" target-type="inter-app"/></field> -->
     </form>
 
-    <form name="ListTrackingCode" target="ListTrackingCode" title="" type="list"
+    <grid name="ListTrackingCode" target="ListTrackingCode" title=""
         odd-row-style="alternate-row" default-table-style="basic-table hover-bar">
         <actions>
             <entity-condition entity-name="TrackingCode"/>
@@ -87,7 +87,8 @@ under the License.
                 <parameter param-name="trackingCodeId"/>
             </hyperlink>
         </field>
-    </form>
+    </grid>
+    
     <!-- UNUSED FORM
     <form name="FindTrackingCode" type="single" target="ListTrackingCode" title=""
         header-row-style="header-row" default-table-style="basic-table">
@@ -131,7 +132,8 @@ under the License.
 
         <field name="submitButton" title="${uiLabelMap.CommonFind}" widget-style="buttontext"><submit button-type="text-link"/></field>
     </form>
-    <form name="ListTrackingCodeOrders" type="list" title="" paginate-target="FindTrackingCodeOrders" list-name="listIt"
+    
+    <grid name="ListTrackingCodeOrders" title="" paginate-target="FindTrackingCodeOrders" list-name="listIt"
         odd-row-style="alternate-row" default-table-style="basic-table hover-bar">
         <actions>
             <service service-name="performFind" result-map="result" result-map-list="listIt">
@@ -147,7 +149,7 @@ under the License.
         <field name="orderId" title="${uiLabelMap.MarketingTrackingCodeOrderOrderId}"><display-entity entity-name="OrderHeader" description="${orderDate} [${orderId}]"/></field>
         <field name="trackingCodeTypeId" title="${uiLabelMap.MarketingTrackingCodeTrackingCodeTypeId}"><display-entity entity-name="TrackingCodeType"/></field>
         <field name="isBillable" title="${uiLabelMap.MarketingTrackingCodeOrderIsBilliable}"><display/></field>
-    </form>
+    </grid>
 
     <form name="EditTrackingCodeVisit" default-map-name="visit" target="updateTrackingCodeVisit" title="" type="single"
         header-row-style="header-row" default-table-style="basic-table">
@@ -166,6 +168,7 @@ under the License.
         <field name="submitButton" title="${uiLabelMap.CommonSave}"><submit button-type="button"/>        </field>
         <field name="cancelLink" title="${uiLabelMap.CommonCancel}" widget-style="buttontext"><hyperlink description="${uiLabelMap.CommonCancelDone}" target="${donePage}" also-hidden="false"/></field>
     </form>
+    
     <form name="FindTrackingCodeVisits" target="ListTrackingCodeVisits" title="" type="single"
         header-row-style="header-row" default-table-style="basic-table">
         <field name="trackingCodeId" title="${uiLabelMap.MarketingTrackingCodeTrackingCodeId}"><text/></field>
@@ -257,7 +260,8 @@ under the License.
         <field name="thruDate" title="${uiLabelMap.CommonThruDate}"><date-find/></field>
         <field name="submitButton" title="${uiLabelMap.CommonFind}"><submit button-type="button"/></field>
     </form>
-    <form name="ListLookupVisit" target="" title="" type="list"
+    
+    <grid name="ListLookupVisit" target="" title=""
         odd-row-style="alternate-row" default-table-style="basic-table hover-bar">
         <actions>
             <service result-map-list="listIt" result-map="result" service-name="performFind">
@@ -285,7 +289,8 @@ under the License.
         <field name="clientHostName" title="${uiLabelMap.MarketingTrackingCodeVisitClientHostName}"><display/></field>
         <field name="webappName" title="${uiLabelMap.MarketingTrackingCodeVisitWebappName}"><display/></field>
         <field name="sessionId" title="${uiLabelMap.MarketingTrackingCodeVisitSessionId}"><display/></field>
-    </form>
+    </grid>
+    
     <form name="EditTrackingCodeType" type="single" target="updateTrackingCodeType" title="" default-map-name="trackingCodeType"
         header-row-style="header-row" default-table-style="basic-table">
         <alt-target use-when="trackingCodeType==null" target="createTrackingCodeType"/>
@@ -300,7 +305,7 @@ under the License.
         <!-- <field name="cancelLink" title=" " widget-style="buttontext"><hyperlink description="${uiLabelMap.CommonCancelDone}" target="${donePage}" also-hidden="false" target-type="inter-app"/></field> -->
     </form>
 
-    <form name="ListTrackingCodeType" target="ListTrackingCodeType" title="" type="list"
+    <grid name="ListTrackingCodeType" target="ListTrackingCodeType" title=""
         odd-row-style="alternate-row" default-table-style="basic-table hover-bar">
         <actions>
             <entity-condition entity-name="TrackingCodeType"/>
@@ -317,14 +322,16 @@ under the License.
                 <parameter param-name="trackingCodeTypeId"/>
             </hyperlink>
         </field>
-    </form>
+    </grid>
+    
     <form name="LookupTrackingCodeType" default-map-name="trackingCode" target="LookupTrackingCodeType" title="" type="single"
         header-row-style="header-row" default-table-style="basic-table">
         <field name="trackingCodeTypeId" title="${uiLabelMap.MarketingTrackingCodeTrackingCodeTypeId}"><text-find/></field>
         <field name="description" title="${uiLabelMap.MarketingTrackingCodeTypeDescription}"><text-find/></field>
         <field name="submitButton" title="${uiLabelMap.CommonSave}" widget-style="buttontext"><submit button-type="text-link"/></field>
     </form>
-    <form name="ListLookupTrackingCodeType" target="" title="" type="list"
+    
+    <grid name="ListLookupTrackingCodeType" target="" title=""
         odd-row-style="alternate-row" default-table-style="basic-table hover-bar">
         <actions>
             <service result-map-list="listIt" result-map="result" service-name="performFind">
@@ -338,5 +345,5 @@ under the License.
             <hyperlink description="${trackingCodeTypeId}" target="javascript:set_value('${trackingCodeTypeId}')" also-hidden="false" target-type="plain"/>
         </field>
         <field name="description" title="${uiLabelMap.MarketingTrackingCodeTypeDescription}"><display/></field>
-    </form>
+    </grid>
 </forms>

Modified: ofbiz/ofbiz-framework/trunk/applications/marketing/widget/TrackingCodeScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/applications/marketing/widget/TrackingCodeScreens.xml?rev=1786984&r1=1786983&r2=1786984&view=diff
==============================================================================
--- ofbiz/ofbiz-framework/trunk/applications/marketing/widget/TrackingCodeScreens.xml (original)
+++ ofbiz/ofbiz-framework/trunk/applications/marketing/widget/TrackingCodeScreens.xml Wed Mar 15 06:33:20 2017
@@ -123,7 +123,7 @@ under the License.
                                     <parameter param-name="DONE_PAGE" from-field="donePage"/>
                                 </link>
                             </container>
-                            <include-form name="ListTrackingCode" location="component://marketing/widget/TrackingCodeForms.xml"/>
+                            <include-grid name="ListTrackingCode" location="component://marketing/widget/TrackingCodeForms.xml"/>
                         </screenlet>
                     </decorator-section>
                 </decorator-screen>
@@ -193,7 +193,7 @@ under the License.
                 <decorator-screen name="CommonTrackingCodeDecorator">
                     <decorator-section name="body">
                         <screenlet title="${uiLabelMap.PageTitleListTrackingCodeOrdersFor} ${uiLabelMap.MarketingTrackingCodeTrackingCodeId}=${trackingCodeId}">
-                            <include-form name="ListTrackingCodeOrders" location="component://marketing/widget/TrackingCodeForms.xml"/>
+                            <include-grid name="ListTrackingCodeOrders" location="component://marketing/widget/TrackingCodeForms.xml"/>
                         </screenlet>
                     </decorator-section>
                 </decorator-screen>
@@ -246,6 +246,7 @@ under the License.
             </widgets>
         </section>
     </screen>
+    
     <screen name="ListTrackingCodeVisits">
         <section>
             <actions>
@@ -310,7 +311,7 @@ under the License.
                         <include-form name="LookupVisit" location="component://marketing/widget/TrackingCodeForms.xml"/>
                     </decorator-section>
                     <decorator-section name="search-results">
-                        <include-form name="ListLookupVisit" location="component://marketing/widget/TrackingCodeForms.xml"/>
+                        <include-grid name="ListLookupVisit" location="component://marketing/widget/TrackingCodeForms.xml"/>
                     </decorator-section>
                 </decorator-screen>
             </widgets>
@@ -331,7 +332,7 @@ under the License.
                         <include-form name="LookupTrackingCode" location="component://marketing/widget/TrackingCodeForms.xml"/>
                     </decorator-section>
                     <decorator-section name="search-results">
-                        <include-form name="ListLookupTrackingCode" location="component://marketing/widget/TrackingCodeForms.xml"/>
+                        <include-grid name="ListLookupTrackingCode" location="component://marketing/widget/TrackingCodeForms.xml"/>
                     </decorator-section>
                 </decorator-screen>
             </widgets>
@@ -397,7 +398,7 @@ under the License.
                                     <parameter param-name="DONE_PAGE" from-field="donePage"/>
                                 </link>
                             </container>
-                            <include-form name="ListTrackingCodeType" location="component://marketing/widget/TrackingCodeForms.xml"/>
+                            <include-grid name="ListTrackingCodeType" location="component://marketing/widget/TrackingCodeForms.xml"/>
                         </screenlet>
                     </decorator-section>
                 </decorator-screen>
@@ -419,7 +420,7 @@ under the License.
                         <include-form name="LookupTrackingCodeType" location="component://marketing/widget/TrackingCodeForms.xml"/>
                     </decorator-section>
                     <decorator-section name="search-results">
-                        <include-form name="ListLookupTrackingCodeType" location="component://marketing/widget/TrackingCodeForms.xml"/>
+                        <include-grid name="ListLookupTrackingCodeType" location="component://marketing/widget/TrackingCodeForms.xml"/>
                     </decorator-section>
                 </decorator-screen>
             </widgets>