svn commit: r607556 - in /ofbiz/trunk/applications/product: config/ webapp/catalog/shipping/ widget/catalog/

[mrisaliti]

Author: mrisaliti
Date: Sun Dec 30 08:38:10 2007
New Revision: 607556

URL: http://svn.apache.org/viewvc?rev=607556&view=rev
Log:
Product Shipping Methods forms (ftl/widgets screen) has now the same look and feel (Part of issue OFBIZ-1544)

Modified:
    ofbiz/trunk/applications/product/config/ProductEntityLabels_it.properties
    ofbiz/trunk/applications/product/config/ProductUiLabels.properties
    ofbiz/trunk/applications/product/config/ProductUiLabels_it.properties
    ofbiz/trunk/applications/product/config/ProductUiLabels_ru.properties
    ofbiz/trunk/applications/product/webapp/catalog/shipping/ShippingForms.xml
    ofbiz/trunk/applications/product/webapp/catalog/shipping/ShippingTabBar.ftl
    ofbiz/trunk/applications/product/widget/catalog/ShippingScreens.xml

Modified: ofbiz/trunk/applications/product/config/ProductEntityLabels_it.properties
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/config/ProductEntityLabels_it.properties?rev=607556&r1=607555&r2=607556&view=diff
==============================================================================
--- ofbiz/trunk/applications/product/config/ProductEntityLabels_it.properties (original)
+++ ofbiz/trunk/applications/product/config/ProductEntityLabels_it.properties Sun Dec 30 08:38:10 2007
@@ -246,9 +246,9 @@
 ProdConfItemContentType.description.LONG_DESCRIPTION=Descrizione - Lunga
 ProdConfItemContentType.description.INSTRUCTIONS=Istruzioni
 
-QuantityBreakType.description.SHIP_WEIGHT=Interruzione Peso Spedizione
-QuantityBreakType.description.SHIP_QUANTITY=Interruzione Quantit\u00e0 Spedizione
-QuantityBreakType.description.SHIP_PRICE=Interruzione Prezzo Spedizione
-QuantityBreakType.description.QUANTITY=Interruzione Prezzo Componente Quantit\u00e0
-QuantityBreakType.description.ORDER_VALUE=Interruzione Prezzo Componente Valore Ordine
+QuantityBreakType.description.SHIP_WEIGHT=Intervallo Peso Spedizione
+QuantityBreakType.description.SHIP_QUANTITY=Intervallo Quantit\u00e0 Spedizione
+QuantityBreakType.description.SHIP_PRICE=Intervallo Prezzo Spedizione
+QuantityBreakType.description.QUANTITY=Intervallo Prezzo Componente Quantit\u00e0
+QuantityBreakType.description.ORDER_VALUE=Intervallo Prezzo Componente Valore Ordine
 

Modified: ofbiz/trunk/applications/product/config/ProductUiLabels.properties
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/config/ProductUiLabels.properties?rev=607556&r1=607555&r2=607556&view=diff
==============================================================================
--- ofbiz/trunk/applications/product/config/ProductUiLabels.properties (original)
+++ ofbiz/trunk/applications/product/config/ProductUiLabels.properties Sun Dec 30 08:38:10 2007
@@ -94,6 +94,7 @@
 PageTitleCreateProductGoodIdentifications=Add Good Identifications
 PageTitleCreateSimpleTextContentForAlternateLocale=Create Simple Text Content For Alternate Locale
 PageTitleCreateVirtualWithVariants=Create Virtual with Variants
+PageTitleEditCarrierShipmentMethods=Edit Carrier Shipment Methods
 PageTitleEditCategory=Edit Category
 PageTitleEditCategoryAttributes=Edit Product Category Attributes
 PageTitleEditCategoryContent=Edit Category Content
@@ -170,6 +171,7 @@
 PageTitleEditProductStoreTaxSetup=Edit Product Store Tax Setup
 PageTitleEditProductStoreWebSites=Edit Product Store Web Sites
 PageTitleEditProductSubscriptionResources=Edit Product Subscription Resources
+PageTitleEditShipmentMethodTypes=Edit Shipment Method Types
 PageTitleEditSubscription=Edit Subscription
 PageTitleEditSubscriptionAttributes=Edit Subscription Attributes
 PageTitleEditSubscriptionResource=Edit Subscription Resource
@@ -182,6 +184,7 @@
 PageTitleEditSupplierProduct=Edit Supplier Product
 PageTitleEditVendorProduct=Edit Vendor Product
 PageTitleEditProductWorkEffort=Edit Product Work Effort
+PageTitleEditQuantityBreaks=Edit Quantity Breaks
 PageTitleFindConfigItems=Find Config Items
 PageTitleFindFacility=Find Facility
 PageTitleFindFacilityGroup=Find Facility Group
@@ -1931,7 +1934,6 @@
 FormFieldTitle_fromQuantity=From Quantity
 FormFieldTitle_thruQuantity=Thru Quantity
 FormFieldTitle_carrierServiceCode=Carrier Service Code
-FormFieldTitle_editLink=Edit Link
 FormFieldTitle_monthsInPastLimit=Months In Past Limit
 FormFieldTitle_picklistBinId=Picklist Bin
 FormFieldTitle_text=Text

Modified: ofbiz/trunk/applications/product/config/ProductUiLabels_it.properties
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/config/ProductUiLabels_it.properties?rev=607556&r1=607555&r2=607556&view=diff
==============================================================================
--- ofbiz/trunk/applications/product/config/ProductUiLabels_it.properties (original)
+++ ofbiz/trunk/applications/product/config/ProductUiLabels_it.properties Sun Dec 30 08:38:10 2007
@@ -92,6 +92,7 @@
 PageTitleCreateProductGoodIdentifications=Aggiungi Identificazione Prodotto
 PageTitleCreateSimpleTextContentForAlternateLocale=Creare Testo Semplice Contenuto per Locale Alternativi
 PageTitleCreateVirtualWithVariants=Creare Virtuale Con Varianti
+PageTitleEditCarrierShipmentMethods=Aggiorna Corriere Metodo di Spedizione
 PageTitleEditCategory=Mostra Categoria
 PageTitleEditCategoryAttributes=Aggiorna Attributi Categoria Prodotto
 PageTitleEditCategoryContent=Aggiorna Contenuto Categoria
@@ -165,6 +166,7 @@
 PageTitleEditProductStoreTaxSetup=Aggiorna Configurazione Tasse Negozio
 PageTitleEditProductStoreWebSites=Aggiorna Siti Web Negozio
 PageTitleEditProductSubscriptionResources=Aggiorna Risorse Abbonamento Prodotto
+PageTitleEditShipmentMethodTypes=Aggiorna Metodi di Spedizione
 PageTitleEditSubscription=Aggiorna Abbonamento
 PageTitleEditSubscriptionAttributes=Aggiorna Attributi Abbonamento
 PageTitleEditSubscriptionResource=Aggiorna Risorsa Abbonamento
@@ -177,6 +179,7 @@
 PageTitleEditSupplierProduct=Aggiorna Prodotto del Fornitore
 PageTitleEditVendorProduct=Aggiorna Fornitore Prodotto
 PageTitleEditProductWorkEffort=Aggiorna Impegno di Lavoro Prodotto
+PageTitleEditQuantityBreaks=Aggiorna Intervalli Quantit\u00e0
 PageTitleFindConfigItems=Ricerca Righe Configurazioni
 PageTitleFindFacility=Ricerca Stabilimento
 PageTitleFindFacilityGroup=Ricerca Gruppo Stabilimento
@@ -192,10 +195,10 @@
 PageTitleViewProductStoreSegments=Mostra Segmenti Negozio
 PageTitleLabelPrinting=Stampa Etichette
 PageTitleListAssociatedContentInfos=Lista Associazioni Infomazioni Contenuto
-PageTitleListCarrierShipmentMethods=Lista Corriere Metodi Spedizione
+PageTitleListCarrierShipmentMethods=Lista Corrieri Metodi di Spedizione
 PageTitleListProductFeatureApplAttrs=Lista Prodotti Attributi Caratteristiche
-PageTitleListShipmentMethodTypes=Lista Tipi Metodo Spedizione
-PageTitleListQuantityBreaks=Lista Interruzioni Quantit\u00e0
+PageTitleListShipmentMethodTypes=Lista Metodi di Spedizione
+PageTitleListQuantityBreaks=Lista Intervalli Quantit\u00e0
 PageTitleLogin=Login
 PageTitleLookupBulkAddProduct=Aggiungi Prodotti in Massa
 PageTitleLookupFacility=Ricerca Stabilimento
@@ -390,8 +393,8 @@
 ProductByProduct=Per Prodotto
 ProductCarrier=Corriere
 ProductCarrierServiceCode=Codice Servizio Corriere
-ProductCarrierShipmentMethod=Metodo Spedizione Corriere
-ProductCarrierShipmentMethods=Metodi Spedizione Corriere
+ProductCarrierShipmentMethod=Metodo di Spedizione Corriere
+ProductCarrierShipmentMethods=Metodi di Spedizione Corrieri
 ProductCarrierStatus=Stato Corriere
 ProductCatalog=Catalogo
 ProductCatalogAdministrationMainPage=Pagina Principale Amministrazione Cataloghi
@@ -743,7 +746,7 @@
 ProductItemATP=Riga ATP
 ProductItemDescription=Descrizione Riga
 ProductItemId=Numero Riga
-ProductItemIdGiftPurchaseFreeShipping=Numero riga su un'azione \u00e8 un Codice Prodotto per Omaggio Con azioni Acquisto o per azioni Spedizioni Gratuite c'\u00e8 il Tipo Metodo di Spedizione per avere spedizioni gratuite (se vuoto qualsiasi Tipo Metodo di Spedizione potrebbe ricevere spedizioni gratuite)
+ProductItemIdGiftPurchaseFreeShipping=Numero riga su un'azione \u00e8 un Codice Prodotto per Omaggio Con azioni Acquisto o per azioni Spedizioni Gratuite c'\u00e8 il Metodo di Spedizione per avere spedizioni gratuite (se vuoto qualsiasi Metodo di Spedizione potrebbe ricevere spedizioni gratuite)
 ProductItemOutofStock=Questa riga non \u00e8 disponibile
 ProductItemPrc=Riga Prc
 ProductItemProduct=Riga : Prodotto
@@ -865,7 +868,7 @@
 ProductNewSegment=Nuovo Segmento
 ProductNewShipment=Nuova Spedizione
 ProductNewShipmentEstimate=Nuova Stima Spedizione
-ProductNewShipmentMethod=Nuovo Metodo Spedizione
+ProductNewShipmentMethod=Nuovo Metodo di Spedizione
 ProductNewSubscription=Nuovo Abbonamento
 ProductNewSubscriptionResource=Nuova Risorsa Abbonamento
 ProductNewVirtualProduct=Nuovo Prodotto Virtuale
@@ -1262,7 +1265,7 @@
 ProductSetWeight=Imposta Peso
 ProductSettingsFromPrimaryOrder=Prendi Impostazioni Dall'Ordine Primario
 ProductShipDate=Data Spedizione
-ProductShipMethod=Metodo Spedizione
+ProductShipMethod=Metodo di Spedizione
 ProductShipOrder=Ordine Spedizione
 ProductShipamountOrderTotalPercent=importo spedizione=importo spedizione + (Totale Ordine * percentuale)
 ProductShipamountPrice=importo spedizione=importo spedizione + prezzo
@@ -1278,9 +1281,9 @@
 ProductShipmentInsuredValuePackage=Valore Assicurato
 ProductShipmentItemSeqId=Numero Seq Riga Spedizione
 ProductShipmentManifest=Manifesto della Spedizione
-ProductShipmentMethod=Metodo Spedizione
-ProductShipmentMethodType=Tipo Metodo Spedizione
-ProductShipmentMethodTypes=Tipi Metodo Spedizione
+ProductShipmentMethod=Metodo di Spedizione
+ProductShipmentMethodType=Metodo di Spedizione
+ProductShipmentMethodTypes=Metodi di Spedizione
 ProductShipmentNone=Nessuno
 ProductShipmentNotFoundId=La Spedizione non \u00e8 stata trovata con Codice
 ProductShipmentPackageNotFound=Pacco spedizione [${shipmentPackageSeqId}] non trovato per la spedizione [${shipmentId}]
@@ -1296,7 +1299,7 @@
 ProductShipmentUpsResidential=Consegna Residenziale
 ProductShipments=Spedizioni
 ProductShipmentsFound=Spedizioni Trovate
-ProductShipping=Spedizioni
+ProductShipping=Metodi di Spedizione
 ProductShippingAddress=Indirizzo di Spedizione
 ProductShippingBox=Spedizioni In Scatoloni ?
 ProductShippingDepth=Profondit\u00e0 Per Spedizioni
@@ -1336,7 +1339,7 @@
 ProductStoreKeywordOverrides=Chiave Negozio Sovrapposti
 ProductStoreName=Nome Negozio
 ProductStoreNameId=Nome Negozio [Codice]
-ProductStoreShipmentMethodAssociations=Associazioni Metodo Negozio Spedizione
+ProductStoreShipmentMethodAssociations=Associazioni Negozio Metodo di Spedizione
 ProductStoreSurveySettings=Configurazione Negozio Sondaggio
 ProductStoreSurveyTemplatePath=Percorso Template Sondaggio
 ProductStoreSurveyResultTemplatePath=Percorso Template Risultati Sondaggio
@@ -1439,7 +1442,7 @@
 ProductUseRole=Usa Ruolo
 ProductUseTime=Usa Ora
 ProductUseTimeUom=Usa UdM Ora
-ProductUsedForDisplayOrdering=Usa Per Ordinamento Visualizzazione
+ProductUsedForDisplayOrdering=Usato per Ordinamento Visualizzazione
 ProductUsuallyShipsIn=Normalmente spedito in
 ProductValueType=Valore, Tipo
 ProductVariantAdd=Aggiungi Variante Prodotti
@@ -1853,7 +1856,7 @@
 FormFieldTitle_autoApproveInvoice=Approvazione Automatica Fattura
 FormFieldTitle_autoApproveOrder=Approvazione Automatica Ordine
 FormFieldTitle_shipIfCaptureFails=Spedire Se la Cattura Pagamento Fallisce
-FormFieldTitle_productStoreShipMethId=Metodo di Spedizione Negozio
+FormFieldTitle_productStoreShipMethId=Negozio Metodo di Spedizione
 FormFieldTitle_companyPartyId=Soggetto Azienda
 FormFieldTitle_minWeight=Altezza Minima
 FormFieldTitle_maxWeight=Altezza Massima
@@ -1874,11 +1877,11 @@
 FormFieldTitle_sequenceNumber=Numero Sequenza
 FormFieldTitle_shipmentCostEstimateId=Costo Stimato Spedizione
 FormFieldTitle_carrierPartyId=Corriere
-FormFieldTitle_weightBreakId=Interruzione Peso
+FormFieldTitle_weightBreakId=Intervalli Peso
 FormFieldTitle_weightUnitPrice=Prezzo Unitario Peso
-FormFieldTitle_quantityBreakId=Interruzione Quantit\u00e0
+FormFieldTitle_quantityBreakId=Intervalli Quantit\u00e0
 FormFieldTitle_quantityUnitPrice=Prezzo Unitario Quantit\u00e0
-FormFieldTitle_priceBreakId=Interruzione Prezzo
+FormFieldTitle_priceBreakId=Intervalli Prezzo
 FormFieldTitle_priceUnitPrice=Prezzo Unitario Prezzo
 FormFieldTitle_orderFlatPrice=Prezzo Fisso Ordine
 FormFieldTitle_orderPricePercent=Percentual Prezzo Ordine
@@ -1894,11 +1897,10 @@
 FormFieldTitle_communicationEventTypeId=Tipo Evento Comunicazione
 FormFieldTitle_roleTypeIdFrom=Tipo Ruolo Da
 FormFieldTitle_roleTypeIdTo=Tipo Ruolo A
-FormFieldTitle_shipmentMethodTypeId=Tipo Metodo Spedizione
+FormFieldTitle_shipmentMethodTypeId=Metodo di Spedizione
 FormFieldTitle_fromQuantity=Dalla Quantit\u00e0
 FormFieldTitle_thruQuantity=Alla Quantit\u00e0
 FormFieldTitle_carrierServiceCode=Codice Servizio Corriere
-FormFieldTitle_editLink=Aggiorna Link
 FormFieldTitle_monthsInPastLimit=Mesi Nel Limite Passato
 FormFieldTitle_picklistBinId=Lista di Prelievo
 FormFieldTitle_text=Testo

Modified: ofbiz/trunk/applications/product/config/ProductUiLabels_ru.properties
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/config/ProductUiLabels_ru.properties?rev=607556&r1=607555&r2=607556&view=diff
==============================================================================
--- ofbiz/trunk/applications/product/config/ProductUiLabels_ru.properties (original)
+++ ofbiz/trunk/applications/product/config/ProductUiLabels_ru.properties Sun Dec 30 08:38:10 2007
@@ -1868,6 +1868,5 @@
 FormFieldTitle_fromQuantity=\u041e\u0442 \u043a\u043e\u043b\u0438\u0447\u0435\u0441\u0442\u0432\u0430
 FormFieldTitle_thruQuantity=\u041f\u043e \u043a\u043e\u043b\u0438\u0447\u0435\u0441\u0442\u0432\u043e
 FormFieldTitle_carrierServiceCode=\u0421\u0435\u0440\u0432\u0438\u0441\u043d\u044b\u0439 \u043a\u043e\u0434 \u043f\u0435\u0440\u0435\u0432\u043e\u0437\u0447\u0438\u043a\u0430
-FormFieldTitle_editLink=\u0418\u0437\u043c\u0435\u043d\u0438\u0442\u044c \u0441\u0441\u044b\u043b\u043a\u0443
 FormFieldTitle_monthsInPastLimit=\u041e\u0433\u0440\u0430\u043d. \u043c\u0435\u0441\u044f\u0446\u044b \u0432 \u043f\u0440\u043e\u0448\u043b\u043e\u043c
 FormFieldTitle_picklistBinId=\u041a\u043e\u0434 \u0441\u043f\u0438\u0441\u043a\u0430 \u0441\u043e\u0440\u0442\u0438\u0440\u043e\u0432\u043a\u0438

Modified: ofbiz/trunk/applications/product/webapp/catalog/shipping/ShippingForms.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/webapp/catalog/shipping/ShippingForms.xml?rev=607556&r1=607555&r2=607556&view=diff
==============================================================================
--- ofbiz/trunk/applications/product/webapp/catalog/shipping/ShippingForms.xml (original)
+++ ofbiz/trunk/applications/product/webapp/catalog/shipping/ShippingForms.xml Sun Dec 30 08:38:10 2007
@@ -22,7 +22,7 @@
         xsi:noNamespaceSchemaLocation="http://ofbiz.apache.org/dtds/widget-form.xsd">
     <!-- QuantityBreak forms -->
     <form name="ListQuantityBreaks" target="" title="" type="list"  list-name="quantityBreaks"
-        paginate-target="ListQuantityBreaks">
+        paginate-target="ListQuantityBreaks" odd-row-style="alternate-row" default-table-style="basic-table">
         <auto-fields-entity entity-name="QuantityBreak" default-field-type="display"/>
         <field name="quantityBreakId" widget-style="buttontext">
             <hyperlink target="ListQuantityBreaks?quantityBreakId=${quantityBreakId}" description="${quantityBreakId}" also-hidden="false"/>
@@ -32,7 +32,8 @@
             <hyperlink target="deleteQuantityBreak?quantityBreakId=${quantityBreakId}" description="${uiLabelMap.CommonRemove}" also-hidden="false"/>
         </field>
     </form>
-    <form name="EditQuantityBreak" type="single" target="createQuantityBreak" title="" default-map-name="quantityBreak">
+    <form name="EditQuantityBreak" type="single" target="createQuantityBreak" title="" default-map-name="quantityBreak"
+        header-row-style="header-row" default-table-style="basic-table">
         <alt-target use-when="quantityBreak!=null" target="updateQuantityBreak"/>
         <auto-fields-entity entity-name="QuantityBreak" default-field-type="edit"/>
         <field name="quantityBreakId"><hidden/></field>
@@ -46,7 +47,7 @@
         <field name="submitButton" title="${uiLabelMap.CommonSubmit}" widget-style="smallSubmit"><submit button-type="button"/></field>
     </form>
     <form name="ListShipmentMethodTypes" target="" title="" type="list"  list-name="shipmentMethodTypes"
-        paginate-target="ListQuantityBreaks">
+        paginate-target="ListQuantityBreaks" odd-row-style="alternate-row" default-table-style="basic-table">
         <auto-fields-entity entity-name="ShipmentMethodType" default-field-type="display"/>
         <field name="shipmentMethodTypeId" widget-style="buttontext">
             <hyperlink target="ListShipmentMethodTypes?shipmentMethodTypeId=${shipmentMethodTypeId}" description="${shipmentMethodTypeId}" also-hidden="false"/>
@@ -55,25 +56,27 @@
             <hyperlink target="deleteShipmentMethodType?shipmentMethodTypeId=${shipmentMethodTypeId}" description="${uiLabelMap.CommonRemove}" also-hidden="false"/>
         </field>
     </form>
-    <form name="EditShipmentMethodType" type="single" target="createShipmentMethodType" title="" default-map-name="shipmentMethodType">
+    <form name="EditShipmentMethodType" type="single" target="createShipmentMethodType" title="" default-map-name="shipmentMethodType"
+        header-row-style="header-row" default-table-style="basic-table">
         <alt-target use-when="shipmentMethodType!=null" target="updateShipmentMethodType"/>
         <auto-fields-service service-name="createShipmentMethodType" default-field-type="edit"/>
         <field name="shipmentMethodTypeId" use-when="shipmentMethodType!=null"><display/></field>
         <field name="submitButton" title="${uiLabelMap.CommonSubmit}" widget-style="smallSubmit"><submit button-type="button"/></field>
     </form>
     <form name="ListCarrierShipmentMethods" target="" title="" type="list"  list-name="carrierShipmentMethods"
-        paginate-target="ListQuantityBreaks">
+        paginate-target="ListQuantityBreaks" odd-row-style="alternate-row" default-table-style="basic-table">
         <auto-fields-entity entity-name="CarrierShipmentMethod" default-field-type="display"/>
         <field name="shipmentMethodTypeId"><display-entity also-hidden="false" entity-name="ShipmentMethodType"/></field>
         <field name="roleTypeId"><display-entity also-hidden="false" entity-name="RoleType"/></field>
-        <field name="editLink" widget-style="buttontext">
+        <field name="editLink" title="${uiLabelMap.CommonEmptyHeader}" widget-style="buttontext">
             <hyperlink target="ListCarrierShipmentMethods?shipmentMethodTypeId=${shipmentMethodTypeId}&amp;partyId=${partyId}&amp;roleTypeId=${roleTypeId}" description="${uiLabelMap.CommonEdit}" also-hidden="false"/>
         </field>
         <field name="deleteLink" title="${uiLabelMap.CommonEmptyHeader}" widget-style="buttontext">
             <hyperlink target="deleteCarrierShipmentMethod?shipmentMethodTypeId=${shipmentMethodTypeId}&amp;partyId=${partyId}&amp;roleTypeId=${roleTypeId}" description="${uiLabelMap.CommonRemove}" also-hidden="false"/>
         </field>
     </form>
-    <form name="EditCarrierShipmentMethod" type="single" target="createCarrierShipmentMethod" title="" default-map-name="carrierShipmentMethod">
+    <form name="EditCarrierShipmentMethod" type="single" target="createCarrierShipmentMethod" title="" default-map-name="carrierShipmentMethod"
+        header-row-style="header-row" default-table-style="basic-table">
         <alt-target use-when="carrierShipmentMethod!=null" target="updateCarrierShipmentMethod"/>
         <auto-fields-service service-name="createCarrierShipmentMethod" default-field-type="edit"/>
         <field name="shipmentMethodTypeId" use-when="carrierShipmentMethod==null">

Modified: ofbiz/trunk/applications/product/webapp/catalog/shipping/ShippingTabBar.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/webapp/catalog/shipping/ShippingTabBar.ftl?rev=607556&r1=607555&r2=607556&view=diff
==============================================================================
--- ofbiz/trunk/applications/product/webapp/catalog/shipping/ShippingTabBar.ftl (original)
+++ ofbiz/trunk/applications/product/webapp/catalog/shipping/ShippingTabBar.ftl Sun Dec 30 08:38:10 2007
@@ -16,10 +16,14 @@
 specific language governing permissions and limitations
 under the License.
 -->
-<#assign unselectedClassName = "tabButton">
-<#assign selectedClassMap = {page.tabButtonItem?default("void") : "tabButtonSelected"}>
-<div class="tabContainer">
-  <a href="<@ofbizUrl>ListShipmentMethodTypes</@ofbizUrl>" class="${selectedClassMap.ListShipmentMethodTypes?default(unselectedClassName)}">${uiLabelMap.ProductShipmentMethodTypes}</a>
-  <a href="<@ofbizUrl>ListQuantityBreaks</@ofbizUrl>" class="${selectedClassMap.ListQuantityBreaks?default(unselectedClassName)}">${uiLabelMap.ProductQuantityBreaks}</a>
-  <a href="<@ofbizUrl>ListCarrierShipmentMethods</@ofbizUrl>" class="${selectedClassMap.ListCarrierShipmentMethods?default(unselectedClassName)}">${uiLabelMap.ProductCarrierShipmentMethods}</a>
-</div>
+<#assign unselectedClassName = "">
+<#assign selectedClassMap = {page.tabButtonItem?default("void") : "selected"}>
+<br/>
+<div class="button-bar tab-bar">
+    <ul>
+        <li><a href="<@ofbizUrl>ListShipmentMethodTypes</@ofbizUrl>" class="${selectedClassMap.ListShipmentMethodTypes?default(unselectedClassName)}">${uiLabelMap.ProductShipmentMethodTypes}</a></li>
+        <li><a href="<@ofbizUrl>ListQuantityBreaks</@ofbizUrl>" class="${selectedClassMap.ListQuantityBreaks?default(unselectedClassName)}">${uiLabelMap.ProductQuantityBreaks}</a></li>
+        <li><a href="<@ofbizUrl>ListCarrierShipmentMethods</@ofbizUrl>" class="${selectedClassMap.ListCarrierShipmentMethods?default(unselectedClassName)}">${uiLabelMap.ProductCarrierShipmentMethods}</a></li>
+    </ul>
+    <br/>
+</div>
\ No newline at end of file

Modified: ofbiz/trunk/applications/product/widget/catalog/ShippingScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/widget/catalog/ShippingScreens.xml?rev=607556&r1=607555&r2=607556&view=diff
==============================================================================
--- ofbiz/trunk/applications/product/widget/catalog/ShippingScreens.xml (original)
+++ ofbiz/trunk/applications/product/widget/catalog/ShippingScreens.xml Sun Dec 30 08:38:10 2007
@@ -41,11 +41,34 @@
             <widgets>
                 <decorator-screen name="CommonShippingDecorator" location="${parameters.mainDecoratorLocation}">
                     <decorator-section name="body">
-                        <container>
-                            <label style="head1">${uiLabelMap.ProductQuantityBreaks}</label>
+                        <container style="screenlet">
+                            <container style="screenlet-title-bar">
+                                <container style="head4">
+                                    <label text="${uiLabelMap.PageTitleListQuantityBreaks}"/>
+                                </container>
+                            </container>
+                            <container style="screenlet-body">
+                                <section>
+                                    <widgets>
+                                        <include-form name="ListQuantityBreaks" location="component://product/webapp/catalog/shipping/ShippingForms.xml"/>
+                                    </widgets>
+                                </section>
+                            </container>
+                        </container>
+                        <container style="screenlet">
+                            <container style="screenlet-title-bar">
+                                <container style="head4">
+                                    <label text="${uiLabelMap.PageTitleEditQuantityBreaks}"/>
+                                </container>
+                            </container>
+                            <container style="screenlet-body">
+                                <section>
+                                    <widgets>
+                                        <include-form name="EditQuantityBreak" location="component://product/webapp/catalog/shipping/ShippingForms.xml"/>
+                                    </widgets>
+                                </section>
+                            </container>
                         </container>
-                        <include-form name="ListQuantityBreaks" location="component://product/webapp/catalog/shipping/ShippingForms.xml"/>
-                        <include-form name="EditQuantityBreak" location="component://product/webapp/catalog/shipping/ShippingForms.xml"/>
                     </decorator-section>
                 </decorator-screen>
             </widgets>
@@ -71,11 +94,34 @@
             <widgets>
                 <decorator-screen name="CommonShippingDecorator" location="${parameters.mainDecoratorLocation}">
                     <decorator-section name="body">
-                        <container>
-                            <label style="head1">${uiLabelMap.ProductShipmentMethodTypes}</label>
+                        <container style="screenlet">
+                            <container style="screenlet-title-bar">
+                                <container style="head4">
+                                    <label text="${uiLabelMap.PageTitleListShipmentMethodTypes}"/>
+                                </container>
+                            </container>
+                            <container style="screenlet-body">
+                                <section>
+                                    <widgets>
+                                        <include-form name="ListShipmentMethodTypes" location="component://product/webapp/catalog/shipping/ShippingForms.xml"/>
+                                    </widgets>
+                                </section>
+                            </container>
+                        </container>
+                        <container style="screenlet">
+                            <container style="screenlet-title-bar">
+                                <container style="head4">
+                                    <label text="${uiLabelMap.PageTitleEditShipmentMethodTypes}"/>
+                                </container>
+                            </container>
+                            <container style="screenlet-body">
+                                <section>
+                                    <widgets>
+                                        <include-form name="EditShipmentMethodType" location="component://product/webapp/catalog/shipping/ShippingForms.xml"/>
+                                    </widgets>
+                                </section>
+                            </container>
                         </container>
-                        <include-form name="ListShipmentMethodTypes" location="component://product/webapp/catalog/shipping/ShippingForms.xml"/>
-                        <include-form name="EditShipmentMethodType" location="component://product/webapp/catalog/shipping/ShippingForms.xml"/>
                     </decorator-section>
                 </decorator-screen>
             </widgets>
@@ -101,11 +147,34 @@
             <widgets>
                 <decorator-screen name="CommonShippingDecorator" location="${parameters.mainDecoratorLocation}">
                     <decorator-section name="body">
-                        <container>
-                            <label style="head1">${uiLabelMap.ProductCarrierShipmentMethods}</label>
+                        <container style="screenlet">
+                            <container style="screenlet-title-bar">
+                                <container style="head4">
+                                    <label text="${uiLabelMap.PageTitleListCarrierShipmentMethods}"/>
+                                </container>
+                            </container>
+                            <container style="screenlet-body">
+                                <section>
+                                    <widgets>
+                                        <include-form name="ListCarrierShipmentMethods" location="component://product/webapp/catalog/shipping/ShippingForms.xml"/>
+                                    </widgets>
+                                </section>
+                            </container>
+                        </container>
+                        <container style="screenlet">
+                            <container style="screenlet-title-bar">
+                                <container style="head4">
+                                    <label text="${uiLabelMap.PageTitleEditCarrierShipmentMethods}"/>
+                                </container>
+                            </container>
+                            <container style="screenlet-body">
+                                <section>
+                                    <widgets>
+                                        <include-form name="EditCarrierShipmentMethod" location="component://product/webapp/catalog/shipping/ShippingForms.xml"/>
+                                    </widgets>
+                                </section>
+                            </container>
                         </container>
-                        <include-form name="ListCarrierShipmentMethods" location="component://product/webapp/catalog/shipping/ShippingForms.xml"/>
-                        <include-form name="EditCarrierShipmentMethod" location="component://product/webapp/catalog/shipping/ShippingForms.xml"/>
                     </decorator-section>
                 </decorator-screen>
             </widgets>