svn commit: r1851010 - in /ofbiz/ofbiz-plugins/branches/
Locked
svn commit: r1851010 - in /ofbiz/ofbiz-plugins/branches/
 
|
Author: deepak
Date: Fri Jan 11 06:23:45 2019 New Revision: 1851010 URL: http://svn.apache.org/viewvc?rev=1851010&view=rev Log: Applied fix from trunk for revision: 1851009 === Improved: Update multifex theme as per new markup (OFBIZ-10118) Thanks Ayushi Rathod, Parakh Maheshwari and Nitish Mishra for your contribution Modified: ofbiz/ofbiz-plugins/branches/release18.12/ (props changed) ofbiz/ofbiz-plugins/branches/release18.12/multiflex/ (props changed) ofbiz/ofbiz-plugins/branches/release18.12/multiflex/template/Footer.ftl ofbiz/ofbiz-plugins/branches/release18.12/multiflex/template/Header.ftl ofbiz/ofbiz-plugins/branches/release18.12/multiflex/webapp/multiflex/style.css ofbiz/ofbiz-plugins/branches/release18.12/multiflex/widget/Theme.xml Propchange: ofbiz/ofbiz-plugins/branches/release18.12/ ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Fri Jan 11 06:23:45 2019 @@ -10,4 +10,4 @@ /ofbiz/branches/json-integration-refactoring/plugins:1634077-1635900 /ofbiz/branches/multitenant20100310/plugins:921280-927264 /ofbiz/branches/release13.07/plugins:1547657 -/ofbiz/ofbiz-plugins/trunk:1851002 +/ofbiz/ofbiz-plugins/trunk:1851002,1851009 Propchange: ofbiz/ofbiz-plugins/branches/release18.12/multiflex/ ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Fri Jan 11 06:23:45 2019 @@ -10,3 +10,4 @@ /ofbiz/branches/json-integration-refactoring/themes/multiflex:1634077-1635900 /ofbiz/branches/multitenant20100310/themes/multiflex:921280-927264 /ofbiz/branches/release13.07/themes/multiflex:1547657 +/ofbiz/ofbiz-plugins/trunk/multiflex:1851009 Modified: ofbiz/ofbiz-plugins/branches/release18.12/multiflex/template/Footer.ftl URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-plugins/branches/release18.12/multiflex/template/Footer.ftl?rev=1851010&r1=1851009&r2=1851010&view=diff ============================================================================== --- ofbiz/ofbiz-plugins/branches/release18.12/multiflex/template/Footer.ftl (original) +++ ofbiz/ofbiz-plugins/branches/release18.12/multiflex/template/Footer.ftl Fri Jan 11 06:23:45 2019 @@ -19,15 +19,15 @@ under the License. <#assign nowTimestamp = Static["org.apache.ofbiz.base.util.UtilDateTime"].nowTimestamp()> -<div class="footer"> - <p align="center"> - <p>Copyright (c) 2001-${nowTimestamp?string("yyyy")} The Apache Software Foundation - <a href="http://www.apache.org" target="_blank">www.apache.org</a></p> - <p>Powered by <a href="http://ofbiz.apache.org" target="_blank">Apache OFBiz</a></p> - </p> +<footer> + <div class="d-flex align-items-center flex-column"> + <div class="d-flex mb-16">Copyright (c) 2001-${nowTimestamp?string("yyyy")} The Apache Software Foundation - <a href="http://www.apache.org" target="_blank">www.apache.org</a></div> + <div class="d-flex mb-16">Powered by <a href="http://ofbiz.apache.org" target="_blank">Apache OFBiz</a></div> + </div> <#if layoutSettings.VT_FTR_JAVASCRIPT?has_content> <#list layoutSettings.VT_FTR_JAVASCRIPT as javaScript> <script type="application/javascript" src="<@ofbizContentUrl>${StringUtil.wrapString(javaScript)}</@ofbizContentUrl>" type="application/javascript"></script> </#list> </#if> -</div> +</footer> </div> Modified: ofbiz/ofbiz-plugins/branches/release18.12/multiflex/template/Header.ftl URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-plugins/branches/release18.12/multiflex/template/Header.ftl?rev=1851010&r1=1851009&r2=1851010&view=diff ============================================================================== --- ofbiz/ofbiz-plugins/branches/release18.12/multiflex/template/Header.ftl (original) +++ ofbiz/ofbiz-plugins/branches/release18.12/multiflex/template/Header.ftl Fri Jan 11 06:23:45 2019 @@ -23,54 +23,49 @@ under the License. <div id="wait-spinner" style="display:none"> <div id="wait-spinner-image"></div> </div> - <div class="page-container"> + <div class="container-fluid"> <div class="header"> + <div class="header-top"> + <div class="row align-items-center"> + <div class="col"> + <a class="navbar-brand" href="<@ofbizUrl>main</@ofbizUrl>"> + <img src="/multiflex/images/ofbizLogo.gif" alt="Logo" height="32px"/> + </a> + </div> + </div> - <!-- Sitelogo and sitename --> - <a class="sitelogo" href="<@ofbizUrl>main</@ofbizUrl>" title="${uiLabelMap.CommonMain}"></a> - <div class="sitename"> + <div class="col text-center d-none d-lg-block"> <#if !productStore??> - <h1><a href="<@ofbizUrl>main</@ofbizUrl>" title="Go to Start page">${uiLabelMap.EcommerceNoProductStore}</a></h1> + <h3><a href="<@ofbizUrl>main</@ofbizUrl>" title="Go to Start page">${uiLabelMap.EcommerceNoProductStore}</a></h3> + </#if> + <#if (productStore.title)??> + <h3><a href="<@ofbizUrl>main</@ofbizUrl>" title="Go to Start page">${productStore.title}</a></h3> + </#if> + <#if (productStore.subtitle)??> + <div id="company-subtitle"><h6>${productStore.subtitle}</h6></div> </#if> - <#if (productStore.title)??><h1><a href="<@ofbizUrl>main</@ofbizUrl>" title="Go to Start page">${productStore.title}</a></h1></#if> - <#if (productStore.subtitle)??><h2>${productStore.subtitle}</h2></#if> - </div> - - <!-- Navigation Level 0 --> - <div class="nav0"> - <ul> - <li><a href="<@ofbizUrl>setSessionLocale?newLocale=it</@ofbizUrl>"><img src="/multiflex/images/flag_it.gif" alt="" /></a></li> - <li><a href="<@ofbizUrl>setSessionLocale?newLocale=en</@ofbizUrl>"><img src="/multiflex/images/flag_en.gif" alt="" /></a></li> - <li><a href="<@ofbizUrl>setSessionLocale?newLocale=de</@ofbizUrl>"><img src="/multiflex/images/flag_de.gif" alt="" /></a></li> - <li><a href="<@ofbizUrl>setSessionLocale?newLocale=fr</@ofbizUrl>"><img src="/multiflex/images/flag_fr.gif" alt="" /></a></li> - </ul> - </div> - - <!-- Navigation Level 1 --> - <div class="nav1"> - <ul> - <li><a href="<@ofbizUrl>main</@ofbizUrl>">${uiLabelMap.CommonMain}</a></li> - <li><a href="<@ofbizUrl>contactus</@ofbizUrl>">${uiLabelMap.CommonContactUs}</a></li> - <li><a href="<@ofbizUrl>policies</@ofbizUrl>">${uiLabelMap.EcommerceSeeStorePoliciesHere}</a></li> - </ul> </div> </div> <!-- A.2 HEADER MIDDLE --> <div class="header-middle"> - <!-- Site message --> - <div class="sitemessage"> - <h1>EASY • FLEXIBLE • ROBUST</h1> - <h2> - <#if sessionAttributes.autoName?has_content> - ${uiLabelMap.CommonWelcome} ${sessionAttributes.autoName}! - (${uiLabelMap.CommonNotYou}? <a href="<@ofbizUrl>autoLogout</@ofbizUrl>" class="buttontext">${uiLabelMap.CommonClickHere}</a>) - <#else> - ${uiLabelMap.CommonWelcome}! - </#if> - </h2> - <h3><a href="#">›› More details</a></h3> + <div class="row"> + <div class="col-3 align-left"> + <h4>EASY • FLEXIBLE • ROBUST</h4> + </div> + <div class="col-3 offset-6"> + <span class="message"> + <#if sessionAttributes.autoName?has_content> + ${uiLabelMap.CommonWelcome} ${sessionAttributes.autoName}! + (${uiLabelMap.CommonNotYou}? <a href="<@ofbizUrl>autoLogout</@ofbizUrl>" class="buttontext">${uiLabelMap.CommonClickHere}</a>) + <#else> + ${uiLabelMap.CommonWelcome}! + </#if> + </span> + + <h5><a href="#">›› More details</a></h5> + </div> </div> </div> @@ -103,6 +98,18 @@ under the License. <li id="header-bar-quickadd"><a href="<@ofbizUrl>quickadd</@ofbizUrl>">${uiLabelMap.CommonQuickAdd}</a></li> </ul> </#if> + <ul> + <li><a href="<@ofbizUrl>main</@ofbizUrl>">${uiLabelMap.CommonMain}</a></li> + </ul> + <ul> + <li><a href="<@ofbizUrl>contactus</@ofbizUrl>">${uiLabelMap.CommonContactUs}</a></li> + </ul> + <ul> + <li><a href="<@ofbizUrl>policies</@ofbizUrl>">${uiLabelMap.EcommerceSeeStorePoliciesHere}</a></li> + </ul> + + + <#if userLogin?has_content && userLogin.userLoginId != "anonymous"> <!-- Navigation item --> @@ -121,9 +128,12 @@ under the License. </ul> </#if> - </div> - </div> + <ul class="flags"> + <li><a href="<@ofbizUrl>setSessionLocale?newLocale=it</@ofbizUrl>"><img src="/multiflex/images/flag_it.gif" alt="" /></a></li> + <li><a href="<@ofbizUrl>setSessionLocale?newLocale=en</@ofbizUrl>"><img src="/multiflex/images/flag_en.gif" alt="" /></a></li> + <li><a href="<@ofbizUrl>setSessionLocale?newLocale=de</@ofbizUrl>"><img src="/multiflex/images/flag_de.gif" alt="" /></a></li> + <li><a href="<@ofbizUrl>setSessionLocale?newLocale=fr</@ofbizUrl>"><img src="/multiflex/images/flag_fr.gif" alt="" /></a></li> + </ul> - <!-- Breadcrumbs --> - <div class="header-breadcrumbs"> - </div> + </div> + </div> \ No newline at end of file Modified: ofbiz/ofbiz-plugins/branches/release18.12/multiflex/webapp/multiflex/style.css URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-plugins/branches/release18.12/multiflex/webapp/multiflex/style.css?rev=1851010&r1=1851009&r2=1851010&view=diff ============================================================================== --- ofbiz/ofbiz-plugins/branches/release18.12/multiflex/webapp/multiflex/style.css (original) +++ ofbiz/ofbiz-plugins/branches/release18.12/multiflex/webapp/multiflex/style.css Fri Jan 11 06:23:45 2019 @@ -40,7 +40,24 @@ body { border: solid 1px #969696; font-size: 1.0em; } - +.container-fluid #ecom-mainarea { + width:100%; +} +@media only screen and (min-width: 992px) { + .container-fluid #div3 { + max-width: 49%; + } +} +.products-card .card-title a { + word-break: break-word!important; + white-space: normal!important; +} +#ecom-mainarea { + background: none!important; +} +#ecom-mainarea .card .card-header { + background: #DCDCDC url(images/bg_head_bottom_nav.jpg) no-repeat; +} div.popup { max-width: 1200px; width: 250px; @@ -84,11 +101,11 @@ div.popup { overflow: hidden /*IE6*/; } -.footer { +footer { clear: both; - width: 900px; padding: 1.0em 0 1.0em 0; background: rgb(225, 225, 225) url(images/bg_foot.jpg) no-repeat; + background-size: 100% 50px; font-size: 1.0em; overflow: visible !important /*Firefox*/; overflow: hidden /*IE6*/; @@ -96,24 +113,36 @@ div.popup { /* HEADER */ .header { - width: 900px; + width: 100%; font-family: "trebuchet ms", arial, sans-serif; } .header-top { - width: 900px; - height: 80px; - background: #F0F0F0 url(images/bg_head_top.jpg); + width: 100%; + height: auto; + padding:10px; + background-color: #F0F0F0; overflow: visible !important /*Firefox*/; overflow: hidden /*IE6*/; } .header-middle { - width: 900px; - height: 150px; + width: 100%; + height: auto; background: #E6E6E6 url(images/bg_head_middle.jpg); overflow: visible !important /*Firefox*/; overflow: hidden /*IE6*/; + background-size: cover; +} + +.header-middle h4 { + padding: 15px; + color: white; +} + +.header-middle .message { + font-size: 17px; + color: #000099; } .header-middle .sitemessage h2 a { @@ -122,15 +151,16 @@ div.popup { } .header-bottom { - width: 900px; - height: 40px; + width: 100%; + height: auto; background: #FFFFFF url(images/bg_head_breadcrumbs.jpg) repeat-y; + margin-bottom: 15px; } .header-breadcrumbs { clear: both; - width: 900px; - height: 10px; + width: 100%; + height: auto; padding: 1.0em 0 1.0em 0; background: #FFFFFF url(images/bg_head_breadcrumbs.jpg) repeat-y; } @@ -144,35 +174,6 @@ div.popup { background: url(images/ofbizLogo.gif); } -.sitename { - width: 400px; - height: 45px; - position: absolute; - z-index: 1; - margin: 20px 0 0 130px; - overflow: visible !important /*Firefox*/; - overflow: hidden /*IE6*/; -} - -.sitename h1 { - font-size: 240%; -} - -.sitename h2 { - margin: -4px 0 0 0; - color: #7D7D7D; - font-size: 120%; -} - -.sitename a { - text-decoration: none; - color: #7D7D7D; -} - -.sitename a:hover { - text-decoration: none; - color: #323232; -} .microcart { width: 400px; @@ -217,7 +218,7 @@ div.popup { } .nav1 { - width: 350px; + width: 100%; position: absolute; z-index: 3; margin: 45px 0 0 550px; @@ -292,19 +293,34 @@ div.popup { color: rgb(50, 50, 50); } +.align-left { + text-align: left; +} + +.flags { + float:right; +} + +.flags li { + border-right: none!important; +} + /*Drop-down menu*/ .nav2 { - float: left; - width: 900px; - border: none; - background: #DCDCDC url(images/bg_head_bottom_nav.jpg) no-repeat; - color: #4B4B4B; - font-size: 130%; + float: left; + width: 100%; + border: none; + background: #DCDCDC url(images/bg_head_bottom_nav.jpg) no-repeat; + color: #4B4B4B; + font-size: 130%; + background-size: cover; + margin-bottom:15px; } /*Color navigation bar normal mode*/ .nav2 ul { list-style-type: none; + margin-bottom: 0px;; } .nav2 ul li { @@ -676,29 +692,34 @@ div.popup { /********************/ /* FOOTER SECTION */ /********************/ -.footer p { +footer .d-flex { line-height: 1.3em; text-align: center; color: rgb(125, 125, 125); font-weight: bold; - font-size: 110%; + font-size: 107%; + margin-bottom: 1rem; } -.footer p.credits { +footer .align-items-center { + padding: 14px 0px 0px 0px; +} + +footer .credits { font-weight: normal; } -.footer a { +footer a { text-decoration: underline; color: rgb(125, 125, 125); } -.footer a:hover { +footer a:hover { text-decoration: none; color: rgb(0, 0, 0); } -.footer a:visited { +footer a:visited { color: rgb(0, 0, 0); } @@ -762,7 +783,7 @@ div.popup { visibility: hidden; } -.footer:after, +footer:after, footer div:after p:after { content: "."; display: block; @@ -837,9 +858,8 @@ p:after { } @media print { - .footer { + footer { clear: both; - width: 900px; height: 3.7em; padding: 1.1em 0 0; background: rgb(240, 240, 240); @@ -1577,12 +1597,6 @@ img { behavior: url("/images/pngbehavior.htc"); } -.endcolumns { - clear: both; - height: 0px; - visibility: hidden; -} - .hidden { visibility: hidden; } @@ -1744,14 +1758,6 @@ A.tableheadbutton:hover { .browsecategorylist { margin-left: 10px; } - -.browsecategorytext { - font-weight: bold; - color: #467AA7; - padding-left: 10px; - background: url(images/bg_bullet_full_2.gif) no-repeat 0px 0.5em; -} - A.browsecategorybutton { font-weight: bold; color: #000099; Modified: ofbiz/ofbiz-plugins/branches/release18.12/multiflex/widget/Theme.xml URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-plugins/branches/release18.12/multiflex/widget/Theme.xml?rev=1851010&r1=1851009&r2=1851010&view=diff ============================================================================== --- ofbiz/ofbiz-plugins/branches/release18.12/multiflex/widget/Theme.xml (original) +++ ofbiz/ofbiz-plugins/branches/release18.12/multiflex/widget/Theme.xml Fri Jan 11 06:23:45 2019 @@ -30,10 +30,12 @@ under the License. <extends location="component://common-theme/widget/Theme.xml"/> <theme-properties> + <property name="VT_HDR_JAVASCRIPT['add']" value="/ecommerce/js/bootstrap.min.js"/> <!--Css style--> <property name="VT_STYLESHEET['add']" value="/ecommerce/images/blog.css"/> <property name="VT_STYLESHEET['add']" value="/multiflex/style.css"/> <property name="VT_STYLESHEET['add']" value="/contentimages/css/contentForum.css"/> + <property name="VT_STYLESHEET['add']" value="/ecommerce/css/bootstrap.min.css"/> <!--template location--> <property name="VT_HDR_TMPLT_LOC" value="component://multiflex/template/Header.ftl"/> <property name="VT_FTR_TMPLT_LOC" value="component://multiflex/template/Footer.ftl"/> |
«
Return to OFBiz - Commits
|
1 view|%1 views
| Free forum by Nabble | Edit this page |