svn commit: r1816840 - in /ofbiz/ofbiz-plugins/trunk/eco
Locked
svn commit: r1816840 - in /ofbiz/ofbiz-plugins/trunk/eco
 
|
Author: deepak
Date: Fri Dec 1 11:36:44 2017 New Revision: 1816840 URL: http://svn.apache.org/viewvc?rev=1816840&view=rev Log: Improved: Update markup of Home page according to standard markup given by Bootstrap v4.0.0 (OFBIZ-10011) Applied OFBIZ-10011.patch as there are some improvement in other patch Thanks Mayank, Saurabh and Parakh for your contribution Added: ofbiz/ofbiz-plugins/trunk/ecommerce/webapp/ecommerce/css/custom.css (with props) Modified: 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/ChooseCatalog.ftl ofbiz/ofbiz-plugins/trunk/ecommerce/template/catalog/MiniAssocProds.ftl ofbiz/ofbiz-plugins/trunk/ecommerce/template/catalog/MiniLastProductSearches.ftl ofbiz/ofbiz-plugins/trunk/ecommerce/template/catalog/MiniLastViewedCategories.ftl ofbiz/ofbiz-plugins/trunk/ecommerce/template/catalog/PopularTags.ftl ofbiz/ofbiz-plugins/trunk/ecommerce/template/catalog/ProductCategories.ftl ofbiz/ofbiz-plugins/trunk/ecommerce/template/content/ContentCategories.ftl ofbiz/ofbiz-plugins/trunk/ecommerce/template/content/Factoids.ftl ofbiz/ofbiz-plugins/trunk/ecommerce/template/content/MiniPoll.ftl ofbiz/ofbiz-plugins/trunk/ecommerce/template/customer/MiniSignUpForContactList.ftl ofbiz/ofbiz-plugins/trunk/ecommerce/template/forum/Forums.ftl ofbiz/ofbiz-plugins/trunk/ecommerce/template/includes/Language.ftl ofbiz/ofbiz-plugins/trunk/ecommerce/widget/CommonScreens.xml 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=1816840&r1=1816839&r2=1816840&view=diff ============================================================================== --- ofbiz/ofbiz-plugins/trunk/ecommerce/template/blog/Blogs.ftl (original) +++ ofbiz/ofbiz-plugins/trunk/ecommerce/template/blog/Blogs.ftl Fri Dec 1 11:36:44 2017 @@ -17,15 +17,12 @@ specific language governing permissions under the License. --> -<div id="browse-blogs" class="screenlet"> - <div class="screenlet-title-bar"> - <ul> - <li class="h3">${uiLabelMap.ProductBrowseBlogs}</li> - </ul> - <br class="clear"/> +<div id="browse-blogs" class="card"> + <div class="card-header"> + ${uiLabelMap.ProductBrowseBlogs} </div> - <div class="screenlet-body"> - <ul class="browsecategorylist"> + <div class="card-body"> + <ul> <#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=1816840&r1=1816839&r2=1816840&view=diff ============================================================================== --- ofbiz/ofbiz-plugins/trunk/ecommerce/template/cart/MiniPromoText.ftl (original) +++ ofbiz/ofbiz-plugins/trunk/ecommerce/template/cart/MiniPromoText.ftl Fri Dec 1 11:36:44 2017 @@ -18,14 +18,11 @@ under the License. --> <#if showPromoText> - <div id="minipromotext" class="screenlet"> - <div class="screenlet-title-bar"> - <ul> - <li class="h3">${uiLabelMap.OrderSpecialOffers}</li> - </ul> - <br class="clear"/> + <div id="minipromotext" class="card"> + <div class="card-header"> + ${uiLabelMap.OrderSpecialOffers} </div> - <div class="screenlet-body"> + <div class="card-body"> <#-- show promotions text --> <ul> <#list productPromos as productPromo> @@ -38,7 +35,7 @@ under the License. </li> </#list> <li> - <a href="<@ofbizUrl>showAllPromotions</@ofbizUrl>" class="button"> + <a href="<@ofbizUrl>showAllPromotions</@ofbizUrl>" class="btn btn-outline-secondary"> ${uiLabelMap.OrderViewAllPromotions} </a> </li> Modified: ofbiz/ofbiz-plugins/trunk/ecommerce/template/catalog/ChooseCatalog.ftl URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-plugins/trunk/ecommerce/template/catalog/ChooseCatalog.ftl?rev=1816840&r1=1816839&r2=1816840&view=diff ============================================================================== --- ofbiz/ofbiz-plugins/trunk/ecommerce/template/catalog/ChooseCatalog.ftl (original) +++ ofbiz/ofbiz-plugins/trunk/ecommerce/template/catalog/ChooseCatalog.ftl Fri Dec 1 11:36:44 2017 @@ -23,25 +23,26 @@ under the License. <#-- Only show if there is more than 1 (one) catalog, no sense selecting when there is only one option... --> <#if (catalogCol?size > 1)> - <div id="choosecatalog" class="screenlet"> - <div class="screenlet-title-bar"> - <ul> - <li class="h3">${uiLabelMap.ProductChooseCatalog}</li> - </ul> - <br class="clear"/> - </div> - <div class="screenlet-body"> - <form name="choosecatalogform" method="post" action="<@ofbizUrl>main</@ofbizUrl>"> - <select name='CURRENT_CATALOG_ID' class='selectBox' onchange="submit()"> - <option value='${currentCatalogId}'>${currentCatalogName}</option> - <option value='${currentCatalogId}'></option> - <#list catalogCol as catalogId> - <#assign thisCatalogName = - Static["org.apache.ofbiz.product.catalog.CatalogWorker"].getCatalogName(request, catalogId)> - <option value='${catalogId}'>${thisCatalogName}</option> - </#list> - </select> - </form> - </div> +<div id="choosecatalog" class="card"> + <div class="card-header"> + ${uiLabelMap.ProductChooseCatalog} </div> + <div class="card-body"> + <form name="choosecatalogform" method="post" action="<@ofbizUrl>main</@ofbizUrl>"> + <select name='CURRENT_CATALOG_ID' class='selectBox form-control' onchange="submit()"> + <option value='${currentCatalogId}'>${currentCatalogName}</option> + <option value='${currentCatalogId}'></option> + <#list catalogCol as catalogId> + <#assign thisCatalogName = + Static["org.apache.ofbiz.product.catalog.CatalogWorker"].getCatalogName(request, catalogId)> + <option value='${catalogId}'>${thisCatalogName}</option> + </#list> + </select> + </form> + </div> +</div> + + + + </#if> Modified: ofbiz/ofbiz-plugins/trunk/ecommerce/template/catalog/MiniAssocProds.ftl URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-plugins/trunk/ecommerce/template/catalog/MiniAssocProds.ftl?rev=1816840&r1=1816839&r2=1816840&view=diff ============================================================================== --- ofbiz/ofbiz-plugins/trunk/ecommerce/template/catalog/MiniAssocProds.ftl (original) +++ ofbiz/ofbiz-plugins/trunk/ecommerce/template/catalog/MiniAssocProds.ftl Fri Dec 1 11:36:44 2017 @@ -20,11 +20,13 @@ under the License. <#assign associatedProducts = Static["org.apache.ofbiz.order.shoppingcart.product.ProductDisplayWorker"] .getRandomCartProductAssoc(request, true)!> <#if associatedProducts?has_content> - <div id="miniassocproducts" class="screenlet"> - <h3>${uiLabelMap.EcommerceYouMightLike}...</h3> - <div class="screenlet-body"> + <div id="miniassocproducts" class="card"> + <div class="card-header"> + ${uiLabelMap.EcommerceYouMightLike}... + </div> + <div class="card-body"> <#-- random complementary products --> - <ul class="browsecategorylist"> + <ul> <#list associatedProducts as miniProduct> <li class="browsecategorytext"> ${setRequestAttribute("miniProdQuantity", 1)} Modified: ofbiz/ofbiz-plugins/trunk/ecommerce/template/catalog/MiniLastProductSearches.ftl URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-plugins/trunk/ecommerce/template/catalog/MiniLastProductSearches.ftl?rev=1816840&r1=1816839&r2=1816840&view=diff ============================================================================== --- ofbiz/ofbiz-plugins/trunk/ecommerce/template/catalog/MiniLastProductSearches.ftl (original) +++ ofbiz/ofbiz-plugins/trunk/ecommerce/template/catalog/MiniLastProductSearches.ftl Fri Dec 1 11:36:44 2017 @@ -26,7 +26,7 @@ under the License. <#else> <#assign limit=(searchOptionsHistoryList?size-1)/> </#if> - <div id="minilastproductsearches" class="screenlet"> + <div id="minilastproductsearches" class="card"> <div class="boxlink"> <a href="<@ofbizUrl>clearLastViewed</@ofbizUrl>" class="lightbuttontextsmall"> [${uiLabelMap.CommonClear}] @@ -37,7 +37,8 @@ under the License. </a> </#if> </div> - <h3>${uiLabelMap.OrderLastSearches}...</h3> + <div class="card-header">${uiLabelMap.OrderLastSearches}...</div> + <div class="card-body"> <ul> <#list searchOptionsHistoryList[0..limit] as searchOptions> <#-- searchOptions type is ProductSearchSession.ProductSearchOptions --> @@ -46,9 +47,9 @@ under the License. <ul> <li> <a href="<@ofbizUrl>setCurrentSearchFromHistoryAndSearch?searchHistoryIndex=${searchOptions_index}&clearSearch=N</@ofbizUrl>" - class="button">${uiLabelMap.CommonSearch}</a> + class="btn btn-outline-secondary btn-sm">${uiLabelMap.CommonSearch}</a> <a href="<@ofbizUrl>setCurrentSearchFromHistory?searchHistoryIndex=${searchOptions_index}</@ofbizUrl>" - class="button">${uiLabelMap.CommonRefine}</a> + class="btn btn-outline-secondary btn-sm">${uiLabelMap.CommonRefine}</a> </li> <#assign constraintStrings = searchOptions.searchGetConstraintStrings(false, delegator, locale)> <#list constraintStrings as constraintString> @@ -58,5 +59,6 @@ under the License. </li> </#list> </ul> + </div> </div> </#if> 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=1816840&r1=1816839&r2=1816840&view=diff ============================================================================== --- ofbiz/ofbiz-plugins/trunk/ecommerce/template/catalog/MiniLastViewedCategories.ftl (original) +++ ofbiz/ofbiz-plugins/trunk/ecommerce/template/catalog/MiniLastViewedCategories.ftl Fri Dec 1 11:36:44 2017 @@ -25,17 +25,12 @@ under the License. <#else> <#assign limit=(lastViewedCategories?size-1)/> </#if> - <div id="minilastviewedcategories" class="screenlet"> - <div class="screenlet-title-bar"> - <ul> - <li class="h3">${uiLabelMap.EcommerceLastCategories}</li> - <li> - <a href="<@ofbizUrl>clearLastViewed</@ofbizUrl>">[${uiLabelMap.CommonClear}]</a> - </li> - </ul> - <br class="clear"/> + <div id="minilastviewedcategories" class="card"> + <div class="card-header"> + ${uiLabelMap.EcommerceLastCategories}</li> + <a href="<@ofbizUrl>clearLastViewed</@ofbizUrl>">[${uiLabelMap.CommonClear}]</a> </div> - <div class="screenlet-body"> + <div class="card-body"> <ul class="browsecategorylist"> <#list lastViewedCategories[0..limit] as categoryId> <#assign category = delegator.findOne("ProductCategory", Modified: ofbiz/ofbiz-plugins/trunk/ecommerce/template/catalog/PopularTags.ftl URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-plugins/trunk/ecommerce/template/catalog/PopularTags.ftl?rev=1816840&r1=1816839&r2=1816840&view=diff ============================================================================== --- ofbiz/ofbiz-plugins/trunk/ecommerce/template/catalog/PopularTags.ftl (original) +++ ofbiz/ofbiz-plugins/trunk/ecommerce/template/catalog/PopularTags.ftl Fri Dec 1 11:36:44 2017 @@ -18,14 +18,11 @@ under the License. --> <#if tagCloudList?has_content> - <div id="populartags" class="screenlet"> - <div class="screenlet-title-bar"> - <ul> - <li class="h3">${uiLabelMap.EcommerceTags}</li> - </ul> - <br class="clear"/> + <div id="populartags" class="card"> + <div class="card-header"> + ${uiLabelMap.EcommerceTags} </div> - <div class="screenlet-body"> + <div class="card-body"> <#list tagCloudList as tagCloud> <a style="font-size: ${tagCloud.fontSize}pt;" href="<@ofbizUrl>tagsearch?SEARCH_STRING=${tagCloud.tag}&keywordTypeId=KWT_TAG&statusId=KW_APPROVED</@ofbizUrl>"> Modified: ofbiz/ofbiz-plugins/trunk/ecommerce/template/catalog/ProductCategories.ftl URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-plugins/trunk/ecommerce/template/catalog/ProductCategories.ftl?rev=1816840&r1=1816839&r2=1816840&view=diff ============================================================================== --- ofbiz/ofbiz-plugins/trunk/ecommerce/template/catalog/ProductCategories.ftl (original) +++ ofbiz/ofbiz-plugins/trunk/ecommerce/template/catalog/ProductCategories.ftl Fri Dec 1 11:36:44 2017 @@ -213,12 +213,10 @@ </script> -<div id="quickadd" class="screenlet"> - <div class="screenlet-title-bar"> - <ul> - <li class="h3">${uiLabelMap.ProductCategories}</li> - </ul> +<div id="quickadd" class="card"> + <div class="card-header"> + ${uiLabelMap.ProductCategories} </div> - <div class="screenlet-body" id="tree"> + <div class="card-body" id="tree"> </div> </div> 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=1816840&r1=1816839&r2=1816840&view=diff ============================================================================== --- ofbiz/ofbiz-plugins/trunk/ecommerce/template/content/ContentCategories.ftl (original) +++ ofbiz/ofbiz-plugins/trunk/ecommerce/template/content/ContentCategories.ftl Fri Dec 1 11:36:44 2017 @@ -30,15 +30,12 @@ under the License. </#if> </#if> -<div id="content_catagories" class="screenlet"> - <div class="screenlet-title-bar"> - <ul> - <li class="h3">${uiLabelMap.ProductBrowseContent}</li> - </ul> - <br class="clear"/> +<div id="content_catagories" class="card"> + <div class="card-header"> + ${uiLabelMap.ProductBrowseContent} </div> - <div class="screenlet-body"> - <ul class="browsecategorylist"> + <div class="card-body"> + <ul> <#assign count_1=0/> <@loopSubContent contentId=contentRootId viewIndex=0 viewSize=9999 orderBy="contentName"> <li class="browsecategorytext"> 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=1816840&r1=1816839&r2=1816840&view=diff ============================================================================== --- ofbiz/ofbiz-plugins/trunk/ecommerce/template/content/Factoids.ftl (original) +++ ofbiz/ofbiz-plugins/trunk/ecommerce/template/content/Factoids.ftl Fri Dec 1 11:36:44 2017 @@ -30,15 +30,12 @@ under the License. </#if> </#if> -<div id="factoids" class="screenlet"> - <div class="screenlet-title-bar"> - <ul> - <li class="h3">${uiLabelMap.EcommerceFactoids}</li> - </ul> - <br class="clear"/> +<div id="factoids" class="card"> + <div class="card-header"> + ${uiLabelMap.EcommerceFactoids}</li> </div> - <div class="screenlet-body"> - <ul class="browsecategorylist"> + <div class="card-body"> + <ul> <#assign count_1=0/> <@limitedSubContent contentId=factoidRootId viewIndex=0 viewSize=9999 orderBy="contentName" limitSize="2"> <li class="browsecategorytext"> Modified: ofbiz/ofbiz-plugins/trunk/ecommerce/template/content/MiniPoll.ftl URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-plugins/trunk/ecommerce/template/content/MiniPoll.ftl?rev=1816840&r1=1816839&r2=1816840&view=diff ============================================================================== --- ofbiz/ofbiz-plugins/trunk/ecommerce/template/content/MiniPoll.ftl (original) +++ ofbiz/ofbiz-plugins/trunk/ecommerce/template/content/MiniPoll.ftl Fri Dec 1 11:36:44 2017 @@ -24,14 +24,11 @@ under the License. </#if> <#if randomSurvey?has_content> - <div id="minipoll" class="screenlet"> - <div class="screenlet-title-bar"> - <ul> - <li class="h3">${randomSurvey.getSurveyName()!}</li> - </ul> - <br class="clear"/> + <div id="minipoll" class="card"> + <div class="card-header"> + ${randomSurvey.getSurveyName()!} </div> - <div class="screenlet-body"> + <div class="card-body"> <form method="post" action="<@ofbizUrl>minipoll<#if requestAttributes._CURRENT_VIEW_??>/${requestAttributes._CURRENT_VIEW_}</#if></@ofbizUrl>" style="margin: 0;"> Modified: ofbiz/ofbiz-plugins/trunk/ecommerce/template/customer/MiniSignUpForContactList.ftl URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-plugins/trunk/ecommerce/template/customer/MiniSignUpForContactList.ftl?rev=1816840&r1=1816839&r2=1816840&view=diff ============================================================================== --- ofbiz/ofbiz-plugins/trunk/ecommerce/template/customer/MiniSignUpForContactList.ftl (original) +++ ofbiz/ofbiz-plugins/trunk/ecommerce/template/customer/MiniSignUpForContactList.ftl Fri Dec 1 11:36:44 2017 @@ -19,7 +19,7 @@ under the License. <#-- A simple macro that builds the contact list --> <#macro contactList publicEmailContactLists> - <select name="contactListId" class="selectBox" style="width:134px"> + <select name="contactListId" class="selectBox form-control"> <#list publicEmailContactLists as publicEmailContactList> <#assign publicContactMechType = publicEmailContactList.contactList.getRelatedOne("ContactMechType", true)!> <option value="${publicEmailContactList.contactList.contactListId}"> @@ -44,30 +44,26 @@ under the License. } </script> -<div id="miniSignUpForContactList" class="screenlet"> - <div class="screenlet-title-bar"> - <ul> - <li class="h3">${uiLabelMap.EcommerceSignUpForContactList}</li> - </ul> - <br class="clear"/> +<div id="miniSignUpForContactList" class="card"> + <div class="card-header"> + ${uiLabelMap.EcommerceSignUpForContactList} </div> - <div class="screenlet-body"> + <div class="card-body"> <#if sessionAttributes.autoName?has_content> <#-- The visitor potentially has an account and party id --> <#if userLogin?has_content && userLogin.userLoginId != "anonymous"> <#-- They are logged in so lets present the form to sign up with their email address --> <form method="post" action="<@ofbizUrl>createContactListParty</@ofbizUrl>" name="signUpForContactListForm" id="signUpForContactListForm"> - <fieldset> <#assign contextPath = request.getContextPath()> <input type="hidden" name="baseLocation" value="${contextPath}"/> <input type="hidden" name="partyId" value="${partyId}"/> <input type="hidden" id="statusId" name="statusId" value="CLPT_PENDING"/> <p>${uiLabelMap.EcommerceSignUpForContactListComments}</p> - <div> + <div class="form-group"> <@contactList publicEmailContactLists=publicEmailContactLists/> </div> - <div> + <div class="form-group"> <label for="preferredContactMechId">${uiLabelMap.CommonEmail} *</label> <select id="preferredContactMechId" name="preferredContactMechId" class="selectBox"> <#list partyAndContactMechList as partyAndContactMech> @@ -86,12 +82,9 @@ under the License. </#list> </select> </div> - <div> - <input type="submit" value="${uiLabelMap.EcommerceSubscribe}"/> - <input type="button" value="${uiLabelMap.EcommerceUnsubscribe}" - onclick="javascript:unsubscribeByContactMech();"/> - </div> - </fieldset> + <input type="submit" class="form-control btn btn-outline-secondary" value="${uiLabelMap.EcommerceSubscribe}"/> + <input type="button" class"form-control btn btn-outline-secondary" value="${uiLabelMap.EcommerceUnsubscribe}" + onclick="javascript:unsubscribeByContactMech();"/>ss </form> <#else> <#-- Not logged in so ask them to log in and then sign up or clear the user association --> @@ -105,7 +98,6 @@ under the License. <#-- There is no party info so just offer an anonymous (non-partyId) related newsletter sign up --> <form method="post" action="<@ofbizUrl>signUpForContactList</@ofbizUrl>" name="signUpForContactListForm" id="signUpForContactListForm"> - <fieldset> <#assign contextPath = request.getContextPath()> <input type="hidden" name="baseLocation" value="${contextPath}"/> <input type="hidden" id="statusId" name="statusId"/> @@ -115,13 +107,10 @@ under the License. </div> <div> <label for="email">${uiLabelMap.CommonEmail} *</label> - <input id="email" name="email" class="required" type="text"/> - </div> - <div> - <input type="submit" value="${uiLabelMap.EcommerceSubscribe}"/> - <input type="button" value="${uiLabelMap.EcommerceUnsubscribe}" onclick="javascript:unsubscribe();"/> + <input id="email" name="email" class="required form-control" type="text"/> </div> - </fieldset> + <input type="submit" class="btn btn-outline-secondary" value="${uiLabelMap.EcommerceSubscribe}"/> + <input type="button" class="btn btn-outline-secondary" value="${uiLabelMap.EcommerceUnsubscribe}" onclick="javascript:unsubscribe();"/> </form> </#if> </div> 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=1816840&r1=1816839&r2=1816840&view=diff ============================================================================== --- ofbiz/ofbiz-plugins/trunk/ecommerce/template/forum/Forums.ftl (original) +++ ofbiz/ofbiz-plugins/trunk/ecommerce/template/forum/Forums.ftl Fri Dec 1 11:36:44 2017 @@ -17,15 +17,12 @@ specific language governing permissions under the License. --> -<div id="browse-forums" class="screenlet"> - <div class="screenlet-title-bar"> - <ul> - <li class="h3">${uiLabelMap.ProductBrowseForums}</li> - </ul> - <br class="clear"/> +<div id="browse-forums" class="card"> + <div class="card-header"> + ${uiLabelMap.ProductBrowseForums}</li> </div> - <div class="screenlet-body"> - <ul class="browsecategorylist"> + <div class="card-body"> + <ul> <#list forums as forum> <li class="browsecategorytext"> <a href="<@ofbizUrl>showforum?forumId=${forum.contentId}</@ofbizUrl>" Modified: ofbiz/ofbiz-plugins/trunk/ecommerce/template/includes/Language.ftl URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-plugins/trunk/ecommerce/template/includes/Language.ftl?rev=1816840&r1=1816839&r2=1816840&view=diff ============================================================================== --- ofbiz/ofbiz-plugins/trunk/ecommerce/template/includes/Language.ftl (original) +++ ofbiz/ofbiz-plugins/trunk/ecommerce/template/includes/Language.ftl Fri Dec 1 11:36:44 2017 @@ -17,16 +17,13 @@ specific language governing permissions under the License. --> -<div id="choose-language" class="screenlet"> - <div class="screenlet-title-bar"> - <ul> - <li class="h3">${uiLabelMap.CommonLanguageTitle}</li> - </ul> - <br class="clear"/> +<div id="choose-language" class="card"> + <div class="card-header"> + ${uiLabelMap.CommonLanguageTitle} </div> - <div class="screenlet-body"> + <div class="card-body"> <form method="post" name="chooseLanguage" action="<@ofbizUrl>setSessionLocale</@ofbizUrl>"> - <select name="newLocale" class="selectBox" style="width:95%" onchange="submit()"> + <select name="newLocale" class="selectBox form-control" onchange="submit()"> <#assign availableLocales = Static["org.apache.ofbiz.base.util.UtilMisc"].availableLocales()/> <#list availableLocales as availableLocale> <#assign langAttr = availableLocale.toString()?replace("_", "-")> Added: 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=1816840&view=auto ============================================================================== --- ofbiz/ofbiz-plugins/trunk/ecommerce/webapp/ecommerce/css/custom.css (added) +++ ofbiz/ofbiz-plugins/trunk/ecommerce/webapp/ecommerce/css/custom.css Fri Dec 1 11:36:44 2017 @@ -0,0 +1,10 @@ +#ecomMainContainer{ + margin-top:10px!important; + padding:10px; +} +.card { + margin-bottom:10px!important; +} +.d-flex.justify-content-center a { + margin-bottom: 10px; +} \ No newline at end of file Propchange: ofbiz/ofbiz-plugins/trunk/ecommerce/webapp/ecommerce/css/custom.css ------------------------------------------------------------------------------ svn:eol-style = native Propchange: ofbiz/ofbiz-plugins/trunk/ecommerce/webapp/ecommerce/css/custom.css ------------------------------------------------------------------------------ svn:keywords = Date Rev Author URL Id Propchange: ofbiz/ofbiz-plugins/trunk/ecommerce/webapp/ecommerce/css/custom.css ------------------------------------------------------------------------------ svn:mime-type = text/css Modified: ofbiz/ofbiz-plugins/trunk/ecommerce/widget/CommonScreens.xml URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-plugins/trunk/ecommerce/widget/CommonScreens.xml?rev=1816840&r1=1816839&r2=1816840&view=diff ============================================================================== --- ofbiz/ofbiz-plugins/trunk/ecommerce/widget/CommonScreens.xml (original) +++ ofbiz/ofbiz-plugins/trunk/ecommerce/widget/CommonScreens.xml Fri Dec 1 11:36:44 2017 @@ -55,6 +55,7 @@ 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/bootstrap.min.js" global="true"/> <set field="layoutSettings.javaScripts[]" value="/ecommerce/js/bootstrap.bundle.min.js" global="true"/> <script location="component://ecommerce/groovyScripts/EcommerceSetup.groovy"/> |
«
Return to OFBiz - Commits
|
1 view|%1 views
| Free forum by Nabble | Edit this page |