svn commit: r1031068 - in /ofbiz/trunk: applications/order/webapp/ordermgr/entry/catalog/ framework/images/webapp/images/ themes/bizznesstime/webapp/bizznesstime/css/ themes/bluelight/webapp/bluelight/ themes/droppingcrumbs/webapp/droppingcrumbs/css/ t...

[erwan]

Author: erwan
Date: Thu Nov  4 16:37:04 2010
New Revision: 1031068

URL: http://svn.apache.org/viewvc?rev=1031068&view=rev
Log:
Replacing the quickadd table with a CSS layout. Works nicely in ecommerce, a bit less in order application

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
    ofbiz/trunk/themes/bizznesstime/webapp/bizznesstime/css/style.css
    ofbiz/trunk/themes/bluelight/webapp/bluelight/style.css
    ofbiz/trunk/themes/droppingcrumbs/webapp/droppingcrumbs/css/style.css
    ofbiz/trunk/themes/flatgrey/webapp/flatgrey/maincss.css
    ofbiz/trunk/themes/multiflex/webapp/multiflex/style.css
    ofbiz/trunk/themes/tomahawk/webapp/tomahawk/css/style.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=1031068&r1=1031067&r2=1031068&view=diff
==============================================================================
--- ofbiz/trunk/applications/order/webapp/ordermgr/entry/catalog/quickadd.ftl (original)
+++ ofbiz/trunk/applications/order/webapp/ordermgr/entry/catalog/quickadd.ftl Thu Nov  4 16:37:04 2010
@@ -60,20 +60,20 @@ under the License.
   <center>
   <form method="post" action="<@ofbizUrl>addtocartbulk</@ofbizUrl>" name="bulkaddform" style='margin: 0;'>
     <input type='hidden' name='category_id' value='${categoryId}' />
-    <div align="right">
-      <a href="javascript:document.bulkaddform.submit()" class="buttontext"><span style="white-space: nowrap;">${uiLabelMap.OrderAddAllToCart}</span></a>
+    <div class="quickaddall">
+      <a href="javascript:document.bulkaddform.submit()" class="buttontext">${uiLabelMap.OrderAddAllToCart}</a>
     </div>
-    <table border='1' cellpadding='2' cellspacing='0'>
+    <div class="quickaddtable">
       <#list productCategoryMembers as productCategoryMember>
         <#assign product = productCategoryMember.getRelatedOneCache("Product")>
-        <tr>
+        <p>
             ${setRequestAttribute("optProductId", productCategoryMember.productId)}
             ${screens.render(quickaddsummaryScreen)}
-        </tr>
+        </p>
       </#list>
-    </table>
-    <div align="right">
-      <a href="javascript:document.bulkaddform.submit()" class="buttontext"><span style="white-space: nowrap;">${uiLabelMap.OrderAddAllToCart}</span></a>
+    </div>
+    <div class="quickaddall">
+      <a href="javascript:document.bulkaddform.submit()" class="buttontext">${uiLabelMap.OrderAddAllToCart}</a>
     </div>
   </form>
   </center>
@@ -87,3 +87,4 @@ under the License.
     </tr>
   </table>
 </#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=1031068&r1=1031067&r2=1031068&view=diff
==============================================================================
--- ofbiz/trunk/applications/order/webapp/ordermgr/entry/catalog/quickaddsummary.ftl (original)
+++ ofbiz/trunk/applications/order/webapp/ordermgr/entry/catalog/quickaddsummary.ftl Thu Nov  4 16:37:04 2010
@@ -18,33 +18,35 @@ under the License.
 -->
 
 <#if product?exists>
-  <td valign="middle" width="5%">
+  <span class="pid">
     <div>
       <b>${product.productId}</b>
     </div>
-  </td>
-  <td valign="middle" width="90%">
-    <a href="<@ofbizUrl>product?product_id=${product.productId}</@ofbizUrl>" class="buttontext">${productContentWrapper.get("PRODUCT_NAME")?if_exists}</a>
-  </td>
-  <td valign="middle" width="5%">
+  </span>
+  <span class="name">
+    <div>
+      <a href="<@ofbizUrl>product?product_id=${product.productId}</@ofbizUrl>" class="buttontext">${productContentWrapper.get("PRODUCT_NAME")?if_exists}</a>
+    </div>
+  </span>
+  <span class="listPrice">
     <div>
       <#if price.listPrice?exists && price.price?exists && price.price?double < price.listPrice?double>
-        ${uiLabelMap.ProductListPrice}:<@ofbizCurrency amount=price.listPrice isoCode=price.currencyUsed/>
+        ${uiLabelMap.ProductListPrice}: <@ofbizCurrency amount=price.listPrice isoCode=price.currencyUsed/>
       <#else>
         &nbsp;
       </#if>
     </div>
-  </td>
-  <td align="right" valign="middle" width="5%">
-      <#if totalPrice?exists>
+  </span>
+  <span class="totalPrice">
+    <#if totalPrice?exists>
         <div>${uiLabelMap.ProductAggregatedPrice}: <span class='basePrice'><@ofbizCurrency amount=totalPrice isoCode=totalPrice.currencyUsed/></span></div>
-      <#else>
-        <div class="<#if price.isSale?exists && price.isSale>salePrice<#else>normalPrice</#if>">
-          <b><@ofbizCurrency amount=price.price isoCode=price.currencyUsed/></b>
-        </div>
-      </#if>
-  </td>
-  <td align="right" valign="middle">
+    <#else>
+      <div class="<#if price.isSale?exists && price.isSale>salePrice<#else>normalPrice</#if>">
+        <b><@ofbizCurrency amount=price.price isoCode=price.currencyUsed/></b>
+      </div>
+    </#if>
+  </span>
+  <span class="qty">
     <#-- check to see if introductionDate hasn't passed yet -->
     <#if product.introductionDate?exists && nowTimestamp.before(product.introductionDate)>
       <div style="color: red;">${uiLabelMap.ProductNotYetAvailable}</div>
@@ -53,11 +55,15 @@ under the License.
       <div style="color: red;">${uiLabelMap.ProductNoLongerAvailable}</div>
     <#-- check to see if the product is a virtual product -->
     <#elseif product.isVirtual?default("N") == "Y">
-      <a href="<@ofbizUrl>product?<#if categoryId?exists>category_id=${categoryId}&amp;</#if>product_id=${product.productId}</@ofbizUrl>" class="buttontext">${uiLabelMap.OrderChooseVariations}...</a>
+      <div>
+        <a href="<@ofbizUrl>product?<#if categoryId?exists>category_id=${categoryId}&amp;</#if>product_id=${product.productId}</@ofbizUrl>" class="buttontext">${uiLabelMap.OrderChooseVariations}...</a>
+      </div>
     <#else>
-      <input type="text" size="5" name="quantity_${product.productId}" value="" />
+      <div>
+        <input type="text" size="5" name="quantity_${product.productId}" value="" />
+      </div>
     </#if>
-  </td>
+  </span>
 <#else>
   <h1>${uiLabelMap.ProductErrorProductNotFound}.</h1>
 </#if>

Modified: ofbiz/trunk/framework/images/webapp/images/ecommain.css
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/images/webapp/images/ecommain.css?rev=1031068&r1=1031067&r2=1031068&view=diff
==============================================================================
--- ofbiz/trunk/framework/images/webapp/images/ecommain.css (original)
+++ ofbiz/trunk/framework/images/webapp/images/ecommain.css Thu Nov  4 16:37:04 2010
@@ -1066,3 +1066,51 @@ border-top: 1px #BBBBBB solid;
 border-top: 1px #BBBBBB solid;
 border-bottom: 1px #BBBBBB solid;
 }
+
+/*=================== For the quickadd page =================================*/
+.quickaddall{
+float:right;
+padding-bottom:1em;
+padding-top:1em;
+}
+
+.quickaddtable{
+clear:both;
+}
+
+.quickaddtable span {
+display:inline;
+float:left;
+border-right:1px solid #BBBBBB;
+border-top:1px solid #BBBBBB;
+margin:0px;
+padding:3px;
+}
+
+.quickaddtable p {
+clear:left;
+margin:0px;
+padding:0px;
+height:100% !important; height:1em;
+}
+
+.quickaddtable span.pid {
+width:10%;
+}
+
+.quickaddtable span.name {
+width:50%;
+text-align:left;
+}
+
+.quickaddtable span.listPrice {
+width:10%
+}
+
+.quickaddtable span.totalPrice {
+width:10%
+}
+
+.quickaddtable span.qty {
+width:10%
+}

Modified: ofbiz/trunk/themes/bizznesstime/webapp/bizznesstime/css/style.css
URL: http://svn.apache.org/viewvc/ofbiz/trunk/themes/bizznesstime/webapp/bizznesstime/css/style.css?rev=1031068&r1=1031067&r2=1031068&view=diff
==============================================================================
--- ofbiz/trunk/themes/bizznesstime/webapp/bizznesstime/css/style.css (original)
+++ ofbiz/trunk/themes/bizznesstime/webapp/bizznesstime/css/style.css Thu Nov  4 16:37:04 2010
@@ -1586,3 +1586,50 @@ margin-right: 20px;
 .last-system-msg a{
 color:#1C334D;
 }
+
+/*=================== For the quickadd page =================================*/
+.quickaddall{
+float:right;
+padding-bottom:1em;
+padding-top:1em;
+}
+
+.quickaddtable{
+display:inline-block;
+clear:both;
+}
+
+.quickaddtable span {
+display:inline;
+float:left;
+border-right:1px solid #999999;
+border-top:1px solid #999999;
+margin:0px;
+padding:3px;
+}
+
+.quickaddtable p {
+clear:left;
+height:100% !important; height:1em;
+}
+
+.quickaddtable span.pid {
+width:10%;
+}
+
+.quickaddtable span.name {
+width:50%;
+text-align:left;
+}
+
+.quickaddtable span.listPrice {
+width:10%
+}
+
+.quickaddtable span.totalPrice {
+width:10%
+}
+
+.quickaddtable span.qty {
+width:10%
+}

Modified: ofbiz/trunk/themes/bluelight/webapp/bluelight/style.css
URL: http://svn.apache.org/viewvc/ofbiz/trunk/themes/bluelight/webapp/bluelight/style.css?rev=1031068&r1=1031067&r2=1031068&view=diff
==============================================================================
--- ofbiz/trunk/themes/bluelight/webapp/bluelight/style.css (original)
+++ ofbiz/trunk/themes/bluelight/webapp/bluelight/style.css Thu Nov  4 16:37:04 2010
@@ -2280,3 +2280,50 @@ height:21px;
 width:56px;
 background-image:url(/images/spinner.gif);
 }
+
+/*=================== For the quickadd page =================================*/
+.quickaddall{
+float:right;
+padding-bottom:1em;
+padding-top:1em;
+}
+
+.quickaddtable{
+display:inline-block;
+clear:both;
+}
+
+.quickaddtable span {
+display:inline;
+float:left;
+border-right:1px solid #999999;
+border-top:1px solid #999999;
+margin:0px;
+padding:3px;
+}
+
+.quickaddtable p {
+clear:left;
+height:100% !important; height:1em;
+}
+
+.quickaddtable span.pid {
+width:10%;
+}
+
+.quickaddtable span.name {
+width:50%;
+text-align:left;
+}
+
+.quickaddtable span.listPrice {
+width:10%
+}
+
+.quickaddtable span.totalPrice {
+width:10%
+}
+
+.quickaddtable span.qty {
+width:10%
+}

Modified: ofbiz/trunk/themes/droppingcrumbs/webapp/droppingcrumbs/css/style.css
URL: http://svn.apache.org/viewvc/ofbiz/trunk/themes/droppingcrumbs/webapp/droppingcrumbs/css/style.css?rev=1031068&r1=1031067&r2=1031068&view=diff
==============================================================================
--- ofbiz/trunk/themes/droppingcrumbs/webapp/droppingcrumbs/css/style.css (original)
+++ ofbiz/trunk/themes/droppingcrumbs/webapp/droppingcrumbs/css/style.css Thu Nov  4 16:37:04 2010
@@ -2258,3 +2258,50 @@ height:21px;
 width:56px;
 background-image:url(/images/spinner.gif);
 }
+
+/*=================== For the quickadd page =================================*/
+.quickaddall{
+float:right;
+padding-bottom:1em;
+padding-top:1em;
+}
+
+.quickaddtable{
+display:inline-block;
+clear:both;
+}
+
+.quickaddtable span {
+display:inline;
+float:left;
+border-right:1px solid #999999;
+border-top:1px solid #999999;
+margin:0px;
+padding:3px;
+}
+
+.quickaddtable p {
+clear:left;
+height:100% !important; height:1em;
+}
+
+.quickaddtable span.pid {
+width:10%;
+}
+
+.quickaddtable span.name {
+width:50%;
+text-align:left;
+}
+
+.quickaddtable span.listPrice {
+width:10%
+}
+
+.quickaddtable span.totalPrice {
+width:10%
+}
+
+.quickaddtable span.qty {
+width:10%
+}

Modified: ofbiz/trunk/themes/flatgrey/webapp/flatgrey/maincss.css
URL: http://svn.apache.org/viewvc/ofbiz/trunk/themes/flatgrey/webapp/flatgrey/maincss.css?rev=1031068&r1=1031067&r2=1031068&view=diff
==============================================================================
--- ofbiz/trunk/themes/flatgrey/webapp/flatgrey/maincss.css (original)
+++ ofbiz/trunk/themes/flatgrey/webapp/flatgrey/maincss.css Thu Nov  4 16:37:04 2010
@@ -2306,3 +2306,50 @@ height:21px;
 width:56px;
 background-image:url(/images/spinner.gif);
 }
+
+/*=================== For the quickadd page =================================*/
+.quickaddall{
+float:right;
+padding-bottom:1em;
+padding-top:1em;
+}
+
+.quickaddtable{
+display:inline-block;
+clear:both;
+}
+
+.quickaddtable span {
+display:inline;
+float:left;
+border-right:1px solid #999999;
+border-top:1px solid #999999;
+margin:0px;
+padding:3px;
+}
+
+.quickaddtable p {
+clear:left;
+height:100% !important; height:1em;
+}
+
+.quickaddtable span.pid {
+width:10%;
+}
+
+.quickaddtable span.name {
+width:50%;
+text-align:left;
+}
+
+.quickaddtable span.listPrice {
+width:10%
+}
+
+.quickaddtable span.totalPrice {
+width:10%
+}
+
+.quickaddtable span.qty {
+width:10%
+}

Modified: ofbiz/trunk/themes/multiflex/webapp/multiflex/style.css
URL: http://svn.apache.org/viewvc/ofbiz/trunk/themes/multiflex/webapp/multiflex/style.css?rev=1031068&r1=1031067&r2=1031068&view=diff
==============================================================================
--- ofbiz/trunk/themes/multiflex/webapp/multiflex/style.css (original)
+++ ofbiz/trunk/themes/multiflex/webapp/multiflex/style.css Thu Nov  4 16:37:04 2010
@@ -2302,3 +2302,51 @@ height:21px;
 width:56px;
 background-image:url(/images/spinner.gif);
 }
+
+/*=================== For the quickadd page =================================*/
+.quickaddall{
+float:right;
+padding-bottom:1em;
+padding-top:1em;
+}
+
+.quickaddtable{
+clear:both;
+}
+
+.quickaddtable span {
+display:inline;
+float:left;
+border-right:1px solid #BBBBBB;
+border-top:1px solid #BBBBBB;
+margin:0px;
+padding:3px;
+}
+
+.quickaddtable p {
+clear:left;
+margin:0px;
+padding:0px;
+height:100% !important; height:1em;
+}
+
+.quickaddtable span.pid {
+width:10%;
+}
+
+.quickaddtable span.name {
+width:50%;
+text-align:left;
+}
+
+.quickaddtable span.listPrice {
+width:10%
+}
+
+.quickaddtable span.totalPrice {
+width:10%
+}
+
+.quickaddtable span.qty {
+width:10%
+}

Modified: ofbiz/trunk/themes/tomahawk/webapp/tomahawk/css/style.css
URL: http://svn.apache.org/viewvc/ofbiz/trunk/themes/tomahawk/webapp/tomahawk/css/style.css?rev=1031068&r1=1031067&r2=1031068&view=diff
==============================================================================
--- ofbiz/trunk/themes/tomahawk/webapp/tomahawk/css/style.css (original)
+++ ofbiz/trunk/themes/tomahawk/webapp/tomahawk/css/style.css Thu Nov  4 16:37:04 2010
@@ -2538,3 +2538,50 @@ height:21px;
 width:56px;
 background-image:url(/tomahawk/images/spinner.gif);
 }
+
+/*=================== For the quickadd page =================================*/
+.quickaddall{
+float:right;
+padding-bottom:1em;
+padding-top:1em;
+}
+
+.quickaddtable{
+display:inline-block;
+clear:both;
+}
+
+.quickaddtable span {
+display:inline;
+float:left;
+border-right:1px solid #999999;
+border-top:1px solid #999999;
+margin:0px;
+padding:3px;
+}
+
+.quickaddtable p {
+clear:left;
+height:100% !important; height:1em;
+}
+
+.quickaddtable span.pid {
+width:10%;
+}
+
+.quickaddtable span.name {
+width:50%;
+text-align:left;
+}
+
+.quickaddtable span.listPrice {
+width:10%
+}
+
+.quickaddtable span.totalPrice {
+width:10%
+}
+
+.quickaddtable span.qty {
+width:10%
+}