Author: deepak
Date: Sun Dec 24 08:29:19 2017 New Revision: 1819205 URL: http://svn.apache.org/viewvc?rev=1819205&view=rev Log: Improved: Improvement in navbar of ecommerce page (OFBIZ-10117) Thanks Parakh and Mayank for your contribtion. Modified: ofbiz/ofbiz-plugins/trunk/ecommerce/data/EcommerceTypeData.xml ofbiz/ofbiz-plugins/trunk/ecommerce/template/cart/MicroCart.ftl ofbiz/ofbiz-plugins/trunk/ecommerce/template/catalog/KeywordSearchBox.ftl ofbiz/ofbiz-plugins/trunk/ecommerce/template/catalog/MiniLastViewedCategories.ftl ofbiz/ofbiz-plugins/trunk/ecommerce/template/content/Factoids.ftl ofbiz/ofbiz-plugins/trunk/ecommerce/template/includes/Footer.ftl ofbiz/ofbiz-plugins/trunk/ecommerce/template/includes/Header.ftl ofbiz/ofbiz-plugins/trunk/ecommerce/webapp/ecommerce/css/custom.css ofbiz/ofbiz-plugins/trunk/ecommerce/widget/CommonScreens.xml ofbiz/ofbiz-plugins/trunk/ecommerce/widget/Theme.xml Modified: ofbiz/ofbiz-plugins/trunk/ecommerce/data/EcommerceTypeData.xml URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-plugins/trunk/ecommerce/data/EcommerceTypeData.xml?rev=1819205&r1=1819204&r2=1819205&view=diff ============================================================================== --- ofbiz/ofbiz-plugins/trunk/ecommerce/data/EcommerceTypeData.xml (original) +++ ofbiz/ofbiz-plugins/trunk/ecommerce/data/EcommerceTypeData.xml Sun Dec 24 08:29:19 2017 @@ -23,7 +23,6 @@ under the License. <VisualTheme visualThemeId="EC_DEFAULT" visualThemeSetId="ECOMMERCE" description="OFBiz Ecommerce Standard Floating Layout"/> <delete> <VisualThemeResource visualThemeId="EC_DEFAULT" resourceTypeEnumId="VT_STYLESHEET" resourceValue="/ecommerce/images/blog.css" sequenceId="01"/> - <VisualThemeResource visualThemeId="EC_DEFAULT" resourceTypeEnumId="VT_STYLESHEET" resourceValue="/ecommerce/images/ecommain.css" sequenceId="02"/> <VisualThemeResource visualThemeId="EC_DEFAULT" resourceTypeEnumId="VT_STYLESHEET" resourceValue="/contentimages/css/contentForum.css" sequenceId="03"/> <VisualThemeResource visualThemeId="EC_DEFAULT" resourceTypeEnumId="VT_SHORTCUT_ICON" resourceValue="/images/ofbiz.ico" sequenceId="04"/> <VisualThemeResource visualThemeId="EC_DEFAULT" resourceTypeEnumId="VT_HDR_IMAGE_URL" resourceValue="/images/ofbiz_logo.png" sequenceId="05"/> Modified: ofbiz/ofbiz-plugins/trunk/ecommerce/template/cart/MicroCart.ftl URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-plugins/trunk/ecommerce/template/cart/MicroCart.ftl?rev=1819205&r1=1819204&r2=1819205&view=diff ============================================================================== --- ofbiz/ofbiz-plugins/trunk/ecommerce/template/cart/MicroCart.ftl (original) +++ ofbiz/ofbiz-plugins/trunk/ecommerce/template/cart/MicroCart.ftl Sun Dec 24 08:29:19 2017 @@ -42,8 +42,8 @@ under the License. <#else> <p>${uiLabelMap.OrderShoppingCartEmpty}</p> </#if> - <ul> - <li> + <ul class="list-inline"> + <li class="list-inline-item"> <a href="<@ofbizUrl>view/showcart</@ofbizUrl>">[${uiLabelMap.OrderViewCart}]</a> </li> <#if (shoppingCartSize > 0)> @@ -54,20 +54,20 @@ under the License. <#assign initialLocaleComplete = "en_US"> </#if> </#if> - <li id="quickCheckoutEnabled"> + <li class="list-inline-item" id="quickCheckoutEnabled"> <a href="<@ofbizUrl>quickcheckout</@ofbizUrl>">[${uiLabelMap.OrderCheckoutQuick}]</a> </li> - <li id="quickCheckoutDisabled" style="display:none" class="disabled"> + <li class="list-inline-item disabled" id="quickCheckoutDisabled" style="display:none"> [${uiLabelMap.OrderCheckoutQuick}] </li> - <li id="onePageCheckoutEnabled"> + <li class="list-inline-item" id="onePageCheckoutEnabled"> <a href="<@ofbizUrl>onePageCheckout</@ofbizUrl>">[${uiLabelMap.EcommerceOnePageCheckout}]</a> </li> - <li id="onePageCheckoutDisabled" style="display:none" class="disabled"> + <li class="list-inline-item disabled" id="onePageCheckoutDisabled" style="display:none"> [${uiLabelMap.EcommerceOnePageCheckout}] </li> <#if shoppingCart?has_content && (shoppingCart.getGrandTotal() > 0)> - <li id="microCartPayPalCheckout"> + <li class="list-inline-item" id="microCartPayPalCheckout"> <a href="<@ofbizUrl>setPayPalCheckout</@ofbizUrl>"> <img src="https://www.paypal.com/${initialLocaleComplete}/i/btn/btn_xpressCheckout.gif" alt="[PayPal Express Checkout]" @@ -76,8 +76,8 @@ under the License. </li> </#if> <#else> - <li class="disabled">[${uiLabelMap.OrderCheckoutQuick}]</li> - <li class="disabled">[${uiLabelMap.EcommerceOnePageCheckout}]</li> + <li class="list-inline-item disabled">[${uiLabelMap.OrderCheckoutQuick}]</li> + <li class="list-inline-item disabled">[${uiLabelMap.EcommerceOnePageCheckout}]</li> </#if> </ul> -</div> +</div> \ No newline at end of file Modified: ofbiz/ofbiz-plugins/trunk/ecommerce/template/catalog/KeywordSearchBox.ftl URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-plugins/trunk/ecommerce/template/catalog/KeywordSearchBox.ftl?rev=1819205&r1=1819204&r2=1819205&view=diff ============================================================================== --- ofbiz/ofbiz-plugins/trunk/ecommerce/template/catalog/KeywordSearchBox.ftl (original) +++ ofbiz/ofbiz-plugins/trunk/ecommerce/template/catalog/KeywordSearchBox.ftl Sun Dec 24 08:29:19 2017 @@ -19,7 +19,7 @@ under the License. <div id="keywordsearchbox" class="card"> <div class="card-header"> - ${uiLabelMap.ProductSearchCatalog}</li> + ${uiLabelMap.ProductSearchCatalog} </div> <div class="card-body"> <form name="keywordsearchform" id="keywordsearchbox_keywordsearchform" method="post" action="<@ofbizUrl>keywordsearch</@ofbizUrl>"> Modified: ofbiz/ofbiz-plugins/trunk/ecommerce/template/catalog/MiniLastViewedCategories.ftl URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-plugins/trunk/ecommerce/template/catalog/MiniLastViewedCategories.ftl?rev=1819205&r1=1819204&r2=1819205&view=diff ============================================================================== --- ofbiz/ofbiz-plugins/trunk/ecommerce/template/catalog/MiniLastViewedCategories.ftl (original) +++ ofbiz/ofbiz-plugins/trunk/ecommerce/template/catalog/MiniLastViewedCategories.ftl Sun Dec 24 08:29:19 2017 @@ -27,7 +27,7 @@ under the License. </#if> <div id="minilastviewedcategories" class="card"> <div class="card-header"> - ${uiLabelMap.EcommerceLastCategories}</li> + ${uiLabelMap.EcommerceLastCategories} <a href="<@ofbizUrl>clearLastViewed</@ofbizUrl>">[${uiLabelMap.CommonClear}]</a> </div> <div class="card-body"> Modified: ofbiz/ofbiz-plugins/trunk/ecommerce/template/content/Factoids.ftl URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-plugins/trunk/ecommerce/template/content/Factoids.ftl?rev=1819205&r1=1819204&r2=1819205&view=diff ============================================================================== --- ofbiz/ofbiz-plugins/trunk/ecommerce/template/content/Factoids.ftl (original) +++ ofbiz/ofbiz-plugins/trunk/ecommerce/template/content/Factoids.ftl Sun Dec 24 08:29:19 2017 @@ -32,7 +32,7 @@ under the License. <div id="factoids" class="card"> <div class="card-header"> - ${uiLabelMap.EcommerceFactoids}</li> + ${uiLabelMap.EcommerceFactoids} </div> <div class="card-body"> <ul> 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=1819205&r1=1819204&r2=1819205&view=diff ============================================================================== --- ofbiz/ofbiz-plugins/trunk/ecommerce/template/includes/Footer.ftl (original) +++ ofbiz/ofbiz-plugins/trunk/ecommerce/template/includes/Footer.ftl Sun Dec 24 08:29:19 2017 @@ -29,7 +29,7 @@ under the License. <img src="<@ofbizContentUrl>/images/valid-xhtml10.png</@ofbizContentUrl>" alt="Valid XHTML 1.0!"/> </a> </div> - <div class="p-2"> + <div class="p-2 text-center"> <a href="//ofbiz.apache.org">${uiLabelMap.EcommerceAboutUs}</a> <div>Copyright © 2001-${nowTimestamp?string("yyyy")} The Apache Software Foundation - <a href="//www.apache.org">www.apache.org</a> Modified: ofbiz/ofbiz-plugins/trunk/ecommerce/template/includes/Header.ftl URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-plugins/trunk/ecommerce/template/includes/Header.ftl?rev=1819205&r1=1819204&r2=1819205&view=diff ============================================================================== --- ofbiz/ofbiz-plugins/trunk/ecommerce/template/includes/Header.ftl (original) +++ ofbiz/ofbiz-plugins/trunk/ecommerce/template/includes/Header.ftl Sun Dec 24 08:29:19 2017 @@ -16,88 +16,103 @@ KIND, either express or implied. See th specific language governing permissions and limitations under the License. --> +<div class="container-fluid"> + <div class="row align-items-center"> + <div class="col"> + <a class="navbar-brand" href="#"> + <#if sessionAttributes.overrideLogo??> + <img src="<@ofbizContentUrl>${sessionAttributes.overrideLogo}</@ofbizContentUrl>" alt="Logo"/> + <#elseif catalogHeaderLogo??> + <img src="<@ofbizContentUrl>${catalogHeaderLogo}</@ofbizContentUrl>" alt="Logo"/> + <#elseif layoutSettings.VT_HDR_IMAGE_URL?has_content> + <img src="<@ofbizContentUrl>${layoutSettings.VT_HDR_IMAGE_URL}</@ofbizContentUrl>" alt="Logo"/> + </#if> + </a> + </div> + <div class="col text-center d-none d-lg-block"> + <#if !productStore??> + <h3>${uiLabelMap.EcommerceNoProductStore}</h3> + </#if> + <#if (productStore.title)??> + <h3>${productStore.title}</h3> + </#if> + <#if (productStore.subtitle)??> + <div id="company-subtitle">${productStore.subtitle}</div> + </#if> + <div> + <#if sessionAttributes.autoName?has_content> + <span class="text-success">${uiLabelMap.CommonWelcome} ${sessionAttributes.autoName}!</span> + (${uiLabelMap.CommonNotYou}? + <a href="<@ofbizUrl>autoLogout</@ofbizUrl>" class="linktext">${uiLabelMap.CommonClickHere}</a>) + <#else> + ${uiLabelMap.CommonWelcome}! + </#if> + </div> + </div> + <div class="col"> + ${screens.render("component://ecommerce/widget/CartScreens.xml#microcart")} + </div> + </div> +</div> -<nav class="navbar navbar-light bg-light"> - <a class="navbar-brand" href="#"> - <#if sessionAttributes.overrideLogo??> - <img src="<@ofbizContentUrl>${sessionAttributes.overrideLogo}</@ofbizContentUrl>" alt="Logo"/> - <#elseif catalogHeaderLogo??> - <img src="<@ofbizContentUrl>${catalogHeaderLogo}</@ofbizContentUrl>" alt="Logo"/> - <#elseif layoutSettings.VT_HDR_IMAGE_URL?has_content> - <img src="<@ofbizContentUrl>${layoutSettings.VT_HDR_IMAGE_URL}</@ofbizContentUrl>" alt="Logo"/> - </#if> - </a> - <div class="navbar-text"> - <#if !productStore??> - <h2>${uiLabelMap.EcommerceNoProductStore}</h2> - </#if> - <#if (productStore.title)??> - <h2>${productStore.title}</h2> - </#if> - <#if (productStore.subtitle)??> - <div id="company-subtitle">${productStore.subtitle}</div> - </#if> - <div id="welcome-message"> - <#if sessionAttributes.autoName?has_content> - ${uiLabelMap.CommonWelcome} ${sessionAttributes.autoName}! - (${uiLabelMap.CommonNotYou}? - <a href="<@ofbizUrl>autoLogout</@ofbizUrl>" class="linktext">${uiLabelMap.CommonClickHere}</a>) +<nav class="navbar navbar-expand-lg navbar-dark bg-dark"> + <button class="navbar-toggler" type="button" data-toggle="collapse" data-target="#navbarContent" aria-controls="navbarSupportedContent" aria-expanded="false" aria-label="Toggle navigation"> + <span class="navbar-toggler-icon"></span> + </button> + <div class="collapse navbar-collapse" id="navbarContent"> + <ul class="navbar-nav mr-auto"> + <#if userLogin?has_content && userLogin.userLoginId != "anonymous"> + <li class="nav-item"> + <a class="nav-link" href="<@ofbizUrl>logout</@ofbizUrl>">${uiLabelMap.CommonLogout}</a> + </li> <#else> - ${uiLabelMap.CommonWelcome}! + <li class="nav-item"> + <a class="nav-link" href="<@ofbizUrl>${checkLoginUrl}</@ofbizUrl>">${uiLabelMap.CommonLogin}</a> + </li> + <li class="nav-item"> + <a class="nav-link" href="<@ofbizUrl>newcustomer</@ofbizUrl>">${uiLabelMap.EcommerceRegister}</a> + </li> </#if> - </div> + <li class="nav-item"> + <#if userLogin?has_content && userLogin.userLoginId != "anonymous"> + <a class="nav-link" href="<@ofbizUrl>contactus</@ofbizUrl>">${uiLabelMap.CommonContactUs}</a> + <#else> + <a class="nav-link" href="<@ofbizUrl>AnonContactus</@ofbizUrl>">${uiLabelMap.CommonContactUs}</a> + </#if> + </li> + <li class="nav-item"> + <a class="nav-link" href="<@ofbizUrl>main</@ofbizUrl>">${uiLabelMap.CommonMain}</a> + </li> + </ul> + <ul class="navbar-nav ml-auto"> + <#if !userLogin?has_content || (userLogin.userLoginId)! != "anonymous"> + <li class="nav-item"> + <a class="nav-link" href="<@ofbizUrl>viewprofile</@ofbizUrl>">${uiLabelMap.CommonProfile}</a> + </li> + <li class="nav-item"> + <a class="nav-link" href="<@ofbizUrl>messagelist</@ofbizUrl>">${uiLabelMap.CommonMessages}</a> + </li> + <li class="nav-item"> + <a class="nav-link" href="<@ofbizUrl>ListQuotes</@ofbizUrl>">${uiLabelMap.OrderOrderQuotes}</a> + </li> + <li class="nav-item"> + <a class="nav-link" href="<@ofbizUrl>ListRequests</@ofbizUrl>">${uiLabelMap.OrderRequests}</a> + </li> + <li class="nav-item"> + <a class="nav-link" href="<@ofbizUrl>editShoppingList</@ofbizUrl>">${uiLabelMap.EcommerceShoppingLists}</a> + </li> + <li class="nav-item"> + <a class="nav-link" href="<@ofbizUrl>orderhistory</@ofbizUrl>">${uiLabelMap.EcommerceOrderHistory}</a> + </li> + </#if> + <#if catalogQuickaddUse> + <li class="nav-item"><a class="nav-link" href="<@ofbizUrl>quickadd</@ofbizUrl>">${uiLabelMap.CommonQuickAdd}</a></li> + </#if> + </ul> </div> - <span class="navbar-text"> - ${screens.render("component://ecommerce/widget/CartScreens.xml#microcart")} - </span> </nav> -<div class="d-flex justify-content-end bd-highlight quick-links ml-2 mr-2"> - <#if userLogin?has_content && userLogin.userLoginId != "anonymous"> - <div class="p-2 bd-highlight"> - <a href="<@ofbizUrl>logout</@ofbizUrl>">${uiLabelMap.CommonLogout}</a> - </div> - <#else> - <div class="p-2 bd-highlight"> - <a href="<@ofbizUrl>${checkLoginUrl}</@ofbizUrl>">${uiLabelMap.CommonLogin}</a> - </div> - <div class="p-2 bd-highlight"> - <a href="<@ofbizUrl>newcustomer</@ofbizUrl>">${uiLabelMap.EcommerceRegister}</a> - </div> - </#if> - <div class="p-2 bd-highlight"> - <#if userLogin?has_content && userLogin.userLoginId != "anonymous"> - <a href="<@ofbizUrl>contactus</@ofbizUrl>">${uiLabelMap.CommonContactUs}</a> - <#else> - <a href="<@ofbizUrl>AnonContactus</@ofbizUrl>">${uiLabelMap.CommonContactUs}</a> - </#if> - </div> - <div class="mr-auto p-2 bd-highlight"> - <a href="<@ofbizUrl>main</@ofbizUrl>">${uiLabelMap.CommonMain}</a> - </div> - <!-- NOTE: these are in reverse order because they are stacked right to left instead of left to right --> - <#if !userLogin?has_content || (userLogin.userLoginId)! != "anonymous"> - <div class="p-2 bd-highlight"> - <a href="<@ofbizUrl>viewprofile</@ofbizUrl>">${uiLabelMap.CommonProfile}</a> - </div> - <div class="p-2 bd-highlight"> - <a href="<@ofbizUrl>messagelist</@ofbizUrl>">${uiLabelMap.CommonMessages}</a> - </div> - <div class="p-2 bd-highlight"> - <a href="<@ofbizUrl>ListQuotes</@ofbizUrl>">${uiLabelMap.OrderOrderQuotes}</a> - </div> - <div class="p-2 bd-highlight"> - <a href="<@ofbizUrl>ListRequests</@ofbizUrl>">${uiLabelMap.OrderRequests}</a> - </div> - <div class="p-2 bd-highlight"> - <a href="<@ofbizUrl>editShoppingList</@ofbizUrl>">${uiLabelMap.EcommerceShoppingLists}</a> - </div> - <div class="p-2 bd-highlight"> - <a href="<@ofbizUrl>orderhistory</@ofbizUrl>">${uiLabelMap.EcommerceOrderHistory}</a> - </div> - </#if> - <#if catalogQuickaddUse> - <div class="p-2 bd-highlight"><a href="<@ofbizUrl>quickadd</@ofbizUrl>">${uiLabelMap.CommonQuickAdd}</a></div> - </#if> -</div> \ No newline at end of file + + + 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=1819205&r1=1819204&r2=1819205&view=diff ============================================================================== --- ofbiz/ofbiz-plugins/trunk/ecommerce/webapp/ecommerce/css/custom.css (original) +++ ofbiz/ofbiz-plugins/trunk/ecommerce/webapp/ecommerce/css/custom.css Sun Dec 24 08:29:19 2017 @@ -17,9 +17,13 @@ * under the License. */ -#ecomMainContainer{ - margin-top:10px!important; +#ecom-mainarea{ padding:10px; + background: #FFF; + margin-top: 20px; + position: relative; + text-align: left; + flex: 1; } .card { margin-bottom:20px!important; @@ -68,11 +72,20 @@ label.required:after { margin-left:2px; } -/*TODO: We will remove this when we eliminate ecommain.css.*/ -.card .card-body dl.row > dd { - margin-left: 0; -} - .amount { text-align:right; -} \ No newline at end of file +} + +.navbar-dark .navbar-nav .nav-link { + color:#ffffff!important; +} +.navbar-dark .nav-item:hover, .navbar-dark .nav-item .nav-link:hover{ + background: #555555!important; +} + +#parentContainer { + display: flex; + min-height: 100vh; + flex-direction: column; +} + Modified: ofbiz/ofbiz-plugins/trunk/ecommerce/widget/CommonScreens.xml URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-plugins/trunk/ecommerce/widget/CommonScreens.xml?rev=1819205&r1=1819204&r2=1819205&view=diff ============================================================================== --- ofbiz/ofbiz-plugins/trunk/ecommerce/widget/CommonScreens.xml (original) +++ ofbiz/ofbiz-plugins/trunk/ecommerce/widget/CommonScreens.xml Sun Dec 24 08:29:19 2017 @@ -59,7 +59,6 @@ under the License. <set field="layoutSettings.styleSheets[+0]" value="/common/js/jquery/plugins/datetimepicker/jquery-ui-timepicker-addon-1.6.3.min.css" global="true" /> <set field="layoutSettings.styleSheets[+0]" value="/ecommerce/css/bootstrap.min.css" global="true" /> - <set field="layoutSettings.styleSheets[+0]" value="/ecommerce/css/custom.css" global="true" /> <set field="layoutSettings.javaScripts[]" value="/ecommerce/js/popper.js" global="true"/> <set field="layoutSettings.javaScripts[]" value="/ecommerce/js/bootstrap.min.js" global="true"/> <set field="layoutSettings.javaScripts[]" value="/ecommerce/js/bootstrap.bundle.min.js" global="true"/> Modified: ofbiz/ofbiz-plugins/trunk/ecommerce/widget/Theme.xml URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-plugins/trunk/ecommerce/widget/Theme.xml?rev=1819205&r1=1819204&r2=1819205&view=diff ============================================================================== --- ofbiz/ofbiz-plugins/trunk/ecommerce/widget/Theme.xml (original) +++ ofbiz/ofbiz-plugins/trunk/ecommerce/widget/Theme.xml Sun Dec 24 08:29:19 2017 @@ -33,7 +33,7 @@ under the License. <theme-properties> <!--Css style--> <property name="VT_STYLESHEET['add']" value="/ecommerce/images/blog.css"/> - <property name="VT_STYLESHEET['add']" value="/ecommerce/images/ecommain.css"/> + <property name="VT_STYLESHEET['add']" value="/ecommerce/css/custom.css"/> <property name="VT_STYLESHEET['add']" value="/contentimages/css/contentForum.css"/> <!--header image --> <property name="VT_HDR_IMAGE_URL" value="/images/ofbiz_logo.png"/> |
Free forum by Nabble | Edit this page |