svn commit: r1721091 - in /ofbiz/trunk: applications/order/webapp/ordermgr/entry/catalog/quickadd.ftl applications/order/webapp/ordermgr/entry/catalog/quickaddsummary.ftl framework/images/webapp/images/ecommain.css

[Deepak Dixit-5]

Author: deepak
Date: Mon Dec 21 05:16:28 2015
New Revision: 1721091

URL: http://svn.apache.org/viewvc?rev=1721091&view=rev
Log:
(OFBIZ-2987) Applied slightly modified patch from OFBIZ-2987
============================================================ Html clean up of quick add page.
============================================================

Modified:
    ofbiz/trunk/applications/order/webapp/ordermgr/entry/catalog/quickadd.ftl
    ofbiz/trunk/applications/order/webapp/ordermgr/entry/catalog/quickaddsummary.ftl
    ofbiz/trunk/framework/images/webapp/images/ecommain.css

Modified: ofbiz/trunk/applications/order/webapp/ordermgr/entry/catalog/quickadd.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/webapp/ordermgr/entry/catalog/quickadd.ftl?rev=1721091&r1=1721090&r2=1721091&view=diff
==============================================================================
--- ofbiz/trunk/applications/order/webapp/ordermgr/entry/catalog/quickadd.ftl (original)
+++ ofbiz/trunk/applications/order/webapp/ordermgr/entry/catalog/quickadd.ftl Mon Dec 21 05:16:28 2015
@@ -18,12 +18,7 @@ under the License.
 -->
 
 <#if productCategory?has_content>
-  <table border='0'  cellpadding='3' cellspacing='0'>
-    <tr>
-      <td>
         <h2>${productCategory.categoryName!}</h2>
-      </td>
-      <td align="right">
         <form name="choosequickaddform" method="post" action="<@ofbizUrl>quickadd</@ofbizUrl>" style='margin: 0;'>
           <select name='category_id'>
             <option value='${productCategory.productCategoryId}'>${productCategory.categoryName!}</option>
@@ -37,54 +32,38 @@ under the License.
           </select>
           <div><a href="javascript:document.choosequickaddform.submit()" class="buttontext">${uiLabelMap.ProductChooseQuickAddCategory}</a></div>
         </form>
-      </td>
-    </tr>
     <#if productCategory.categoryImageUrl?? || productCategory.longDescription??>
-      <tr><td colspan='2'><hr class='sepbar'/></td></tr>
-      <tr>
-        <td valign="top" width="0" colspan='2'>
           <div>
             <#if productCategory.categoryImageUrl??>
               <img src="<@ofbizContentUrl>${productCategory.categoryImageUrl}</@ofbizContentUrl>" vspace="5" hspace="5" class="cssImgLarge" alt="" />
             </#if>
             ${productCategory.longDescription!}
           </div>
-        </td>
-      </tr>
     </#if>
-  </table>
 </#if>
 
 <#if productCategoryMembers?? && 0 < productCategoryMembers?size>
-  <br />
-  <center>
-  <form method="post" action="<@ofbizUrl>addtocartbulk</@ofbizUrl>" name="bulkaddform" style='margin: 0;'>
-    <input type='hidden' name='category_id' value='${categoryId}' />
-    <div class="quickaddall">
-      <a href="javascript:document.bulkaddform.submit()" class="buttontext">${uiLabelMap.OrderAddAllToCart}</a>
-    </div>
-    <div class="quickaddtable">
-      <#list productCategoryMembers as productCategoryMember>
-        <#assign product = productCategoryMember.getRelatedOne("Product", true)>
-        <p>
-            ${setRequestAttribute("optProductId", productCategoryMember.productId)}
-            ${screens.render(quickaddsummaryScreen)}
-        </p>
-      </#list>
-    </div>
-    <div class="quickaddall">
-      <a href="javascript:document.bulkaddform.submit()" class="buttontext">${uiLabelMap.OrderAddAllToCart}</a>
-    </div>
+  <form method="post" action="<@ofbizUrl>addtocartbulk</@ofbizUrl>" name="bulkaddform">
+    <fieldset>
+      <input type='hidden' name='category_id' value='${categoryId}' />
+      <div class="quickaddall">
+        <a href="javascript:document.bulkaddform.submit()" class="buttontext">${uiLabelMap.OrderAddAllToCart}</a>
+      </div>
+      <div class="quickaddtable">
+        <#list productCategoryMembers as productCategoryMember>
+          <#assign product = productCategoryMember.getRelatedOne("Product", true)>
+          <p>
+              ${setRequestAttribute("optProductId", productCategoryMember.productId)}
+              ${screens.render(quickaddsummaryScreen)}
+          </p>
+        </#list>
+      </div>
+      <div class="quickaddall">
+        <a href="javascript:document.bulkaddform.submit()" class="buttontext">${uiLabelMap.OrderAddAllToCart}</a>
+      </div>
+  </fieldset>
   </form>
-  </center>
 <#else>
-  <table border="0" cellpadding="2">
-    <tr><td colspan="2"><hr class='sepbar'/></td></tr>
-    <tr>
-      <td>
-        <div class='tabletext'>${uiLabelMap.ProductNoProductsInThisCategory}.</div>
-      </td>
-    </tr>
-  </table>
+  <label>${uiLabelMap.ProductNoProductsInThisCategory}.</label>
 </#if>
 

Modified: ofbiz/trunk/applications/order/webapp/ordermgr/entry/catalog/quickaddsummary.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/webapp/ordermgr/entry/catalog/quickaddsummary.ftl?rev=1721091&r1=1721090&r2=1721091&view=diff
==============================================================================
--- ofbiz/trunk/applications/order/webapp/ordermgr/entry/catalog/quickaddsummary.ftl (original)
+++ ofbiz/trunk/applications/order/webapp/ordermgr/entry/catalog/quickaddsummary.ftl Mon Dec 21 05:16:28 2015
@@ -24,18 +24,14 @@ under the License.
     </div>
   </span>
   <span class="name">
-    <div>
       <a href="<@ofbizUrl>product?product_id=${product.productId}</@ofbizUrl>" class="buttontext">${productContentWrapper.get("PRODUCT_NAME", "html")!}</a>
-    </div>
   </span>
   <span class="listPrice">
-    <div>
       <#if price.listPrice?? && price.price?? && price.price?double < price.listPrice?double>
         ${uiLabelMap.ProductListPrice}: <@ofbizCurrency amount=price.listPrice isoCode=price.currencyUsed/>
       <#else>
         &nbsp;
       </#if>
-    </div>
   </span>
   <span class="totalPrice">
     <#if totalPrice??>
@@ -49,19 +45,15 @@ under the License.
   <span class="qty">
     <#-- check to see if introductionDate hasn't passed yet -->
     <#if product.introductionDate?? && nowTimestamp.before(product.introductionDate)>
-      <div style="color: red;">${uiLabelMap.ProductNotYetAvailable}</div>
+      ${uiLabelMap.ProductNotYetAvailable}
     <#-- check to see if salesDiscontinuationDate has passed -->
     <#elseif product.salesDiscontinuationDate?? && nowTimestamp.before(product.salesDiscontinuationDate)>
-      <div style="color: red;">${uiLabelMap.ProductNoLongerAvailable}</div>
+      ${uiLabelMap.ProductNoLongerAvailable}
     <#-- check to see if the product is a virtual product -->
     <#elseif product.isVirtual?default("N") == "Y">
-      <div>
         <a href="<@ofbizUrl>product?<#if categoryId??>category_id=${categoryId}&amp;</#if>product_id=${product.productId}</@ofbizUrl>" class="buttontext">${uiLabelMap.OrderChooseVariations}...</a>
-      </div>
     <#else>
-      <div>
         <input type="text" size="5" name="quantity_${product.productId}" value="" />
-      </div>
     </#if>
   </span>
 <#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=1721091&r1=1721090&r2=1721091&view=diff
==============================================================================
--- ofbiz/trunk/framework/images/webapp/images/ecommain.css (original)
+++ ofbiz/trunk/framework/images/webapp/images/ecommain.css Mon Dec 21 05:16:28 2015
@@ -1088,6 +1088,7 @@ padding-top:1em;
 }
 
 .quickaddtable{
+text-align:center;
 clear:both;
 }