svn commit: r680069 - in /ofbiz/trunk: applications/ecommerce/widget/CatalogScreens.xml applications/order/webapp/ordermgr/entry/catalog/categorydetail.ftl framework/images/webapp/images/ecommain.css

Author: jleroux
Date: Sun Jul 27 00:13:27 2008
New Revision: 680069

URL: http://svn.apache.org/viewvc?rev=680069&view=rev
Log:
Enhancement of the previous commit on " Matrix layout for Featured Products" (https://issues.apache.org/jira/browse/OFBIZ-1890) - OFBIZ-1890



Modified:
    ofbiz/trunk/applications/ecommerce/widget/CatalogScreens.xml
    ofbiz/trunk/applications/order/webapp/ordermgr/entry/catalog/categorydetail.ftl
    ofbiz/trunk/framework/images/webapp/images/ecommain.css

Modified: ofbiz/trunk/applications/ecommerce/widget/CatalogScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/ecommerce/widget/CatalogScreens.xml?rev=680069&r1=680068&r2=680069&view=diff
==============================================================================
--- ofbiz/trunk/applications/ecommerce/widget/CatalogScreens.xml (original)
+++ ofbiz/trunk/applications/ecommerce/widget/CatalogScreens.xml Sun Jul 27 00:13:27 2008
@@ -217,7 +217,7 @@
     <screen name="categorydetailmatrix">
         <section>
             <actions>
-                <set field="numCol" value="1"/>
+                <set field="numCol" value="3"/>
                 <set field="searchInCategory" value="N"/>
                 <set field="parameters.VIEW_SIZE" from-field="parameters.VIEW_SIZE" default-value="9"/>
             </actions>

Modified: ofbiz/trunk/applications/order/webapp/ordermgr/entry/catalog/categorydetail.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/webapp/ordermgr/entry/catalog/categorydetail.ftl?rev=680069&r1=680068&r2=680069&view=diff
==============================================================================
--- ofbiz/trunk/applications/order/webapp/ordermgr/entry/catalog/categorydetail.ftl (original)
+++ ofbiz/trunk/applications/order/webapp/ordermgr/entry/catalog/categorydetail.ftl Sun Jul 27 00:13:27 2008
@@ -91,6 +91,9 @@
       <#assign numCol = numCol?number>
       <#assign tabCol = 1>
       <div class="productsummary-container <#if (numCol?int > 1)>matrix</#if>">
+      <#if (numCol?int > 1)>
+        <table>
+      </#if>
         <#list productCategoryMembers as productCategoryMember>
           <#if (numCol?int == 1)>
             ${setRequestAttribute("optProductId", productCategoryMember.productId)}
@@ -98,7 +101,6 @@
             ${setRequestAttribute("listIndex", productCategoryMember_index)}
             ${screens.render(productsummaryScreen)}
           <#else>
-            <table>
               <#if (tabCol?int = 1)><tr></#if>
                   <td>
                       ${setRequestAttribute("optProductId", productCategoryMember.productId)}
@@ -108,9 +110,11 @@
                   </td>
               <#if (tabCol?int = numCol)></tr></#if>
               <#assign tabCol = tabCol+1><#if (tabCol?int > numCol)><#assign tabCol = 1></#if>
-            </table>
            </#if>
         </#list>
+      <#if (numCol?int > 1)>
+        </table>
+      </#if>
       </div>
     <@paginationControls/>
 <#else>

Modified: ofbiz/trunk/framework/images/webapp/images/ecommain.css
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/images/webapp/images/ecommain.css?rev=680069&r1=680068&r2=680069&view=diff
==============================================================================
--- ofbiz/trunk/framework/images/webapp/images/ecommain.css (original)
+++ ofbiz/trunk/framework/images/webapp/images/ecommain.css Sun Jul 27 00:13:27 2008
@@ -944,11 +944,6 @@
 text-align: right;
 }
 
-.productsummary .productinfo {
-/* margin-left: 60px; */
-text-align: left;
-}
-
 .matrix .productsummary {
 border: none;
 padding: 10px;
@@ -971,6 +966,9 @@
 
 .productsummary .productinfo {
 text-align: left;
+font-size: 10px;
+text-decoration: none;
+font-family: Verdana, Arial, Helvetica, sans-serif;
 }
 
 /* ===== Product Detail Styles ===== */