ofbiz-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From mrisal...@apache.org
Subject svn commit: r609746 - in /ofbiz/trunk/applications/product: config/ webapp/facility/group/ webapp/facility/lookup/ widget/facility/
Date Mon, 07 Jan 2008 19:22:17 GMT
Author: mrisaliti
Date: Mon Jan  7 11:22:15 2008
New Revision: 609746

URL: http://svn.apache.org/viewvc?rev=609746&view=rev
Log:
Facility Groups and Lookup forms (ftl/widgets screen) has now the same look and feel (Part
of issue OFBIZ-1556)

Modified:
    ofbiz/trunk/applications/product/config/ProductUiLabels.properties
    ofbiz/trunk/applications/product/config/ProductUiLabels_it.properties
    ofbiz/trunk/applications/product/webapp/facility/group/FacilityGroupForms.xml
    ofbiz/trunk/applications/product/webapp/facility/lookup/FieldLookupForms.xml
    ofbiz/trunk/applications/product/widget/facility/FacilityGroupScreens.xml
    ofbiz/trunk/applications/product/widget/facility/LookupScreens.xml

Modified: ofbiz/trunk/applications/product/config/ProductUiLabels.properties
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/config/ProductUiLabels.properties?rev=609746&r1=609745&r2=609746&view=diff
==============================================================================
--- ofbiz/trunk/applications/product/config/ProductUiLabels.properties (original)
+++ ofbiz/trunk/applications/product/config/ProductUiLabels.properties Mon Jan  7 11:22:15
2008
@@ -65,6 +65,7 @@
 OrderOrdersToPack=Orders to pack
 OrderShipGroup=Ship Group
 OrderShipping=Shipping
+PageTitleAddFacilityGroupRollup=Add Facility Group Rollup
 PageTitleAddItemsFromOrder=Add Items From Order
 PageTitleAddInventoryItemLabelAppls=Add Inventory Item Label Appls
 PageTitleAddInventoryItemLabelTypes=Add Inventory Item Label Types
@@ -711,7 +712,8 @@
 ProductGoToFeatureCategory=Go to Feature Category
 ProductGrams=Grams
 ProductGroupMemberMaintenance=Group Member Maintenance
-ProductGroupRollupChildGroups=Group Rollup : Child Groups
+ProductGroupRollupChildGroups=Group Rollup : Update Child Groups
+ProductGroupRollupChildGroupsAdd=Group Rollup : Add Child Groups
 ProductGroupSelectCategoryFromDate=Group (select Category and enter From Date)
 ProductGroupSelectGroupFromDate=Group (select Group and enter From Date)
 ProductGroups=Groups
@@ -2031,4 +2033,9 @@
 FormFieldTitle_locationSeqIdTo=Location Seq Id To
 FormFieldTitle_sendDate=Send Date
 FormFieldTitle_receiveDate=Receive Date
-FormFieldTitle_facilityIdTo=Facility Id To
\ No newline at end of file
+FormFieldTitle_facilityIdTo=Facility Id To
+FormFieldTitle_facilityGroupId=Facility Group Id
+FormFieldTitle_facilityGroupTypeId=Facility Group Type Id
+FormFieldTitle_primaryParentGroupId=Primary Parent Group Id
+FormFieldTitle_facilityGroupName=Facility Group Name
+FormFieldTitle_parentFacilityGroupId=Parent Facility Group Id
\ No newline at end of file

Modified: ofbiz/trunk/applications/product/config/ProductUiLabels_it.properties
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/config/ProductUiLabels_it.properties?rev=609746&r1=609745&r2=609746&view=diff
==============================================================================
--- ofbiz/trunk/applications/product/config/ProductUiLabels_it.properties (original)
+++ ofbiz/trunk/applications/product/config/ProductUiLabels_it.properties Mon Jan  7 11:22:15
2008
@@ -63,6 +63,7 @@
 OrderOrdersToPack=Ordini da imballare
 OrderShipGroup=Gruppo Spedizione
 OrderShipping=Spedizione
+PageTitleAddFacilityGroupRollup=Aggiungi Gruppo Stabilimento Arrivo
 PageTitleAddItemsFromOrder=Aggiungi Righe Dall'Ordine
 PageTitleAddInventoryItemLabelAppls=Aggiungi Applicabilit\u00e0 Etichetta Riga Inventario
 PageTitleAddInventoryItemLabelTypes=Aggiungi Tipo Etichetta Riga Inventario
@@ -703,7 +704,8 @@
 ProductGoToFeatureCategory=Vai alle Categoria Caratteristiche
 ProductGrams=Grammi
 ProductGroupMemberMaintenance=Manutenzione Membri Gruppo
-ProductGroupRollupChildGroups=Gruppo Arrivo : Gruppi Figlio
+ProductGroupRollupChildGroups=Aggiorna Gruppo Stabilimento Arrivo : Gruppi Figlio
+ProductGroupRollupChildGroupsAdd=Aggiungi Gruppo Stabilimento Arrivo : Gruppi Figlio
 ProductGroupSelectCategoryFromDate=Gruppo (seleziona Categoria e inserisci Da Data)
 ProductGroupSelectGroupFromDate=Gruppo (seleziona Gruppo e inserisci Da Data)
 ProductGroups=Gruppi
@@ -2014,4 +2016,9 @@
 FormFieldTitle_locationSeqIdTo=Sequenza Locazione Destinazione
 FormFieldTitle_sendDate=Data Invio
 FormFieldTitle_receiveDate=Data Ricezione
-FormFieldTitle_facilityIdTo=Stabilimento Destinazione
\ No newline at end of file
+FormFieldTitle_facilityIdTo=Stabilimento Destinazione
+FormFieldTitle_facilityGroupId=Gruppo Stabilimento
+FormFieldTitle_facilityGroupTypeId=Tipo Gruppo Stabilimento
+FormFieldTitle_primaryParentGroupId=Gruppo Primario Padre
+FormFieldTitle_facilityGroupName=Nome Gruppo Stabilimento
+FormFieldTitle_parentFacilityGroupId=Gruppo Stabilimento Padre
\ No newline at end of file

Modified: ofbiz/trunk/applications/product/webapp/facility/group/FacilityGroupForms.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/webapp/facility/group/FacilityGroupForms.xml?rev=609746&r1=609745&r2=609746&view=diff
==============================================================================
--- ofbiz/trunk/applications/product/webapp/facility/group/FacilityGroupForms.xml (original)
+++ ofbiz/trunk/applications/product/webapp/facility/group/FacilityGroupForms.xml Mon Jan
 7 11:22:15 2008
@@ -21,7 +21,8 @@
 <forms xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" 
         xsi:noNamespaceSchemaLocation="http://ofbiz.apache.org/dtds/widget-form.xsd">
     <!-- Forms for FacilityGroups -->
-    <form name="FindFacilityGroup" type="list" title="" list-name="facilityGroups" paginate-target="FindFacilityGroup">
+    <form name="FindFacilityGroup" type="list" title="" list-name="facilityGroups" paginate-target="FindFacilityGroup"
+        odd-row-style="alternate-row" default-table-style="basic-table hover-bar">
         <auto-fields-entity entity-name="FacilityGroup" default-field-type="display"/>
         <field name="facilityGroupId" widget-style="buttontext">
             <hyperlink description="${facilityGroupId}" target="EditFacilityGroup?facilityGroupId=${facilityGroupId}"/>
@@ -29,7 +30,8 @@
         <field name="facilityGroupTypeId"><display-entity entity-name="FacilityGroupType"/></field>
         <field name="description"><display/></field>
     </form>
-    <form name="EditFacilityGroup" type="single" target="updateFacilityGroup" title=""
default-map-name="facilityGroup">
+    <form name="EditFacilityGroup" type="single" target="updateFacilityGroup" title=""
default-map-name="facilityGroup"
+        header-row-style="header-row" default-table-style="basic-table">
         <alt-target use-when="facilityGroup==null" target="createFacilityGroup"/>
         <auto-fields-service service-name="updateFacilityGroup"/>
         <field name="facilityGroupId" use-when="facilityGroup!=null" tooltip="&amp;nbsp;${uiLabelMap.ProductNotModificationRecrationFacilityGroup}"><display/></field>
@@ -48,7 +50,8 @@
         </field>
         <field name="submitButton" title="${uiLabelMap.CommonSubmit}"><submit button-type="button"/></field>
     </form>
-    <form name="UpdateFacilityGroupRollupTo" type="list" target="updateFacilityGroupToGroup"
title="" list-name="currentGroupRollups">
+    <form name="UpdateFacilityGroupRollupTo" type="list" target="updateFacilityGroupToGroup"
title="" list-name="currentGroupRollups"
+        odd-row-style="alternate-row" default-table-style="basic-table hover-bar">
         <auto-fields-service service-name="updateFacilityGroupToGroup"/>
         <field name="showFacilityGroupId"><hidden value="${facilityGroupId}"/></field>
         <field name="facilityGroupId"><hidden value="${facilityGroupId}"/></field>
@@ -64,7 +67,8 @@
                 description="${uiLabelMap.CommonDelete}" also-hidden="false"/>
         </field>
     </form>
-    <form name="AddFacilityGroupRollupFrom" target="addFacilityGroupToGroup" title=""
type="single">
+    <form name="AddFacilityGroupRollupFrom" target="addFacilityGroupToGroup" title=""
type="single"
+        header-row-style="header-row" default-table-style="basic-table">
         <auto-fields-service service-name="addFacilityGroupToGroup"/>
         <field name="facilityGroupId"><hidden/></field>
         <field name="parentFacilityGroupId">
@@ -76,7 +80,8 @@
         </field>
         <field name="submitButton" title="${uiLabelMap.CommonAdd}"><submit button-type="button"/></field>
     </form>
-    <form name="UpdateFacilityGroupRollupFrom" type="list" target="updateFacilityGroupToGroup"
title="" list-name="parentGroupRollups">
+    <form name="UpdateFacilityGroupRollupFrom" type="list" target="updateFacilityGroupToGroup"
title="" list-name="parentGroupRollups"
+        odd-row-style="alternate-row" default-table-style="basic-table hover-bar">
         <auto-fields-service service-name="updateFacilityGroupToGroup"/>
         <field name="showFacilityGroupId"><hidden value="${parentFacilityGroupId}"/></field>
         <field name="parentFacilityGroupId"><hidden/></field>
@@ -92,7 +97,8 @@
                 description="${uiLabelMap.CommonDelete}" also-hidden="false"/>
         </field>
     </form>
-    <form name="AddFacilityGroupRollupTo" target="addFacilityGroupToGroup" title="" type="single">
+    <form name="AddFacilityGroupRollupTo" target="addFacilityGroupToGroup" title="" type="single"
+        header-row-style="header-row" default-table-style="basic-table">
         <auto-fields-service service-name="addFacilityGroupToGroup"/>
         <field name="showFacilityGroupId"><hidden value="${facilityGroupId}"/></field>
         <field name="parentFacilityGroupId"><hidden value="${facilityGroupId}"/></field>
@@ -105,7 +111,8 @@
         </field>
         <field name="submitButton" title="${uiLabelMap.CommonAdd}"><submit button-type="button"/></field>
     </form>
-    <form name="UpdateFacilityGroupMembers" type="list" target="updateFacilityToGroup"
title="" list-name="facilityGroupMembers">
+    <form name="UpdateFacilityGroupMembers" type="list" target="updateFacilityToGroup"
title="" list-name="facilityGroupMembers"
+        odd-row-style="alternate-row" default-table-style="basic-table hover-bar">
         <auto-fields-service service-name="updateFacilityToGroup"/>
         <field name="facilityGroupId"><hidden value="${facilityGroupId}"/></field>
         <field name="facilityId">
@@ -120,7 +127,8 @@
                 description="${uiLabelMap.CommonDelete}" also-hidden="false"/>
         </field>
     </form>
-    <form name="AddFacilityGroupMember" target="addFacilityToGroup" title="" type="single">
+    <form name="AddFacilityGroupMember" target="addFacilityToGroup" title="" type="single"
+        header-row-style="header-row" default-table-style="basic-table">
         <auto-fields-service service-name="addFacilityToGroup"/>
         <field name="facilityGroupId"><hidden/></field>
         <field name="facilityId">
@@ -132,7 +140,8 @@
         </field>
         <field name="submitButton" title="${uiLabelMap.CommonAdd}"><submit button-type="button"/></field>
     </form>
-    <form name="UpdateFacilityGroupRoles" type="list" target="removePartyFromFacilityGroup"
title="" list-name="facilityRoles">
+    <form name="UpdateFacilityGroupRoles" type="list" target="removePartyFromFacilityGroup"
title="" list-name="facilityRoles"
+        odd-row-style="alternate-row" default-table-style="basic-table hover-bar">
         <auto-fields-service service-name="removePartyFromFacilityGroup"/>
         <field name="facilityGroupId"><hidden value="${facilityGroupId}"/></field>
         <field name="partyId">
@@ -148,7 +157,8 @@
                 description="${uiLabelMap.CommonDelete}" also-hidden="false"/>
         </field>
     </form>
-    <form name="AddFacilityGroupRole" target="addPartyToFacilityGroup" title="" type="single">
+    <form name="AddFacilityGroupRole" target="addPartyToFacilityGroup" title="" type="single"
+        header-row-style="header-row" default-table-style="basic-table">
         <auto-fields-service service-name="addPartyToFacilityGroup"/>
         <field name="facilityGroupId"><hidden/></field>
         <field name="partyId"><lookup target-form-name="LookupPartyName"/></field>
@@ -161,4 +171,4 @@
         </field>
         <field name="submitButton" title="${uiLabelMap.CommonAdd}"><submit button-type="button"/></field>
     </form>
-</forms>
+</forms>
\ No newline at end of file

Modified: ofbiz/trunk/applications/product/webapp/facility/lookup/FieldLookupForms.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/webapp/facility/lookup/FieldLookupForms.xml?rev=609746&r1=609745&r2=609746&view=diff
==============================================================================
--- ofbiz/trunk/applications/product/webapp/facility/lookup/FieldLookupForms.xml (original)
+++ ofbiz/trunk/applications/product/webapp/facility/lookup/FieldLookupForms.xml Mon Jan 
7 11:22:15 2008
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="UTF-8" ?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!--
 Licensed to the Apache Software Foundation (ASF) under one
 or more contributor license agreements.  See the NOTICE file
@@ -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="lookupFacility" target="LookupFacility" title="" type="single"
-        default-title-style="tableheadtext" default-tooltip-style="tabletext" default-widget-style="inputBox">
+        header-row-style="header-row" default-table-style="basic-table">
         <auto-fields-entity entity-name="Facility" default-field-type="hidden"/>
         <field name="facilityId"><text-find/></field>
         <field name="facilityName"><text-find/></field>
@@ -37,8 +37,7 @@
         <field name="submitButton" title="${uiLabelMap.CommonLookup}" widget-style="smallSubmit"><submit
button-type="button"/></field>
     </form>
     <form name="listLookupFacility" list-name="listIt" title="" type="list" 
-        default-title-style="tableheadtext" default-tooltip-style="tabletext" default-widget-style="tabletext"
-        paginate-target="LookupFacility">
+        odd-row-style="alternate-row" default-table-style="basic-table hover-bar" paginate-target="LookupFacility">
         <actions>
             <service service-name="performFind" result-map-name="result" result-map-list-name="listIt">
                 <field-map field-name="inputFields" env-name="parameters"/>
@@ -52,7 +51,7 @@
         <field name="facilityTypeId"><display/></field>
     </form>
     <form name="lookupFacilityLocation" target="LookupFacilityLocation" title="" type="single"
-        default-title-style="tableheadtext" default-tooltip-style="tabletext" default-widget-style="inputBox">
+        header-row-style="header-row" default-table-style="basic-table">
         <auto-fields-entity entity-name="FacilityLocation" default-field-type="find"/>
         <field name="facilityId" widget-style="selectBox">
             <drop-down allow-empty="false">
@@ -73,7 +72,7 @@
         <field name="submitButton" title="${uiLabelMap.CommonLookup}" widget-style="smallSubmit"><submit
button-type="button"/></field>
     </form>
     <form name="listLookupFacilityLocation" list-name="listIt" title="" type="list" 
-        default-title-style="tableheadtext" default-tooltip-style="tabletext" default-widget-style="tabletext"
+        odd-row-style="alternate-row" default-table-style="basic-table hover-bar"
         paginate-target="LookupFacilityLocation">
         <actions>
             <service service-name="performFind" result-map-name="result" result-map-list-name="listIt">
@@ -91,7 +90,8 @@
         </field>
     </form>
 
-    <form name="lookupShipment" type="single" target="LookupShipment">
+    <form name="lookupShipment" type="single" target="LookupShipment"
+        header-row-style="header-row" default-table-style="basic-table">
         <field position="1" name="shipmentId"><text-find/></field>
         <field position="1" name="shipmentTypeId">
             <drop-down allow-empty="true">
@@ -112,7 +112,8 @@
         <field name="noConditionFind"><hidden value="Y"/><!-- if this isn't
there then with all fields empty no query will be done --></field> 
         <field name="submitButton" title="${uiLabelMap.CommonLookup}" widget-style="smallSubmit"><submit
button-type="button"/></field>
     </form>
-    <form name="listShipment" list-name="listIt" title="" type="list" paginate-target="LookupShipment">
+    <form name="listShipment" list-name="listIt" title="" type="list" paginate-target="LookupShipment"
+        odd-row-style="alternate-row" default-table-style="basic-table hover-bar">
         <actions>
             <service service-name="performFind" result-map-name="result" result-map-list-name="listIt">
                 <field-map field-name="inputFields" env-name="parameters"/>
@@ -126,6 +127,5 @@
         <field name="statusId"><display-entity entity-name="StatusItem" description="${description}"/></field>
         <field name="partyIdFrom" title="${uiLabelMap.PartyPartyFrom}"><display-entity
entity-name="PartyNameView" key-field-name="partyId" description="${groupName}${lastName}[${partyId}]"/></field>
         <field name="partyIdTo" title="${uiLabelMap.PartyPartyTo}"><display-entity
entity-name="PartyNameView" key-field-name="partyId" description="${groupName}${lastName}[${partyId}]"/></field>
-    </form>
-    
-</forms>
+    </form>    
+</forms>
\ No newline at end of file

Modified: ofbiz/trunk/applications/product/widget/facility/FacilityGroupScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/widget/facility/FacilityGroupScreens.xml?rev=609746&r1=609745&r2=609746&view=diff
==============================================================================
--- ofbiz/trunk/applications/product/widget/facility/FacilityGroupScreens.xml (original)
+++ ofbiz/trunk/applications/product/widget/facility/FacilityGroupScreens.xml Mon Jan  7 11:22:15
2008
@@ -30,13 +30,23 @@
             <widgets>
                 <decorator-screen name="main-decorator" location="${parameters.mainDecoratorLocation}">
                     <decorator-section name="body">
-                        <container>
-                            <label style="head1">${uiLabelMap.ProductFacilityGroupList}</label>
-                        </container>
-                        <container>
-                            <link target="EditFacilityGroup" text="${uiLabelMap.ProductNewGroup}"
style="buttontext"/>
+                        <container style="screenlet">
+                            <container style="screenlet-title-bar">
+                                <container style="head4">
+                                    <label text="${uiLabelMap.PageTitleFindFacilityGroup}"/>
+                                </container>
+                            </container>
+                            <container style="screenlet-body">
+                                <section>
+                                    <widgets>
+                                        <container>
+                                            <link target="EditFacilityGroup" text="${uiLabelMap.ProductNewGroup}"
style="buttontext"/>
+                                        </container>
+                                        <include-form name="FindFacilityGroup" location="component://product/webapp/facility/group/FacilityGroupForms.xml"/>
+                                    </widgets>
+                                </section>
+                            </container>
                         </container>
-                        <include-form name="FindFacilityGroup" location="component://product/webapp/facility/group/FacilityGroupForms.xml"/>
                     </decorator-section>
                 </decorator-screen>
             </widgets>
@@ -83,11 +93,23 @@
             <widgets>
                 <decorator-screen name="CommonFacilityGroupDecorator">
                     <decorator-section name="body">
-                        <label style="head1">${uiLabelMap.ProductFacilityGroup}</label>
-                        <container>
-                            <link target="EditFacilityGroup" text="${uiLabelMap.CommonNew}"
style="buttontext"/>
+                        <container style="screenlet">
+                            <container style="screenlet-title-bar">
+                                <container style="head4">
+                                    <label text="${uiLabelMap.PageTitleEditFacilityGroup}"/>
+                                </container>
+                            </container>
+                            <container style="screenlet-body">
+                                <section>
+                                    <widgets>
+                                        <container>
+                                            <link target="EditFacilityGroup" text="${uiLabelMap.CommonNew}"
style="buttontext"/>
+                                        </container>
+                                        <include-form name="EditFacilityGroup" location="component://product/webapp/facility/group/FacilityGroupForms.xml"/>
+                                    </widgets>
+                                </section>
+                            </container>
                         </container>
-                        <include-form name="EditFacilityGroup" location="component://product/webapp/facility/group/FacilityGroupForms.xml"/>
                     </decorator-section>
                 </decorator-screen>
             </widgets>
@@ -106,12 +128,40 @@
             <widgets>
                 <decorator-screen name="CommonFacilityGroupDecorator">
                     <decorator-section name="body">
-                        <container><label style="head1">${uiLabelMap.ProductFacilities}
${uiLabelMap.CommonFor} ${facilityGroup.facilityGroupName} [${facilityGroup.facilityGroupId}]</label></container>
-                        <container><link target="EditFacilityGroup" text="${uiLabelMap.ProductNewGroup}"
style="buttontext"/></container>
-                        <label style="head2">${uiLabelMap.ProductFacilityGroupMemberMaintenance}</label>
-                        <include-form name="UpdateFacilityGroupMembers" location="component://product/webapp/facility/group/FacilityGroupForms.xml"/>
-                        <label style="head2">${uiLabelMap.ProductAddFacilityGroupMember}</label>
-                        <include-form name="AddFacilityGroupMember" location="component://product/webapp/facility/group/FacilityGroupForms.xml"/>
+                        <container>
+                            <label style="head1">${uiLabelMap.ProductFacilities} ${uiLabelMap.CommonFor}
${facilityGroup.facilityGroupName} [${facilityGroup.facilityGroupId}]</label>
+                        </container>
+                        <container style="screenlet">
+                            <container style="screenlet-title-bar">
+                                <container style="head4">
+                                    <label text="${uiLabelMap.PageTitleEditFacilityGroupMembers}"/>
+                                </container>
+                            </container>
+                            <container style="screenlet-body">
+                                <section>
+                                    <widgets>
+                                        <container>
+                                            <link target="EditFacilityGroup" text="${uiLabelMap.ProductNewGroup}"
style="buttontext"/>
+                                        </container>
+                                        <include-form name="UpdateFacilityGroupMembers"
location="component://product/webapp/facility/group/FacilityGroupForms.xml"/>
+                                    </widgets>
+                                </section>
+                            </container>
+                        </container>
+                        <container style="screenlet">
+                            <container style="screenlet-title-bar">
+                                <container style="head4">
+                                    <label text="${uiLabelMap.ProductAddFacilityGroupMember}"/>
+                                </container>
+                            </container>
+                            <container style="screenlet-body">
+                                <section>
+                                    <widgets>
+                                        <include-form name="AddFacilityGroupMember" location="component://product/webapp/facility/group/FacilityGroupForms.xml"/>
+                                    </widgets>
+                                </section>
+                            </container>
+                        </container>
                     </decorator-section>
                 </decorator-screen>
             </widgets>
@@ -130,11 +180,35 @@
                 <decorator-screen name="CommonFacilityGroupDecorator">
                     <decorator-section name="body">
                         <label style="head1">${uiLabelMap.PartyRoles} ${uiLabelMap.CommonFor}
${facilityGroup.facilityGroupName} [${facilityGroup.facilityGroupId}]</label>
-                        <container><link target="EditFacilityGroup" text="${uiLabelMap.ProductNewGroup}"
style="buttontext"/></container>
-                        <label style="head2">${uiLabelMap.ProductMaintenanceFacilityGroupPartyRole}</label>
-                        <include-form name="UpdateFacilityGroupRoles" location="component://product/webapp/facility/group/FacilityGroupForms.xml"/>
-                        <label style="head2">${uiLabelMap.ProductAddFacilityGroupPartyRole}</label>
-                        <include-form name="AddFacilityGroupRole" location="component://product/webapp/facility/group/FacilityGroupForms.xml"/>
+                        <container style="screenlet">
+                            <container style="screenlet-title-bar">
+                                <container style="head4">
+                                    <label text="${uiLabelMap.PageTitleEditFacilityGroupRoles}"/>
+                                </container>
+                            </container>
+                            <container style="screenlet-body">
+                                <section>
+                                    <widgets>
+                                        <container><link target="EditFacilityGroup"
text="${uiLabelMap.ProductNewGroup}" style="buttontext"/></container>
+                                        <include-form name="UpdateFacilityGroupRoles"
location="component://product/webapp/facility/group/FacilityGroupForms.xml"/>
+                                    </widgets>
+                                </section>
+                            </container>
+                        </container>
+                        <container style="screenlet">
+                            <container style="screenlet-title-bar">
+                                <container style="head4">
+                                    <label text="${uiLabelMap.ProductAddFacilityGroupPartyRole}"/>
+                                </container>
+                            </container>
+                            <container style="screenlet-body">
+                                <section>
+                                    <widgets>
+                                        <include-form name="AddFacilityGroupRole" location="component://product/webapp/facility/group/FacilityGroupForms.xml"/>
+                                    </widgets>
+                                </section>
+                            </container>
+                        </container>
                     </decorator-section>
                 </decorator-screen>
             </widgets>
@@ -157,17 +231,66 @@
                 <decorator-screen name="CommonFacilityGroupDecorator">
                     <decorator-section name="body">
                         <container><label style="head1">${uiLabelMap.ProductRollups}
${uiLabelMap.CommonFor} ${facilityGroup.facilityGroupName} [${facilityGroup.facilityGroupId}]</label></container>
-                        <container><link target="EditFacilityGroup" text="${uiLabelMap.ProductNewGroup}"
style="buttontext"/></container>
-                        <container><label style="head2">${uiLabelMap.ProductFacilityGroupRollupParentGroups}</label></container>
-                        <include-form name="UpdateFacilityGroupRollupTo" location="component://product/webapp/facility/group/FacilityGroupForms.xml"/>
-                        <include-form name="AddFacilityGroupRollupFrom" location="component://product/webapp/facility/group/FacilityGroupForms.xml"/>
-                        <container><label style="head2">${uiLabelMap.ProductGroupRollupChildGroups}</label></container>
-                        <include-form name="UpdateFacilityGroupRollupFrom" location="component://product/webapp/facility/group/FacilityGroupForms.xml"/>
-                        <include-form name="AddFacilityGroupRollupTo" location="component://product/webapp/facility/group/FacilityGroupForms.xml"/>
+                        <container style="screenlet">
+                            <container style="screenlet-title-bar">
+                                <container style="head4">
+                                    <label text="${uiLabelMap.PageTitleEditFacilityGroupRollup}"/>
+                                </container>
+                            </container>
+                            <container style="screenlet-body">
+                                <section>
+                                    <widgets>
+                                        <container><link target="EditFacilityGroup"
text="${uiLabelMap.ProductNewGroup}" style="buttontext"/></container>
+                                        <include-form name="UpdateFacilityGroupRollupTo"
location="component://product/webapp/facility/group/FacilityGroupForms.xml"/>
+                                    </widgets>
+                                </section>
+                            </container>
+                        </container>
+                        <container style="screenlet">
+                            <container style="screenlet-title-bar">
+                                <container style="head4">
+                                    <label text="${uiLabelMap.PageTitleAddFacilityGroupRollup}"/>
+                                </container>
+                            </container>
+                            <container style="screenlet-body">
+                                <section>
+                                    <widgets>
+                                        <include-form name="AddFacilityGroupRollupFrom"
location="component://product/webapp/facility/group/FacilityGroupForms.xml"/>
+                                    </widgets>
+                                </section>
+                            </container>
+                        </container>
+                        <container style="screenlet">
+                            <container style="screenlet-title-bar">
+                                <container style="head4">
+                                    <label text="${uiLabelMap.ProductGroupRollupChildGroups}"/>
+                                </container>
+                            </container>
+                            <container style="screenlet-body">
+                                <section>
+                                    <widgets>
+                                        <include-form name="UpdateFacilityGroupRollupFrom"
location="component://product/webapp/facility/group/FacilityGroupForms.xml"/>
+                                    </widgets>
+                                </section>
+                            </container>
+                        </container>
+                        <container style="screenlet">
+                            <container style="screenlet-title-bar">
+                                <container style="head4">
+                                    <label text="${uiLabelMap.ProductGroupRollupChildGroupsAdd}"/>
+                                </container>
+                            </container>
+                            <container style="screenlet-body">
+                                <section>
+                                    <widgets>
+                                        <include-form name="AddFacilityGroupRollupTo"
location="component://product/webapp/facility/group/FacilityGroupForms.xml"/>
+                                    </widgets>
+                                </section>
+                            </container>
+                        </container>
                     </decorator-section>
                 </decorator-screen>
             </widgets>
         </section>
     </screen>
-</screens>
-
+</screens>
\ No newline at end of file

Modified: ofbiz/trunk/applications/product/widget/facility/LookupScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/widget/facility/LookupScreens.xml?rev=609746&r1=609745&r2=609746&view=diff
==============================================================================
--- ofbiz/trunk/applications/product/widget/facility/LookupScreens.xml (original)
+++ ofbiz/trunk/applications/product/widget/facility/LookupScreens.xml Mon Jan  7 11:22:15
2008
@@ -37,8 +37,21 @@
             <widgets>
                 <decorator-screen name="LookupDecorator" location="component://common/widget/CommonScreens.xml">
                     <decorator-section name="body">
-                        <include-form name="lookupFacility" location="component://product/webapp/facility/lookup/FieldLookupForms.xml"
/>
-                        <include-form name="listLookupFacility" location="component://product/webapp/facility/lookup/FieldLookupForms.xml"
/>
+                        <container style="screenlet">
+                            <container style="screenlet-title-bar">
+                                <container style="head4">
+                                    <label text="${uiLabelMap.PageTitleLookupFacility}"/>
+                                </container>
+                            </container>
+                            <container style="screenlet-body">
+                                <section>
+                                    <widgets>
+                                        <include-form name="lookupFacility" location="component://product/webapp/facility/lookup/FieldLookupForms.xml"
/>
+                                        <include-form name="listLookupFacility" location="component://product/webapp/facility/lookup/FieldLookupForms.xml"
/>
+                                    </widgets>
+                                </section>
+                            </container>
+                        </container>                        
                     </decorator-section>
                 </decorator-screen>
             </widgets>
@@ -61,8 +74,21 @@
             <widgets>
                 <decorator-screen name="LookupDecorator" location="component://common/widget/CommonScreens.xml">
                     <decorator-section name="body">
-                        <include-form name="lookupFacilityLocation" location="component://product/webapp/facility/lookup/FieldLookupForms.xml"
/>
-                        <include-form name="listLookupFacilityLocation" location="component://product/webapp/facility/lookup/FieldLookupForms.xml"
/>
+                        <container style="screenlet">
+                            <container style="screenlet-title-bar">
+                                <container style="head4">
+                                    <label text="${uiLabelMap.PageTitleLookupFacility}"/>
+                                </container>
+                            </container>
+                            <container style="screenlet-body">
+                                <section>
+                                    <widgets>
+                                        <include-form name="lookupFacilityLocation" location="component://product/webapp/facility/lookup/FieldLookupForms.xml"
/>
+                                        <include-form name="listLookupFacilityLocation"
location="component://product/webapp/facility/lookup/FieldLookupForms.xml" />
+                                    </widgets>
+                                </section>
+                            </container>
+                        </container>                        
                     </decorator-section>
                 </decorator-screen>
             </widgets>
@@ -82,12 +108,24 @@
             <widgets>
                 <decorator-screen name="LookupDecorator" location="component://common/widget/CommonScreens.xml">
                     <decorator-section name="body">
-                        <include-form name="lookupShipment" location="component://product/webapp/facility/lookup/FieldLookupForms.xml"
/>
-                        <include-form name="listShipment" location="component://product/webapp/facility/lookup/FieldLookupForms.xml"
/>
+                        <container style="screenlet">
+                            <container style="screenlet-title-bar">
+                                <container style="head4">
+                                    <label text="${uiLabelMap.ProductLookupShipment}"/>
+                                </container>
+                            </container>
+                            <container style="screenlet-body">
+                                <section>
+                                    <widgets>
+                                        <include-form name="lookupShipment" location="component://product/webapp/facility/lookup/FieldLookupForms.xml"
/>
+                                        <include-form name="listShipment" location="component://product/webapp/facility/lookup/FieldLookupForms.xml"
/>
+                                    </widgets>
+                                </section>
+                            </container>
+                        </container>
                     </decorator-section>
                 </decorator-screen>
             </widgets>
         </section>
-    </screen>
-    
-</screens>
+    </screen>    
+</screens>
\ No newline at end of file



Mime
View raw message