svn commit: r608946 - in /ofbiz/trunk/applications/product/webapp/catalog/catalog: CatalogTabBar.ftl FindProdCatalog.ftl

[adrianc]

Author: adrianc
Date: Fri Jan  4 10:09:01 2008
New Revision: 608946

URL: http://svn.apache.org/viewvc?rev=608946&view=rev
Log:
Small UI fixups in the catalog application.

Modified:
    ofbiz/trunk/applications/product/webapp/catalog/catalog/CatalogTabBar.ftl
    ofbiz/trunk/applications/product/webapp/catalog/catalog/FindProdCatalog.ftl

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=608946&r1=608945&r2=608946&view=diff
==============================================================================
--- ofbiz/trunk/applications/product/webapp/catalog/catalog/CatalogTabBar.ftl (original)
+++ ofbiz/trunk/applications/product/webapp/catalog/catalog/CatalogTabBar.ftl Fri Jan  4 10:09:01 2008
@@ -17,16 +17,15 @@
 under the License.
 -->
 
-<#assign unselectedClassName = "">
-<#assign selectedClassMap = {page.tabButtonItem?default("void") : "selected"}>
+<#assign selected = tabButtonItem?default("void")>
 <#if prodCatalogId?exists>
     <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>
+            <li<#if selected="ProductCatalog"> class="selected"</#if>><a href="<@ofbizUrl>EditProdCatalog?prodCatalogId=${prodCatalogId}</@ofbizUrl>">${uiLabelMap.ProductCatalog}</a></li>
+            <li<#if selected="ProductStores"> class="selected"</#if>><a href="<@ofbizUrl>EditProdCatalogStores?prodCatalogId=${prodCatalogId}</@ofbizUrl>">${uiLabelMap.ProductStores}</a></li>
+            <li<#if selected="PartyParties"> class="selected"</#if>><a href="<@ofbizUrl>EditProdCatalogParties?prodCatalogId=${prodCatalogId}</@ofbizUrl>">${uiLabelMap.PartyParties}</a></li>
+            <li<#if selected="ProductCategories"> class="selected"</#if>><a href="<@ofbizUrl>EditProdCatalogCategories?prodCatalogId=${prodCatalogId}</@ofbizUrl>">${uiLabelMap.ProductCategories}</a></li>
         </ul>
         <br/>
     </div>

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=608946&r1=608945&r2=608946&view=diff
==============================================================================
--- ofbiz/trunk/applications/product/webapp/catalog/catalog/FindProdCatalog.ftl (original)
+++ ofbiz/trunk/applications/product/webapp/catalog/catalog/FindProdCatalog.ftl Fri Jan  4 10:09:01 2008
@@ -23,25 +23,20 @@
     <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>
+            <td>${uiLabelMap.ProductCatalogNameId}</td>    
+            <td>${uiLabelMap.ProductUseQuickAdd}?</td>
+            <td>&nbsp;</td>
           </tr>
-        <#assign rowClass = "2">
+        <#assign alt_row = false>
         <#list prodCatalogs as prodCatalog>
-          <tr valign="middle"<#if rowClass == "1"> class="alternate-row"</#if>>
+          <tr valign="middle"<#if alt_row> 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>
+          <#assign alt_row = !alt_row>
         </#list>
         </table>
     </div>