svn commit: r737506 - in /ofbiz/trunk: applications/ecommerce/webapp/
Locked
svn commit: r737506 - in /ofbiz/trunk: applications/ecommerce/webapp/
 
|
Author: jleroux
Date: Sun Jan 25 11:54:13 2009 New Revision: 737506 URL: http://svn.apache.org/viewvc?rev=737506&view=rev Log: A patch from Bruno Busco "Visual Themes for Ecommerce" '(https://issues.apache.org/jira/browse/OFBIZ-2106) - OFBIZ-2106 + 2 images added Added: ofbiz/trunk/framework/images/webapp/images/bg_bullet_full_2.gif (with props) ofbiz/trunk/framework/images/webapp/images/ecdefaulttheme.jpg (with props) Modified: ofbiz/trunk/applications/ecommerce/webapp/ecommerce/blog/blogs.ftl ofbiz/trunk/applications/ecommerce/webapp/ecommerce/cart/minipromotext.ftl ofbiz/trunk/applications/ecommerce/webapp/ecommerce/catalog/minilastproductsearches.ftl ofbiz/trunk/applications/ecommerce/webapp/ecommerce/catalog/minilastviewedcategories.ftl ofbiz/trunk/applications/ecommerce/webapp/ecommerce/catalog/miniproductsummary.ftl ofbiz/trunk/applications/ecommerce/webapp/ecommerce/catalog/sidedeepcategory.ftl ofbiz/trunk/applications/ecommerce/webapp/ecommerce/content/content_categories.ftl ofbiz/trunk/applications/ecommerce/webapp/ecommerce/content/factoids.ftl ofbiz/trunk/applications/ecommerce/webapp/ecommerce/content/recentlyviewed.ftl ofbiz/trunk/applications/ecommerce/webapp/ecommerce/customer/miniSignUpForContactList.ftl ofbiz/trunk/applications/ecommerce/webapp/ecommerce/forum/forums.ftl ofbiz/trunk/applications/order/webapp/ordermgr/entry/cart/minicart.ftl ofbiz/trunk/applications/order/webapp/ordermgr/entry/catalog/breadcrumbs.ftl ofbiz/trunk/applications/order/webapp/ordermgr/entry/catalog/sidedeepcategory.ftl ofbiz/trunk/applications/product/webapp/catalog/find/sidecatalogs.ftl ofbiz/trunk/applications/product/webapp/catalog/find/sidedeepcategory.ftl ofbiz/trunk/framework/images/webapp/images/ecommain.css ofbiz/trunk/framework/images/webapp/images/maincss.css Modified: ofbiz/trunk/applications/ecommerce/webapp/ecommerce/blog/blogs.ftl URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/ecommerce/webapp/ecommerce/blog/blogs.ftl?rev=737506&r1=737505&r2=737506&view=diff ============================================================================== --- ofbiz/trunk/applications/ecommerce/webapp/ecommerce/blog/blogs.ftl (original) +++ ofbiz/trunk/applications/ecommerce/webapp/ecommerce/blog/blogs.ftl Sun Jan 25 11:54:13 2009 @@ -22,10 +22,12 @@ <div class="boxhead">${uiLabelMap.ProductBrowseBlogs}</div> </div> <div class="screenlet-body"> + <div class="browsecategorylist"> <#list blogs as blog> - <div class="browsecategorytext" style="margin-left: 10px"> - - <a href="<@ofbizUrl>MainBlog?blogContentId=${blog.contentId}</@ofbizUrl>" class="browsecategorybutton">${blog.contentName}</a> + <div class="browsecategorytext"> + <a href="<@ofbizUrl>MainBlog?blogContentId=${blog.contentId}</@ofbizUrl>" class="browsecategorybutton">${blog.contentName}</a> </div> </#list> + </div> </div> </div> Modified: ofbiz/trunk/applications/ecommerce/webapp/ecommerce/cart/minipromotext.ftl URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/ecommerce/webapp/ecommerce/cart/minipromotext.ftl?rev=737506&r1=737505&r2=737506&view=diff ============================================================================== --- ofbiz/trunk/applications/ecommerce/webapp/ecommerce/cart/minipromotext.ftl (original) +++ ofbiz/trunk/applications/ecommerce/webapp/ecommerce/cart/minipromotext.ftl Sun Jan 25 11:54:13 2009 @@ -25,13 +25,13 @@ <div class="screenlet-body"> <#-- show promotions text --> <#list productPromos as productPromo> - <div class="tabletext"><a href="<@ofbizUrl>showPromotionDetails?productPromoId=${productPromo.productPromoId}</@ofbizUrl>" class="linktext">${uiLabelMap.CommonDetails}</a> ${productPromo.promoText}</div> + <p><a href="<@ofbizUrl>showPromotionDetails?productPromoId=${productPromo.productPromoId}</@ofbizUrl>" class="linktext">${uiLabelMap.CommonDetails}</a> ${productPromo.promoText}</p> <#if productPromo_has_next> <div><hr/></div> </#if> </#list> <div><hr/></div> - <div class="tabletext"><a href="<@ofbizUrl>showAllPromotions</@ofbizUrl>" class="buttontext">${uiLabelMap.OrderViewAllPromotions}</a></div> + <a href="<@ofbizUrl>showAllPromotions</@ofbizUrl>" class="buttontext">${uiLabelMap.OrderViewAllPromotions}</a> </div> </div> </#if> Modified: ofbiz/trunk/applications/ecommerce/webapp/ecommerce/catalog/minilastproductsearches.ftl URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/ecommerce/webapp/ecommerce/catalog/minilastproductsearches.ftl?rev=737506&r1=737505&r2=737506&view=diff ============================================================================== --- ofbiz/trunk/applications/ecommerce/webapp/ecommerce/catalog/minilastproductsearches.ftl (original) +++ ofbiz/trunk/applications/ecommerce/webapp/ecommerce/catalog/minilastproductsearches.ftl Sun Jan 25 11:54:13 2009 @@ -34,9 +34,9 @@ <div class="screenlet-body"> <#list searchOptionsHistoryList[0..limit] as searchOptions> <#-- searchOptions type is ProductSearchSession.ProductSearchOptions --> - <div class="tabletext"> + <p> <b>${uiLabelMap.EcommerceSearchNumber} ${searchOptions_index + 1}</b> - </div> + </p> <div class="tabletext"> <a href="<@ofbizUrl>setCurrentSearchFromHistoryAndSearch?searchHistoryIndex=${searchOptions_index}&clearSearch=N</@ofbizUrl>" class="buttontext">${uiLabelMap.CommonSearch}</a> <a href="<@ofbizUrl>setCurrentSearchFromHistory?searchHistoryIndex=${searchOptions_index}</@ofbizUrl>" class="buttontext">${uiLabelMap.CommonRefine}</a> Modified: ofbiz/trunk/applications/ecommerce/webapp/ecommerce/catalog/minilastviewedcategories.ftl URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/ecommerce/webapp/ecommerce/catalog/minilastviewedcategories.ftl?rev=737506&r1=737505&r2=737506&view=diff ============================================================================== --- ofbiz/trunk/applications/ecommerce/webapp/ecommerce/catalog/minilastviewedcategories.ftl (original) +++ ofbiz/trunk/applications/ecommerce/webapp/ecommerce/catalog/minilastviewedcategories.ftl Sun Jan 25 11:54:13 2009 @@ -29,11 +29,11 @@ <div class="boxhead">${uiLabelMap.EcommerceLastCategories}</div> </div> <div class="screenlet-body"> + <div class="browsecategorylist"> <#list lastViewedCategories[0..limit] as categoryId> <#assign category = delegator.findByPrimaryKeyCache("ProductCategory", Static["org.ofbiz.base.util.UtilMisc"].toMap("productCategoryId", categoryId))?if_exists> <#if category?has_content> - <div> - <span class="browsecategorytext">- </span> + <div class="browsecategorytext"> <#if catContentWrappers?exists && catContentWrappers[category.productCategoryId]?exists && catContentWrappers[category.productCategoryId].get("CATEGORY_NAME")?exists> <a href="<@ofbizUrl>category/~category_id=${categoryId}</@ofbizUrl>" class="browsecategorybutton">${catContentWrappers[category.productCategoryId].get("CATEGORY_NAME")}</a> <#elseif catContentWrappers?exists && catContentWrappers[category.productCategoryId]?exists && catContentWrappers[category.productCategoryId].get("DESCRIPTION")?exists> @@ -44,6 +44,7 @@ </div> </#if> </#list> + </div> </div> </div> </#if> Modified: ofbiz/trunk/applications/ecommerce/webapp/ecommerce/catalog/miniproductsummary.ftl URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/ecommerce/webapp/ecommerce/catalog/miniproductsummary.ftl?rev=737506&r1=737505&r2=737506&view=diff ============================================================================== --- ofbiz/trunk/applications/ecommerce/webapp/ecommerce/catalog/miniproductsummary.ftl (original) +++ ofbiz/trunk/applications/ecommerce/webapp/ecommerce/catalog/miniproductsummary.ftl Sun Jan 25 11:54:13 2009 @@ -17,26 +17,26 @@ under the License. --> <#if miniProduct?exists> - <a href="<@ofbizUrl>product/~product_id=${miniProduct.productId}</@ofbizUrl>" class="linktext">${miniProductContentWrapper.get("PRODUCT_NAME")?default("No Name Available")}</a> - <div class="tabletext"><b>${miniProduct.productId}</b> + <p><a href="<@ofbizUrl>product/~product_id=${miniProduct.productId}</@ofbizUrl>" class="linktext">${miniProductContentWrapper.get("PRODUCT_NAME")?default("No Name Available")}</a></p> + <p><b>${miniProduct.productId}</b> <#if (priceResult.price?default(0) > 0 && miniProduct.requireAmount?default("N") == "N")> <#if "Y" = miniProduct.isVirtual?if_exists> ${uiLabelMap.CommonFrom} </#if> <#if totalPrice?exists> - <div class="tabletext">${uiLabelMap.ProductAggregatedPrice}: <span class='basePrice'><@ofbizCurrency amount=totalPrice isoCode=totalPrice.currencyUsed/></span></div> + <p>${uiLabelMap.ProductAggregatedPrice}: <span class='basePrice'><@ofbizCurrency amount=totalPrice isoCode=totalPrice.currencyUsed/></span></p> <#else> <b><span class="<#if priceResult.isSale>salePrice<#else>normalPrice</#if>"> <@ofbizCurrency amount=priceResult.price isoCode=priceResult.currencyUsed/></span></b> </#if> </#if> - </div> + </p> <div style="margin-top: 4px;"> <#if (miniProduct.introductionDate?exists) && (nowTimeLong < miniProduct.introductionDate.getTime())> <#-- check to see if introductionDate hasn't passed yet --> - <div class="tabletext" style="color: red;">${uiLabelMap.ProductNotYetAvailable}</div> + <p style="color: red;">${uiLabelMap.ProductNotYetAvailable}</p> <#elseif (miniProduct.salesDiscontinuationDate?exists) && (nowTimeLong > miniProduct.salesDiscontinuationDate.getTime())> <#-- check to see if salesDiscontinuationDate has passed --> - <div class="tabletext" style="color: red;">${uiLabelMap.ProductNoLongerAvailable}</div> + <p style="color: red;">${uiLabelMap.ProductNoLongerAvailable}</p> <#elseif miniProduct.isVirtual?default("N") == "Y"> <a href="<@ofbizUrl>product/<#if requestParameters.category_id?exists>~category_id=${requestParameters.category_id}/</#if>~product_id=${miniProduct.productId}</@ofbizUrl>" class="buttontext"><span style="white-space: nowrap;">${uiLabelMap.OrderChooseVariations}...</span></a> <#elseif miniProduct.requireAmount?default("N") == "Y"> Modified: ofbiz/trunk/applications/ecommerce/webapp/ecommerce/catalog/sidedeepcategory.ftl URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/ecommerce/webapp/ecommerce/catalog/sidedeepcategory.ftl?rev=737506&r1=737505&r2=737506&view=diff ============================================================================== --- ofbiz/trunk/applications/ecommerce/webapp/ecommerce/catalog/sidedeepcategory.ftl (original) +++ ofbiz/trunk/applications/ecommerce/webapp/ecommerce/catalog/sidedeepcategory.ftl Sun Jan 25 11:54:13 2009 @@ -46,16 +46,16 @@ <div class="boxhead"><#if categoryDescription?has_content>${categoryDescription}<#else>${categoryName?default("")}</#if></div> </div> <div class="screenlet-body"> - <div style='margin-left: 10px;'> + <div class="browsecategorylist"> </#if> <div class="browsecategorytext"> - - <a href="<@ofbizUrl>category/~category_id=${category.productCategoryId}${pStr?if_exists}</@ofbizUrl>" class="${browseCategoryButtonClass}"><#if categoryName?has_content>${categoryName}<#else>${categoryDescription?default("")}</#if></a> + <a href="<@ofbizUrl>category/~category_id=${category.productCategoryId}${pStr?if_exists}</@ofbizUrl>" class="${browseCategoryButtonClass}"><#if categoryName?has_content>${categoryName}<#else>${categoryDescription?default("")}</#if></a> </div> <#if (Static["org.ofbiz.product.category.CategoryWorker"].checkTrailItem(request, category.getString("productCategoryId"))) || (curCategoryId?exists && curCategoryId == category.productCategoryId)> <#local subCatList = Static["org.ofbiz.product.category.CategoryWorker"].getRelatedCategoriesRet(request, "subCatList", category.getString("productCategoryId"), true)> <#if subCatList?exists> <#list subCatList as subCat> - <div style="margin-left: 10px"> + <div class="browsecategorylist"> <@categoryList parentCategory=category category=subCat wrapInBox="N"/> </div> </#list> @@ -74,7 +74,7 @@ <div class="boxhead">${uiLabelMap.ProductBrowseCategories}</div> </div> <div class="screenlet-body"> - <div style='margin-left: 10px;'> + <div class="browsecategorylist"> <#list topLevelList as category> <@categoryList parentCategory=category category=category wrapInBox="N"/> </#list> Modified: ofbiz/trunk/applications/ecommerce/webapp/ecommerce/content/content_categories.ftl URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/ecommerce/webapp/ecommerce/content/content_categories.ftl?rev=737506&r1=737505&r2=737506&view=diff ============================================================================== --- ofbiz/trunk/applications/ecommerce/webapp/ecommerce/content/content_categories.ftl (original) +++ ofbiz/trunk/applications/ecommerce/webapp/ecommerce/content/content_categories.ftl Sun Jan 25 11:54:13 2009 @@ -35,12 +35,14 @@ <div class="boxhead">${uiLabelMap.ProductBrowseContent}</div> </div> <div class="screenlet-body"> + <div class="browsecategorylist"> <#assign count_1=0/> <@loopSubContent contentId=contentRootId viewIndex=0 viewSize=9999 orderBy="contentName"> - <div class="browsecategorytext" style="margin-left: 10px"> - - <a href="<@ofbizUrl>showcontenttree?contentId=${subContentId}&nodeTrailCsv=${subContentId}</@ofbizUrl>" class="browsecategorybutton">${content.contentName}</a> + <div class="browsecategorytext"> + <a href="<@ofbizUrl>showcontenttree?contentId=${subContentId}&nodeTrailCsv=${subContentId}</@ofbizUrl>" class="browsecategorybutton">${content.contentName}</a> </div> <#assign count_1=(count_1 + 1)/> </@loopSubContent> + </div> </div> </div> Modified: ofbiz/trunk/applications/ecommerce/webapp/ecommerce/content/factoids.ftl URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/ecommerce/webapp/ecommerce/content/factoids.ftl?rev=737506&r1=737505&r2=737506&view=diff ============================================================================== --- ofbiz/trunk/applications/ecommerce/webapp/ecommerce/content/factoids.ftl (original) +++ ofbiz/trunk/applications/ecommerce/webapp/ecommerce/content/factoids.ftl Sun Jan 25 11:54:13 2009 @@ -35,12 +35,14 @@ <div class="boxhead">${uiLabelMap.EcommerceFactoids}</div> </div> <div class="screenlet-body"> + <div class="browsecategorylist"> <#assign count_1=0/> <@limitedSubContent contentId=factoidRootId viewIndex=0 viewSize=9999 orderBy="contentName" limitSize="2"> - <div class="browsecategorytext" style="margin-left: 10px"> - - <@renderSubContentCache subContentId=subContentId/> + <div class="browsecategorytext"> + <@renderSubContentCache subContentId=subContentId/> </div> <#assign count_1=(count_1 + 1)/> </@limitedSubContent> + </div> </div> </div> Modified: ofbiz/trunk/applications/ecommerce/webapp/ecommerce/content/recentlyviewed.ftl URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/ecommerce/webapp/ecommerce/content/recentlyviewed.ftl?rev=737506&r1=737505&r2=737506&view=diff ============================================================================== --- ofbiz/trunk/applications/ecommerce/webapp/ecommerce/content/recentlyviewed.ftl (original) +++ ofbiz/trunk/applications/ecommerce/webapp/ecommerce/content/recentlyviewed.ftl Sun Jan 25 11:54:13 2009 @@ -19,15 +19,17 @@ <#if mrvList?has_content> <div id="recentlyviewed" class="screenlet"> + <div class="browsecategorylist"> <div class="screenlet-header"> <div class="boxhead">${uiLabelMap.EcommerceLastContent}</div> </div> <div class="screenlet-body"> <#list mrvList as mrvArr> - <div class="browsecategorytext" style="margin-left: 10px"> - - <a href="<@ofbizUrl>viewcontent?contentId=${mrvArr[0]}</@ofbizUrl>" class="browsecategorybutton">${mrvArr[1]}</a> + <div class="browsecategorytext"> + <a href="<@ofbizUrl>viewcontent?contentId=${mrvArr[0]}</@ofbizUrl>" class="browsecategorybutton">${mrvArr[1]}</a> </div> </#list> </div> + </div> </div> </#if> Modified: ofbiz/trunk/applications/ecommerce/webapp/ecommerce/customer/miniSignUpForContactList.ftl URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/ecommerce/webapp/ecommerce/customer/miniSignUpForContactList.ftl?rev=737506&r1=737505&r2=737506&view=diff ============================================================================== --- ofbiz/trunk/applications/ecommerce/webapp/ecommerce/customer/miniSignUpForContactList.ftl (original) +++ ofbiz/trunk/applications/ecommerce/webapp/ecommerce/customer/miniSignUpForContactList.ftl Sun Jan 25 11:54:13 2009 @@ -39,7 +39,7 @@ <form method="post" action="<@ofbizUrl>createContactListParty</@ofbizUrl>" name="signUpForContactListForm"> <input type="hidden" name="partyId" value="${partyId}"/> <input type="hidden" name="statusId" value="CLPT_PENDING"/> - <span class="tabletext">${uiLabelMap.EcommerceSignUpForContactListComments}</span> + <p>${uiLabelMap.EcommerceSignUpForContactListComments}</p> <@contactList publicEmailContactLists=publicEmailContactLists/> <select name="preferredContactMechId" class="selectBox" style="width:134px"> @@ -52,14 +52,14 @@ </form> <#else> <#-- Not logged in so ask them to log in and then sign up or clear the user association --> - <div class="tabletext">${uiLabelMap.EcommerceSignUpForContactListLogIn}</div> - <div class="tabletext"><a href="<@ofbizUrl>${checkLoginUrl}</@ofbizUrl>" class="linktext">${uiLabelMap.CommonLogin}</a> ${sessionAttributes.autoName}</div> - <div class="tabletext">(${uiLabelMap.CommonNotYou}? <a href="<@ofbizUrl>autoLogout</@ofbizUrl>" class="buttontext">${uiLabelMap.CommonClickHere}</a>)</div> + <p>${uiLabelMap.EcommerceSignUpForContactListLogIn}</p> + <p><a href="<@ofbizUrl>${checkLoginUrl}</@ofbizUrl>" class="linktext">${uiLabelMap.CommonLogin}</a> ${sessionAttributes.autoName}</p> + <p>(${uiLabelMap.CommonNotYou}? <a href="<@ofbizUrl>autoLogout</@ofbizUrl>" class="buttontext">${uiLabelMap.CommonClickHere}</a>)</p> </#if> <#else> <#-- 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"> - <span class="tabletext">${uiLabelMap.EcommerceSignUpForContactListComments}</span> + <p>${uiLabelMap.EcommerceSignUpForContactListComments}</p> <@contactList publicEmailContactLists=publicEmailContactLists/> <input size="20" maxlength="255" name="email" class="inputBox" value="" type="text"> <input type="submit" value="${uiLabelMap.EcommerceSubscribe}" class="smallSubmit"/> @@ -68,3 +68,5 @@ </div> </div> + + Modified: ofbiz/trunk/applications/ecommerce/webapp/ecommerce/forum/forums.ftl URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/ecommerce/webapp/ecommerce/forum/forums.ftl?rev=737506&r1=737505&r2=737506&view=diff ============================================================================== --- ofbiz/trunk/applications/ecommerce/webapp/ecommerce/forum/forums.ftl (original) +++ ofbiz/trunk/applications/ecommerce/webapp/ecommerce/forum/forums.ftl Sun Jan 25 11:54:13 2009 @@ -22,10 +22,12 @@ <div class="boxhead">${uiLabelMap.ProductBrowseForums}</div> </div> <div class="screenlet-body"> + <div class="browsecategorylist"> <#list forums as forum> - <div class="browsecategorytext" style="margin-left: 10px"> - - <a href="<@ofbizUrl>showforum?forumId=${forum.contentId}</@ofbizUrl>" class="browsecategorybutton">${forum.contentName}</a> + <div class="browsecategorytext"> + <a href="<@ofbizUrl>showforum?forumId=${forum.contentId}</@ofbizUrl>" class="browsecategorybutton">${forum.contentName}</a> </div> </#list> + </div> </div> </div> Modified: ofbiz/trunk/applications/order/webapp/ordermgr/entry/cart/minicart.ftl URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/webapp/ordermgr/entry/cart/minicart.ftl?rev=737506&r1=737505&r2=737506&view=diff ============================================================================== --- ofbiz/trunk/applications/order/webapp/ordermgr/entry/cart/minicart.ftl (original) +++ ofbiz/trunk/applications/order/webapp/ordermgr/entry/cart/minicart.ftl Sun Jan 25 11:54:13 2009 @@ -73,7 +73,7 @@ <div style="margin-top: 4px;"><a href="<@ofbizUrl>onePageCheckout</@ofbizUrl>" class="buttontext">${uiLabelMap.EcommerceOnePageCheckout}</a></div> </#if> <#else> - <div>${uiLabelMap.OrderShoppingCartEmpty}</div> + <p>${uiLabelMap.OrderShoppingCartEmpty}</p> </#if> </div> </div> Modified: ofbiz/trunk/applications/order/webapp/ordermgr/entry/catalog/breadcrumbs.ftl URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/webapp/ordermgr/entry/catalog/breadcrumbs.ftl?rev=737506&r1=737505&r2=737506&view=diff ============================================================================== --- ofbiz/trunk/applications/order/webapp/ordermgr/entry/catalog/breadcrumbs.ftl (original) +++ ofbiz/trunk/applications/order/webapp/ordermgr/entry/catalog/breadcrumbs.ftl Sun Jan 25 11:54:13 2009 @@ -27,23 +27,25 @@ </#if> <#if (Static["org.ofbiz.product.category.CategoryWorker"].checkTrailItem(request, category.getString("productCategoryId"))) || (curCategoryId?exists && curCategoryId == category.productCategoryId)> + <li> <#if curCategoryId?exists && curCategoryId == category.productCategoryId> <#if catContentWrappers?exists && catContentWrappers[category.productCategoryId]?exists && catContentWrappers[category.productCategoryId].get("CATEGORY_NAME")?exists> - -> <a href="<@ofbizUrl>category/~category_id=${category.productCategoryId}${pStr?if_exists}</@ofbizUrl>" class="buttontextdisabled">${catContentWrappers[category.productCategoryId].get("CATEGORY_NAME")}</a> + <a href="<@ofbizUrl>category/~category_id=${category.productCategoryId}${pStr?if_exists}</@ofbizUrl>" class="buttontextdisabled">${catContentWrappers[category.productCategoryId].get("CATEGORY_NAME")}</a> <#elseif catContentWrappers?exists && catContentWrappers[category.productCategoryId]?exists && catContentWrappers[category.productCategoryId].get("DESCRIPTION")?exists> - -> <a href="<@ofbizUrl>category/~category_id=${category.productCategoryId}${pStr?if_exists}</@ofbizUrl>" class="buttontextdisabled">${catContentWrappers[category.productCategoryId].get("DESCRIPTION")}</a> + <a href="<@ofbizUrl>category/~category_id=${category.productCategoryId}${pStr?if_exists}</@ofbizUrl>" class="buttontextdisabled">${catContentWrappers[category.productCategoryId].get("DESCRIPTION")}</a> <#else> - -> <a href="<@ofbizUrl>category/~category_id=${category.productCategoryId}${pStr?if_exists}</@ofbizUrl>" class="buttontextdisabled">${category.description?if_exists}</a> - </#if> + <a href="<@ofbizUrl>category/~category_id=${category.productCategoryId}${pStr?if_exists}</@ofbizUrl>" class="buttontextdisabled">${category.description?if_exists}</a> + </#if> <#else> <#if catContentWrappers?exists && catContentWrappers[category.productCategoryId]?exists && catContentWrappers[category.productCategoryId].get("CATEGORY_NAME")?exists> - -> <a href="<@ofbizUrl>category/~category_id=${category.productCategoryId}${pStr?if_exists}</@ofbizUrl>" class="linktext">${catContentWrappers[category.productCategoryId].get("CATEGORY_NAME")}</a> + <a href="<@ofbizUrl>category/~category_id=${category.productCategoryId}${pStr?if_exists}</@ofbizUrl>" class="linktext">${catContentWrappers[category.productCategoryId].get("CATEGORY_NAME")}</a> <#elseif catContentWrappers?exists && catContentWrappers[category.productCategoryId]?exists && catContentWrappers[category.productCategoryId].get("DESCRIPTION")?exists> - -> <a href="<@ofbizUrl>category/~category_id=${category.productCategoryId}${pStr?if_exists}</@ofbizUrl>" class="linktext">${catContentWrappers[category.productCategoryId].get("DESCRIPTION")}</a> + <a href="<@ofbizUrl>category/~category_id=${category.productCategoryId}${pStr?if_exists}</@ofbizUrl>" class="linktext">${catContentWrappers[category.productCategoryId].get("DESCRIPTION")}</a> <#else> - -> <a href="<@ofbizUrl>category/~category_id=${category.productCategoryId}${pStr?if_exists}</@ofbizUrl>" class="linktext">${category.description?if_exists}</a> + <a href="<@ofbizUrl>category/~category_id=${category.productCategoryId}${pStr?if_exists}</@ofbizUrl>" class="linktext">${category.description?if_exists}</a> </#if> </#if> + </li> <#local subCatList = Static["org.ofbiz.product.category.CategoryWorker"].getRelatedCategoriesRet(request, "subCatList", category.getString("productCategoryId"), true)> <#if subCatList?exists> <#list subCatList as subCat> @@ -53,15 +55,19 @@ </#if> </#macro> -<div> - <a href="<@ofbizUrl>main</@ofbizUrl>" class="linktext">${uiLabelMap.CommonMain}</a> - <#-- Show the category branch --> - <#list topLevelList as category> - <@categoryList parentCategory=category category=category/> - </#list> - <#-- Show the product, if there is one --> - <#if productContentWrapper?exists> - -> ${productContentWrapper.get("PRODUCT_NAME")?if_exists} - </#if> +<div class="breadcrumbs"> + <ul> + <li> + <a href="<@ofbizUrl>main</@ofbizUrl>" class="linktext">${uiLabelMap.CommonMain}</a> + </li> + <#-- Show the category branch --> + <#list topLevelList as category> + <@categoryList parentCategory=category category=category/> + </#list> + <#-- Show the product, if there is one --> + <#if productContentWrapper?exists> + <li>${productContentWrapper.get("PRODUCT_NAME")?if_exists}</li> + </#if> + </ul> </div> <br/> Modified: ofbiz/trunk/applications/order/webapp/ordermgr/entry/catalog/sidedeepcategory.ftl URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/webapp/ordermgr/entry/catalog/sidedeepcategory.ftl?rev=737506&r1=737505&r2=737506&view=diff ============================================================================== --- ofbiz/trunk/applications/order/webapp/ordermgr/entry/catalog/sidedeepcategory.ftl (original) +++ ofbiz/trunk/applications/order/webapp/ordermgr/entry/catalog/sidedeepcategory.ftl Sun Jan 25 11:54:13 2009 @@ -29,21 +29,21 @@ <div class="browsecategorytext"> <#if catContentWrappers?exists && catContentWrappers[category.productCategoryId]?exists && catContentWrappers[category.productCategoryId].get("CATEGORY_NAME")?has_content> <#if sessionAttributes.shoppingCart?exists && sessionAttributes.shoppingCart.isPurchaseOrder()> - - <a href="<@ofbizUrl>keywordsearch/~SEARCH_CATEGORY_ID=${category.productCategoryId}/~SEARCH_SUPPLIER_ID=${sessionAttributes.shoppingCart.partyId?if_exists}/~category_id=${category.productCategoryId}${pStr?if_exists}</@ofbizUrl>" class="browsecategorybuttondisabled">${catContentWrappers[category.productCategoryId].get("CATEGORY_NAME")}</a> + <a href="<@ofbizUrl>keywordsearch/~SEARCH_CATEGORY_ID=${category.productCategoryId}/~SEARCH_SUPPLIER_ID=${sessionAttributes.shoppingCart.partyId?if_exists}/~category_id=${category.productCategoryId}${pStr?if_exists}</@ofbizUrl>" class="browsecategorybuttondisabled">${catContentWrappers[category.productCategoryId].get("CATEGORY_NAME")}</a> <#else> - - <a href="<@ofbizUrl>category/~category_id=${category.productCategoryId}${pStr?if_exists}</@ofbizUrl>" class="browsecategorybuttondisabled">${catContentWrappers[category.productCategoryId].get("CATEGORY_NAME")}</a> + <a href="<@ofbizUrl>category/~category_id=${category.productCategoryId}${pStr?if_exists}</@ofbizUrl>" class="browsecategorybuttondisabled">${catContentWrappers[category.productCategoryId].get("CATEGORY_NAME")}</a> </#if> <#elseif catContentWrappers?exists && catContentWrappers[category.productCategoryId]?exists && catContentWrappers[category.productCategoryId].get("DESCRIPTION")?has_content> <#if sessionAttributes.shoppingCart?exists && sessionAttributes.shoppingCart.isPurchaseOrder()> - - <a href="<@ofbizUrl>keywordsearch/~SEARCH_CATEGORY_ID=${category.productCategoryId}/~SEARCH_SUPPLIER_ID=${sessionAttributes.shoppingCart.partyId?if_exists}/~category_id=${category.productCategoryId}${pStr?if_exists}</@ofbizUrl>" class="browsecategorybuttondisabled">${catContentWrappers[category.productCategoryId].get("DESCRIPTION")}</a> + <a href="<@ofbizUrl>keywordsearch/~SEARCH_CATEGORY_ID=${category.productCategoryId}/~SEARCH_SUPPLIER_ID=${sessionAttributes.shoppingCart.partyId?if_exists}/~category_id=${category.productCategoryId}${pStr?if_exists}</@ofbizUrl>" class="browsecategorybuttondisabled">${catContentWrappers[category.productCategoryId].get("DESCRIPTION")}</a> <#else> - - <a href="<@ofbizUrl>category/~category_id=${category.productCategoryId}${pStr?if_exists}</@ofbizUrl>" class="browsecategorybuttondisabled">${catContentWrappers[category.productCategoryId].get("DESCRIPTION")}</a> + <a href="<@ofbizUrl>category/~category_id=${category.productCategoryId}${pStr?if_exists}</@ofbizUrl>" class="browsecategorybuttondisabled">${catContentWrappers[category.productCategoryId].get("DESCRIPTION")}</a> </#if> <#else> <#if sessionAttributes.shoppingCart?exists && sessionAttributes.shoppingCart.isPurchaseOrder()> - - <a href="<@ofbizUrl>keywordsearch/~SEARCH_CATEGORY_ID=${category.productCategoryId}/~SEARCH_SUPPLIER_ID=${sessionAttributes.shoppingCart.partyId?if_exists}/~category_id=${category.productCategoryId}${pStr?if_exists}</@ofbizUrl>" class="browsecategorybuttondisabled">${category.categoryName?if_exists}</a> + <a href="<@ofbizUrl>keywordsearch/~SEARCH_CATEGORY_ID=${category.productCategoryId}/~SEARCH_SUPPLIER_ID=${sessionAttributes.shoppingCart.partyId?if_exists}/~category_id=${category.productCategoryId}${pStr?if_exists}</@ofbizUrl>" class="browsecategorybuttondisabled">${category.categoryName?if_exists}</a> <#else> - - <a href="<@ofbizUrl>category/~category_id=${category.productCategoryId}${pStr?if_exists}</@ofbizUrl>" class="browsecategorybuttondisabled">${category.categoryName?default(category.description)?default(category.productCategoryId)}</a> + <a href="<@ofbizUrl>category/~category_id=${category.productCategoryId}${pStr?if_exists}</@ofbizUrl>" class="browsecategorybuttondisabled">${category.categoryName?default(category.description)?default(category.productCategoryId)}</a> </#if> </#if> </div> @@ -51,21 +51,21 @@ <div class="browsecategorytext"> <#if catContentWrappers[category.productCategoryId].get("CATEGORY_NAME")?has_content> <#if sessionAttributes.shoppingCart?exists && sessionAttributes.shoppingCart.isPurchaseOrder()> - - <a href="<@ofbizUrl>keywordsearch/~SEARCH_CATEGORY_ID=${category.productCategoryId}/~SEARCH_SUPPLIER_ID=${sessionAttributes.shoppingCart.partyId?if_exists}/~category_id=${category.productCategoryId}${pStr?if_exists}</@ofbizUrl>" class="browsecategorybutton">${catContentWrappers[category.productCategoryId].get("CATEGORY_NAME")}</a> + <a href="<@ofbizUrl>keywordsearch/~SEARCH_CATEGORY_ID=${category.productCategoryId}/~SEARCH_SUPPLIER_ID=${sessionAttributes.shoppingCart.partyId?if_exists}/~category_id=${category.productCategoryId}${pStr?if_exists}</@ofbizUrl>" class="browsecategorybutton">${catContentWrappers[category.productCategoryId].get("CATEGORY_NAME")}</a> <#else> - - <a href="<@ofbizUrl>category/~category_id=${category.productCategoryId}${pStr?if_exists}</@ofbizUrl>" class="browsecategorybutton">${catContentWrappers[category.productCategoryId].get("CATEGORY_NAME")}</a> + <a href="<@ofbizUrl>category/~category_id=${category.productCategoryId}${pStr?if_exists}</@ofbizUrl>" class="browsecategorybutton">${catContentWrappers[category.productCategoryId].get("CATEGORY_NAME")}</a> </#if> <#elseif catContentWrappers[category.productCategoryId].get("DESCRIPTION")?has_content> <#if sessionAttributes.shoppingCart?exists && sessionAttributes.shoppingCart.isPurchaseOrder()> - - <a href="<@ofbizUrl>keywordsearch/~SEARCH_CATEGORY_ID=${category.productCategoryId}/~SEARCH_SUPPLIER_ID=${sessionAttributes.shoppingCart.partyId?if_exists}/~category_id=${category.productCategoryId}${pStr?if_exists}</@ofbizUrl>" class="browsecategorybutton">${catContentWrappers[category.productCategoryId].get("DESCRIPTION")}</a> + <a href="<@ofbizUrl>keywordsearch/~SEARCH_CATEGORY_ID=${category.productCategoryId}/~SEARCH_SUPPLIER_ID=${sessionAttributes.shoppingCart.partyId?if_exists}/~category_id=${category.productCategoryId}${pStr?if_exists}</@ofbizUrl>" class="browsecategorybutton">${catContentWrappers[category.productCategoryId].get("DESCRIPTION")}</a> <#else> - - <a href="<@ofbizUrl>category/~category_id=${category.productCategoryId}${pStr?if_exists}</@ofbizUrl>" class="browsecategorybutton">${catContentWrappers[category.productCategoryId].get("DESCRIPTION")}</a> + <a href="<@ofbizUrl>category/~category_id=${category.productCategoryId}${pStr?if_exists}</@ofbizUrl>" class="browsecategorybutton">${catContentWrappers[category.productCategoryId].get("DESCRIPTION")}</a> </#if> <#else> <#if sessionAttributes.shoppingCart?exists && sessionAttributes.shoppingCart.isPurchaseOrder()> - - <a href="<@ofbizUrl>keywordsearch/~SEARCH_CATEGORY_ID=${category.productCategoryId}/~SEARCH_SUPPLIER_ID=${sessionAttributes.shoppingCart.partyId?if_exists}/~category_id=${category.productCategoryId}${pStr?if_exists}</@ofbizUrl>" class="browsecategorybutton">${category.categoryName?if_exists}</a> + <a href="<@ofbizUrl>keywordsearch/~SEARCH_CATEGORY_ID=${category.productCategoryId}/~SEARCH_SUPPLIER_ID=${sessionAttributes.shoppingCart.partyId?if_exists}/~category_id=${category.productCategoryId}${pStr?if_exists}</@ofbizUrl>" class="browsecategorybutton">${category.categoryName?if_exists}</a> <#else> - - <a href="<@ofbizUrl>category/~category_id=${category.productCategoryId}${pStr?if_exists}</@ofbizUrl>" class="browsecategorybutton">${category.categoryName?default(category.description)?default(category.productCategoryId)}</a> + <a href="<@ofbizUrl>category/~category_id=${category.productCategoryId}${pStr?if_exists}</@ofbizUrl>" class="browsecategorybutton">${category.categoryName?default(category.description)?default(category.productCategoryId)}</a> </#if> </#if> </div> @@ -75,7 +75,7 @@ <#local subCatList = Static["org.ofbiz.product.category.CategoryWorker"].getRelatedCategoriesRet(request, "subCatList", category.getString("productCategoryId"), true)> <#if subCatList?exists> <#list subCatList as subCat> - <div style="margin-left: 10px"> + <div class="browsecategorylist"> <@categoryList parentCategory=category category=subCat/> </div> </#list> @@ -89,7 +89,7 @@ <div class="boxhead">${uiLabelMap.ProductBrowseCategories}</div> </div> <div class="screenlet-body"> - <div style='margin-left: 10px;'> + <div class="browsecategorylist"> <#list topLevelList as category> <@categoryList parentCategory=category category=category/> </#list> Modified: ofbiz/trunk/applications/product/webapp/catalog/find/sidecatalogs.ftl URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/webapp/catalog/find/sidecatalogs.ftl?rev=737506&r1=737505&r2=737506&view=diff ============================================================================== --- ofbiz/trunk/applications/product/webapp/catalog/find/sidecatalogs.ftl (original) +++ ofbiz/trunk/applications/product/webapp/catalog/find/sidecatalogs.ftl Sun Jan 25 11:54:13 2009 @@ -17,20 +17,20 @@ under the License. --> <div><a href='<@ofbizUrl>FindProdCatalog</@ofbizUrl>' class='buttontext'>${uiLabelMap.ProductCatalogDetailList}</a></div> -<div style='margin-left: 10px;'> +<div class="browsecategorylist"> <#assign sortList = Static["org.ofbiz.base.util.UtilMisc"].toList("prodCatalogCategoryTypeId", "sequenceNum", "productCategoryId")> <#list prodCatalogs as prodCatalog> <#if curProdCatalogId?exists && curProdCatalogId == prodCatalog.prodCatalogId> <#assign prodCatalogCategories = prodCatalog.getRelatedOrderByCache("ProdCatalogCategory", sortList)> - <div class='browsecategorytext'>- <a href="<@ofbizUrl>EditProdCatalog?prodCatalogId=${prodCatalog.prodCatalogId}</@ofbizUrl>" class='browsecategorybutton'>${prodCatalog.catalogName?if_exists}</a></div> - <div style='margin-left: 10px;'> + <div class='browsecategorytext'><a href="<@ofbizUrl>EditProdCatalog?prodCatalogId=${prodCatalog.prodCatalogId}</@ofbizUrl>" class='browsecategorybutton'>${prodCatalog.catalogName?if_exists}</a></div> + <div class="browsecategorylist"> <#list prodCatalogCategories as prodCatalogCategory> <#assign productCategory = prodCatalogCategory.getRelatedOneCache("ProductCategory")> - <div class='browsecategorytext'>- <a href='<@ofbizUrl>EditCategory?CATALOG_TOP_CATEGORY=${prodCatalogCategory.productCategoryId}&productCategoryId=${prodCatalogCategory.productCategoryId}</@ofbizUrl>' class="browsecategorybutton">${(productCategory.categoryName)?default(productCategory.description)?default(productCategory.productCategoryId)}</a></div> + <div class='browsecategorytext'><a href='<@ofbizUrl>EditCategory?CATALOG_TOP_CATEGORY=${prodCatalogCategory.productCategoryId}&productCategoryId=${prodCatalogCategory.productCategoryId}</@ofbizUrl>' class="browsecategorybutton">${(productCategory.categoryName)?default(productCategory.description)?default(productCategory.productCategoryId)}</a></div> </#list> </div> <#else> - <div class='browsecategorytext'>- <a href="<@ofbizUrl>EditProdCatalog?prodCatalogId=${prodCatalog.prodCatalogId}</@ofbizUrl>" class='browsecategorybutton'>${prodCatalog.catalogName?if_exists}</a></div> + <div class='browsecategorytext'><a href="<@ofbizUrl>EditProdCatalog?prodCatalogId=${prodCatalog.prodCatalogId}</@ofbizUrl>" class='browsecategorybutton'>${prodCatalog.catalogName?if_exists}</a></div> </#if> </#list> </div> Modified: ofbiz/trunk/applications/product/webapp/catalog/find/sidedeepcategory.ftl URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/webapp/catalog/find/sidedeepcategory.ftl?rev=737506&r1=737505&r2=737506&view=diff ============================================================================== --- ofbiz/trunk/applications/product/webapp/catalog/find/sidedeepcategory.ftl (original) +++ ofbiz/trunk/applications/product/webapp/catalog/find/sidedeepcategory.ftl Sun Jan 25 11:54:13 2009 @@ -25,21 +25,21 @@ <#if curCategoryId?exists && curCategoryId == category.productCategoryId> <div class="browsecategorytext"> <#if catContentWrappers?exists && catContentWrappers[category.productCategoryId]?exists && catContentWrappers[category.productCategoryId].get("CATEGORY_NAME")?has_content> - - <a href="<@ofbizUrl>EditCategory?productCategoryId=${category.productCategoryId}${pStr?if_exists}</@ofbizUrl>" class="browsecategorybuttondisabled">${catContentWrappers[category.productCategoryId].get("CATEGORY_NAME")} [${category.productCategoryId}]</a> + <a href="<@ofbizUrl>EditCategory?productCategoryId=${category.productCategoryId}${pStr?if_exists}</@ofbizUrl>" class="browsecategorybuttondisabled">${catContentWrappers[category.productCategoryId].get("CATEGORY_NAME")} [${category.productCategoryId}]</a> <#elseif catContentWrappers?exists && catContentWrappers[category.productCategoryId]?exists && catContentWrappers[category.productCategoryId].get("DESCRIPTION")?has_content> - - <a href="<@ofbizUrl>EditCategory?productCategoryId=${category.productCategoryId}${pStr?if_exists}</@ofbizUrl>" class="browsecategorybuttondisabled">${catContentWrappers[category.productCategoryId].get("DESCRIPTION")} [${category.productCategoryId}]</a> + <a href="<@ofbizUrl>EditCategory?productCategoryId=${category.productCategoryId}${pStr?if_exists}</@ofbizUrl>" class="browsecategorybuttondisabled">${catContentWrappers[category.productCategoryId].get("DESCRIPTION")} [${category.productCategoryId}]</a> <#else> - - <a href="<@ofbizUrl>EditCategory?productCategoryId=${category.productCategoryId}${pStr?if_exists}</@ofbizUrl>" class="browsecategorybuttondisabled">${category.categoryName?default(category.description)?if_exists} [${category.productCategoryId}]</a> + <a href="<@ofbizUrl>EditCategory?productCategoryId=${category.productCategoryId}${pStr?if_exists}</@ofbizUrl>" class="browsecategorybuttondisabled">${category.categoryName?default(category.description)?if_exists} [${category.productCategoryId}]</a> </#if> </div> <#else> <div class="browsecategorytext"> <#if catContentWrappers?exists && catContentWrappers[category.productCategoryId]?exists && catContentWrappers[category.productCategoryId].get("CATEGORY_NAME")?has_content> - - <a href="<@ofbizUrl>EditCategory?productCategoryId=${category.productCategoryId}${pStr?if_exists}</@ofbizUrl>" class="browsecategorybutton">${catContentWrappers[category.productCategoryId].get("CATEGORY_NAME")} [${category.productCategoryId}]</a> + <a href="<@ofbizUrl>EditCategory?productCategoryId=${category.productCategoryId}${pStr?if_exists}</@ofbizUrl>" class="browsecategorybutton">${catContentWrappers[category.productCategoryId].get("CATEGORY_NAME")} [${category.productCategoryId}]</a> <#elseif catContentWrappers?exists && catContentWrappers[category.productCategoryId]?exists && catContentWrappers[category.productCategoryId].get("DESCRIPTION")?has_content> - - <a href="<@ofbizUrl>EditCategory?productCategoryId=${category.productCategoryId}${pStr?if_exists}</@ofbizUrl>" class="browsecategorybutton">${catContentWrappers[category.productCategoryId].get("DESCRIPTION")} [${category.productCategoryId}]</a> + <a href="<@ofbizUrl>EditCategory?productCategoryId=${category.productCategoryId}${pStr?if_exists}</@ofbizUrl>" class="browsecategorybutton">${catContentWrappers[category.productCategoryId].get("DESCRIPTION")} [${category.productCategoryId}]</a> <#else> - - <a href="<@ofbizUrl>EditCategory?productCategoryId=${category.productCategoryId}${pStr?if_exists}</@ofbizUrl>" class="browsecategorybutton">${category.categoryName?default(category.description)?if_exists} [${category.productCategoryId}]</a> + <a href="<@ofbizUrl>EditCategory?productCategoryId=${category.productCategoryId}${pStr?if_exists}</@ofbizUrl>" class="browsecategorybutton">${category.categoryName?default(category.description)?if_exists} [${category.productCategoryId}]</a> </#if> </div> </#if> @@ -48,7 +48,7 @@ <#local subCatList = Static["org.ofbiz.product.category.CategoryWorker"].getRelatedCategoriesRet(request, "subCatList", category.getString("productCategoryId"), true)> <#if subCatList?exists> <#list subCatList as subCat> - <div style="margin-left: 10px"> + <div class="browsecategorylist"> <@categoryList parentCategory=category category=subCat/> </div> </#list> @@ -57,15 +57,15 @@ </#macro> <div><a href='<@ofbizUrl>ChooseTopCategory</@ofbizUrl>' class='buttontext'>${uiLabelMap.ProductChooseTopCategory}</a></div> -<div style='margin-left: 10px;'> +<div class="browsecategorylist"> <#if currentTopCategory?exists> <#if curCategoryId?exists && curCategoryId == currentTopCategory.productCategoryId> - <div style='text-indent: -10px;'><b>- ${currentTopCategory.categoryName?default("No Name")} [${currentTopCategory.productCategoryId}]</b></div> + <div style='text-indent: -10px;'><b>${currentTopCategory.categoryName?default("No Name")} [${currentTopCategory.productCategoryId}]</b></div> <#else> - <div class='browsecategorytext'>- <a href="<@ofbizUrl>EditCategory?productCategoryId=${currentTopCategory.productCategoryId}</@ofbizUrl>" class='browsecategorybutton'>${currentTopCategory.categoryName?default(currentTopCategory.description)?if_exists} [${currentTopCategory.productCategoryId}]</a></div> + <div class='browsecategorytext'><a href="<@ofbizUrl>EditCategory?productCategoryId=${currentTopCategory.productCategoryId}</@ofbizUrl>" class='browsecategorybutton'>${currentTopCategory.categoryName?default(currentTopCategory.description)?if_exists} [${currentTopCategory.productCategoryId}]</a></div> </#if> </#if> - <div style='margin-left: 10px;'> + <div class="browsecategorylist"> <#if topLevelList?exists> <#list topLevelList as category> <@categoryList parentCategory=category category=category/> Added: ofbiz/trunk/framework/images/webapp/images/bg_bullet_full_2.gif URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/images/webapp/images/bg_bullet_full_2.gif?rev=737506&view=auto ============================================================================== Binary file - no diff available. Propchange: ofbiz/trunk/framework/images/webapp/images/bg_bullet_full_2.gif ------------------------------------------------------------------------------ svn:mime-type = application/octet-stream Added: ofbiz/trunk/framework/images/webapp/images/ecdefaulttheme.jpg URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/images/webapp/images/ecdefaulttheme.jpg?rev=737506&view=auto ============================================================================== Binary file - no diff available. Propchange: ofbiz/trunk/framework/images/webapp/images/ecdefaulttheme.jpg ------------------------------------------------------------------------------ svn:mime-type = application/octet-stream Modified: ofbiz/trunk/framework/images/webapp/images/ecommain.css URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/images/webapp/images/ecommain.css?rev=737506&r1=737505&r2=737506&view=diff ============================================================================== --- ofbiz/trunk/framework/images/webapp/images/ecommain.css (original) +++ ofbiz/trunk/framework/images/webapp/images/ecommain.css Sun Jan 25 11:54:13 2009 @@ -86,20 +86,20 @@ } input[type="text"], input[type="password"] { -font-size: 8pt; -background: white; -border: #999999 solid 1px; -margin: 2px; +font-size: 8pt; +background: white; +border: #999999 solid 1px; +margin: 2px; } input[type="submit"], input[type="button"], input[type="reset"] { -font-size: 8pt; -font-weight: bold; -color: #000099; -background: white; -border: #999999 solid 1px; -margin: 2px; +font-size: 8pt; +font-weight: bold; +color: #000099; +background: white; +border: #999999 solid 1px; +margin: 2px; } input[type="submit"]:hover { @@ -113,10 +113,10 @@ } select { -background: #FFFFFF; -font-size: 8pt; -border: #999999 solid 1px; -margin: 2px; +background: #FFFFFF; +font-size: 8pt; +border: #999999 solid 1px; +margin: 2px; } h1, .h1 { @@ -146,11 +146,11 @@ } textarea { -background: #FFFFFF; -font-size: 8pt; -background: white; -border: #999999 solid 1px; -margin: 2px; +background: #FFFFFF; +font-size: 8pt; +background: white; +border: #999999 solid 1px; +margin: 2px; } th, th a { @@ -171,16 +171,16 @@ .hidden { visibility: hidden; } - -.label { -/* Used for <input> element labels */ -font-weight: bold; -padding-right: 11px; -text-align: right; -white-space: nowrap; -width: 1%; -} - + +.label { +/* Used for <input> element labels */ +font-weight: bold; +padding-right: 11px; +text-align: right; +white-space: nowrap; +width: 1%; +} + /* ===== Header Styles ===== */ #ecom-header { position: relative; @@ -498,10 +498,15 @@ color: red; } +.browsecategorylist { +margin-left: 10px; +} + .browsecategorytext { font-weight: bold; color: #000099; -text-indent: -10px; +padding-left: 10px; +background:url(/images/bg_bullet_full_2.gif) no-repeat 0px 0.5em; } A.browsecategorybutton { Modified: ofbiz/trunk/framework/images/webapp/images/maincss.css URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/images/webapp/images/maincss.css?rev=737506&r1=737505&r2=737506&view=diff ============================================================================== --- ofbiz/trunk/framework/images/webapp/images/maincss.css (original) +++ ofbiz/trunk/framework/images/webapp/images/maincss.css Sun Jan 25 11:54:13 2009 @@ -267,10 +267,15 @@ padding-left: 0.5em; } +.browsecategorylist { +margin-left: 10px; +} + .browsecategorytext { color: #000099; font-weight: bold; -text-indent: -1em; +padding-left: 10px; +background:url(/images/bg_bullet_full_2.gif) no-repeat 0px 0.5em; } A.browsecategorybutton { |
«
Return to OFBiz - Commits
|
1 view|%1 views
| Free forum by Nabble | Edit this page |