You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ofbiz.apache.org by de...@apache.org on 2017/12/20 12:41:26 UTC

svn commit: r1818789 - in /ofbiz/ofbiz-plugins/trunk/ecommerce: template/includes/Footer.ftl webapp/ecommerce/css/custom.css webapp/ecommerce/images/ecommain.css widget/CommonScreens.xml

Author: deepak
Date: Wed Dec 20 12:41:25 2017
New Revision: 1818789

URL: http://svn.apache.org/viewvc?rev=1818789&view=rev
Log:
Improved: Updated footer markup, now footer will be render properly on all pages.
Thanks Parakh for your contribution

Modified:
    ofbiz/ofbiz-plugins/trunk/ecommerce/template/includes/Footer.ftl
    ofbiz/ofbiz-plugins/trunk/ecommerce/webapp/ecommerce/css/custom.css
    ofbiz/ofbiz-plugins/trunk/ecommerce/webapp/ecommerce/images/ecommain.css
    ofbiz/ofbiz-plugins/trunk/ecommerce/widget/CommonScreens.xml

Modified: ofbiz/ofbiz-plugins/trunk/ecommerce/template/includes/Footer.ftl
URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-plugins/trunk/ecommerce/template/includes/Footer.ftl?rev=1818789&r1=1818788&r2=1818789&view=diff
==============================================================================
--- ofbiz/ofbiz-plugins/trunk/ecommerce/template/includes/Footer.ftl (original)
+++ ofbiz/ofbiz-plugins/trunk/ecommerce/template/includes/Footer.ftl Wed Dec 20 12:41:25 2017
@@ -19,6 +19,7 @@ under the License.
 
 <#assign nowTimestamp = Static["org.apache.ofbiz.base.util.UtilDateTime"].nowTimestamp()>
 
+<div class="footer-block">
 <div class="d-flex justify-content-between">
   <div class="p-2">
     <a href="//jigsaw.w3.org/css-validator/">
@@ -39,3 +40,4 @@ under the License.
     <div><a href="<@o...@ofbizUrl>">${uiLabelMap.EcommerceSeeStorePoliciesHere}</a></div>
   </div>
 </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=1818789&r1=1818788&r2=1818789&view=diff
==============================================================================
--- ofbiz/ofbiz-plugins/trunk/ecommerce/webapp/ecommerce/css/custom.css (original)
+++ ofbiz/ofbiz-plugins/trunk/ecommerce/webapp/ecommerce/css/custom.css Wed Dec 20 12:41:25 2017
@@ -58,4 +58,8 @@
 
 .quick-links a, #paginationBox a {
 color: #000000;
+}
+
+.footer-block {
+    background: #f8f9fa;
 }
\ No newline at end of file

Modified: ofbiz/ofbiz-plugins/trunk/ecommerce/webapp/ecommerce/images/ecommain.css
URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-plugins/trunk/ecommerce/webapp/ecommerce/images/ecommain.css?rev=1818789&r1=1818788&r2=1818789&view=diff
==============================================================================
--- ofbiz/ofbiz-plugins/trunk/ecommerce/webapp/ecommerce/images/ecommain.css (original)
+++ ofbiz/ofbiz-plugins/trunk/ecommerce/webapp/ecommerce/images/ecommain.css Wed Dec 20 12:41:25 2017
@@ -259,8 +259,16 @@ margin-top:10px;
 position:relative;
 width:100%;
 text-align:left;
+flex:1;
 }
 
+#parentContainer {
+display: flex;
+min-height: 100vh;
+flex-direction: column;
+}
+
+
 #ecom-mainarea .left {
 background:#fff;
 float:left;

Modified: ofbiz/ofbiz-plugins/trunk/ecommerce/widget/CommonScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-plugins/trunk/ecommerce/widget/CommonScreens.xml?rev=1818789&r1=1818788&r2=1818789&view=diff
==============================================================================
--- ofbiz/ofbiz-plugins/trunk/ecommerce/widget/CommonScreens.xml (original)
+++ ofbiz/ofbiz-plugins/trunk/ecommerce/widget/CommonScreens.xml Wed Dec 20 12:41:25 2017
@@ -81,6 +81,7 @@ under the License.
                      <platform-specific><html><html-template location="component://ecommerce/template/includes/HeaderHead.ftl"/></html></platform-specific>
                      <platform-specific><html><html-template location="component://common-theme/template/includes/OpenHtmlBody.ftl"/></html></platform-specific>
                      <!-- render header -->
+                     <container id="parentContainer">
                      <container id="header"><platform-specific><html><html-template location="${headerTemplateLocation}"/></html></platform-specific></container>
 
                      <container id="ecom-mainarea">
@@ -99,6 +100,7 @@ under the License.
 
                     <!-- render footer -->
                     <container id="footer"><platform-specific><html><html-template location="${footerTemplateLocation}"/></html></platform-specific></container>
+                    </container>
                     <platform-specific><html><html-template location="component://common-theme/template/includes/CloseHtmlBody.ftl"/></html></platform-specific>
                   </widgets>
                   <fail-widgets>