svn commit: r607631 [1/2] - in /ofbiz/trunk/applications/product: config/ webapp/catalog/store/ widget/catalog/

Previous Topic Next Topic
 
classic Classic list List threaded Threaded
1 message Options
Reply | Threaded
Open this post in threaded view
|

svn commit: r607631 [1/2] - in /ofbiz/trunk/applications/product: config/ webapp/catalog/store/ widget/catalog/

mrisaliti
Author: mrisaliti
Date: Sun Dec 30 16:47:44 2007
New Revision: 607631

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

Modified:
    ofbiz/trunk/applications/product/config/ProductUiLabels.properties
    ofbiz/trunk/applications/product/config/ProductUiLabels_it.properties
    ofbiz/trunk/applications/product/webapp/catalog/store/EditProductStoreRoles.ftl
    ofbiz/trunk/applications/product/webapp/catalog/store/EditProductStoreShipSetup.ftl
    ofbiz/trunk/applications/product/webapp/catalog/store/EditProductStoreSurveys.ftl
    ofbiz/trunk/applications/product/webapp/catalog/store/EditProductStoreTaxSetup.ftl
    ofbiz/trunk/applications/product/webapp/catalog/store/EditProductStoreWebSites.ftl
    ofbiz/trunk/applications/product/webapp/catalog/store/ProductStoreForms.xml
    ofbiz/trunk/applications/product/webapp/catalog/store/ProductStoreTabBar.ftl
    ofbiz/trunk/applications/product/widget/catalog/StoreScreens.xml

Modified: ofbiz/trunk/applications/product/config/ProductUiLabels.properties
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/config/ProductUiLabels.properties?rev=607631&r1=607630&r2=607631&view=diff
==============================================================================
--- ofbiz/trunk/applications/product/config/ProductUiLabels.properties (original)
+++ ofbiz/trunk/applications/product/config/ProductUiLabels.properties Sun Dec 30 16:47:44 2007
@@ -76,6 +76,11 @@
 PageTitleAddProductMeters=Add Product Meters
 PageTitleAddProductPaymentMethodType=Add Product Payment Method Type
 PageTitleAddProductPrices=Add Product Prices
+PageTitleAddProductStoreCatalogs=Add Product Store Catalogs
+PageTitleAddProductStoreEmailSetup=Add Product Store Email Setup
+PageTitleAddProductStoreKeywordOvrd=Add Product Store Keyword Ovrd
+PageTitleAddProductStoreShipSetup=Add Product Store Ship Setup
+PageTitleAddProductStoreSurveys=Add Product Store Surveys
 PageTitleAddProductSubscriptionResources=Add Product Subscription Resources
 PageTitleAddProductSupplier=Add Product Supplier
 PageTitleAddProductWorkEffort=Add Product Work Effort
@@ -169,6 +174,7 @@
 PageTitleEditProductStorePaySetup=Edit Product Store Payment Setup
 PageTitleEditProductStorePromos=Edit Product Store Promos
 PageTitleEditProductStoreRoles=Edit Product Store Roles
+PageTitleEditProductStoreShipmentCostEstimates=Edit Product Store Shipment Cost Estimates
 PageTitleEditProductStoreShipSetup=Edit Product Store Ship Setup
 PageTitleEditProductStoreSurveys=Edit Product Store Surveys
 PageTitleEditProductStoreTaxSetup=Edit Product Store Tax Setup
@@ -204,6 +210,10 @@
 PageTitleLabelPrinting=Label Printing
 PageTitleListAssociatedContentInfos=List Associated Content Infos
 PageTitleListCarrierShipmentMethods=List Carrier Shipment Methods
+PageTitleListProductStoreFinAccountSettings=List Product Store Financial Account Settings
+PageTitleListProductStorePaySetup=List Product Store Payment Setup
+PageTitleListProductStoreVendorPayments=List Product Store Vendor Payments
+PageTitleListProductStoreVendorShipments=List Product Store Vendor Shipments
 PageTitleListProductFeatureApplAttrs=List Product Feature Appl Attrs
 PageTitleListShipmentMethodTypes=List Shipment Method Types
 PageTitleListQuantityBreaks=List Quantity Breaks
@@ -1695,7 +1705,7 @@
 FormFieldTitle_templateDataResourceId=Template Data Resource Id
 FormFieldTitle_dataSourceId=Data Source Id
 FormFieldTitle_privilegeEnumId=Privilege Enum Id
-FormFieldTitle_serviceName=Service Name
+FormFieldTitle_serviceName=Serv. Name
 FormFieldTitle_contentName=Content Name
 FormFieldTitle_localeString=Locale String
 FormFieldTitle_mimeTypeId=Mime Type Id
@@ -1827,7 +1837,7 @@
 FormFieldTitle_meterUomId=Meter Uom Id
 FormFieldTitle_meterName=Meter Name
 FormFieldTitle_productMeterTypeId=Product Meter Type Id
-FormFieldTitle_sequenceNum=Sequence Num
+FormFieldTitle_sequenceNum=Sequence Number
 FormFieldTitle_configTypeId=Config Type Id
 FormFieldTitle_isMandatory=Is Mandatory
 FormFieldTitle_productPromoCodeId=Product Promo Code Id
@@ -1893,24 +1903,24 @@
 FormFieldTitle_autoApproveOrder=Auto Approve Order
 FormFieldTitle_shipIfCaptureFails=Ship If Capture Fails
 FormFieldTitle_productStoreShipMethId=Product Store Ship Meth Id
-FormFieldTitle_companyPartyId=Company Party Id
-FormFieldTitle_minWeight=Min Weight
-FormFieldTitle_maxWeight=Max Weight
+FormFieldTitle_companyPartyId=Comp. Party Id
+FormFieldTitle_minWeight=Min Wt.
+FormFieldTitle_maxWeight=Max Wt.
 FormFieldTitle_minSize=Min Size
 FormFieldTitle_maxSize=Max Size
-FormFieldTitle_minTotal=Min Total
-FormFieldTitle_maxTotal=Max Total
+FormFieldTitle_minTotal=Min Tot.
+FormFieldTitle_maxTotal=Max Tot.
 FormFieldTitle_allowUspsAddr=Allow Usps Addr
-FormFieldTitle_requireUspsAddr=Require Usps Addr
-FormFieldTitle_allowCompanyAddr=Allow Company Addr
-FormFieldTitle_requireCompanyAddr=Require Company Addr
-FormFieldTitle_includeNoChargeItems=Include No Charge Items
-FormFieldTitle_includeFeatureGroup=Include Feature Group
-FormFieldTitle_excludeFeatureGroup=Exclude Feature Group
-FormFieldTitle_includeGeoId=Include Geo Id
-FormFieldTitle_excludeGeoId=Exclude Geo Id
-FormFieldTitle_configProps=Config Props
-FormFieldTitle_sequenceNumber=Sequence Number
+FormFieldTitle_requireUspsAddr=Req. Usps Addr
+FormFieldTitle_allowCompanyAddr=Allow Comp. Addr
+FormFieldTitle_requireCompanyAddr=Req. Comp. Addr
+FormFieldTitle_includeNoChargeItems=Incl. No Charge Items
+FormFieldTitle_includeFeatureGroup=Incl. Feat. Group
+FormFieldTitle_excludeFeatureGroup=Excl. Feat. Group
+FormFieldTitle_includeGeoId=Incl. Geo Id
+FormFieldTitle_excludeGeoId=Excl. Geo Id
+FormFieldTitle_configProps=Conf. Props
+FormFieldTitle_sequenceNumber=Seq. Num.
 FormFieldTitle_shipmentCostEstimateId=Shipment Cost Estimate Id
 FormFieldTitle_carrierPartyId=Carrier Party Id
 FormFieldTitle_weightBreakId=Weight Break Id
@@ -1953,4 +1963,13 @@
 FormFieldTitle_productStoreGroupId=Product Store Group Id
 FormFieldTitle_defaultConfigOptionId=Default Config Option Id
 FormFieldTitle_caContentAssocTypeId=Content Assoc Type Id
-FormFieldTitle_editDataResource=Edit Data Resource
\ No newline at end of file
+FormFieldTitle_editDataResource=Edit Data Resource
+FormFieldTitle_reqShipAddrForDigItems=Req Ship Addr For Dig Items
+FormFieldTitle_prodSearchExcludeVariants=Prod Search Exclude Variants
+FormFieldTitle_setOwnerUponIssuance=Set Owner Upon Issuance
+FormFieldTitle_reqReturnInventoryReceive=Req Return Inventory Receive
+FormFieldTitle_addToCartRemoveIncompat=Add To Cart Remove Incompat
+FormFieldTitle_addToCartReplaceUpsell=Add To Cart Replace Upsell
+FormFieldTitle_splitPayPrefPerShpGrp=Split Pay Pref Per Shp Grp
+FormFieldTitle_manualOnly=Manual Only
+FormFieldTitle_creditCardEnumId=Credit Card Enum 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=607631&r1=607630&r2=607631&view=diff
==============================================================================
--- ofbiz/trunk/applications/product/config/ProductUiLabels_it.properties (original)
+++ ofbiz/trunk/applications/product/config/ProductUiLabels_it.properties Sun Dec 30 16:47:44 2007
@@ -74,6 +74,11 @@
 PageTitleAddProductMeters=Aggiungi Contatori Prodotto
 PageTitleAddProductPaymentMethodType=Aggiungi Tipo Metodo di Pagamento Prodotto
 PageTitleAddProductPrices=Aggiungi Prezzo Prodotto
+PageTitleAddProductStoreCatalogs=Aggiungi Cataloghi Negozio
+PageTitleAddProductStoreEmailSetup=Aggiungi Negozio Configurazione Emails
+PageTitleAddProductStoreKeywordOvrd=Aggiungi Negozio Prodotto Sostituzione Chiavi
+PageTitleAddProductStoreShipSetup=Aggiungi Configurazione Spedizioni Negozio
+PageTitleAddProductStoreSurveys=Aggiungi Sondaggi Negozio
 PageTitleAddProductSubscriptionResources=Aggiungi Risorse Abbonamento Prodotto
 PageTitleAddProductSupplier=Aggiungi Prodotto del Fornitore
 PageTitleAddProductWorkEffort=Aggiungi Impegno di Lavoro Prodotto
@@ -159,14 +164,18 @@
 PageTitleEditProductStore=Aggiorna Negozio
 PageTitleEditProductStoreCatalogs=Aggiorna Cataloghi Negozio
 PageTitleEditProductStoreEmailSetup=Aggiorna Negozio Configurazione Emails
+PageTitleEditProductStoreFinAccountSettings=Aggiorna Negozio Configurazione Conti Finanziari
 PageTitleEditProductStoreKeywordOvrd=Aggiorna Negozio Prodotto Sostituzione Chiavi
-PageTitleEditProductStoreList=Aggiorna Lista Negozio
+PageTitleEditProductStoreList=Lista Negozi
 PageTitleEditProductStorePaySetup=Aggiorna Configurazione Pagamenti Negozio
 PageTitleEditProductStorePromos=Aggiorna Promozioni Negozio
 PageTitleEditProductStoreRoles=Aggiorna Ruoli Negozio
+PageTitleEditProductStoreShipmentCostEstimates=Aggiorna Stime Costi Spedizione Negozio
 PageTitleEditProductStoreShipSetup=Aggiorna Configurazione Spedizioni Negozio
 PageTitleEditProductStoreSurveys=Aggiorna Sondaggi Negozio
 PageTitleEditProductStoreTaxSetup=Aggiorna Configurazione Tasse Negozio
+PageTitleEditProductStoreVendorPayments=Aggiorna Pagamenti dei Fornitori Negozio
+PageTitleEditProductStoreVendorShipments=Aggiorna Metodi di Spedizione dei Fornitori Negozio
 PageTitleEditProductStoreWebSites=Aggiorna Siti Web Negozio
 PageTitleEditProductSubscriptionResources=Aggiorna Risorse Abbonamento Prodotto
 PageTitleEditShipmentMethodTypes=Aggiorna Metodi di Spedizione
@@ -200,6 +209,10 @@
 PageTitleListAssociatedContentInfos=Lista Associazioni Infomazioni Contenuto
 PageTitleListCarrierShipmentMethods=Lista Corrieri Metodi di Spedizione
 PageTitleListProductFeatureApplAttrs=Lista Prodotti Attributi Caratteristiche
+PageTitleListProductStoreFinAccountSettings=Lista Negozio Configurazione Conti Finanziari
+PageTitleListProductStorePaySetup=Lista Configurazione Pagamenti Negozio
+PageTitleListProductStoreVendorPayments=Lista Pagamenti dei Fornitori Negozio
+PageTitleListProductStoreVendorShipments=Lista Metodi di Spedizione dei Fornitori Negozio
 PageTitleListShipmentMethodTypes=Lista Metodi di Spedizione
 PageTitleListQuantityBreaks=Lista Intervalli Quantit\u00e0
 PageTitleLogin=Login
@@ -1599,7 +1612,7 @@
 FormFieldTitle_requirementMethodEnumId=Richiesta Scelta Tipo Metodo Fabbisogno
 FormFieldTitle_orderNumberPrefix=Prefisso Numero Ordine
 FormFieldTitle_defaultLocaleString=Stringa Localizzazione di Default
-FormFieldTitle_defaultCurrencyUomId=Codice Valuta Default
+FormFieldTitle_defaultCurrencyUomId=Codice Valuta di Default
 FormFieldTitle_defaultSalesChannelEnumId=Scelta Canale di Vendita di Default
 FormFieldTitle_allowPassword=Permetti Password
 FormFieldTitle_defaultPassword=Password di Default
@@ -1794,7 +1807,7 @@
 FormFieldTitle_meterUomId=Udm Contatore
 FormFieldTitle_meterName=Nome Contatore
 FormFieldTitle_productMeterTypeId=Tipo Contatore Prodotto
-FormFieldTitle_sequenceNum=Num.Sequenza
+FormFieldTitle_sequenceNum=Numero Sequenza
 FormFieldTitle_configTypeId=Tipo Configurazione
 FormFieldTitle_isMandatory=E' Obbligatorio
 FormFieldTitle_productPromoCodeId=Codice Promozione Prodotto
@@ -1860,24 +1873,24 @@
 FormFieldTitle_autoApproveOrder=Approvazione Automatica Ordine
 FormFieldTitle_shipIfCaptureFails=Spedire Se la Cattura Pagamento Fallisce
 FormFieldTitle_productStoreShipMethId=Negozio Metodo di Spedizione
-FormFieldTitle_companyPartyId=Soggetto Azienda
-FormFieldTitle_minWeight=Altezza Minima
-FormFieldTitle_maxWeight=Altezza Massima
-FormFieldTitle_minSize=Larghezza Minima
-FormFieldTitle_maxSize=Larghezza Massima
-FormFieldTitle_minTotal=Totale Minimo
-FormFieldTitle_maxTotal=Totale Massima
-FormFieldTitle_allowUspsAddr=Permesso Indirizzo Usps
-FormFieldTitle_requireUspsAddr=Richiesto Usps Addr
-FormFieldTitle_allowCompanyAddr=Permesso Indirizzo Azienda
-FormFieldTitle_requireCompanyAddr=Richiesto Indirizzo Azienda
-FormFieldTitle_includeNoChargeItems=Includi Righe Senza Ricarico
-FormFieldTitle_includeFeatureGroup=Includi Gruppo Caratteristica
-FormFieldTitle_excludeFeatureGroup=Escludi Gruppo Caratteristica
-FormFieldTitle_includeGeoId=Includi Geografia
-FormFieldTitle_excludeGeoId=Escludi Geografia
-FormFieldTitle_configProps=Configurazione Propriet\u00e0
-FormFieldTitle_sequenceNumber=Numero Sequenza
+FormFieldTitle_companyPartyId=Az.
+FormFieldTitle_minWeight=Alt. Min.
+FormFieldTitle_maxWeight=Alt. Mas.
+FormFieldTitle_minSize=Lar. Min.
+FormFieldTitle_maxSize=Lar. Mas.
+FormFieldTitle_minTotal=Tot. Min.
+FormFieldTitle_maxTotal=Tot. Mas.
+FormFieldTitle_allowUspsAddr=Per. Ind. Usps
+FormFieldTitle_requireUspsAddr=Ric. Ind. Usps
+FormFieldTitle_allowCompanyAddr=Per. Ind. Az.
+FormFieldTitle_requireCompanyAddr=Ric. Ind. Az.
+FormFieldTitle_includeNoChargeItems=Inc. Rig. No Ric.
+FormFieldTitle_includeFeatureGroup=Inc. Gru. Car.
+FormFieldTitle_excludeFeatureGroup=Esc. Gru. Car.
+FormFieldTitle_includeGeoId=Inc. Geo.
+FormFieldTitle_excludeGeoId=Esc. Geo.
+FormFieldTitle_configProps=Con. Pro.
+FormFieldTitle_sequenceNumber=Num. Seq.
 FormFieldTitle_shipmentCostEstimateId=Costo Stimato Spedizione
 FormFieldTitle_carrierPartyId=Corriere
 FormFieldTitle_weightBreakId=Intervalli Peso
@@ -1920,4 +1933,13 @@
 FormFieldTitle_productStoreGroupId=Gruppo Negozio
 FormFieldTitle_defaultConfigOptionId=Opzione di Default Configurazione
 FormFieldTitle_caContentAssocTypeId=Tipo Associazione Contenuto
-FormFieldTitle_editDataResource=Aggiorna Risorsa Dati
\ No newline at end of file
+FormFieldTitle_editDataResource=Aggiorna Risorsa Dati
+FormFieldTitle_reqShipAddrForDigItems=Richiesto Indirizzo di Spedizione per Prodotti Digitali
+FormFieldTitle_prodSearchExcludeVariants=Escludere Varianti dalla Ricerca Prodotti
+FormFieldTitle_setOwnerUponIssuance=Imposta Proprietario durante il Prelievo
+FormFieldTitle_reqReturnInventoryReceive=Richiesta Ricezione Inventario Resi
+FormFieldTitle_addToCartRemoveIncompat=Aggiunta al Carrello Rimuove Incompatibilit\u00e0
+FormFieldTitle_addToCartReplaceUpsell=Aggiunta al Carrello Sostituisce Upsell
+FormFieldTitle_splitPayPrefPerShpGrp=Suddividere Preferenze Pagamento Per Gruppo di Spedizione
+FormFieldTitle_manualOnly=Solo Manuale
+FormFieldTitle_creditCardEnumId=Tipo Carta di Credito
\ No newline at end of file

Modified: ofbiz/trunk/applications/product/webapp/catalog/store/EditProductStoreRoles.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/webapp/catalog/store/EditProductStoreRoles.ftl?rev=607631&r1=607630&r2=607631&view=diff
==============================================================================
--- ofbiz/trunk/applications/product/webapp/catalog/store/EditProductStoreRoles.ftl (original)
+++ ofbiz/trunk/applications/product/webapp/catalog/store/EditProductStoreRoles.ftl Sun Dec 30 16:47:44 2007
@@ -16,73 +16,89 @@
 specific language governing permissions and limitations
 under the License.
 -->
-  <#if !requestParameters.showAll?exists>
-    <a href="<@ofbizUrl>EditProductStoreRoles?productStoreId=${productStoreId}&showAll=Y</@ofbizUrl>" class="buttontext">[${uiLabelMap.ProductShowAll}]</a>
-  <#else>
-    <a href="<@ofbizUrl>EditProductStoreRoles?productStoreId=${productStoreId}</@ofbizUrl>" class="buttontext">[${uiLabelMap.ProductShowActive}]</a>
-  </#if>
-  <br/>
-  
-  <table border="1" cellpadding="2" cellspacing="0">
-    <tr>
-      <td><span class="tableheadtext">${uiLabelMap.PartyParty}</span></td>
-      <td><span class="tableheadtext">${uiLabelMap.PartyRole}</span></td>
-      <td><span class="tableheadtext">${uiLabelMap.CommonFromDate}</span></td>
-      <td><span class="tableheadtext">${uiLabelMap.CommonThruDate}</span></td>
-      <td>&nbsp;</td>
-    </tr>
-    <#if productStoreRoles?has_content>
-      <#list productStoreRoles as role>
-        <#assign roleType = role.getRelatedOne("RoleType")>
-        <tr>
-          <td><a href="/partymgr/control/viewprofile?partyId=${role.partyId}&externalLoginKey=${requestAttributes.externalLoginKey}" class="buttontext">${role.partyId}</a></td>
-          <td><span class="tabletext">${roleType.get("description",locale)}</span></td>
-          <td><span class="tabletext">${role.fromDate?string}</span></td>
-          <td><span class="tabletext">${role.thruDate?default("${uiLabelMap.CommonNA}")?string?if_exists}</span></td>
-          <#if role.thruDate?exists>
-            <td>&nbsp;</td>
-          <#else>
-            <td align="center">
-              <a href="<@ofbizUrl>storeRemoveRole?productStoreId=${productStoreId}&partyId=${role.partyId}&roleTypeId=${role.roleTypeId}&fromDate=${role.fromDate}</@ofbizUrl>" class="buttontext">[${uiLabelMap.CommonDelete}]</a>
-            </td>
-          </#if>
-        </tr>
-      </#list>
-    </#if>
-  </table>
-  
-  <br/>
-  <h2>${uiLabelMap.ProductCreateProductStoreRole}:</h2>
-  <form name="addProductStoreRole" action="<@ofbizUrl>storeCreateRole</@ofbizUrl>" method="post">
-    <input type="hidden" name="productStoreId" value="${productStoreId}">
-    <table cellspacing="2" cellpadding="2">
-      <tr>
-        <td><span class="tableheadtext">${uiLabelMap.PartyRoleType}</span></td>
-        <td>
-          <select class="selectBox" name="roleTypeId">
-            <#list roleTypes as roleType>
-              <option value="${roleType.roleTypeId}">${roleType.get("description",locale)}</option>
-            </#list>
-          </select>
-        </td>
-      </tr>
-      <tr>
-        <td><span class="tableheadtext">${uiLabelMap.PartyParty}</span></td>
-        <td>
-          <input type="text" class="inputBox" name="partyId" size="20">
-          <a href="javascript:call_fieldlookup2(document.addProductStoreRole.partyId,'LookupPartyName');"><img src='/images/fieldlookup.gif' width='15' height='14' border='0' alt='Click here For Field Lookup'/></a>
-        </td>
-      </tr>
-      <tr>
-        <td><span class="tableheadtext">${uiLabelMap.CommonFromDate}</span></td>
-        <td>
-          <input type="text" class="inputBox" name="fromDate" size="25">
-          <a href="javascript:call_cal(document.addProductStoreRole.fromDate, null);"><img src='/images/cal.gif' width='16' height='16' border='0' alt='Calendar'></a>                  
-        </td>
-      </tr>
-      <tr>
-        <td>&nbsp;</td>
-        <td><input type="submit" class="smallSubmit" value="${uiLabelMap.CommonAdd}"></td>
-      </tr>
-    </table>
-  </form>
+<#if !requestParameters.showAll?exists>
+    <a href="<@ofbizUrl>EditProductStoreRoles?productStoreId=${productStoreId}&showAll=Y</@ofbizUrl>" class="buttontext">${uiLabelMap.ProductShowAll}</a>
+<#else>
+    <a href="<@ofbizUrl>EditProductStoreRoles?productStoreId=${productStoreId}</@ofbizUrl>" class="buttontext">${uiLabelMap.ProductShowActive}</a>
+</#if>  
+<div class="screenlet">
+    <div class="screenlet-title-bar">
+        <h3>${uiLabelMap.PageTitleEditProductStoreRoles}</h3>
+    </div>
+    <div class="screenlet-body">
+        <table cellspacing="0" class="basic-table">
+            <tr class="header-row">
+              <td><b>${uiLabelMap.PartyParty}</b></td>
+              <td><b>${uiLabelMap.PartyRole}</b></td>
+              <td><b>${uiLabelMap.CommonFromDate}</b></td>
+              <td><b>${uiLabelMap.CommonThruDate}</b></td>
+              <td><b>&nbsp;</b></td>
+            </tr>
+            <#if productStoreRoles?has_content>
+              <#assign rowClass = "2">
+              <#list productStoreRoles as role>
+              <#assign roleType = role.getRelatedOne("RoleType")>
+                <tr valign="middle"<#if rowClass == "1"> class="alternate-row"</#if>>
+                  <td><a href="/partymgr/control/viewprofile?partyId=${role.partyId}&externalLoginKey=${requestAttributes.externalLoginKey}" class="buttontext">${role.partyId}</a></td>
+                  <td>${roleType.get("description",locale)}</td>
+                  <td>${role.fromDate?string}</td>
+                  <td>${role.thruDate?default("${uiLabelMap.CommonNA}")?string?if_exists}</td>
+                  <#if role.thruDate?exists>
+                    <td>&nbsp;</td>
+                  <#else>
+                    <td align="center">
+                      <a href="<@ofbizUrl>storeRemoveRole?productStoreId=${productStoreId}&partyId=${role.partyId}&roleTypeId=${role.roleTypeId}&fromDate=${role.fromDate}</@ofbizUrl>" class="buttontext">${uiLabelMap.CommonDelete}</a>
+                    </td>
+                  </#if>
+                </tr>
+                <#-- toggle the row color -->
+                <#if rowClass == "2">
+                    <#assign rowClass = "1">
+                <#else>
+                    <#assign rowClass = "2">
+                </#if>
+              </#list>
+            </#if>
+        </table>
+    </div>
+</div>
+<div class="screenlet">
+    <div class="screenlet-title-bar">
+        <h3>${uiLabelMap.ProductCreateProductStoreRole}</h3>
+    </div>
+    <div class="screenlet-body">
+        <form name="addProductStoreRole" action="<@ofbizUrl>storeCreateRole</@ofbizUrl>" method="post">
+            <input type="hidden" name="productStoreId" value="${productStoreId}">
+            <table cellspacing="0" class="basic-table">
+              <tr>
+                <td class="label">${uiLabelMap.PartyRoleType}</td>
+                <td>
+                  <select class="selectBox" name="roleTypeId">
+                    <#list roleTypes as roleType>
+                      <option value="${roleType.roleTypeId}">${roleType.get("description",locale)}</option>
+                    </#list>
+                  </select>
+                </td>
+              </tr>
+              <tr>
+                <td class="label">${uiLabelMap.PartyParty}</td>
+                <td>
+                  <input type="text" name="partyId" size="20">
+                  <a href="javascript:call_fieldlookup2(document.addProductStoreRole.partyId,'LookupPartyName');"><img src='/images/fieldlookup.gif' width='15' height='14' border='0' alt='Click here For Field Lookup'/></a>
+                </td>
+              </tr>
+              <tr>
+                <td class="label">${uiLabelMap.CommonFromDate}</td>
+                <td>
+                  <input type="text" name="fromDate" size="25">
+                  <a href="javascript:call_cal(document.addProductStoreRole.fromDate, null);"><img src='/images/cal.gif' width='16' height='16' border='0' alt='Calendar'></a>                  
+                </td>
+              </tr>
+              <tr>
+                <td>&nbsp;</td>
+                <td><input type="submit" class="smallSubmit" value="${uiLabelMap.CommonAdd}"></td>
+              </tr>
+            </table>
+        </form>
+    </div>
+</div>
\ No newline at end of file

Modified: ofbiz/trunk/applications/product/webapp/catalog/store/EditProductStoreShipSetup.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/webapp/catalog/store/EditProductStoreShipSetup.ftl?rev=607631&r1=607630&r2=607631&view=diff
==============================================================================
--- ofbiz/trunk/applications/product/webapp/catalog/store/EditProductStoreShipSetup.ftl (original)
+++ ofbiz/trunk/applications/product/webapp/catalog/store/EditProductStoreShipSetup.ftl Sun Dec 30 16:47:44 2007
@@ -16,27 +16,26 @@
 specific language governing permissions and limitations
 under the License.
 -->
-
 <form name="addscarr" method="post" action="<@ofbizUrl>prepareCreateShipMeth</@ofbizUrl>">
-<input type="hidden" name="newShipMethod" value="Y"/>
-<input type="hidden" name="productStoreId" value="${productStoreId}"/>
-<table cellspacing="2" cellpadding="2">
-    <tr>
-      <td align="right"><b>${uiLabelMap.ProductCarrierShipmentMethod}</b></td>
-      <td>
-        <select name="carrierShipmentString">
-          <option>${uiLabelMap.ProductSelectOne}</option>
-          <#list carrierShipmentMethods as shipmentMethod>
-            <option value="${shipmentMethod.partyId}|${shipmentMethod.roleTypeId}|${shipmentMethod.shipmentMethodTypeId}">${shipmentMethod.shipmentMethodTypeId} (${shipmentMethod.partyId}/${shipmentMethod.roleTypeId})</option>
-          </#list>
-        </select>
-      </td>
-    </tr>
-    <tr>
-      <td></td>
-      <td>
-        <input type="submit" class="smallSubmit" value="${uiLabelMap.CommonAdd}"/>
-      </td>
-    </tr>
-</table>
-</form>
+    <input type="hidden" name="newShipMethod" value="Y"/>
+    <input type="hidden" name="productStoreId" value="${productStoreId}"/>
+    <table cellspacing="0" class="basic-table">
+        <tr>
+          <td align="right" class="label">${uiLabelMap.ProductCarrierShipmentMethod}</td>
+          <td>
+            <select name="carrierShipmentString">
+              <option>${uiLabelMap.ProductSelectOne}</option>
+              <#list carrierShipmentMethods as shipmentMethod>
+                <option value="${shipmentMethod.partyId}|${shipmentMethod.roleTypeId}|${shipmentMethod.shipmentMethodTypeId}">${shipmentMethod.shipmentMethodTypeId} (${shipmentMethod.partyId}/${shipmentMethod.roleTypeId})</option>
+              </#list>
+            </select>
+          </td>
+        </tr>
+        <tr>
+          <td></td>
+          <td>
+            <input type="submit" class="smallSubmit" value="${uiLabelMap.CommonAdd}"/>
+          </td>
+        </tr>
+    </table>
+</form>
\ No newline at end of file

Modified: ofbiz/trunk/applications/product/webapp/catalog/store/EditProductStoreSurveys.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/webapp/catalog/store/EditProductStoreSurveys.ftl?rev=607631&r1=607630&r2=607631&view=diff
==============================================================================
--- ofbiz/trunk/applications/product/webapp/catalog/store/EditProductStoreSurveys.ftl (original)
+++ ofbiz/trunk/applications/product/webapp/catalog/store/EditProductStoreSurveys.ftl Sun Dec 30 16:47:44 2007
@@ -16,112 +16,129 @@
 specific language governing permissions and limitations
 under the License.
 -->
-<table border="1" cellpadding="2" cellspacing="0" width="100%">
-    <tr>
-      <td><span class="tableheadtext">${uiLabelMap.CommonType}</span></td>
-      <td><span class="tableheadtext">${uiLabelMap.CommonName}</span></td>
-      <td><span class="tableheadtext">${uiLabelMap.CommonSurveys}</span></td>
-      <td><span class="tableheadtext">${uiLabelMap.ProductProduct}</span></td>
-      <td><span class="tableheadtext">${uiLabelMap.ProductCategory}</span></td>
-      <td><span class="tableheadtext">${uiLabelMap.CommonFromDate}</span></td>
-      <td><span class="tableheadtext">${uiLabelMap.CommonSequenceNum}</span></td>
-      <td>&nbsp;</td>
-    </tr>
-
-    <#list productStoreSurveys as storeSurvey>
-      <#assign surveyType = storeSurvey.getRelatedOne("SurveyApplType")>
-      <#assign survey = storeSurvey.getRelatedOne("Survey")>
-      <tr>
-        <td><span class="tabletext">${surveyType.get("description",locale)}</span></td>
-        <td><span class="tabletext">${storeSurvey.groupName?if_exists}</span></td>
-        <td><a href="/content/control/EditSurvey?surveyId=${storeSurvey.surveyId}" class="buttontext">${survey.description?default("[" + survey.surveyId + "]")}</a>
-        <td><span class="tabletext">${storeSurvey.productId?default("${uiLabelMap.CommonNA}")}</span></td>
-        <td><span class="tabletext">${storeSurvey.productCategoryId?default("${uiLabelMap.CommonNA}")}</span></td>
-        <td><span class="tabletext">${storeSurvey.fromDate?string}</span></td>
-        <td><span class="tabletext">${storeSurvey.sequenceNum?if_exists}</span></td>
-        <td><a href="<@ofbizUrl>deleteProductStoreSurveyAppl?productStoreId=${productStoreId}&productStoreSurveyId=${storeSurvey.productStoreSurveyId}</@ofbizUrl>" class="buttontext">[${uiLabelMap.CommonDelete}]</a>
-    </#list>
-</table>
-<br/>
-
-<h2>${uiLabelMap.PageTitleEditProductStoreSurveys}:</h2>
-<form name="addSurvey" action="<@ofbizUrl>createProductStoreSurveyAppl</@ofbizUrl>" method="post">
-    <input type="hidden" name="productStoreId" value="${productStoreId}">
-    <table cellspacing="2" cellpadding="2">
-      <tr>
-        <td><span class="tableheadtext">${uiLabelMap.CommonType}</span></td>
-        <td>
-          <select class="selectBox" name="surveyApplTypeId">
-            <#list surveyApplTypes as type>
-              <option value="${type.surveyApplTypeId}">${type.get("description",locale)}</option>
+<div class="screenlet">
+    <div class="screenlet-title-bar">
+        <h3>${uiLabelMap.PageTitleEditProductStoreSurveys}</h3>
+    </div>
+    <div class="screenlet-body">
+        <table cellspacing="0" class="basic-table">
+            <tr class="header-row">
+              <td><b>${uiLabelMap.CommonType}</b></td>
+              <td><b>${uiLabelMap.CommonName}</b></td>
+              <td><b>${uiLabelMap.CommonSurveys}</b></td>
+              <td><b>${uiLabelMap.ProductProduct}</b></td>
+              <td><b>${uiLabelMap.ProductCategory}</b></td>
+              <td><b>${uiLabelMap.CommonFromDate}</b></td>
+              <td><b>${uiLabelMap.CommonSequenceNum}</b></td>
+              <td><b>&nbsp;</b></td>
+            </tr>
+            <#assign rowClass = "2">
+            <#list productStoreSurveys as storeSurvey>
+              <#assign surveyType = storeSurvey.getRelatedOne("SurveyApplType")>
+              <#assign survey = storeSurvey.getRelatedOne("Survey")>
+              <tr valign="middle"<#if rowClass == "1"> class="alternate-row"</#if>>
+                <td>${surveyType.get("description",locale)}</td>
+                <td>${storeSurvey.groupName?if_exists}</td>
+                <td><a href="/content/control/EditSurvey?surveyId=${storeSurvey.surveyId}" class="buttontext">${survey.description?default("[" + survey.surveyId + "]")}</a>
+                <td>${storeSurvey.productId?default("${uiLabelMap.CommonNA}")}</td>
+                <td>${storeSurvey.productCategoryId?default("${uiLabelMap.CommonNA}")}</td>
+                <td>${storeSurvey.fromDate?string}</td>
+                <td>${storeSurvey.sequenceNum?if_exists}</td>
+                <td><a href="<@ofbizUrl>deleteProductStoreSurveyAppl?productStoreId=${productStoreId}&productStoreSurveyId=${storeSurvey.productStoreSurveyId}</@ofbizUrl>" class="buttontext">${uiLabelMap.CommonDelete}</a>
+                <#-- toggle the row color -->
+                <#if rowClass == "2">
+                    <#assign rowClass = "1">
+                <#else>
+                    <#assign rowClass = "2">
+                </#if>    
             </#list>
-          </select>
-        </td>
-      </tr>
-      <tr>
-        <td><span class="tableheadtext">${uiLabelMap.CommonGroup} ${uiLabelMap.CommonName}</span></td>
-        <td>
-          <input type="text" class="inputBox" size="20" name="groupName">          
-        </td>
-      </tr>
-      <tr>
-        <td><span class="tableheadtext">${uiLabelMap.CommonSurveys}</span></td>
-        <td>
-          <select class="selectBox" name="surveyId">
-            <#list surveys as survey>
-              <option value="${survey.surveyId}">${survey.description?default("[" + survey.surveyId + "]")}</option>
-            </#list>
-          </select>
-        </td>
-      </tr>
-      <tr>
-        <td><span class="tableheadtext">${uiLabelMap.ProductProductId}</span></td>
-        <td>
-          <input type="text" class="inputBox" size="20" name="productId">
-        </td>
-      </tr>
-      <tr>
-        <td><span class="tableheadtext">${uiLabelMap.ProductCategoryId}</span></td>
-        <td>
-          <input type="text" class="inputBox" name="productCategoryId" size="20" maxlength="20"/>
-          <a href="javascript:call_fieldlookup2(document.addSurvey.productCategoryId,'LookupProductCategory');"><img src='/images/fieldlookup.gif' width='15' height='14' border='0' alt='Click here For Field Lookup'/></a>
-        </td>
-      </tr>
-      <tr>
-        <td><span class="tableheadtext">${uiLabelMap.CommonFromDate}</span></td>
-        <td>
-          <input type="text" class="inputBox" size="25" name="fromDate">
-          <a href="javascript:call_cal(document.addSurvey.fromDate, '${nowTimestampString}');"><img src="<@ofbizContentUrl>/images/cal.gif</@ofbizContentUrl>" width="16" height="16" border="0" alt="Calendar"></a>
-        </td>
-      </tr>
-      <tr>
-        <td><span class="tableheadtext">${uiLabelMap.CommonThruDate}</span></td>
-        <td>
-          <input type="text" class="inputBox" size="25" name="thruDate">
-          <a href="javascript:call_cal(document.addSurvey.thruDate, '${nowTimestampString}');"><img src="<@ofbizContentUrl>/images/cal.gif</@ofbizContentUrl>" width="16" height="16" border="0" alt="Calendar"></a>
-        </td>
-      </tr>
-      <tr>
-        <td><span class="tableheadtext">${uiLabelMap.ProductStoreSurveyTemplatePath}</span></td>
-        <td>
-          <input type="text" class="inputBox" size="30" name="surveyTemplate">
-        </td>
-      </tr>
-      <tr>
-        <td><span class="tableheadtext">${uiLabelMap.ProductStoreSurveyResultTemplatePath}</span></td>
-        <td>
-          <input type="text" class="inputBox" size="30" name="resultTemplate">
-        </td>
-      </tr>
-      <tr>
-        <td><span class="tableheadtext">${uiLabelMap.CommonSequenceNum}</span></td>
-        <td>
-          <input type="text" class="inputBox" size="5" name="sequenceNum">
-        </td>
-      </tr>
-      <tr>
-        <td>&nbsp;</td>
-        <td><input type="submit" class="smallSubmit" value="${uiLabelMap.CommonAdd}"></td>
-      </tr>
-    </table>
-</form>
+        </table>
+    </div>
+</div>
+<div class="screenlet">
+    <div class="screenlet-title-bar">
+        <h3>${uiLabelMap.PageTitleAddProductStoreSurveys}</h3>
+    </div>
+    <div class="screenlet-body">
+        <form name="addSurvey" action="<@ofbizUrl>createProductStoreSurveyAppl</@ofbizUrl>" method="post">
+            <input type="hidden" name="productStoreId" value="${productStoreId}">
+            <table cellspacing="0" class="basic-table">
+              <tr>
+                <td class="label">${uiLabelMap.CommonType}</td>
+                <td>
+                  <select name="surveyApplTypeId">
+                    <#list surveyApplTypes as type>
+                      <option value="${type.surveyApplTypeId}">${type.get("description",locale)}</option>
+                    </#list>
+                  </select>
+                </td>
+              </tr>
+              <tr>
+                <td class="label">${uiLabelMap.CommonGroup} ${uiLabelMap.CommonName}</td>
+                <td>
+                  <input type="text" size="20" name="groupName">          
+                </td>
+              </tr>
+              <tr>
+                <td class="label">${uiLabelMap.CommonSurveys}</td>
+                <td>
+                  <select name="surveyId">
+                    <#list surveys as survey>
+                      <option value="${survey.surveyId}">${survey.description?default("[" + survey.surveyId + "]")}</option>
+                    </#list>
+                  </select>
+                </td>
+              </tr>
+              <tr>
+                <td class="label">${uiLabelMap.ProductProductId}</td>
+                <td>
+                  <input type="text" size="20" name="productId">
+                </td>
+              </tr>
+              <tr>
+                <td class="label">${uiLabelMap.ProductCategoryId}</td>
+                <td>
+                  <input type="text" name="productCategoryId" size="20" maxlength="20"/>
+                  <a href="javascript:call_fieldlookup2(document.addSurvey.productCategoryId,'LookupProductCategory');"><img src='/images/fieldlookup.gif' width='15' height='14' border='0' alt='Click here For Field Lookup'/></a>
+                </td>
+              </tr>
+              <tr>
+                <td class="label">${uiLabelMap.CommonFromDate}</td>
+                <td>
+                  <input type="text" size="25" name="fromDate">
+                  <a href="javascript:call_cal(document.addSurvey.fromDate, '${nowTimestampString}');"><img src="<@ofbizContentUrl>/images/cal.gif</@ofbizContentUrl>" width="16" height="16" border="0" alt="Calendar"></a>
+                </td>
+              </tr>
+              <tr>
+                <td class="label">${uiLabelMap.CommonThruDate}</td>
+                <td>
+                  <input type="text" size="25" name="thruDate">
+                  <a href="javascript:call_cal(document.addSurvey.thruDate, '${nowTimestampString}');"><img src="<@ofbizContentUrl>/images/cal.gif</@ofbizContentUrl>" width="16" height="16" border="0" alt="Calendar"></a>
+                </td>
+              </tr>
+              <tr>
+                <td class="label">${uiLabelMap.ProductStoreSurveyTemplatePath}</td>
+                <td>
+                  <input type="text" size="30" name="surveyTemplate">
+                </td>
+              </tr>
+              <tr>
+                <td class="label">${uiLabelMap.ProductStoreSurveyResultTemplatePath}</td>
+                <td>
+                  <input type="text" size="30" name="resultTemplate">
+                </td>
+              </tr>
+              <tr>
+                <td class="label">${uiLabelMap.CommonSequenceNum}</td>
+                <td>
+                  <input type="text" size="5" name="sequenceNum">
+                </td>
+              </tr>
+              <tr>
+                <td>&nbsp;</td>
+                <td><input type="submit" class="smallSubmit" value="${uiLabelMap.CommonAdd}"></td>
+              </tr>
+            </table>
+        </form>
+    </div>
+</div>
\ No newline at end of file

Modified: ofbiz/trunk/applications/product/webapp/catalog/store/EditProductStoreTaxSetup.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/webapp/catalog/store/EditProductStoreTaxSetup.ftl?rev=607631&r1=607630&r2=607631&view=diff
==============================================================================
--- ofbiz/trunk/applications/product/webapp/catalog/store/EditProductStoreTaxSetup.ftl (original)
+++ ofbiz/trunk/applications/product/webapp/catalog/store/EditProductStoreTaxSetup.ftl Sun Dec 30 16:47:44 2007
@@ -16,98 +16,110 @@
 specific language governing permissions and limitations
 under the License.
 -->
-<table border="1" cellpadding="2" cellspacing="0">
-    <tr>
-      <td nowrap><div class="tableheadtext">${uiLabelMap.ProductCountry}</td>
-      <td nowrap><div class="tableheadtext">${uiLabelMap.ProductState}</div></td>
-      <td nowrap><div class="tableheadtext">${uiLabelMap.ProductTaxCategory}</div></td>
-      <td nowrap><div class="tableheadtext">${uiLabelMap.ProductMinItemPrice}</div></td>
-      <td nowrap><div class="tableheadtext">${uiLabelMap.ProductMinPurchase}</div></td>
-      <td nowrap><div class="tableheadtext">${uiLabelMap.ProductTaxRate}</div></td>
-      <td nowrap><div class="tableheadtext">${uiLabelMap.CommonFromDate}</div></td>            
-      <td nowrap><div class="tabletext">&nbsp;</div></td>
-    </tr>
-    <#list taxItems as taxItem>      
-      <tr>                  
-        <td><div class="tabletext">${taxItem.countryGeoId}</div></td>
-        <td><div class="tabletext">${taxItem.stateProvinceGeoId}</div></td>
-        <td><div class="tabletext">${taxItem.taxCategory}</div></td>
-        <td><div class="tabletext">${taxItem.minItemPrice?string("##0.00")}</div></td>
-        <td><div class="tabletext">${taxItem.minPurchase?string("##0.00")}</div></td>
-        <td><div class="tabletext">${taxItem.salesTaxPercentage?if_exists}</div></td>
-        <td><div class="tabletext">${taxItem.fromDate?string}</div></td>
-        <#if security.hasEntityPermission("TAXRATE", "_DELETE", session)>
-          <td align="center"><div class="tabletext"><a href="<@ofbizUrl>storeRemoveTaxRate?productStoreId=${productStoreId}&countryGeoId=${taxItem.countryGeoId}&stateProvinceGeoId=${taxItem.stateProvinceGeoId}&taxCategory=${taxItem.taxCategory}&minItemPrice=${taxItem.minItemPrice?string.number}&minPurchase=${taxItem.minPurchase?string.number}&fromDate=${taxItem.fromDate}</@ofbizUrl>" class="buttontext">[${uiLabelMap.CommonDelete}]</a></div></td>
-        <#else>
-          <td>&nbsp;</td>
-        </#if>
-      </tr>
-    </#list>
-</table>
-  
-<br/>
-<table>
-    <#if security.hasEntityPermission("TAXRATE", "_CREATE", session)>
-      <form name="addrate" action="<@ofbizUrl>storeCreateTaxRate</@ofbizUrl>">
-        <input type="hidden" name="productStoreId" value="${productStoreId}">
-        <tr>
-          <td><span class="tableheadtext">${uiLabelMap.ProductCountry}</span></td>
-          <td>
-            <select name="countryGeoId" class="selectBox">
-              <option value="_NA_">${uiLabelMap.CommonAll}</option>
-              ${screens.render("component://common/widget/CommonScreens.xml#countries")}
-            </select>
-          </td>
-        </tr>
-        <tr>
-          <td><span class="tableheadtext">${uiLabelMap.PartyState}</span></td>
-          <td>
-            <select name="stateProvinceGeoId" class="selectBox">
-              <option value="_NA_">${uiLabelMap.CommonAll}</option>
-              ${screens.render("component://common/widget/CommonScreens.xml#states")}
-            </select>
-          </td>
-        </tr>
-        <tr>
-          <td><span class="tableheadtext">${uiLabelMap.ProductTaxCategory}</span></td>      
-          <td><input type="text" size="20" name="taxCategory" class="inputBox"></td>      
-        </tr>
-        <tr>
-          <td><span class="tableheadtext">${uiLabelMap.ProductMinimumItemPrice}</span></td>
-          <td><input type="text" size="10" name="minItemPrice" class="inputBox" value="0.00"></td>
-        </tr>
-        <tr>
-          <td><span class="tableheadtext">${uiLabelMap.ProductMinimumPurchase}</span></td>
-          <td><input type="text" size="10" name="minPurchase" class="inputBox" value="0.00"></td>      
-        </tr>
-        <tr>
-          <td><span class="tableheadtext">${uiLabelMap.ProductTaxShipping}?</span></td>
-          <td>
-            <select name="taxShipping" class="selectBox">
-              <option value="N">${uiLabelMap.CommonNo}</option>
-              <option value="Y">${uiLabelMap.CommonYes}</option>
-            </select>
-          </td>
-        </tr>
-        <tr>
-          <td><span class="tableheadtext">${uiLabelMap.CommonDescription}</span></td>
-          <td><input type="text" size="20" name="description" class="inputBox"></td>
-        </tr>
-        <tr>
-          <td><span class="tableheadtext">${uiLabelMap.ProductTaxRate}</span></td>
-          <td><input type="text" size="10" name="salesTaxPercentage" class="inputBox"></td>
-        </tr>
-        <tr>
-          <td><span class="tableheadtext">${uiLabelMap.CommonFromDate}</span></td>
-          <td><input type="text" name="fromDate" class="inputBox"><a href="javascript:call_cal(document.addrate.fromDate, null);"><img src='/images/cal.gif' width='16' height='16' border='0' alt='Calendar'></a></td>
-        </tr>
-       <tr>
-          <td><span class="tableheadtext">${uiLabelMap.CommonThruDate}</span></td>
-          <td><input type="text" name="thruDate" class="inputBox"><a href="javascript:call_cal(document.addrate.thruDate, null);"><img src='/images/cal.gif' width='16' height='16' border='0' alt='Calendar'></a></td>
-        </tr>        
-        <tr>
-          <td><input type="submit" class="smallSubmit" value="${uiLabelMap.CommonAdd}"/></td>
-        </tr>
-      </form>
-    </#if>
-</table>  
+<div class="screenlet">
+    <div class="screenlet-title-bar">
+        <h3>${uiLabelMap.PageTitleEditProductStoreTaxSetup}</h3>
+    </div>
+    <div class="screenlet-body">
+        <table cellspacing="0" class="basic-table">
+            <tr class="header-row">
+              <td nowrap>${uiLabelMap.ProductCountry}</td>
+              <td nowrap>${uiLabelMap.ProductState}</td>
+              <td nowrap>${uiLabelMap.ProductTaxCategory}</td>
+              <td nowrap>${uiLabelMap.ProductMinItemPrice}</td>
+              <td nowrap>${uiLabelMap.ProductMinPurchase}</td>
+              <td nowrap>${uiLabelMap.ProductTaxRate}</td>
+              <td nowrap>${uiLabelMap.CommonFromDate}</td>            
+              <td nowrap>&nbsp;</td>
+            </tr>
+            <#list taxItems as taxItem>      
+              <tr>                  
+                <td>${taxItem.countryGeoId}</td>
+                <td>${taxItem.stateProvinceGeoId}</td>
+                <td>${taxItem.taxCategory}</td>
+                <td>${taxItem.minItemPrice?string("##0.00")}</td>
+                <td>${taxItem.minPurchase?string("##0.00")}</td>
+                <td>${taxItem.salesTaxPercentage?if_exists}</td>
+                <td>${taxItem.fromDate?string}</td>
+                <#if security.hasEntityPermission("TAXRATE", "_DELETE", session)>
+                  <td align="center"><a href="<@ofbizUrl>storeRemoveTaxRate?productStoreId=${productStoreId}&countryGeoId=${taxItem.countryGeoId}&stateProvinceGeoId=${taxItem.stateProvinceGeoId}&taxCategory=${taxItem.taxCategory}&minItemPrice=${taxItem.minItemPrice?string.number}&minPurchase=${taxItem.minPurchase?string.number}&fromDate=${taxItem.fromDate}</@ofbizUrl>" class="buttontext">${uiLabelMap.CommonDelete}</a></td>
+                <#else>
+                  <td>&nbsp;</td>
+                </#if>
+              </tr>
+            </#list>
+        </table>
+    </div>
+</div>      
+<div class="screenlet">
+    <div class="screenlet-title-bar">
+        <h3>${uiLabelMap.PageTitleEditProductStoreTaxSetup}</h3>
+    </div>
+    <div class="screenlet-body">
+        <table cellspacing="0" class="basic-table">
+            <#if security.hasEntityPermission("TAXRATE", "_CREATE", session)>
+              <form name="addrate" action="<@ofbizUrl>storeCreateTaxRate</@ofbizUrl>">
+                <input type="hidden" name="productStoreId" value="${productStoreId}">
+                <tr>
+                  <td class="label">${uiLabelMap.ProductCountry}</td>
+                  <td>
+                    <select name="countryGeoId">
+                      <option value="_NA_">${uiLabelMap.CommonAll}</option>
+                      ${screens.render("component://common/widget/CommonScreens.xml#countries")}
+                    </select>
+                  </td>
+                </tr>
+                <tr>
+                  <td class="label">${uiLabelMap.PartyState}</td>
+                  <td>
+                    <select name="stateProvinceGeoId">
+                      <option value="_NA_">${uiLabelMap.CommonAll}</option>
+                      ${screens.render("component://common/widget/CommonScreens.xml#states")}
+                    </select>
+                  </td>
+                </tr>
+                <tr>
+                  <td class="label">${uiLabelMap.ProductTaxCategory}</td>      
+                  <td><input type="text" size="20" name="taxCategory"></td>      
+                </tr>
+                <tr>
+                  <td class="label">${uiLabelMap.ProductMinimumItemPrice}</td>
+                  <td><input type="text" size="10" name="minItemPrice" value="0.00"></td>
+                </tr>
+                <tr>
+                  <td class="label">${uiLabelMap.ProductMinimumPurchase}</td>
+                  <td><input type="text" size="10" name="minPurchase" value="0.00"></td>      
+                </tr>
+                <tr>
+                  <td class="label">${uiLabelMap.ProductTaxShipping}?</td>
+                  <td>
+                    <select name="taxShipping">
+                      <option value="N">${uiLabelMap.CommonNo}</option>
+                      <option value="Y">${uiLabelMap.CommonYes}</option>
+                    </select>
+                  </td>
+                </tr>
+                <tr>
+                  <td class="label">${uiLabelMap.CommonDescription}</td>
+                  <td><input type="text" size="20" name="description"></td>
+                </tr>
+                <tr>
+                  <td class="label">${uiLabelMap.ProductTaxRate}</td>
+                  <td><input type="text" size="10" name="salesTaxPercentage"></td>
+                </tr>
+                <tr>
+                  <td class="label">${uiLabelMap.CommonFromDate}</td>
+                  <td><input type="text" name="fromDate"><a href="javascript:call_cal(document.addrate.fromDate, null);"><img src='/images/cal.gif' width='16' height='16' border='0' alt='Calendar'></a></td>
+                </tr>
+               <tr>
+                  <td class="label">${uiLabelMap.CommonThruDate}</td>
+                  <td><input type="text" name="thruDate"><a href="javascript:call_cal(document.addrate.thruDate, null);"><img src='/images/cal.gif' width='16' height='16' border='0' alt='Calendar'></a></td>
+                </tr>        
+                <tr>
+                  <td><input type="submit" class="smallSubmit" value="${uiLabelMap.CommonAdd}"/></td>
+                </tr>
+              </form>
+            </#if>
+        </table>  
+    </div>
+</div>
\ No newline at end of file

Modified: ofbiz/trunk/applications/product/webapp/catalog/store/EditProductStoreWebSites.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/webapp/catalog/store/EditProductStoreWebSites.ftl?rev=607631&r1=607630&r2=607631&view=diff
==============================================================================
--- ofbiz/trunk/applications/product/webapp/catalog/store/EditProductStoreWebSites.ftl (original)
+++ ofbiz/trunk/applications/product/webapp/catalog/store/EditProductStoreWebSites.ftl Sun Dec 30 16:47:44 2007
@@ -16,36 +16,54 @@
 specific language governing permissions and limitations
 under the License.
 -->
-<table border="1" cellpadding="2" cellspacing="0">
-    <tr>
-      <td><span class="tableheadtext">${uiLabelMap.ProductWebSiteId}</span></td>
-      <td><span class="tableheadtext">${uiLabelMap.ProductHost}</span></td>
-      <td><span class="tableheadtext">${uiLabelMap.ProductPort}</span></td>
-      <td>&nbsp;</td>
-    </tr>
-    <#if storeWebSites?has_content>
-      <#list storeWebSites as webSite>
-        <tr>
-          <td><a href="/content/control/EditWebSite?webSiteId=${webSite.webSiteId}&externalLoginKey=${requestAttributes.externalLoginKey}" class="buttontext">${webSite.siteName} [${webSite.webSiteId}]</a></td>
-          <td><span class="tabletext">${webSite.httpHost?default('&nbsp;')}</span></td>
-          <td><span class="tabletext">${webSite.httpPort?default('&nbsp;')}</span></td>
-          <td align="center">
-            <a href="<@ofbizUrl>storeUpdateWebSite?viewProductStoreId=${productStoreId}&productStoreId=&webSiteId=${webSite.webSiteId}</@ofbizUrl>" class="buttontext">[${uiLabelMap.CommonDelete}]</a>
-          </td>
-        </tr>
-      </#list>
-    </#if>
-</table>
-  
-  <br/>
-<h2>${uiLabelMap.ProductSetStoreOnWebSite}:</h2>
-<form name="addWebSite" action="<@ofbizUrl>storeUpdateWebSite</@ofbizUrl>" method="post">
-    <input type="hidden" name="viewProductStoreId" value="${productStoreId}">
-    <input type="hidden" name="productStoreId" value="${productStoreId}">
-    <select class="selectBox" name="webSiteId">
-      <#list webSites as webSite>
-        <option value="${webSite.webSiteId}">${webSite.siteName} [${webSite.webSiteId}]</option>
-      </#list>
-    </select>
-    <input type="submit" class="smallSubmit" value="${uiLabelMap.CommonUpdate}">
-</form>
+<div class="screenlet">
+    <div class="screenlet-title-bar">
+        <h3>${uiLabelMap.PageTitleEditProductStoreWebSites}</h3>
+    </div>
+    <div class="screenlet-body">
+        <table cellspacing="0" class="basic-table">
+            <tr class="header-row">
+              <td>${uiLabelMap.ProductWebSiteId}</td>
+              <td>${uiLabelMap.ProductHost}</td>
+              <td>${uiLabelMap.ProductPort}</td>
+              <td>&nbsp;</td>
+            </tr>
+            <#if storeWebSites?has_content>
+              <#assign rowClass = "2">
+              <#list storeWebSites as webSite>
+                <tr valign="middle"<#if rowClass == "1"> class="alternate-row"</#if>>
+                  <td><a href="/content/control/EditWebSite?webSiteId=${webSite.webSiteId}&externalLoginKey=${requestAttributes.externalLoginKey}" class="buttontext">${webSite.siteName} [${webSite.webSiteId}]</a></td>
+                  <td>${webSite.httpHost?default('&nbsp;')}</td>
+                  <td>${webSite.httpPort?default('&nbsp;')}</td>
+                  <td align="center">
+                    <a href="<@ofbizUrl>storeUpdateWebSite?viewProductStoreId=${productStoreId}&productStoreId=&webSiteId=${webSite.webSiteId}</@ofbizUrl>" class="buttontext">${uiLabelMap.CommonDelete}</a>
+                  </td>
+                </tr>
+                <#-- toggle the row color -->
+                <#if rowClass == "2">
+                    <#assign rowClass = "1">
+                <#else>
+                    <#assign rowClass = "2">
+                </#if>
+              </#list>
+            </#if>
+        </table>
+    </div>
+</div>
+<div class="screenlet">
+    <div class="screenlet-title-bar">
+        <h3>${uiLabelMap.ProductSetStoreOnWebSite}</h3>
+    </div>
+    <div class="screenlet-body">
+        <form name="addWebSite" action="<@ofbizUrl>storeUpdateWebSite</@ofbizUrl>" method="post">
+            <input type="hidden" name="viewProductStoreId" value="${productStoreId}">
+            <input type="hidden" name="productStoreId" value="${productStoreId}">
+            <select class="selectBox" name="webSiteId">
+              <#list webSites as webSite>
+                <option value="${webSite.webSiteId}">${webSite.siteName} [${webSite.webSiteId}]</option>
+              </#list>
+            </select>
+            <input type="submit" class="smallSubmit" value="${uiLabelMap.CommonUpdate}">
+        </form>
+    </div>
+</div>
\ No newline at end of file

Modified: ofbiz/trunk/applications/product/webapp/catalog/store/ProductStoreForms.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/webapp/catalog/store/ProductStoreForms.xml?rev=607631&r1=607630&r2=607631&view=diff
==============================================================================
--- ofbiz/trunk/applications/product/webapp/catalog/store/ProductStoreForms.xml (original)
+++ ofbiz/trunk/applications/product/webapp/catalog/store/ProductStoreForms.xml Sun Dec 30 16:47:44 2007
@@ -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
@@ -20,7 +20,8 @@
 
 <forms xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
         xsi:noNamespaceSchemaLocation="http://ofbiz.apache.org/dtds/widget-form.xsd">
-    <form name="FindProductStore" type="list" list-name="productStores">
+    <form name="FindProductStore" type="list" list-name="productStores"
+        odd-row-style="alternate-row" default-table-style="basic-table">
         <field name="ProductStoreNameId" title="${uiLabelMap.ProductStoreNameId}" widget-style="buttontext">
             <hyperlink target="EditProductStore?productStoreId=${productStoreId}" description="${storeName} [${productStoreId}]"/>
         </field>
@@ -30,8 +31,8 @@
             <hyperlink target="EditProductStore?productStoreId=${productStoreId}" description="${uiLabelMap.CommonEdit}"/>
         </field>
     </form>
-    <form name="EditProductStore" type="single" target="updateProductStore" title="" default-map-name="productStore">
-
+    <form name="EditProductStore" type="single" target="updateProductStore" title="" default-map-name="productStore"
+        header-row-style="header-row" default-table-style="basic-table">
         <alt-target use-when="productStore==null" target="createProductStore"/>
 
         <auto-fields-service service-name="updateProductStore" map-name=""/>
@@ -268,7 +269,8 @@
         <field name="submitButton" title="${uiLabelMap.CommonUpdate}"><submit button-type="button"/></field>
     </form>
 
-    <form name="ListProductStoreFinAccountSettings" type="list" target="UpdateProductStoreFinAccountSettings" list-name="productStoreFinActSettings">
+    <form name="ListProductStoreFinAccountSettings" type="list" target="UpdateProductStoreFinAccountSettings" list-name="productStoreFinActSettings"
+        odd-row-style="alternate-row" default-table-style="basic-table">
         <auto-fields-service service-name="updateProductStoreFinActSetting" default-field-type="display"/>
         <field name="productStoreId"><ignored/></field>
         <field name="finAccountTypeId">
@@ -277,14 +279,15 @@
         <field name="replenishMethodEnumId">
             <display-entity entity-name="Enumeration" description="${description}" key-field-name="enumId"/>
         </field>
-        <field name="remove" title="&amp;nbsp;">
+        <field name="remove" title="${uiLabelMap.CommonEmptyHeader}" widget-style="buttontext">
             <hyperlink target="RemoveProductStoreFinAccountSettings?productStoreId=${productStoreId}&amp;finAccountTypeId=${finAccountTypeId}" description="${uiLabelMap.CommonRemove}"/>
         </field>
-        <field name="edit" title="&amp;nbsp;">
+        <field name="edit" title="${uiLabelMap.CommonEmptyHeader}" widget-style="buttontext">
             <hyperlink target="EditProductStoreFinAccountSettings?productStoreId=${productStoreId}&amp;finAccountTypeId=${finAccountTypeId}" description="${uiLabelMap.CommonEdit}"/>
         </field>
     </form>
-    <form name="EditProductStoreFinAccountSettings" type="single" target="UpdateProductStoreFinAccountSettings" default-map-name="finAccountSetting">
+    <form name="EditProductStoreFinAccountSettings" type="single" target="UpdateProductStoreFinAccountSettings" default-map-name="finAccountSetting"
+        header-row-style="header-row" default-table-style="basic-table">
         <alt-target use-when="finAccountSetting==null" target="CreateProductStoreFinAccountSettings"/>
         <auto-fields-service service-name="updateProductStoreFinActSetting"/>
 
@@ -308,11 +311,11 @@
         </field>
 
         <field name="spacer" title="&amp;nbsp;"><display/></field>
-        <field name="submit" title="${uiLabelMap.CommonSubmit}"><submit/></field>
+        <field name="submit" title="${uiLabelMap.CommonSubmit}" widget-style="smallSubmit"><submit/></field>
     </form>
 
     <form name="CreateProductStoreCatalog" type="single" target="createProductStoreCatalog" title=""
-        default-title-style="tableheadtext" default-widget-style="inputBox" default-tooltip-style="tabletext">
+        header-row-style="header-row" default-table-style="basic-table">
         <auto-fields-service service-name="createProductStoreCatalog"/>
         <field name="productStoreId" map-name="productStore"><hidden/></field>
         <field name="prodCatalogId" title="${uiLabelMap.ProductCatalog}" widget-style="selectBox">
@@ -325,7 +328,7 @@
         <field name="submitButton" title="${uiLabelMap.CommonAdd}" widget-style="smallSubmit"><submit button-type="button"/></field>
     </form>
     <form name="UpdateProductStoreCatalog" type="list" target="updateProductStoreCatalog" title="" list-name="productStoreCatalogs"
-        default-title-style="tableheadtext" default-widget-style="inputBox" default-tooltip-style="tabletext">
+        odd-row-style="alternate-row" default-table-style="basic-table">
         <auto-fields-service service-name="updateProductStoreCatalog"/>
         <field name="productStoreId"><hidden/></field>
         <field name="prodCatalogId" title="${uiLabelMap.ProductCatalogId}" widget-style="tabletext">
@@ -343,7 +346,7 @@
     </form>
 
     <form name="createProductStoreEmail" type="single" target="createProductStoreEmail" title=""
-        default-title-style="tableheadtext" default-widget-style="inputBox" default-tooltip-style="tabletext">
+        header-row-style="header-row" default-table-style="basic-table">
         <auto-fields-service service-name="createProductStoreEmailSetting"/>
         <field name="productStoreId" map-name="productStore"><hidden/></field>
         <field name="emailType" title="${uiLabelMap.CommonEmailType}" widget-style="selectBox">
@@ -361,7 +364,7 @@
         <field name="submitButton" title="${uiLabelMap.CommonAdd}" widget-style="smallSubmit"><submit button-type="button"/></field>
     </form>
     <form name="updateProductStoreEmail" type="list" target="updateProductStoreEmail" title="" list-name="productStoreEmailSettings"
-        default-title-style="tableheadtext" default-widget-style="inputBox" default-tooltip-style="tabletext">
+        odd-row-style="alternate-row" default-table-style="basic-table">
         <auto-fields-service service-name="updateProductStoreEmailSetting"/>
         <field name="productStoreId"><hidden/></field>
         <field name="emailType" title="${uiLabelMap.CommonEmailType}" widget-style="tabletext">
@@ -379,7 +382,7 @@
     </form>
 
     <form name="CreateproductStorekeywordOvrdForm" type="single" target="createProductStoreKeywordOvrd" title=""
-        default-title-style="tableheadtext" default-widget-style="inputBox" default-tooltip-style="tabletext">
+        header-row-style="header-row" default-table-style="basic-table">
         <auto-fields-service service-name="createProductStoreKeywordOvrd"/>
         <field name="productStoreId" map-name="productStore"><hidden/></field>
         <field name="targetTypeEnumId" title="${uiLabelMap.ProductTargetTypeEnumId}" widget-style="selectBox">
@@ -393,7 +396,7 @@
         <field name="submitButton" title="${uiLabelMap.CommonAdd}" widget-style="smallSubmit"><submit button-type="button"/></field>
     </form>
     <form name="UpdateproductStorekeywordOvrdForm" type="list" target="updateProductStoreKeywordOvrd" title="" list-name="productStorekeywordOvrdList"
-        default-title-style="tableheadtext" default-widget-style="inputBox" default-tooltip-style="tabletext">
+        odd-row-style="alternate-row" default-table-style="basic-table">
         <auto-fields-service service-name="updateProductStoreKeywordOvrd"/>
         <field name="productStoreId"><hidden/></field>
         <field name="keyword" title="${uiLabelMap.ProductKeyword}"><display description="${keyword}"/></field>
@@ -413,8 +416,7 @@
         </field>
     </form>
     <form name="ViewProductStoreSegments" target="" title="" type="list"
-        default-title-style="tableheadtext" default-tooltip-style="tabletext" default-widget-style="tabletext"
-        paginate-target="">
+        odd-row-style="alternate-row" default-table-style="basic-table" paginate-target="">
         <actions>
             <entity-and entity-name="SegmentGroup">
                 <field-map field-name="productStoreId"/>
@@ -431,7 +433,7 @@
         </field>
     </form>
     <form name="ListProductStoreShipmentMeths" target="" title="" type="list"  list-name="storeShipMethods"
-        paginate-target="EditProductStoreShipSetup">
+        paginate-target="EditProductStoreShipSetup" odd-row-style="alternate-row" default-table-style="basic-table">
         <auto-fields-entity entity-name="ProductStoreShipmentMeth" default-field-type="display"/>
         <field name="productStoreId"><hidden/></field>
         <field name="productStoreShipMethId" title="${uiLabelMap.CommonEmptyHeader}" widget-style="buttontext">
@@ -451,7 +453,8 @@
             <hyperlink target="storeRemoveShipMeth?productStoreId=${productStoreId}&amp;productStoreShipMethId=${productStoreShipMethId}" description="${uiLabelMap.CommonRemove}" also-hidden="false"/>
         </field>
     </form>
-    <form name="EditProductStoreShipmentMeth" type="single" target="storeUpdateShipMeth" title="" default-map-name="productStoreShipmentMeth">
+    <form name="EditProductStoreShipmentMeth" type="single" target="storeUpdateShipMeth" title="" default-map-name="productStoreShipmentMeth"
+        header-row-style="header-row" default-table-style="basic-table">
         <alt-target use-when="productStoreShipmentMeth==null" target="storeCreateShipMeth"/>
         <!--<auto-fields-service service-name="updateProductStoreShipMeth"/>-->
         <field name="productStoreId"><hidden/></field>
@@ -503,17 +506,17 @@
                 </entity-options>
             </drop-down>
         </field>
-        <field name="includeFeatureGroup" tooltip="${uiLabelMap.ProductIncludeFeatureMessage}"><text/></field>
-        <field name="excludeFeatureGroup" tooltip="${uiLabelMap.ProductExcludeFeatureMessage}"><text/></field>
+        <field name="includeFeatureGroup" title="${uiLabelMap.ProductIncludeFeature}" tooltip="${uiLabelMap.ProductIncludeFeatureMessage}"><text/></field>
+        <field name="excludeFeatureGroup" title="${uiLabelMap.ProductExcludeFeature}" tooltip="${uiLabelMap.ProductExcludeFeatureMessage}"><text/></field>
         <field name="serviceName"><text/></field>
         <field name="configProps"><text/></field>
-        <field name="sequenceNumber" tooltip="${uiLabelMap.ProductUsedForDisplayOrdering}"><text/></field>
+        <field name="sequenceNumber" title="${uiLabelMap.FormFieldTitle_sequenceNum}" tooltip="${uiLabelMap.ProductUsedForDisplayOrdering}"><text/></field>
         <field name="submitButton" title="${uiLabelMap.CommonSubmit}" widget-style="smallSubmit"><submit button-type="button"/></field>
     </form>
     
     
     <form name="ListShipmentCostEstimates" target="" title="" type="list"  list-name="estimates"
-        paginate-target="EditProductStoreShipmentCostEstimates">
+        paginate-target="EditProductStoreShipmentCostEstimates" odd-row-style="alternate-row" default-table-style="basic-table">
         <auto-fields-entity entity-name="ShipmentCostEstimate" default-field-type="display"/>
         <field name="productStoreId"><hidden/></field>
         <field name="carrierRoleTypeId"><hidden/></field>
@@ -551,7 +554,8 @@
             <hyperlink target="storeRemoveShipRate?productStoreId=${productStoreId}&amp;shipmentCostEstimateId=${shipmentCostEstimateId}" description="${uiLabelMap.CommonRemove}" also-hidden="false"/>
         </field>
     </form>
-    <form name="AddShipmentCostEstimate" type="single" target="storeCreateShipRate" title="">
+    <form name="AddShipmentCostEstimate" type="single" target="storeCreateShipRate" title=""
+        header-row-style="header-row" default-table-style="basic-table">
         <field name="productStoreId"><hidden/></field>
         <field name="productStoreShipMethId" title="${uiLabelMap.ProductShipmentMethod}">
             <drop-down allow-empty="false">
@@ -663,7 +667,8 @@
         <field name="pprice" title="${uiLabelMap.ProductPerUnitPrice}" tooltip="${uiLabelMap.ProductOnlyAppliesWithinSpan}"><text/></field>
         <field name="submitButton" title="${uiLabelMap.CommonSubmit}" widget-style="smallSubmit"><submit button-type="button"/></field>
     </form>
-    <form name="ViewShipmentCostEstimate" type="single" title="" default-map-name="estimate">
+    <form name="ViewShipmentCostEstimate" type="single" title="" default-map-name="estimate"
+        header-row-style="header-row" default-table-style="basic-table">
         <field name="shipmentCostEstimateId"><display/></field>
         <field name="productStoreId"><hidden/></field>
         <field name="shipmentMethodTypeId">
@@ -723,7 +728,8 @@
         </field>
         <field name="priceUnitPrice" title="${uiLabelMap.ProductPerUnitPrice}" tooltip="${uiLabelMap.ProductOnlyAppliesWithinSpan}"><display/></field>
     </form>
-    <form name="ListProductStoreVendorPayments" type="list" list-name="productStoreVendorPaymentList" target="deleteProductStoreVendorPayment" paginate-target="EditProductStoreVendorPayments">
+    <form name="ListProductStoreVendorPayments" type="list" list-name="productStoreVendorPaymentList" target="deleteProductStoreVendorPayment" paginate-target="EditProductStoreVendorPayments"
+        odd-row-style="alternate-row" default-table-style="basic-table">
         <field name="productStoreId"><hidden/></field>
         <field name="vendorPartyId"><display/></field>
         <field name="paymentMethodTypeId">
@@ -734,7 +740,8 @@
         </field>
         <field name="submitButton" title="${uiLabelMap.CommonDelete}" widget-style="smallSubmit"><submit button-type="button"/></field>
     </form>
-    <form name="EditProductStoreVendorPayment" type="single" target="createProductStoreVendorPayment">
+    <form name="EditProductStoreVendorPayment" type="single" target="createProductStoreVendorPayment"
+        header-row-style="header-row" default-table-style="basic-table">
         <field name="productStoreId"><hidden/></field>
         <field name="vendorPartyId"><lookup target-form-name="LookupPartyName"/></field>
         <field name="paymentMethodTypeId">
@@ -751,7 +758,8 @@
         </field>
         <field name="submitButton" title="${uiLabelMap.CommonAdd}" widget-style="smallSubmit"><submit button-type="button"/></field>
     </form>
-    <form name="ListProductStoreVendorShipments" type="list" list-name="productStoreVendorShipmentList" target="deleteProductStoreVendorShipment" paginate-target="EditProductStoreVendorShipments">
+    <form name="ListProductStoreVendorShipments" type="list" list-name="productStoreVendorShipmentList" target="deleteProductStoreVendorShipment"
+        paginate-target="EditProductStoreVendorShipments" odd-row-style="alternate-row" default-table-style="basic-table">
         <field name="productStoreId"><hidden/></field>
         <field name="carrierPartyId"><display/></field>
         <field name="vendorPartyId"><display/></field>
@@ -760,7 +768,8 @@
         </field>
         <field name="submitButton" title="${uiLabelMap.CommonDelete}" widget-style="smallSubmit"><submit button-type="button"/></field>
     </form>
-    <form name="EditProductStoreVendorShipment" type="single" target="createProductStoreVendorShipment">
+    <form name="EditProductStoreVendorShipment" type="single" target="createProductStoreVendorShipment"
+        header-row-style="header-row" default-table-style="basic-table">
         <field name="productStoreId"><hidden/></field>
         <field name="carrierPartyId"><lookup target-form-name="LookupPartyName"/></field>
         <field name="vendorPartyId"><lookup target-form-name="LookupPartyName"/></field>
@@ -772,7 +781,8 @@
         <field name="submitButton" title="${uiLabelMap.CommonAdd}" widget-style="smallSubmit"><submit button-type="button"/></field>
     </form>
 
-    <form name="ListProductStorePromos" type="list" list-name="productStorePromoAndAppls" target="updateProductStorePromoAppl">
+    <form name="ListProductStorePromos" type="list" list-name="productStorePromoAndAppls" target="updateProductStorePromoAppl"
+        odd-row-style="alternate-row" default-table-style="basic-table">
         <field name="productStoreId"><hidden/></field>
         <field name="productPromoId" widget-style="buttontext">
             <hyperlink target="EditProductPromo?productPromoId=${productPromoId}"
@@ -790,7 +800,8 @@
         </field>
          <field name="submitButton" title="${uiLabelMap.CommonUpdate}"><submit button-type="button"/></field>
     </form>
-    <form name="CreateProductStorePromo" type="single" target="createProductStorePromoAppl">
+    <form name="CreateProductStorePromo" type="single" target="createProductStorePromoAppl"
+        header-row-style="header-row" default-table-style="basic-table">
         <field name="productStoreId"><hidden/></field>
         <field name="productPromoId">
             <drop-down allow-empty="false">
@@ -808,7 +819,7 @@
         <field name="submitButton" title="${uiLabelMap.CommonAdd}" widget-style="smallSubmit"><submit button-type="button"/></field>
     </form>
 
-    <form name="ListProductStorePaymentSettings" type="list">
+    <form name="ListProductStorePaymentSettings" type="list" odd-row-style="alternate-row" default-table-style="basic-table">
         <actions>
             <entity-and entity-name="ProductStorePaymentSetting">
                 <field-map field-name="productStoreId"/>
@@ -840,7 +851,8 @@
         </field>
     </form>
 
-    <form name="EditProductStorePaymentSetting" type="single" target="storeUpdatePaySetting" default-map-name="editSetting">
+    <form name="EditProductStorePaymentSetting" type="single" target="storeUpdatePaySetting" default-map-name="editSetting"
+        header-row-style="header-row" default-table-style="basic-table">
         <alt-target use-when="editSetting==null" target="storeCreatePaySetting"/>
         <field name="productStoreId"><hidden/></field>
         <field name="paymentMethodTypeId" title="${uiLabelMap.AccountingPaymentMethodType}">

Modified: ofbiz/trunk/applications/product/webapp/catalog/store/ProductStoreTabBar.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/webapp/catalog/store/ProductStoreTabBar.ftl?rev=607631&r1=607630&r2=607631&view=diff
==============================================================================
--- ofbiz/trunk/applications/product/webapp/catalog/store/ProductStoreTabBar.ftl (original)
+++ ofbiz/trunk/applications/product/webapp/catalog/store/ProductStoreTabBar.ftl Sun Dec 30 16:47:44 2007
@@ -16,25 +16,28 @@
 specific language governing permissions and limitations
 under the License.
 -->
-  <#assign unselectedClassName = "tabButton">
-  <#assign selectedClassMap = {page.tabButtonItem?default("void") : "tabButtonSelected"}>
-  <#if productStoreId?has_content>
-    <div class='tabContainer'>
-      <a href="<@ofbizUrl>EditProductStore?productStoreId=${productStoreId}</@ofbizUrl>" class="${selectedClassMap.EditProductStore?default(unselectedClassName)}">${uiLabelMap.ProductStore}</a>
-      <a href="<@ofbizUrl>EditProductStoreRoles?productStoreId=${productStoreId}</@ofbizUrl>" class="${selectedClassMap.EditProductStoreRoles?default(unselectedClassName)}">${uiLabelMap.PartyRoles}</a>
-      <a href="<@ofbizUrl>EditProductStorePromos?productStoreId=${productStoreId}</@ofbizUrl>" class="${selectedClassMap.EditProductStorePromos?default(unselectedClassName)}">${uiLabelMap.ProductPromos}</a>
-      <a href="<@ofbizUrl>EditProductStoreCatalogs?productStoreId=${productStoreId}</@ofbizUrl>" class="${selectedClassMap.EditProductStoreCatalogs?default(unselectedClassName)}">${uiLabelMap.ProductCatalogs}</a>
-      <a href="<@ofbizUrl>EditProductStoreWebSites?viewProductStoreId=${productStoreId}</@ofbizUrl>" class="${selectedClassMap.EditProductStoreWebSites?default(unselectedClassName)}">${uiLabelMap.ProductWebSites}</a>
-      <!-- The tax stuff is in the Tax Authority area of the accounting manager, need to re-do this screen to list current tax entries and link to the accmgr screens <a href="<@ofbizUrl>EditProductStoreTaxSetup?productStoreId=${productStoreId}</@ofbizUrl>" class="${selectedClassMap.EditProductStoreTaxSetup?default(unselectedClassName)}">${uiLabelMap.ProductSalesTax}</a> -->
-      <a href="<@ofbizUrl>EditProductStoreShipSetup?productStoreId=${productStoreId}</@ofbizUrl>" class="${selectedClassMap.EditProductStoreShipSetup?default(unselectedClassName)}">${uiLabelMap.OrderShipping}</a>
-      <a href="<@ofbizUrl>EditProductStoreShipmentCostEstimates?productStoreId=${productStoreId}</@ofbizUrl>" class="${selectedClassMap.EditProductStoreShipmentCostEstimates?default(unselectedClassName)}">${uiLabelMap.ProductViewEstimates}</a>
-      <a href="<@ofbizUrl>EditProductStorePaySetup?productStoreId=${productStoreId}</@ofbizUrl>" class="${selectedClassMap.EditProductStorePaySetup?default(unselectedClassName)}">${uiLabelMap.AccountingPayments}</a>
-      <a href="<@ofbizUrl>EditProductStoreFinAccountSettings?productStoreId=${productStoreId}</@ofbizUrl>" class="${selectedClassMap.EditProductStoreFinAccountSettings?default(unselectedClassName)}">${uiLabelMap.CommonFinAccounts}</a>
-      <a href="<@ofbizUrl>EditProductStoreEmails?productStoreId=${productStoreId}</@ofbizUrl>" class="${selectedClassMap.EditProductStoreEmails?default(unselectedClassName)}">${uiLabelMap.CommonEmails}</a>
-      <a href="<@ofbizUrl>EditProductStoreSurveys?productStoreId=${productStoreId}</@ofbizUrl>" class="${selectedClassMap.EditProductStoreSurveys?default(unselectedClassName)}">${uiLabelMap.CommonSurveys}</a>
-      <a href="<@ofbizUrl>editProductStoreKeywordOvrd?productStoreId=${productStoreId}</@ofbizUrl>" class="${selectedClassMap.EditProductStoreKeywordOvrd?default(unselectedClassName)}">${uiLabelMap.ProductOverride}</a>
-      <a href="<@ofbizUrl>ViewProductStoreSegments?productStoreId=${productStoreId}</@ofbizUrl>" class="${selectedClassMap.ViewProductStoreSegments?default(unselectedClassName)}">${uiLabelMap.ProductSegments}</a>
-      <a href="<@ofbizUrl>EditProductStoreVendorPayments?productStoreId=${productStoreId}</@ofbizUrl>" class="${selectedClassMap.EditProductStoreVendorPayments?default(unselectedClassName)}">${uiLabelMap.ProductVendorPayments}</a>
-      <a href="<@ofbizUrl>EditProductStoreVendorShipments?productStoreId=${productStoreId}</@ofbizUrl>" class="${selectedClassMap.EditProductStoreVendorShipments?default(unselectedClassName)}">${uiLabelMap.ProductVendorShipments}</a>
+<#assign unselectedClassName = "">
+<#assign selectedClassMap = {page.tabButtonItem?default("void") : "selected"}>
+<#if productStoreId?has_content>
+    <br/>
+    <div class="button-bar tab-bar">
+        <ul>
+            <li><a href="<@ofbizUrl>EditProductStore?productStoreId=${productStoreId}</@ofbizUrl>" class="${selectedClassMap.EditProductStore?default(unselectedClassName)}">${uiLabelMap.ProductStore}</a></li>
+            <li><a href="<@ofbizUrl>EditProductStoreRoles?productStoreId=${productStoreId}</@ofbizUrl>" class="${selectedClassMap.EditProductStoreRoles?default(unselectedClassName)}">${uiLabelMap.PartyRoles}</a></li>
+            <li><a href="<@ofbizUrl>EditProductStorePromos?productStoreId=${productStoreId}</@ofbizUrl>" class="${selectedClassMap.EditProductStorePromos?default(unselectedClassName)}">${uiLabelMap.ProductPromos}</a></li>
+            <li><a href="<@ofbizUrl>EditProductStoreCatalogs?productStoreId=${productStoreId}</@ofbizUrl>" class="${selectedClassMap.EditProductStoreCatalogs?default(unselectedClassName)}">${uiLabelMap.ProductCatalogs}</a></li>
+            <li><a href="<@ofbizUrl>EditProductStoreWebSites?viewProductStoreId=${productStoreId}</@ofbizUrl>" class="${selectedClassMap.EditProductStoreWebSites?default(unselectedClassName)}">${uiLabelMap.ProductWebSites}</a></li>
+            <!-- The tax stuff is in the Tax Authority area of the accounting manager, need to re-do this screen to list current tax entries and link to the accmgr screens <a href="<@ofbizUrl>EditProductStoreTaxSetup?productStoreId=${productStoreId}</@ofbizUrl>" class="${selectedClassMap.EditProductStoreTaxSetup?default(unselectedClassName)}">${uiLabelMap.ProductSalesTax}</a> -->
+            <li><a href="<@ofbizUrl>EditProductStoreShipSetup?productStoreId=${productStoreId}</@ofbizUrl>" class="${selectedClassMap.EditProductStoreShipSetup?default(unselectedClassName)}">${uiLabelMap.OrderShipping}</a></li>
+            <li><a href="<@ofbizUrl>EditProductStoreShipmentCostEstimates?productStoreId=${productStoreId}</@ofbizUrl>" class="${selectedClassMap.EditProductStoreShipmentCostEstimates?default(unselectedClassName)}">${uiLabelMap.ProductViewEstimates}</a></li>
+            <li><a href="<@ofbizUrl>EditProductStorePaySetup?productStoreId=${productStoreId}</@ofbizUrl>" class="${selectedClassMap.EditProductStorePaySetup?default(unselectedClassName)}">${uiLabelMap.AccountingPayments}</a></li>
+            <li><a href="<@ofbizUrl>EditProductStoreFinAccountSettings?productStoreId=${productStoreId}</@ofbizUrl>" class="${selectedClassMap.EditProductStoreFinAccountSettings?default(unselectedClassName)}">${uiLabelMap.CommonFinAccounts}</a></li>
+            <li><a href="<@ofbizUrl>EditProductStoreEmails?productStoreId=${productStoreId}</@ofbizUrl>" class="${selectedClassMap.EditProductStoreEmails?default(unselectedClassName)}">${uiLabelMap.CommonEmails}</a></li>
+            <li><a href="<@ofbizUrl>EditProductStoreSurveys?productStoreId=${productStoreId}</@ofbizUrl>" class="${selectedClassMap.EditProductStoreSurveys?default(unselectedClassName)}">${uiLabelMap.CommonSurveys}</a></li>
+            <li><a href="<@ofbizUrl>editProductStoreKeywordOvrd?productStoreId=${productStoreId}</@ofbizUrl>" class="${selectedClassMap.EditProductStoreKeywordOvrd?default(unselectedClassName)}">${uiLabelMap.ProductOverride}</a></li>
+            <li><a href="<@ofbizUrl>ViewProductStoreSegments?productStoreId=${productStoreId}</@ofbizUrl>" class="${selectedClassMap.ViewProductStoreSegments?default(unselectedClassName)}">${uiLabelMap.ProductSegments}</a></li>
+            <li><a href="<@ofbizUrl>EditProductStoreVendorPayments?productStoreId=${productStoreId}</@ofbizUrl>" class="${selectedClassMap.EditProductStoreVendorPayments?default(unselectedClassName)}">${uiLabelMap.ProductVendorPayments}</a></li>
+            <li><a href="<@ofbizUrl>EditProductStoreVendorShipments?productStoreId=${productStoreId}</@ofbizUrl>" class="${selectedClassMap.EditProductStoreVendorShipments?default(unselectedClassName)}">${uiLabelMap.ProductVendorShipments}</a></li>
+        </ul>
     </div>
-  </#if>
+</#if>
\ No newline at end of file