svn commit: r1840263 - in /ofbiz: ofbiz-framework/trunk/applications/order/template/entry/cart/ ofbiz-plugins/trunk/ecommerce/template/blog/ ofbiz-plugins/trunk/ecommerce/template/cart/ ofbiz-plugins/trunk/ecommerce/template/catalog/ ofbiz-plugins/trun...

Author: jleroux
Date: Thu Sep  6 20:42:10 2018
New Revision: 1840263

URL: http://svn.apache.org/viewvc?rev=1840263&view=rev
Log:
Improved: UI for all promotions listing disturbed
(OFBIZ-10462)
The "checkout section" in the ecommerce main page is not easily legible
(OFBIZ-10414)

Steps to regenerate the issue are as follows:
1) Navigate to storefront
2) Click on "View All Promotions" button.

Expected:
All promotions should be in a listed format.

Actual:
All promotions are listed inline.

jleroux: I also added a space after uiLabelMap.CommonDetails in
ShowAllPromotions template in order

This also improves OFBIZ-10414

Thanks: Pritam Kute

Modified:
    ofbiz/ofbiz-framework/trunk/applications/order/template/entry/cart/ShowAllPromotions.ftl
    ofbiz/ofbiz-plugins/trunk/ecommerce/template/blog/Blogs.ftl
    ofbiz/ofbiz-plugins/trunk/ecommerce/template/cart/MiniPromoText.ftl
    ofbiz/ofbiz-plugins/trunk/ecommerce/template/catalog/MiniProductSummary.ftl
    ofbiz/ofbiz-plugins/trunk/ecommerce/template/content/ContentCategories.ftl
    ofbiz/ofbiz-plugins/trunk/ecommerce/template/forum/Forums.ftl
    ofbiz/ofbiz-plugins/trunk/ecommerce/webapp/ecommerce/css/custom.css

Modified: ofbiz/ofbiz-framework/trunk/applications/order/template/entry/cart/ShowAllPromotions.ftl
URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/applications/order/template/entry/cart/ShowAllPromotions.ftl?rev=1840263&r1=1840262&r2=1840263&view=diff
==============================================================================
--- ofbiz/ofbiz-framework/trunk/applications/order/template/entry/cart/ShowAllPromotions.ftl (original)
+++ ofbiz/ofbiz-framework/trunk/applications/order/template/entry/cart/ShowAllPromotions.ftl Thu Sep  6 20:42:10 2018
@@ -22,7 +22,7 @@ under the License.
         <ul>
         <#-- show promotions text -->
         <#list productPromosAllShowable as productPromo>
-            <li><a href="<@ofbizUrl>showPromotionDetails?productPromoId=${productPromo.productPromoId}</@ofbizUrl>" class="button">${uiLabelMap.CommonDetails}</a>${StringUtil.wrapString(productPromo.promoText!)}</li>
+            <li><a href="<@ofbizUrl>showPromotionDetails?productPromoId=${productPromo.productPromoId}</@ofbizUrl>" class="button">${uiLabelMap.CommonDetails}</a> ${StringUtil.wrapString(productPromo.promoText!)}</li>
         </#list>
         </ul>
     </div>

Modified: ofbiz/ofbiz-plugins/trunk/ecommerce/template/blog/Blogs.ftl
URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-plugins/trunk/ecommerce/template/blog/Blogs.ftl?rev=1840263&r1=1840262&r2=1840263&view=diff
==============================================================================
--- ofbiz/ofbiz-plugins/trunk/ecommerce/template/blog/Blogs.ftl (original)
+++ ofbiz/ofbiz-plugins/trunk/ecommerce/template/blog/Blogs.ftl Thu Sep  6 20:42:10 2018
@@ -22,7 +22,7 @@ under the License.
     ${uiLabelMap.ProductBrowseBlogs}
   </div>
   <div class="card-body">
-    <ul>
+    <ul class="list-unstyled">
       <#list blogs as blog>
         <li class="browsecategorytext">
           <a href="<@ofbizUrl>MainBlog?blogContentId=${blog.contentId}</@ofbizUrl>" class="browsecategorybutton">

Modified: ofbiz/ofbiz-plugins/trunk/ecommerce/template/cart/MiniPromoText.ftl
URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-plugins/trunk/ecommerce/template/cart/MiniPromoText.ftl?rev=1840263&r1=1840262&r2=1840263&view=diff
==============================================================================
--- ofbiz/ofbiz-plugins/trunk/ecommerce/template/cart/MiniPromoText.ftl (original)
+++ ofbiz/ofbiz-plugins/trunk/ecommerce/template/cart/MiniPromoText.ftl Thu Sep  6 20:42:10 2018
@@ -34,12 +34,10 @@ under the License.
             </p>
           </li>
         </#list>
-        <li>
-          <a href="<@ofbizUrl>showAllPromotions</@ofbizUrl>" class="btn btn-outline-secondary">
-            ${uiLabelMap.OrderViewAllPromotions}
-          </a>
-        </li>
       </ul>
+      <a href="<@ofbizUrl>showAllPromotions</@ofbizUrl>" class="btn btn-outline-secondary">
+        ${uiLabelMap.OrderViewAllPromotions}
+      </a>
     </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=1840263&r1=1840262&r2=1840263&view=diff
==============================================================================
--- ofbiz/ofbiz-plugins/trunk/ecommerce/template/catalog/MiniProductSummary.ftl (original)
+++ ofbiz/ofbiz-plugins/trunk/ecommerce/template/catalog/MiniProductSummary.ftl Thu Sep  6 20:42:10 2018
@@ -20,7 +20,7 @@ under the License.
   <a href="<@ofbizCatalogAltUrl productId=miniProduct.productId/>" class="linktext">
     ${miniProductContentWrapper.get("PRODUCT_NAME", "html")?default("No Name Available")}
   </a>
-  <ul>
+  <ul class="list-unstyled">
     <li>
       ${miniProduct.productId}
       <#if (priceResult.price?default(0) > 0 && "N" == miniProduct.requireAmount?default("N"))>

Modified: ofbiz/ofbiz-plugins/trunk/ecommerce/template/content/ContentCategories.ftl
URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-plugins/trunk/ecommerce/template/content/ContentCategories.ftl?rev=1840263&r1=1840262&r2=1840263&view=diff
==============================================================================
--- ofbiz/ofbiz-plugins/trunk/ecommerce/template/content/ContentCategories.ftl (original)
+++ ofbiz/ofbiz-plugins/trunk/ecommerce/template/content/ContentCategories.ftl Thu Sep  6 20:42:10 2018
@@ -38,7 +38,7 @@ under the License.
     <ul>
       <#assign count_1=0/>
       <@loopSubContent contentId=contentRootId viewIndex=0 viewSize=9999 orderBy="contentName">
-        <li class="browsecategorytext">
+        <li class="browsecategorytext list-unstyled">
           <a href="<@ofbizUrl>showcontenttree?contentId=${subContentId}&amp;nodeTrailCsv=${subContentId}</@ofbizUrl>"
               class="browsecategorybutton">
             ${content.contentName}

Modified: ofbiz/ofbiz-plugins/trunk/ecommerce/template/forum/Forums.ftl
URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-plugins/trunk/ecommerce/template/forum/Forums.ftl?rev=1840263&r1=1840262&r2=1840263&view=diff
==============================================================================
--- ofbiz/ofbiz-plugins/trunk/ecommerce/template/forum/Forums.ftl (original)
+++ ofbiz/ofbiz-plugins/trunk/ecommerce/template/forum/Forums.ftl Thu Sep  6 20:42:10 2018
@@ -22,7 +22,7 @@ under the License.
     ${uiLabelMap.ProductBrowseForums}
   </div>
   <div class="card-body">
-    <ul>
+    <ul class="list-unstyled">
     <#list forums as forum>
       <li class="browsecategorytext">
         <a href="<@ofbizUrl>showforum?forumId=${forum.contentId}</@ofbizUrl>"

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=1840263&r1=1840262&r2=1840263&view=diff
==============================================================================
--- ofbiz/ofbiz-plugins/trunk/ecommerce/webapp/ecommerce/css/custom.css (original)
+++ ofbiz/ofbiz-plugins/trunk/ecommerce/webapp/ecommerce/css/custom.css Thu Sep  6 20:42:10 2018
@@ -98,9 +98,7 @@ label.required:after {
     min-height: 100vh;
     flex-direction: column;
 }
-li {
-    display: inline;
-}
+
 .jGrowl {
   z-index: 9999;
   color: #ffffff;