svn commit: r1824654 - in /ofbiz/ofbiz-plugins/trunk/ecommerce: template/cart/ template/catalog/ template/customer/ webapp/ecommerce/css/

Previous Topic Next Topic
 
classic Classic list List threaded Threaded
1 message Options
Reply | Threaded
Open this post in threaded view
|

svn commit: r1824654 - in /ofbiz/ofbiz-plugins/trunk/ecommerce: template/cart/ template/catalog/ template/customer/ webapp/ecommerce/css/

Deepak Dixit-5
Author: deepak
Date: Sun Feb 18 10:03:06 2018
New Revision: 1824654

URL: http://svn.apache.org/viewvc?rev=1824654&view=rev
Log:
Improved: Done some markup cleanup, Removed some unusd html tag. Added css rule to set padding=0 for  ul (OFBIZ-9760)

Modified:
    ofbiz/ofbiz-plugins/trunk/ecommerce/template/cart/ShowCart.ftl
    ofbiz/ofbiz-plugins/trunk/ecommerce/template/catalog/MiniProductSummary.ftl
    ofbiz/ofbiz-plugins/trunk/ecommerce/template/catalog/ProductDetail.ftl
    ofbiz/ofbiz-plugins/trunk/ecommerce/template/catalog/ShowBestSellingCategory.ftl
    ofbiz/ofbiz-plugins/trunk/ecommerce/template/customer/MessageList.ftl
    ofbiz/ofbiz-plugins/trunk/ecommerce/webapp/ecommerce/css/custom.css

Modified: ofbiz/ofbiz-plugins/trunk/ecommerce/template/cart/ShowCart.ftl
URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-plugins/trunk/ecommerce/template/cart/ShowCart.ftl?rev=1824654&r1=1824653&r2=1824654&view=diff
==============================================================================
--- ofbiz/ofbiz-plugins/trunk/ecommerce/template/cart/ShowCart.ftl (original)
+++ ofbiz/ofbiz-plugins/trunk/ecommerce/template/cart/ShowCart.ftl Sun Feb 18 10:03:06 2018
@@ -648,19 +648,21 @@ under the License.
 </div>
 
 <#if associatedProducts?has_content>
-  <div>
-    <div>
+  <div class="card">
+    <div class="card-header">
       <h3>${uiLabelMap.EcommerceYouMightAlsoIntrested}:</h3>
     </div>
-    <div>
+    <div class="card-body">
       <#-- random complementary products -->
+      <div class="row row-eq-height">
       <#list associatedProducts as assocProduct>
-        <div>
+
           ${setRequestAttribute("optProduct", assocProduct)}
           ${setRequestAttribute("listIndex", assocProduct_index)}
           ${screens.render("component://ecommerce/widget/CatalogScreens.xml#productsummary")}
-        </div>
+
       </#list>
+        </div>
     </div>
   </div>
 </#if>

Modified: ofbiz/ofbiz-plugins/trunk/ecommerce/template/catalog/MiniProductSummary.ftl
URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-plugins/trunk/ecommerce/template/catalog/MiniProductSummary.ftl?rev=1824654&r1=1824653&r2=1824654&view=diff
==============================================================================
--- ofbiz/ofbiz-plugins/trunk/ecommerce/template/catalog/MiniProductSummary.ftl (original)
+++ ofbiz/ofbiz-plugins/trunk/ecommerce/template/catalog/MiniProductSummary.ftl Sun Feb 18 10:03:06 2018
@@ -28,12 +28,10 @@ under the License.
           ${uiLabelMap.CommonFrom}
         </#if>
         <#if totalPrice??>
-          <li>
             ${uiLabelMap.ProductAggregatedPrice}:
             <span class='basePrice'>
               <@ofbizCurrency amount=totalPrice isoCode=priceResult.currencyUsed/>
             </span>
-          </li>
         <#else>
           <span class="<#if priceResult.isSale>salePrice<#else>normalPrice</#if>">
           <@ofbizCurrency amount=priceResult.price isoCode=priceResult.currencyUsed/></span>

Modified: ofbiz/ofbiz-plugins/trunk/ecommerce/template/catalog/ProductDetail.ftl
URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-plugins/trunk/ecommerce/template/catalog/ProductDetail.ftl?rev=1824654&r1=1824653&r2=1824654&view=diff
==============================================================================
--- ofbiz/ofbiz-plugins/trunk/ecommerce/template/catalog/ProductDetail.ftl (original)
+++ ofbiz/ofbiz-plugins/trunk/ecommerce/template/catalog/ProductDetail.ftl Sun Feb 18 10:03:06 2018
@@ -695,7 +695,7 @@ $(function(){
             </#list>
             <input type="hidden" name="add_product_id" value="${product.productId}"/>
             <div id="addCart1" class="form-group" style="display:none;">
-              <label><strong>${uiLabelMap.CommonQuantity}:</strong></span>
+              <label><strong>${uiLabelMap.CommonQuantity}:</strong></label>
               <input type="text" class="form-control" size="5" name="quantity" value="1"/>
               <a href="javascript:javascript:addItem();" class="btn btn-outline-secondary"><span
                   style="white-space: nowrap;">${uiLabelMap.OrderAddToCart}</span></a>
@@ -756,7 +756,6 @@ $(function(){
         </div>
         <#-- check to see if introductionDate hasnt passed yet -->
         <#if product.introductionDate?? && nowTimestamp.before(product.introductionDate)>
-          <p>&nbsp;</p>
           <div style="color: red;">${uiLabelMap.ProductProductNotYetMadeAvailable}.</div>
         <#-- check to see if salesDiscontinuationDate has passed -->
         <#elseif product.salesDiscontinuationDate?? && nowTimestamp.after(product.salesDiscontinuationDate)>
@@ -924,7 +923,7 @@ $(function(){
             <a href="javascript:getList('FT${featureOrderFirst}','${indexer}',1);">
               <img src="<@ofbizContentUrl>${contentPathPrefix!}${imageUrl}</@ofbizContentUrl>" class="cssImgSmall" alt=""/>
             </a>
-          <li/>
+          </li>
         </#if>
         <#assign indexer = indexer + 1 />
       </#list>
@@ -1078,7 +1077,6 @@ $(function(){
       <h4>${uiLabelMap.EcommerceProductTags}</h4>
     <#if productTags??>
       <p class="titleAddTags"><strong>${uiLabelMap.EcommerceProductTagsDetail}:</strong></p>
-      <p>
         <ul>
           <li>
             <#assign no = 0 />
@@ -1094,7 +1092,6 @@ $(function(){
             </#list>
           </li>
         </ul>
-      </p>
     </#if>
     <div class="form-group">
       <label>${uiLabelMap.EcommerceAddYourTags}:</label>

Modified: ofbiz/ofbiz-plugins/trunk/ecommerce/template/catalog/ShowBestSellingCategory.ftl
URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-plugins/trunk/ecommerce/template/catalog/ShowBestSellingCategory.ftl?rev=1824654&r1=1824653&r2=1824654&view=diff
==============================================================================
--- ofbiz/ofbiz-plugins/trunk/ecommerce/template/catalog/ShowBestSellingCategory.ftl (original)
+++ ofbiz/ofbiz-plugins/trunk/ecommerce/template/catalog/ShowBestSellingCategory.ftl Sun Feb 18 10:03:06 2018
@@ -22,7 +22,6 @@ under the License.
     Popular Categories
   </h4>
   <div class="card-body">
-    <p class="card-text">
         <div class="row">
 
           <#list productCategoryList as childCategoryList>
@@ -70,9 +69,9 @@ under the License.
                         <#list productCategoryMembers as productCategoryMember>
                           <#if (i > 2)>
                             <#if productCategoryMembers[i]?has_content>
-                              <a class="linktext" href="<@ofbizCatalogAltUrl productCategoryId=productCategoryId/>">
+                              <li><a class="linktext" href="<@ofbizCatalogAltUrl productCategoryId=productCategoryId/>">
                                 <span>More...</span>
-                              </a>
+                              </a></li>
                             </#if>
                             <#break>
                           </#if>
@@ -100,7 +99,6 @@ under the License.
           </#list>
           </div>
         </#list>
-    </p>
   </div>
 </div>
 

Modified: ofbiz/ofbiz-plugins/trunk/ecommerce/template/customer/MessageList.ftl
URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-plugins/trunk/ecommerce/template/customer/MessageList.ftl?rev=1824654&r1=1824653&r2=1824654&view=diff
==============================================================================
--- ofbiz/ofbiz-plugins/trunk/ecommerce/template/customer/MessageList.ftl (original)
+++ ofbiz/ofbiz-plugins/trunk/ecommerce/template/customer/MessageList.ftl Sun Feb 18 10:03:06 2018
@@ -74,12 +74,12 @@ under the License.
     </#if>
   </div>
   <div class="card-body">
-    <table class="table table-responsive-sm">
     <#if (!receivedCommunicationEvents?has_content && !sentCommunicationEvents?has_content)>
       <div class="alert alert-light" role="alert">
         ${uiLabelMap.EcommerceNoMessages}.
       </div>
     <#else>
+    <table class="table table-responsive-sm">
       <thead class="thead-light">
         <tr>
           <th>
@@ -104,7 +104,8 @@ under the License.
       <#list sentCommunicationEvents! as sentCommunicationEvent>
         <@showMessage communicationEvent=sentCommunicationEvent isSentMessage=true index=sentCommunicationEvent_index/>
       </#list>
-    </#if>
     </table>
+    </#if>
+
   </div>
 </div>

Modified: ofbiz/ofbiz-plugins/trunk/ecommerce/webapp/ecommerce/css/custom.css
URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-plugins/trunk/ecommerce/webapp/ecommerce/css/custom.css?rev=1824654&r1=1824653&r2=1824654&view=diff
==============================================================================
--- ofbiz/ofbiz-plugins/trunk/ecommerce/webapp/ecommerce/css/custom.css (original)
+++ ofbiz/ofbiz-plugins/trunk/ecommerce/webapp/ecommerce/css/custom.css Sun Feb 18 10:03:06 2018
@@ -43,6 +43,9 @@ a.btn-primary {
     width: auto;
     height: 140px;
 }
+.card-body ul {
+    padding : 0px;
+}
 
 .products-card .card-title a {
     white-space: normal;