svn commit: r607068 - in /ofbiz/trunk/applications/product: webapp/catalog/catalog/CatalogTabBar.ftl webapp/catalog/catalog/FindProdCatalog.ftl webapp/catalog/catalog/ProdCatalogForms.xml widget/catalog/CatalogScreens.xml

[mrisaliti]

Author: mrisaliti
Date: Thu Dec 27 05:33:25 2007
New Revision: 607068

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

Modified:
    ofbiz/trunk/applications/product/webapp/catalog/catalog/CatalogTabBar.ftl
    ofbiz/trunk/applications/product/webapp/catalog/catalog/FindProdCatalog.ftl
    ofbiz/trunk/applications/product/webapp/catalog/catalog/ProdCatalogForms.xml
    ofbiz/trunk/applications/product/widget/catalog/CatalogScreens.xml

Modified: ofbiz/trunk/applications/product/webapp/catalog/catalog/CatalogTabBar.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/webapp/catalog/catalog/CatalogTabBar.ftl?rev=607068&r1=607067&r2=607068&view=diff
==============================================================================
--- ofbiz/trunk/applications/product/webapp/catalog/catalog/CatalogTabBar.ftl (original)
+++ ofbiz/trunk/applications/product/webapp/catalog/catalog/CatalogTabBar.ftl Thu Dec 27 05:33:25 2007
@@ -17,13 +17,17 @@
 under the License.
 -->
 
-<#assign unselectedClassName = "tabButton">
-<#assign selectedClassMap = {page.tabButtonItem?default("void") : "tabButtonSelected"}>
+<#assign unselectedClassName = "">
+<#assign selectedClassMap = {page.tabButtonItem?default("void") : "selected"}>
 <#if prodCatalogId?exists>
-    <div class="tabContainer">
-        <a href="<@ofbizUrl>EditProdCatalog?prodCatalogId=${prodCatalogId}</@ofbizUrl>" class="${selectedClassMap.ProductCatalog?default(unselectedClassName)}">${uiLabelMap.ProductCatalog}</a>
-        <a href="<@ofbizUrl>EditProdCatalogStores?prodCatalogId=${prodCatalogId}</@ofbizUrl>" class="${selectedClassMap.ProductStores?default(unselectedClassName)}">${uiLabelMap.ProductStores}</a>
-        <a href="<@ofbizUrl>EditProdCatalogParties?prodCatalogId=${prodCatalogId}</@ofbizUrl>" class="${selectedClassMap.PartyParties?default(unselectedClassName)}">${uiLabelMap.PartyParties}</a>
-        <a href="<@ofbizUrl>EditProdCatalogCategories?prodCatalogId=${prodCatalogId}</@ofbizUrl>" class="${selectedClassMap.ProductCategories?default(unselectedClassName)}">${uiLabelMap.ProductCategories}</a>
+    <br/>
+    <div class="button-bar tab-bar">
+        <ul>
+            <li><a href="<@ofbizUrl>EditProdCatalog?prodCatalogId=${prodCatalogId}</@ofbizUrl>" class="${selectedClassMap.ProductCatalog?default(unselectedClassName)}">${uiLabelMap.ProductCatalog}</a></li>
+            <li><a href="<@ofbizUrl>EditProdCatalogStores?prodCatalogId=${prodCatalogId}</@ofbizUrl>" class="${selectedClassMap.ProductStores?default(unselectedClassName)}">${uiLabelMap.ProductStores}</a></li>
+            <li><a href="<@ofbizUrl>EditProdCatalogParties?prodCatalogId=${prodCatalogId}</@ofbizUrl>" class="${selectedClassMap.PartyParties?default(unselectedClassName)}">${uiLabelMap.PartyParties}</a></li>
+            <li><a href="<@ofbizUrl>EditProdCatalogCategories?prodCatalogId=${prodCatalogId}</@ofbizUrl>" class="${selectedClassMap.ProductCategories?default(unselectedClassName)}">${uiLabelMap.ProductCategories}</a></li>
+        </ul>
+        <br/>
     </div>
 </#if>

Modified: ofbiz/trunk/applications/product/webapp/catalog/catalog/FindProdCatalog.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/webapp/catalog/catalog/FindProdCatalog.ftl?rev=607068&r1=607067&r2=607068&view=diff
==============================================================================
--- ofbiz/trunk/applications/product/webapp/catalog/catalog/FindProdCatalog.ftl (original)
+++ ofbiz/trunk/applications/product/webapp/catalog/catalog/FindProdCatalog.ftl Thu Dec 27 05:33:25 2007
@@ -16,25 +16,33 @@
 specific language governing permissions and limitations
 under the License.
 -->
-
-<h1>${uiLabelMap.ProductProductCatalogsList}</h1>
-<div><a href="<@ofbizUrl>EditProdCatalog</@ofbizUrl>" class="buttontext">[${uiLabelMap.ProductCreateNewProdCatalog}]</a></div>
-<br/>
-<table border="1" cellpadding="2" cellspacing="0">
-  <tr>
-    <td><div class="tabletext"><b>${uiLabelMap.ProductCatalogNameId}</b></div></td>    
-    <td><div class="tabletext"><b>${uiLabelMap.ProductUseQuickAdd}?</b></div></td>
-    <td><div class="tabletext">&nbsp;</div></td>
-  </tr>
-<#list prodCatalogs as prodCatalog>
-  <tr valign="middle">
-    <td><div class="tabletext">&nbsp;<a href="<@ofbizUrl>EditProdCatalog?prodCatalogId=${prodCatalog.prodCatalogId}</@ofbizUrl>" class="buttontext">${prodCatalog.catalogName} [${prodCatalog.prodCatalogId}]</a></div></td>  
-    <td><div class="tabletext">&nbsp;${prodCatalog.useQuickAdd?if_exists}</div></td>
-    <td>
-      <a href="<@ofbizUrl>EditProdCatalog?prodCatalogId=${prodCatalog.prodCatalogId}</@ofbizUrl>" class="buttontext">
-      [${uiLabelMap.CommonEdit}]</a>
-    </td>
-  </tr>
-</#list>
-</table>
-<br/>
+<div class="screenlet">
+    <div class="screenlet-title-bar">
+        <h3>${uiLabelMap.ProductProductCatalogsList}</h3>
+    </div>
+    <div class="screenlet-body">
+        <table cellspacing="0" class="basic-table">
+          <tr class="header-row">
+            <td><b>${uiLabelMap.ProductCatalogNameId}</b></td>    
+            <td><b>${uiLabelMap.ProductUseQuickAdd}?</b></td>
+            <td><b>&nbsp;</b></td>
+          </tr>
+        <#assign rowClass = "2">
+        <#list prodCatalogs as prodCatalog>
+          <tr valign="middle"<#if rowClass == "1"> class="alternate-row"</#if>>
+            <td><a href="<@ofbizUrl>EditProdCatalog?prodCatalogId=${prodCatalog.prodCatalogId}</@ofbizUrl>" class="buttontext">${prodCatalog.catalogName} [${prodCatalog.prodCatalogId}]</a></td>  
+            <td>${prodCatalog.useQuickAdd?if_exists}</td>
+            <td>
+              <a href="<@ofbizUrl>EditProdCatalog?prodCatalogId=${prodCatalog.prodCatalogId}</@ofbizUrl>" class="buttontext">${uiLabelMap.CommonEdit}</a>
+            </td>
+          </tr>
+          <#-- toggle the row color -->
+          <#if rowClass == "2">
+            <#assign rowClass = "1">
+          <#else>
+            <#assign rowClass = "2">
+          </#if>
+        </#list>
+        </table>
+    </div>
+</div>

Modified: ofbiz/trunk/applications/product/webapp/catalog/catalog/ProdCatalogForms.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/webapp/catalog/catalog/ProdCatalogForms.xml?rev=607068&r1=607067&r2=607068&view=diff
==============================================================================
--- ofbiz/trunk/applications/product/webapp/catalog/catalog/ProdCatalogForms.xml (original)
+++ ofbiz/trunk/applications/product/webapp/catalog/catalog/ProdCatalogForms.xml Thu Dec 27 05:33:25 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
@@ -21,7 +21,7 @@
 <forms xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
         xsi:noNamespaceSchemaLocation="http://ofbiz.apache.org/dtds/widget-form.xsd">
     <form name="EditProdCatalog" type="single" target="updateProdCatalog" title="" default-map-name="prodCatalog"
-        default-title-style="tableheadtext" default-widget-style="inputBox" default-tooltip-style="tabletext">
+        header-row-style="header-row" default-table-style="basic-table">
         
         <alt-target use-when="prodCatalog==null" target="createProdCatalog"/>
         
@@ -34,7 +34,7 @@
 
         <field name="catalogName" title="${uiLabelMap.ProductCatalogName}"><text size="30" maxlength="60"/></field>
         
-        <field name="useQuickAdd" title="${uiLabelMap.ProductUseQuickAdd}" widget-style="selectBox">
+        <field name="useQuickAdd" title="${uiLabelMap.ProductUseQuickAdd}">
             <drop-down allow-empty="false" no-current-selected-key="Y"><option key="Y" description="${uiLabelMap.CommonY}"/><option key="N" description="${uiLabelMap.CommonN}"/></drop-down>
         </field>
 
@@ -43,21 +43,21 @@
         <field name="contentPathPrefix" title="${uiLabelMap.ProductContentPathPrefix}" tooltip="${uiLabelMap.ProductPrependedImageContentPaths}"><text size="60" maxlength="250"/></field>
         <field name="templatePathPrefix" title="${uiLabelMap.ProductTemplatePathPrefix}"  tooltip="${uiLabelMap.ProductPrependedTemplatePaths}"><text size="60" maxlength="250"/></field>
 
-        <field name="viewAllowPermReqd" title="${uiLabelMap.ProductCategoryViewAllowPermReqd}" widget-style="selectBox">
+        <field name="viewAllowPermReqd" title="${uiLabelMap.ProductCategoryViewAllowPermReqd}">
             <drop-down allow-empty="false" no-current-selected-key="N"><option key="Y" description="${uiLabelMap.CommonY}"/><option key="N" description="${uiLabelMap.CommonN}"/></drop-down>
         </field>
-        <field name="purchaseAllowPermReqd" title="${uiLabelMap.ProductCategoryPurchaseAllowPermReqd}" widget-style="selectBox">
+        <field name="purchaseAllowPermReqd" title="${uiLabelMap.ProductCategoryPurchaseAllowPermReqd}">
             <drop-down allow-empty="false" no-current-selected-key="N"><option key="Y" description="${uiLabelMap.CommonY}"/><option key="N" description="${uiLabelMap.CommonN}"/></drop-down>
         </field>
 
         <field name="submitButton" title="${uiLabelMap.CommonUpdate}" widget-style="smallSubmit"><submit button-type="button"/></field>
     </form>
     <form name="AddProdCatalogToParty" type="single" target="addProdCatalogToParty" 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="addProdCatalogToParty"/>
         <field name="prodCatalogId" map-name="prodCatalog"><hidden/></field>
         <field name="partyId" title="${uiLabelMap.PartyPartyId}"><lookup target-form-name="LookupPartyName"></lookup></field>
-        <field name="roleTypeId" title="${uiLabelMap.PartyRole}"   widget-style="selectBox">
+        <field name="roleTypeId" title="${uiLabelMap.PartyRole}">
             <drop-down no-current-selected-key="_NA_">
                 <entity-options entity-name="RoleType" description="${description}">
                     <entity-order-by field-name="description"/>
@@ -67,7 +67,7 @@
         <field name="submitButton" title="${uiLabelMap.CommonAdd}" widget-style="smallSubmit"><submit button-type="button"/></field>
     </form>
     <form name="UpdateProdCatalogToParty" type="list" target="updateProdCatalogToParty" title="" list-name="prodCatalogRoleList"
-        default-title-style="tableheadtext" default-widget-style="tabletext" default-tooltip-style="tabletext">
+        odd-row-style="alternate-row" default-table-style="basic-table">
         <auto-fields-service service-name="updateProdCatalogToParty"/>
         <field name="prodCatalogId"><hidden/></field>
         <!-- three possibilities for the Party: person, partyGroup, neither... just print everything and if it's empty, no biggie -->
@@ -78,7 +78,7 @@
         </field>
         <field name="roleTypeId" title="${uiLabelMap.PartyRole}"><display-entity entity-name="RoleType"/></field>
         <field name="fromDate" title="${uiLabelMap.CommonFromDateTime}"><display/></field>
-        <field name="thruDate" title="${uiLabelMap.CommonThruDateTime}" widget-style="inputBox"></field>
+        <field name="thruDate" title="${uiLabelMap.CommonThruDateTime}"></field>
         <field name="submitButton" title="${uiLabelMap.CommonUpdate}" widget-style="smallSubmit"><submit button-type="button"/></field>
         <field name="deleteLink" title="${uiLabelMap.CommonEmptyHeader}" widget-style="buttontext">
             <hyperlink target="removeProdCatalogFromParty?prodCatalogId=${prodCatalogId}&amp;partyId=${partyId}&amp;roleTypeId=${roleTypeId}&amp;fromDate=${fromDate}"
@@ -86,10 +86,10 @@
         </field>
     </form>
     <form name="CreateProductStoreCatalog" type="single" target="createProdCatalogStore" 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="prodCatalogId" map-name="prodCatalog"><hidden/></field>
-        <field name="productStoreId" title="${uiLabelMap.ProductStore}" widget-style="selectBox">
+        <field name="productStoreId" title="${uiLabelMap.ProductStore}">
             <drop-down>
                 <entity-options entity-name="ProductStore" description="${storeName}">
                     <entity-order-by field-name="storeName"/>
@@ -99,7 +99,7 @@
         <field name="submitButton" title="${uiLabelMap.CommonAdd}" widget-style="smallSubmit"><submit button-type="button"/></field>
     </form>
     <form name="UpdateProductStoreCatalog" type="list" target="updateProdCatalogStore" title="" list-name="productStoreCatalogList"
-        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="prodCatalogId"><hidden/></field>
         <field name="productStoreId" title="${uiLabelMap.ProductStoreId}">
@@ -107,7 +107,7 @@
                 <sub-hyperlink link-style="buttontext" target="EditProductStore?productStoreId=${productStoreId}" description="${productStoreId}"/>
             </display-entity>
         </field>
-        <field name="fromDate" title="${uiLabelMap.CommonFromDateTime}" widget-style="tabletext"><display/></field>
+        <field name="fromDate" title="${uiLabelMap.CommonFromDateTime}"><display/></field>
         <field name="thruDate" title="${uiLabelMap.CommonThruDateTime}"></field>
         <field name="submitButton" title="${uiLabelMap.CommonUpdate}" widget-style="smallSubmit"><submit button-type="button"/></field>
         <field name="deleteLink" title="${uiLabelMap.CommonEmptyHeader}" widget-style="buttontext">
@@ -116,7 +116,7 @@
         </field>
     </form>
     <form name="EditProdCatalogCategories" type="list" target="updateProductCategoryToProdCatalog" title="" list-name="prodCatalogCategories"
-        default-title-style="tableheadtext" default-widget-style="tabletext" default-tooltip-style="tabletext">
+        odd-row-style="alternate-row" default-table-style="basic-table">
         <auto-fields-service service-name="updateProductCategoryToProdCatalog"/>
         <field name="prodCatalogId"><hidden/></field>
         <field name="productCategoryId" title="${uiLabelMap.ProductCategoryId}">
@@ -126,8 +126,8 @@
         </field>
         <field name="prodCatalogCategoryTypeId" title="${uiLabelMap.ProductCatalogCategoryType}"><display-entity entity-name="ProdCatalogCategoryType" also-hidden="true" cache="true"/></field>
         <field name="fromDate" title="${uiLabelMap.CommonFromDateTime}"><display/></field>
-        <field name="thruDate" title="${uiLabelMap.CommonThruDateTime}" widget-style="inputBox"></field>
-        <field name="sequenceNum" title="${uiLabelMap.CommonSequenceNum}" widget-style="inputBox"></field>
+        <field name="thruDate" title="${uiLabelMap.CommonThruDateTime}"></field>
+        <field name="sequenceNum" title="${uiLabelMap.CommonSequenceNum}"></field>
         <field name="deleteLink" title="${uiLabelMap.CommonEmptyHeader}" widget-style="buttontext">
             <hyperlink target="removeProductCategoryFromProdCatalog?prodCatalogId=${prodCatalogId}&amp;productCategoryId=${productCategoryId}&amp;fromDate=${fromDate}&amp;prodCatalogCategoryTypeId=${prodCatalogCategoryTypeId}"
                 description="${uiLabelMap.CommonDelete}" also-hidden="false"/>
@@ -139,18 +139,18 @@
         <field name="submitButton" title="${uiLabelMap.CommonUpdate}" widget-style="smallSubmit"><submit button-type="button"/></field>
     </form>
     <form name="addProductCategoryToProdCatalog" type="single" target="addProductCategoryToProdCatalog" 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="addProductCategoryToProdCatalog"/>
         <field name="prodCatalogId"><hidden/></field>
         <field name="productCategoryId" title="${uiLabelMap.ProductCategoryId}"><lookup target-form-name="LookupProductCategory"></lookup></field>
-        <field name="prodCatalogCategoryTypeId" widget-style="selectBox" title="${uiLabelMap.ProductCatalogCategoryType}">
+        <field name="prodCatalogCategoryTypeId" title="${uiLabelMap.ProductCatalogCategoryType}">
             <drop-down>
                 <entity-options entity-name="ProdCatalogCategoryType" description="${description}">
                     <entity-order-by field-name="description"/>
                 </entity-options>
             </drop-down>
         </field>
-        <field name="fromDate" title="${uiLabelMap.CommonFromDateTime}" widget-style="inputBox"/>
+        <field name="fromDate" title="${uiLabelMap.CommonFromDateTime}"/>
         <field name="thruDate" title="${uiLabelMap.CommonThruDateTime}"/>
         <field name="sequenceNum" title="${uiLabelMap.CommonSequenceNum}"/>
         <field name="submitButton" title="${uiLabelMap.CommonAdd}" widget-style="smallSubmit"><submit button-type="button"/></field>

Modified: ofbiz/trunk/applications/product/widget/catalog/CatalogScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/widget/catalog/CatalogScreens.xml?rev=607068&r1=607067&r2=607068&view=diff
==============================================================================
--- ofbiz/trunk/applications/product/widget/catalog/CatalogScreens.xml (original)
+++ ofbiz/trunk/applications/product/widget/catalog/CatalogScreens.xml Thu Dec 27 05:33:25 2007
@@ -239,7 +239,7 @@
     <screen name="FindProdCatalog">
         <section>
             <actions>
-                <set field="titleProperty" value="PageTitleEditFindProductCatalog"/>
+                <set field="titleProperty" value="PageTitleFindProductCatalog"/>
                 <set field="leftbarScreenName" value="leftbar"/>
                 <set field="leftbarScreenLocation" value="component://product/widget/catalog/CommonScreens.xml"/>