svn commit: r781606 - in /ofbiz/trunk: applications/order/webapp/orde
Locked
svn commit: r781606 - in /ofbiz/trunk: applications/order/webapp/orde
 
|
Author: apatel
Date: Wed Jun 3 22:14:08 2009 New Revision: 781606 URL: http://svn.apache.org/viewvc?rev=781606&view=rev Log: Improving html in ftl templates. This commit focus on replacing screenlet headers with html header element. Also removed some extra html so we can get closer to xhtml compliance. Modified: ofbiz/trunk/applications/order/webapp/ordermgr/entry/cart/minicart.ftl ofbiz/trunk/applications/order/webapp/ordermgr/entry/catalog/keywordsearchbox.ftl ofbiz/trunk/framework/images/webapp/images/ecommain.css ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/blog/blogs.ftl ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/blog/menubar.ftl ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/cart/minipromotext.ftl ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/catalog/advancedsearch.ftl ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/catalog/choosecatalog.ftl ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/catalog/configproductdetail.ftl ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/catalog/detailImage.ftl ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/catalog/lastviewedproducts.ftl ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/catalog/miniassocprods.ftl ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/catalog/minilastproductsearches.ftl ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/catalog/minilastviewedcategories.ftl ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/catalog/minilastviewedproducts.ftl ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/catalog/miniproductsummary.ftl ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/catalog/minireorderprods.ftl ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/catalog/productreview.ftl ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/catalog/sidedeepcategory.ftl ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/catalog/tellafriend.ftl ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/content/content_categories.ftl ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/content/factoids.ftl ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/content/minipoll.ftl ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/content/recentlyviewed.ftl ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/content/searchContent.ftl ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/content/showcontenttree.ftl ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/customer/miniSignUpForContactList.ftl ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/forum/ViewComboResponse.ftl ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/forum/createforumresponse.ftl ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/forum/editforumarticle.ftl ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/forum/forums.ftl ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/forum/messageDisplay.ftl ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/forum/mostrecent.ftl ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/forum/showblog.ftl ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/forum/showforumresponse.ftl ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/includes/language.ftl ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/quote/QuoteList.ftl ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/request/RequestList.ftl ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/shoppinglist/editShoppingList.ftl 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=781606&r1=781605&r2=781606&view=diff ============================================================================== --- ofbiz/trunk/applications/order/webapp/ordermgr/entry/cart/minicart.ftl (original) +++ ofbiz/trunk/applications/order/webapp/ordermgr/entry/cart/minicart.ftl Wed Jun 3 22:14:08 2009 @@ -25,7 +25,7 @@ </#if> <div id="minicart" class="screenlet"> - <div class="screenlet-header boxhead">${uiLabelMap.OrderCartSummary}</div> + <h3>${uiLabelMap.OrderCartSummary}</h3> <div class="screenlet-body"> <#if (shoppingCartSize > 0)> <#if hidetoplinks?default("N") != "Y"> Modified: ofbiz/trunk/applications/order/webapp/ordermgr/entry/catalog/keywordsearchbox.ftl URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/webapp/ordermgr/entry/catalog/keywordsearchbox.ftl?rev=781606&r1=781605&r2=781606&view=diff ============================================================================== --- ofbiz/trunk/applications/order/webapp/ordermgr/entry/catalog/keywordsearchbox.ftl (original) +++ ofbiz/trunk/applications/order/webapp/ordermgr/entry/catalog/keywordsearchbox.ftl Wed Jun 3 22:14:08 2009 @@ -18,10 +18,8 @@ --> <div id="keywordsearchbox" class="screenlet"> - <div class="screenlet-header"> - <div class="boxhead">${uiLabelMap.ProductSearchCatalog}</div> - </div> - <div class="screenlet-body" style="text-align: center;"> + <h3>${uiLabelMap.ProductSearchCatalog}</h3> + <div class="screenlet-body"> <form name="keywordsearchform" method="post" action="<@ofbizUrl>keywordsearch</@ofbizUrl>"> <input type="hidden" name="VIEW_SIZE" value="10"/> <input type="hidden" name="PAGING" value="Y"/> Modified: ofbiz/trunk/framework/images/webapp/images/ecommain.css URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/images/webapp/images/ecommain.css?rev=781606&r1=781605&r2=781606&view=diff ============================================================================== --- ofbiz/trunk/framework/images/webapp/images/ecommain.css (original) +++ ofbiz/trunk/framework/images/webapp/images/ecommain.css Wed Jun 3 22:14:08 2009 @@ -379,6 +379,15 @@ height:1% } +#ecom-mainarea .screenlet h3 { + background: #1C334D; + color:#fff; + height:auto !important; + height:1%; + padding:1px 4px 3px 4px; +} + + .boxhead { font-size: 8pt; font-weight: bold; Modified: ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/blog/blogs.ftl URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/blog/blogs.ftl?rev=781606&r1=781605&r2=781606&view=diff ============================================================================== --- ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/blog/blogs.ftl (original) +++ ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/blog/blogs.ftl Wed Jun 3 22:14:08 2009 @@ -1,31 +1,31 @@ -<#-- -Licensed to the Apache Software Foundation (ASF) under one -or more contributor license agreements. See the NOTICE file -distributed with this work for additional information -regarding copyright ownership. The ASF licenses this file -to you under the Apache License, Version 2.0 (the -"License"); you may not use this file except in compliance -with the License. You may obtain a copy of the License at - -http://www.apache.org/licenses/LICENSE-2.0 - -Unless required by applicable law or agreed to in writing, -software distributed under the License is distributed on an -"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY -KIND, either express or implied. See the License for the -specific language governing permissions and limitations -under the License. ---> - -<div id="browse-blogs" class="screenlet"> - <div class="screenlet-header boxhead">${uiLabelMap.ProductBrowseBlogs}</div> - <div class="screenlet-body"> - <ul class="browsecategorylist"> - <#list blogs as blog> - <li class="browsecategorytext"> - <a href="<@ofbizUrl>MainBlog?blogContentId=${blog.contentId}</@ofbizUrl>" class="browsecategorybutton">${blog.contentName}</a> - </li> - </#list> - </ul> - </div> -</div> +<#-- +Licensed to the Apache Software Foundation (ASF) under one +or more contributor license agreements. See the NOTICE file +distributed with this work for additional information +regarding copyright ownership. The ASF licenses this file +to you under the Apache License, Version 2.0 (the +"License"); you may not use this file except in compliance +with the License. You may obtain a copy of the License at + +http://www.apache.org/licenses/LICENSE-2.0 + +Unless required by applicable law or agreed to in writing, +software distributed under the License is distributed on an +"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +KIND, either express or implied. See the License for the +specific language governing permissions and limitations +under the License. +--> + +<div id="browse-blogs" class="screenlet"> + <h3>${uiLabelMap.ProductBrowseBlogs}</h3> + <div class="screenlet-body"> + <ul class="browsecategorylist"> + <#list blogs as blog> + <li class="browsecategorytext"> + <a href="<@ofbizUrl>MainBlog?blogContentId=${blog.contentId}</@ofbizUrl>" class="browsecategorybutton">${blog.contentName}</a> + </li> + </#list> + </ul> + </div> +</div> Modified: ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/blog/menubar.ftl URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/blog/menubar.ftl?rev=781606&r1=781605&r2=781606&view=diff ============================================================================== --- ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/blog/menubar.ftl (original) +++ ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/blog/menubar.ftl Wed Jun 3 22:14:08 2009 @@ -1,9 +1,9 @@ - -<div id="menubar" style="background-color: #ccc;"> - <a href="<@ofbizUrl>/main</@ofbizUrl>" class="headerlink">${uiLabelMap.CommonHome}</a> - <a href="#" class="headerlink">${uiLabelMap.CommonNew}</a> - <a href="#" class="headerlink">Recommended</a> - <a href="#" class="headerlink">Highest Rated</a> - <a href="#" class="headerlink">Upload Pitch</a> - <a href="/webtools/control/main" class="headerlink">${uiLabelMap.WebTools}</a> -</div> + +<div id="menubar"> + <a href="<@ofbizUrl>/main</@ofbizUrl>" class="headerlink">${uiLabelMap.CommonHome}</a> + <a href="#" class="headerlink">${uiLabelMap.CommonNew}</a> + <a href="#" class="headerlink">Recommended</a> + <a href="#" class="headerlink">Highest Rated</a> + <a href="#" class="headerlink">Upload Pitch</a> + <a href="/webtools/control/main" class="headerlink">${uiLabelMap.WebTools}</a> +</div> Modified: ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/cart/minipromotext.ftl URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/cart/minipromotext.ftl?rev=781606&r1=781605&r2=781606&view=diff ============================================================================== --- ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/cart/minipromotext.ftl (original) +++ ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/cart/minipromotext.ftl Wed Jun 3 22:14:08 2009 @@ -19,9 +19,7 @@ <#if showPromoText> <div id="minipromotext" class="screenlet"> - <div class="screenlet-header"> - <div class="boxhead">${uiLabelMap.OrderSpecialOffers}</div> - </div> + <h3>${uiLabelMap.OrderSpecialOffers}</h3> <div class="screenlet-body"> <#-- show promotions text --> <ul> Modified: ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/catalog/advancedsearch.ftl URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/catalog/advancedsearch.ftl?rev=781606&r1=781605&r2=781606&view=diff ============================================================================== --- ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/catalog/advancedsearch.ftl (original) +++ ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/catalog/advancedsearch.ftl Wed Jun 3 22:14:08 2009 @@ -18,12 +18,11 @@ --> <#assign searchOptionsHistoryList = Static["org.ofbiz.product.product.ProductSearchSession"].getSearchOptionsHistoryList(session)/> <#assign currentCatalogId = Static["org.ofbiz.product.catalog.CatalogWorker"].getCurrentCatalogId(request)/> -<h1>${uiLabelMap.ProductAdvancedSearchInCategory}</h1> -<br/> -<form name="advtokeywordsearchform" method="post" action="<@ofbizUrl>keywordsearch</@ofbizUrl>" style="margin: 0;"> +<h2>${uiLabelMap.ProductAdvancedSearchInCategory}</h2> +<form name="advtokeywordsearchform" method="post" action="<@ofbizUrl>keywordsearch</@ofbizUrl>"> <input type="hidden" name="VIEW_SIZE" value="10"/> <input type="hidden" name="PAGING" value="Y"/> - <table width="100%"> + <table> <input type="hidden" name="SEARCH_CATALOG_ID" value="${currentCatalogId}"> <#if searchCategory?has_content> <input type="hidden" name="SEARCH_CATEGORY_ID" value="${searchCategoryId?if_exists}"/> @@ -101,7 +100,7 @@ </table> <#if searchOptionsHistoryList?has_content> - <hr/> + <h2>${uiLabelMap.OrderLastSearches}...</h2> @@ -112,7 +111,7 @@ <#list searchOptionsHistoryList as searchOptions> <#-- searchOptions type is ProductSearchSession.ProductSearchOptions --> <div> - <b>${uiLabelMap.EcommerceSearchNumber}${searchOptions_index + 1}</b> + ${uiLabelMap.EcommerceSearchNumber}${searchOptions_index + 1} <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> </div> @@ -121,7 +120,7 @@ <div> - ${constraintString}</div> </#list> <#if searchOptions_has_next> - <hr/> + </#if> </#list> </#if> Modified: ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/catalog/choosecatalog.ftl URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/catalog/choosecatalog.ftl?rev=781606&r1=781605&r2=781606&view=diff ============================================================================== --- ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/catalog/choosecatalog.ftl (original) +++ ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/catalog/choosecatalog.ftl Wed Jun 3 22:14:08 2009 @@ -23,11 +23,9 @@ <#-- 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-header"> - <div class="boxhead">${uiLabelMap.ProductChooseCatalog}</div> - </div> - <div class="screenlet-body" style="text-align: center;"> - <form name="choosecatalogform" method="post" action="<@ofbizUrl>main</@ofbizUrl>" style='margin: 0;'> + <h3>${uiLabelMap.ProductChooseCatalog}</h3> + <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> Modified: ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/catalog/configproductdetail.ftl URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/catalog/configproductdetail.ftl?rev=781606&r1=781605&r2=781606&view=diff ============================================================================== --- ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/catalog/configproductdetail.ftl (original) +++ ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/catalog/configproductdetail.ftl Wed Jun 3 22:14:08 2009 @@ -174,7 +174,7 @@ <div id="productdetail"> -<table border="0" cellpadding="2" cellspacing="0" width="100%"> +<table> <#-- Category next/previous --> <#if category?exists> @@ -191,7 +191,7 @@ </tr> </#if> - <tr><td colspan="2"><hr class='sepbar'></td></tr> + <tr><td colspan="2"></td></tr> <#-- Product image/name/price --> <tr> @@ -244,7 +244,7 @@ <div>${uiLabelMap.ProductRegularPrice}: <span class='basePrice'><@ofbizCurrency amount=price.defaultPrice isoCode=price.currencyUsed/></span></div> </#if> <div> - <b> + <#if price.isSale?exists && price.isSale> <span class='salePrice'>${uiLabelMap.OrderOnSale}!</span> <#assign priceStyle = "salePrice"> @@ -252,7 +252,7 @@ <#assign priceStyle = "regularPrice"> </#if> ${uiLabelMap.OrderYourPrice}: <#if "Y" = product.isVirtual?if_exists> from </#if><span class='${priceStyle}'><@ofbizCurrency amount=price.price isoCode=price.currencyUsed/></span> - </b> + </div> <#if price.listPrice?exists && price.price?exists && price.price < price.listPrice> <#assign priceSaved = price.listPrice - price.price> @@ -274,7 +274,7 @@ </div> </#if> <#if daysToShip?exists> - <div><b>${uiLabelMap.ProductUsuallyShipsIn} <font color='red'>${daysToShip}</font> ${uiLabelMap.CommonDays}!<b></div> + <div>${uiLabelMap.ProductUsuallyShipsIn} ${daysToShip} ${uiLabelMap.CommonDays}</div> </#if> <#-- show tell a friend details only in ecommerce application --> @@ -363,7 +363,7 @@ </form> <div> <#if sessionAttributes.userLogin?has_content && sessionAttributes.userLogin.userLoginId != "anonymous"> - <hr/> + <form name="addToShoppingList" method="post" action="<@ofbizUrl>addItemToShoppingList<#if requestAttributes._CURRENT_VIEW_?exists>/${requestAttributes._CURRENT_VIEW_}</#if></@ofbizUrl>"> <input type="hidden" name="productId" value="${product.productId}"> <input type="hidden" name="product_id" value="${product.productId}"> @@ -427,7 +427,7 @@ </td> </tr> - <tr><td colspan="2"><hr class='sepbar'></td></tr> + <#-- Long description of product --> <tr> @@ -456,7 +456,7 @@ </div> </td> </tr> - <tr><td><hr/></td></tr> + <#assign counter = 0> <#assign questions = configwrapper.questions> <#list questions as question> @@ -598,14 +598,14 @@ </#if> </td> </tr> - <tr><td><hr/></td></tr> + <#assign counter = counter + 1> </#list> </table> </form> </td> </tr> - <tr><td colspan="2"><hr class='sepbar'></td></tr> + <#-- Product Reviews --> <tr> @@ -626,13 +626,13 @@ <table border="0" cellpadding="0" cellspacing='0'> <tr> <td> - <div><b>${uiLabelMap.CommonBy}: </b><#if productReview.postedAnonymous?default("N") == "Y">${uiLabelMap.OrderAnonymous}<#else>${postedPerson.firstName} ${postedPerson.lastName}</#if></div> + <div>${uiLabelMap.CommonBy}: <#if productReview.postedAnonymous?default("N") == "Y">${uiLabelMap.OrderAnonymous}<#else>${postedPerson.firstName} ${postedPerson.lastName}</#if></div> </td> <td> - <div><b>${uiLabelMap.CommonOn}: </b>${productReview.postedDateTime?if_exists}</div> + <div>${uiLabelMap.CommonOn}: ${productReview.postedDateTime?if_exists}</div> </td> <td> - <div><b>${uiLabelMap.OrderRanking}: </b>${productReview.productRating?if_exists?string}</div> + <div>${uiLabelMap.OrderRanking}: ${productReview.productRating?if_exists?string}</div> </td> </tr> <tr> @@ -645,7 +645,7 @@ <div>${productReview.productReview?if_exists}</div> </td> </tr> - <tr><td colspan="3"><hr/></td></tr> + </table> </td> </tr> @@ -678,14 +678,14 @@ <#if assocProducts?has_content> <tr><td> </td></tr> <tr><td colspan="2"><h2>${beforeName?if_exists}<#if showName == "Y">${productContentWrapper.get("PRODUCT_NAME")?if_exists}</#if>${afterName?if_exists}</h2></td></tr> - <tr><td><hr/></td></tr> + <#list assocProducts as productAssoc> <tr><td> <div> <a href='<@ofbizUrl>${targetRequest}/<#if categoryId?exists>~category_id=${categoryId}/</#if>~product_id=${productAssoc.productIdTo?if_exists}</@ofbizUrl>' class="buttontext"> ${productAssoc.productIdTo?if_exists} </a> - - <b>${productAssoc.reason?if_exists}</b> + - ${productAssoc.reason?if_exists} </div> </td></tr> ${setRequestAttribute("optProductId", productAssoc.productIdTo)} @@ -700,7 +700,7 @@ </td> </tr> <#local listIndex = listIndex + 1> - <tr><td><hr/></td></tr> + </#list> ${setRequestAttribute("optProductId", "")} ${setRequestAttribute("formNamePrefix", "")} @@ -725,7 +725,7 @@ <#-- special cross/up-sell area using commonFeatureResultIds (from common feature product search) --> <#if commonFeatureResultIds?has_content> <h2>Similar Products That Might Interest You...</h2> - <hr/> + <#list commonFeatureResultIds as commonFeatureResultId> <div> Modified: ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/catalog/detailImage.ftl URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/catalog/detailImage.ftl?rev=781606&r1=781605&r2=781606&view=diff ============================================================================== --- ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/catalog/detailImage.ftl (original) +++ ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/catalog/detailImage.ftl Wed Jun 3 22:14:08 2009 @@ -18,10 +18,9 @@ --> <html> <body> - <center> <#if requestParameters.detail?has_content> <#assign detailImage = Static["org.ofbiz.base.util.Base64"].base64Decode(requestParameters.detail)> - <img src="${detailImage}" border="0" width='500'> + <img src="${detailImage}"> <#else> <script language="JavaScript" type="text/javascript"> <!-- // @@ -29,6 +28,5 @@ // --> </script> </#if> - </center> </body> </html> Modified: ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/catalog/lastviewedproducts.ftl URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/catalog/lastviewedproducts.ftl?rev=781606&r1=781605&r2=781606&view=diff ============================================================================== --- ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/catalog/lastviewedproducts.ftl (original) +++ ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/catalog/lastviewedproducts.ftl Wed Jun 3 22:14:08 2009 @@ -16,7 +16,7 @@ specific language governing permissions and limitations under the License. --> -<table border="0" width="100%" cellpadding="3"> +<table> <tr> <td colspan="2"> <h1> @@ -27,9 +27,8 @@ </table> <#if sessionAttributes.lastViewedProducts?exists && sessionAttributes.lastViewedProducts?has_content> -<br/> -<center> - <table width='100%' border='0' cellpadding='0' cellspacing='0'> + + <table> <#list sessionAttributes.lastViewedProducts as productId> <tr> <td> @@ -40,15 +39,12 @@ </tr> </#list> </table> -</center> + <#else> -<table border="0" width="100%" cellpadding="2"> - <tr> - <td colspan="2"><hr/></td> - </tr> +<table> <tr> <td> - <div class='tabletext'>${uiLabelMap.ProductNotViewedAnyProducts}.</DIV> + <div class='tabletext'>${uiLabelMap.ProductNotViewedAnyProducts}.</div> </td> </tr> </table> Modified: ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/catalog/miniassocprods.ftl URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/catalog/miniassocprods.ftl?rev=781606&r1=781605&r2=781606&view=diff ============================================================================== --- ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/catalog/miniassocprods.ftl (original) +++ ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/catalog/miniassocprods.ftl Wed Jun 3 22:14:08 2009 @@ -20,7 +20,7 @@ <#assign associatedProducts = Static["org.ofbiz.order.shoppingcart.product.ProductDisplayWorker"].getRandomCartProductAssoc(request, true)?if_exists> <#if associatedProducts?has_content> <div id="miniassocproducts" class="screenlet"> - <div class="screenlet-header boxhead">${uiLabelMap.EcommerceYouMightLike}...</div> + <h3>${uiLabelMap.EcommerceYouMightLike}...</h3> <div class="screenlet-body"> <#-- random complementary products --> <ul class="browsecategorylist"> Modified: ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/catalog/minilastproductsearches.ftl URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/catalog/minilastproductsearches.ftl?rev=781606&r1=781605&r2=781606&view=diff ============================================================================== --- ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/catalog/minilastproductsearches.ftl (original) +++ ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/catalog/minilastproductsearches.ftl Wed Jun 3 22:14:08 2009 @@ -22,20 +22,20 @@ <#if searchOptionsHistoryList?has_content> <#if (searchOptionsHistoryList?size > maxToShow)><#assign limit=maxToShow/><#else><#assign limit=(searchOptionsHistoryList?size-1)/></#if> <div id="minilastproductsearches" class="screenlet"> - <div class="screenlet-header"> + <div class="boxlink"> <a href="<@ofbizUrl>clearLastViewed</@ofbizUrl>" class="lightbuttontextsmall">[${uiLabelMap.CommonClear}]</a> <#if (searchOptionsHistoryList?size > maxToShow)> <a href="<@ofbizUrl>advancedsearch</@ofbizUrl>" class="lightbuttontextsmall">[${uiLabelMap.CommonMore}]</a> </#if> </div> - <div class="boxhead">${uiLabelMap.OrderLastSearches}...</div> - </div> + <h3>${uiLabelMap.OrderLastSearches}...</h3> + <div class="screenlet-body"> <#list searchOptionsHistoryList[0..limit] as searchOptions> <#-- searchOptions type is ProductSearchSession.ProductSearchOptions --> <p> - <b>${uiLabelMap.EcommerceSearchNumber} ${searchOptions_index + 1}</b> + ${uiLabelMap.EcommerceSearchNumber} ${searchOptions_index + 1} </p> <div class="tabletext"> <a href="<@ofbizUrl>setCurrentSearchFromHistoryAndSearch?searchHistoryIndex=${searchOptions_index}&clearSearch=N</@ofbizUrl>" class="buttontext">${uiLabelMap.CommonSearch}</a> @@ -46,7 +46,7 @@ <div class="tabletext"> - ${constraintString}</div> </#list> <#if searchOptions_has_next> - <div><hr/></div> + </#if> </#list> </div> Modified: ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/catalog/minilastviewedcategories.ftl URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/catalog/minilastviewedcategories.ftl?rev=781606&r1=781605&r2=781606&view=diff ============================================================================== --- ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/catalog/minilastviewedcategories.ftl (original) +++ ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/catalog/minilastviewedcategories.ftl Wed Jun 3 22:14:08 2009 @@ -22,12 +22,11 @@ <#if lastViewedCategories?has_content> <#if (lastViewedCategories?size > maxToShow)><#assign limit=maxToShow/><#else><#assign limit=(lastViewedCategories?size-1)/></#if> <div id="minilastviewedcategories" class="screenlet"> - <div class="screenlet-header"> + <div class="boxlink"> <a href="<@ofbizUrl>clearLastViewed</@ofbizUrl>" class="lightbuttontextsmall">[${uiLabelMap.CommonClear}]</a> </div> - <div class="boxhead">${uiLabelMap.EcommerceLastCategories}</div> - </div> + <h3>${uiLabelMap.EcommerceLastCategories}</h3> <div class="screenlet-body"> <ul class="browsecategorylist"> <#list lastViewedCategories[0..limit] as categoryId> Modified: ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/catalog/minilastviewedproducts.ftl URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/catalog/minilastviewedproducts.ftl?rev=781606&r1=781605&r2=781606&view=diff ============================================================================== --- ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/catalog/minilastviewedproducts.ftl (original) +++ ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/catalog/minilastviewedproducts.ftl Wed Jun 3 22:14:08 2009 @@ -22,15 +22,14 @@ <#if lastViewedProducts?has_content> <#if (lastViewedProducts?size > maxToShow)><#assign limit=maxToShow/><#else><#assign limit=(lastViewedProducts?size-1)/></#if> <div id="minilastviewedproducts" class="screenlet"> - <div class="screenlet-header"> + <div class="boxlink"> <a href="<@ofbizUrl>clearLastViewed</@ofbizUrl>" class="lightbuttontextsmall">[${uiLabelMap.CommonClear}]</a> <#if (lastViewedProducts?size > maxToShow)> <a href="<@ofbizUrl>lastviewedproducts</@ofbizUrl>" class="lightbuttontextsmall">[${uiLabelMap.CommonMore}]</a> </#if> </div> - <div class="boxhead">${uiLabelMap.EcommerceLastProducts}</div> - </div> + <h3>${uiLabelMap.EcommerceLastProducts}</h3> <div class="screenlet-body"> <#list lastViewedProducts[0..limit] as productId> <div> @@ -40,7 +39,7 @@ ${screens.render("component://ecommerce/widget/CatalogScreens.xml#miniproductsummary")} </div> <#if productId_has_next> - <div><hr/></div> + </#if> </#list> </div> Modified: ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/catalog/miniproductsummary.ftl URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/catalog/miniproductsummary.ftl?rev=781606&r1=781605&r2=781606&view=diff ============================================================================== --- ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/catalog/miniproductsummary.ftl (original) +++ ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/catalog/miniproductsummary.ftl Wed Jun 3 22:14:08 2009 @@ -18,25 +18,25 @@ --> <#if miniProduct?exists> <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> + <p>${miniProduct.productId} <#if (priceResult.price?default(0) > 0 && miniProduct.requireAmount?default("N") == "N")> <#if "Y" = miniProduct.isVirtual?if_exists> ${uiLabelMap.CommonFrom} </#if> <#if totalPrice?exists> <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> + <span class="<#if priceResult.isSale>salePrice<#else>normalPrice</#if>"> + <@ofbizCurrency amount=priceResult.price isoCode=priceResult.currencyUsed/></span> </#if> </#if> </p> - <div style="margin-top: 4px;"> + <div> <#if (miniProduct.introductionDate?exists) && (nowTimeLong < miniProduct.introductionDate.getTime())> <#-- check to see if introductionDate hasn't passed yet --> - <p style="color: red;">${uiLabelMap.ProductNotYetAvailable}</p> + <p>${uiLabelMap.ProductNotYetAvailable}</p> <#elseif (miniProduct.salesDiscontinuationDate?exists) && (nowTimeLong > miniProduct.salesDiscontinuationDate.getTime())> <#-- check to see if salesDiscontinuationDate has passed --> - <p style="color: red;">${uiLabelMap.ProductNoLongerAvailable}</p> + <p>${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/specialpurpose/ecommerce/webapp/ecommerce/catalog/minireorderprods.ftl URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/catalog/minireorderprods.ftl?rev=781606&r1=781605&r2=781606&view=diff ============================================================================== --- ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/catalog/minireorderprods.ftl (original) +++ ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/catalog/minireorderprods.ftl Wed Jun 3 22:14:08 2009 @@ -18,9 +18,7 @@ --> <#if reorderProducts?has_content> <div id ="minireorderprods" class="screenlet"> - <div class="screenlet-header"> - <div class="boxhead">${uiLabelMap.ProductQuickReorder}...</div> - </div> + <h3>${uiLabelMap.ProductQuickReorder}...</h3> <div class="screenlet-body"> <#list reorderProducts as miniProduct> <div> @@ -30,7 +28,7 @@ ${screens.render("component://ecommerce/widget/CatalogScreens.xml#miniproductsummary")} </div> <#if miniProduct_has_next> - <div><hr/></div> + </#if> </#list> </div> Modified: ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/catalog/productreview.ftl URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/catalog/productreview.ftl?rev=781606&r1=781605&r2=781606&view=diff ============================================================================== --- ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/catalog/productreview.ftl (original) +++ ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/catalog/productreview.ftl Wed Jun 3 22:14:08 2009 @@ -38,7 +38,7 @@ <tr> <td> <div class="tabletext"> - <b>${uiLabelMap.EcommercePostAnonymous}:</b> + ${uiLabelMap.EcommercePostAnonymous}: ${uiLabelMap.CommonYes} <input type="radio" name="postedAnonymous" value="true"> ${uiLabelMap.CommonNo} <input type="radio" name="postedAnonymous" value="false" CHECKED> </div> Modified: ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/catalog/sidedeepcategory.ftl URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/catalog/sidedeepcategory.ftl?rev=781606&r1=781605&r2=781606&view=diff ============================================================================== --- ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/catalog/sidedeepcategory.ftl (original) +++ ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/catalog/sidedeepcategory.ftl Wed Jun 3 22:14:08 2009 @@ -39,9 +39,7 @@ </#if> <#if wrapInBox == "Y"> <div id="sidedeepcategory" class="screenlet"> - <div class="screenlet-header"> - <div class="boxhead"><#if categoryDescription?has_content>${categoryDescription}<#else>${categoryName?default("")}</#if></div> - </div> + <h3><#if categoryDescription?has_content>${categoryDescription}<#else>${categoryName?default("")}</#if></h3> <div class="screenlet-body"> <div class="browsecategorylist"> </#if> @@ -67,9 +65,7 @@ <#if topLevelList?has_content> <div id="sidedeepcategory" class="screenlet"> - <div class="screenlet-header"> - <div class="boxhead">${uiLabelMap.ProductBrowseCategories}</div> - </div> + <h3>${uiLabelMap.ProductBrowseCategories}</h3> <div class="screenlet-body"> <ul class="browsecategorylist"> <#list topLevelList as category> Modified: ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/catalog/tellafriend.ftl URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/catalog/tellafriend.ftl?rev=781606&r1=781605&r2=781606&view=diff ============================================================================== --- ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/catalog/tellafriend.ftl (original) +++ ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/catalog/tellafriend.ftl Wed Jun 3 22:14:08 2009 @@ -22,7 +22,6 @@ <title>${uiLabelMap.EcommerceTellAFriend}</title> </head> <body class="ecbody"> - <center> <form name="tellafriend" action="<@ofbizUrl>emailFriend</@ofbizUrl>" method="post"> <#if requestParameters.productId?exists> <input type="hidden" name="pageUrl" value="<@ofbizUrl fullPath="true" encode="false" secure="false">/product?product_id=${requestParameters.productId}</@ofbizUrl>"> @@ -64,6 +63,5 @@ <div class="tabletext">${uiLabelMap.EcommerceTellAFriendSorry}</div> </#if> </form> - </center> </body> </html> Modified: ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/content/content_categories.ftl URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/content/content_categories.ftl?rev=781606&r1=781605&r2=781606&view=diff ============================================================================== --- ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/content/content_categories.ftl (original) +++ ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/content/content_categories.ftl Wed Jun 3 22:14:08 2009 @@ -31,7 +31,7 @@ </#if> <div id="content_catagories" class="screenlet"> - <div class="screenlet-header boxhead">${uiLabelMap.ProductBrowseContent}</div> + <h3>${uiLabelMap.ProductBrowseContent}</h3> <div class="screenlet-body"> <ul class="browsecategorylist"> <#assign count_1=0/> Modified: ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/content/factoids.ftl URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/content/factoids.ftl?rev=781606&r1=781605&r2=781606&view=diff ============================================================================== --- ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/content/factoids.ftl (original) +++ ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/content/factoids.ftl Wed Jun 3 22:14:08 2009 @@ -31,7 +31,7 @@ </#if> <div id="factoids" class="screenlet"> - <div class="screenlet-header boxhead">${uiLabelMap.EcommerceFactoids}</div> + <h3>${uiLabelMap.EcommerceFactoids}</h3> <div class="screenlet-body"> <ul class="browsecategorylist"> <#assign count_1=0/> Modified: ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/content/minipoll.ftl URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/content/minipoll.ftl?rev=781606&r1=781605&r2=781606&view=diff ============================================================================== --- ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/content/minipoll.ftl (original) +++ ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/content/minipoll.ftl Wed Jun 3 22:14:08 2009 @@ -24,9 +24,7 @@ <#if randomSurvey?has_content> <div id="minipoll" class="screenlet"> - <div class="screenlet-header"> - <div class="boxhead">${randomSurvey.getSurveyName()?if_exists}</div> - </div> + <h3>${randomSurvey.getSurveyName()?if_exists}</h3> <div class="screenlet-body"> <form method="post" action="<@ofbizUrl>minipoll<#if requestAttributes._CURRENT_VIEW_?exists>/${requestAttributes._CURRENT_VIEW_}</#if></@ofbizUrl>" style="margin: 0;"> ${randomSurvey.render()} Modified: ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/content/recentlyviewed.ftl URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/content/recentlyviewed.ftl?rev=781606&r1=781605&r2=781606&view=diff ============================================================================== --- ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/content/recentlyviewed.ftl (original) +++ ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/content/recentlyviewed.ftl Wed Jun 3 22:14:08 2009 @@ -19,10 +19,7 @@ <#if mrvList?has_content> <div id="recentlyviewed" class="screenlet"> - <div class="browsecategorylist"> - <div class="screenlet-header"> - <div class="boxhead">${uiLabelMap.EcommerceLastContent}</div> - </div> + <h3>${uiLabelMap.EcommerceLastContent}</h3> <div class="screenlet-body"> <#list mrvList as mrvArr> <div class="browsecategorytext"> @@ -30,6 +27,5 @@ </div> </#list> </div> - </div> </div> </#if> Modified: ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/content/searchContent.ftl URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/content/searchContent.ftl?rev=781606&r1=781605&r2=781606&view=diff ============================================================================== --- ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/content/searchContent.ftl (original) +++ ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/content/searchContent.ftl Wed Jun 3 22:14:08 2009 @@ -17,8 +17,8 @@ under the License. --> -<hr/> - <form method="post" action="<@ofbizUrl>searchContent</@ofbizUrl>" name="searchQuery" style="margin: 0;"> + +<form method="post" action="<@ofbizUrl>searchContent</@ofbizUrl>" name="searchQuery"> <table border="0" cellpadding="2" cellspacing="0"> <tr> @@ -35,7 +35,7 @@ <!-- category form --> <tr> - <table border="0" wdith="100%"> + <table> <tr> <td align="right" valign="middle"> <div class="tabletext">${uiLabelMap.ProductFeatures}:</div> @@ -96,7 +96,7 @@ </form> -<hr/> + ${listWrapper.renderFormString()} <#macro listSiteIds contentId indentIndex=0> Modified: ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/content/showcontenttree.ftl URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/content/showcontenttree.ftl?rev=781606&r1=781605&r2=781606&view=diff ============================================================================== --- ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/content/showcontenttree.ftl (original) +++ ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/content/showcontenttree.ftl Wed Jun 3 22:14:08 2009 @@ -53,7 +53,7 @@ <#assign dummy=Static["org.ofbiz.base.util.Debug"].logInfo("in showcontenttree, nodeTrail:" + nodeTrail, "")/> --> -<div style="padding-left:20px;"> +<div> <@renderCategoryBrowse contentId=siteId indentIndex=1 nodeTrail=nodeTrail /> </div> @@ -105,7 +105,7 @@ <a class="tabButton" href="<@ofbizUrl>searchContent?siteId=${subContentId?if_exists}&nodeTrailCsv=${thisCsv}</@ofbizUrl>" >${uiLabelMap.CommonSearch}</a> <br/> <#if thisContentId == subContentId> <#assign catTrail = nodeTrail + [subContentId]/> - <div style="padding-left:20px;"><@renderCategoryBrowse contentId=subContentId indentIndex=(indentIndex + 1) nodeTrail=catTrail viewSz=viewSz viewIdx=viewIdx /></div> + <div><@renderCategoryBrowse contentId=subContentId indentIndex=(indentIndex + 1) nodeTrail=catTrail viewSz=viewSz viewIdx=viewIdx /></div> </#if> </@loopSubContent> </#macro> Modified: ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/customer/miniSignUpForContactList.ftl URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/customer/miniSignUpForContactList.ftl?rev=781606&r1=781605&r2=781606&view=diff ============================================================================== --- ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/customer/miniSignUpForContactList.ftl (original) +++ ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/customer/miniSignUpForContactList.ftl Wed Jun 3 22:14:08 2009 @@ -1,72 +1,70 @@ -<#-- -Licensed to the Apache Software Foundation (ASF) under one -or more contributor license agreements. See the NOTICE file -distributed with this work for additional information -regarding copyright ownership. The ASF licenses this file -to you under the Apache License, Version 2.0 (the -"License"); you may not use this file except in compliance -with the License. You may obtain a copy of the License at - -http://www.apache.org/licenses/LICENSE-2.0 - -Unless required by applicable law or agreed to in writing, -software distributed under the License is distributed on an -"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY -KIND, either express or implied. See the License for the -specific language governing permissions and limitations -under the License. ---> - -<#-- A simple macro that builds the contact list --> -<#macro contactList publicEmailContactLists> - <select name="contactListId" class="selectBox" style="width:134px"> - <#list publicEmailContactLists as publicEmailContactList> - <#assign publicContactMechType = publicEmailContactList.getRelatedOneCache("ContactMechType")?if_exists> - <option value="${publicEmailContactList.contactListId}">${publicEmailContactList.contactListName?if_exists}</option> - </#list> - </select> -</#macro> - -<div id="miniSignUpForContactList" class="screenlet"> - <div class="screenlet-header"> - <div class="boxhead">${uiLabelMap.EcommerceSignUpForContactList}</div> - </div> - <div class="screenlet-body" style="text-align: center;"> - <#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"> - <input type="hidden" name="partyId" value="${partyId}"/> - <input type="hidden" name="statusId" value="CLPT_PENDING"/> - <p>${uiLabelMap.EcommerceSignUpForContactListComments}</p> - <@contactList publicEmailContactLists=publicEmailContactLists/> - - <select name="preferredContactMechId" class="selectBox" style="width:134px"> - <#list partyAndContactMechList as partyAndContactMech> - <option value="${partyAndContactMech.contactMechId}"><#if partyAndContactMech.infoString?has_content>${partyAndContactMech.infoString}<#elseif partyAndContactMech.tnContactNumber?has_content>${partyAndContactMech.tnCountryCode?if_exists}-${partyAndContactMech.tnAreaCode?if_exists}-${partyAndContactMech.tnContactNumber}<#elseif partyAndContactMech.paAddress1?has_content>${partyAndContactMech.paAddress1}, ${partyAndContactMech.paAddress2?if_exists}, ${partyAndContactMech.paCity?if_exists}, ${partyAndContactMech.paStateProvinceGeoId?if_exists}, ${partyAndContactMech.paPostalCode?if_exists}, ${partyAndContactMech.paPostalCodeExt?if_exists} ${partyAndContactMech.paCountryGeoId?if_exists}</#if></option> - </#list> - </select> - - <input type="submit" value="${uiLabelMap.EcommerceSubscribe}" class="smallSubmit"/> - </form> - <#else> - <#-- Not logged in so ask them to log in and then sign up or clear the user association --> - <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"> - <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"/> - </form> - </#if> - </div> -</div> - - - +<#-- +Licensed to the Apache Software Foundation (ASF) under one +or more contributor license agreements. See the NOTICE file +distributed with this work for additional information +regarding copyright ownership. The ASF licenses this file +to you under the Apache License, Version 2.0 (the +"License"); you may not use this file except in compliance +with the License. You may obtain a copy of the License at + +http://www.apache.org/licenses/LICENSE-2.0 + +Unless required by applicable law or agreed to in writing, +software distributed under the License is distributed on an +"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +KIND, either express or implied. See the License for the +specific language governing permissions and limitations +under the License. +--> + +<#-- A simple macro that builds the contact list --> +<#macro contactList publicEmailContactLists> + <select name="contactListId" class="selectBox" style="width:134px"> + <#list publicEmailContactLists as publicEmailContactList> + <#assign publicContactMechType = publicEmailContactList.getRelatedOneCache("ContactMechType")?if_exists> + <option value="${publicEmailContactList.contactListId}">${publicEmailContactList.contactListName?if_exists}</option> + </#list> + </select> +</#macro> + +<div id="miniSignUpForContactList" class="screenlet"> + <h3>${uiLabelMap.EcommerceSignUpForContactList}</h3> + <div class="screenlet-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"> + <input type="hidden" name="partyId" value="${partyId}"/> + <input type="hidden" name="statusId" value="CLPT_PENDING"/> + <p>${uiLabelMap.EcommerceSignUpForContactListComments}</p> + <@contactList publicEmailContactLists=publicEmailContactLists/> + + <select name="preferredContactMechId" class="selectBox" style="width:134px"> + <#list partyAndContactMechList as partyAndContactMech> + <option value="${partyAndContactMech.contactMechId}"><#if partyAndContactMech.infoString?has_content>${partyAndContactMech.infoString}<#elseif partyAndContactMech.tnContactNumber?has_content>${partyAndContactMech.tnCountryCode?if_exists}-${partyAndContactMech.tnAreaCode?if_exists}-${partyAndContactMech.tnContactNumber}<#elseif partyAndContactMech.paAddress1?has_content>${partyAndContactMech.paAddress1}, ${partyAndContactMech.paAddress2?if_exists}, ${partyAndContactMech.paCity?if_exists}, ${partyAndContactMech.paStateProvinceGeoId?if_exists}, ${partyAndContactMech.paPostalCode?if_exists}, ${partyAndContactMech.paPostalCodeExt?if_exists} ${partyAndContactMech.paCountryGeoId?if_exists}</#if></option> + </#list> + </select> + + <input type="submit" value="${uiLabelMap.EcommerceSubscribe}" class="smallSubmit"/> + </form> + <#else> + <#-- Not logged in so ask them to log in and then sign up or clear the user association --> + <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"> + <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"/> + </form> + </#if> + </div> +</div> + + + Modified: ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/forum/ViewComboResponse.ftl URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/forum/ViewComboResponse.ftl?rev=781606&r1=781605&r2=781606&view=diff ============================================================================== --- ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/forum/ViewComboResponse.ftl (original) +++ ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/forum/ViewComboResponse.ftl Wed Jun 3 22:14:08 2009 @@ -36,7 +36,7 @@ <a class="tabButton" href="<@ofbizUrl>ViewBlog?contentId=${pair[0]?if_exists}&nodeTrailCsv=${csv?if_exists}"></@ofbizUrl>${uiLabelMap.CommonView}</a> <br/> <#assign indent = indent + " "> <#else> - <hr/> + <u>${uiLabelMap.EcommerceAddResponseFor}${pair[0]?if_exists} - ${pair[1]?if_exists}:</u><br/> </#if> <#assign counter = counter + 1> Modified: ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/forum/createforumresponse.ftl URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/forum/createforumresponse.ftl?rev=781606&r1=781605&r2=781606&view=diff ============================================================================== --- ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/forum/createforumresponse.ftl (original) +++ ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/forum/createforumresponse.ftl Wed Jun 3 22:14:08 2009 @@ -19,7 +19,6 @@ <#import "bloglib.ftl" as blog/> <div class="screenlet" > -<div style="margin:10px;" > <#-- <@blog.renderSiteAncestryPath trail=siteAncestorList?default([])/> <@blog.renderAncestryPath trail=trailList startIndex=1/> @@ -27,4 +26,3 @@ ${singleWrapper.renderFormString()} </div> -</div> Modified: ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/forum/editforumarticle.ftl URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/forum/editforumarticle.ftl?rev=781606&r1=781605&r2=781606&view=diff ============================================================================== --- ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/forum/editforumarticle.ftl (original) +++ ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/forum/editforumarticle.ftl Wed Jun 3 22:14:08 2009 @@ -34,14 +34,14 @@ --> <div class="screenlet"> - <div class="screenlet-header"> + <div class="boxlink"> <a href="<@ofbizUrl>editforuminfo?contentId=${contentId?if_exists}&nodeTrailCsv=${nodeTrailCsv?if_exists}&contentIdTo=${contentIdTo?if_exists}</@ofbizUrl>" class="submenutextright">${uiLabelMap.CommonUpdate}</a> </div> - <div class="boxhead"> ${uiLabelMap.EcommerceContentInformation}</div> - </div> + <h3>${uiLabelMap.EcommerceContentInformation}</h3> + <div class="screenlet-body"> - <table width="100%" border="0" cellpadding="0" cellspacing='0'> + <table> <tr><td align="right" nowrap><div class='tabletext'><b>${uiLabelMap.ProductContentId}</b></div></td><td> </td><td><div class='tabletext'>${contentId?if_exists}</div></td></tr> <tr><td align="right" nowrap><div class='tabletext'><b>${uiLabelMap.EcommerceContentName}</b></div></td><td> </td><td><div class='tabletext'>${contentName?if_exists}</div></td></tr> <tr><td align="right" nowrap><div class='tabletext'><b>${uiLabelMap.CommonDescription}</b></div></td><td> </td><td><div class='tabletext'>${description?if_exists}<div></td></tr> @@ -50,15 +50,15 @@ </div> <div class="screenlet"> - <div class="screenlet-header"> + <div class="boxlink"> <a href="<@ofbizUrl>editaddimage?contentIdTo=${contentId?if_exists}&dataResourceId=${txtDataResourceId?if_exists}&mapKey=IMAGE&nodeTrailCsv=${nodeTrailCsv?if_exists}</@ofbizUrl>" class="submenutextright">${uiLabelMap.CommonUpdate}</a> </div> - <div class="boxhead"> ${uiLabelMap.EcommerceImageInformation}</div> - </div> + <h3>${uiLabelMap.EcommerceImageInformation}</h3> + <div class="screenlet-body"> - <table width="100%" border="0" cellpadding="0" cellspacing='0'> - <tr><td align="right" nowrap><div class='tabletext'><b>${uiLabelMap.EcommerceImage}</b></div></td><td> </td><td><div class='tabletext'> + <table> + <tr><td align="right" nowrap><div class='tabletext'>${uiLabelMap.EcommerceImage}</div></td><td> </td><td><div class='tabletext'> <img src="<@ofbizUrl>img?imgId=${imgDataResourceId?if_exists}</@ofbizUrl>" /> <div></td></tr> </table> @@ -66,15 +66,13 @@ </div> <div class="screenlet"> - <div class="screenlet-header"> <div class="boxlink"> <a href="<@ofbizUrl>editaddforumdata?contentIdTo=${contentId?if_exists}&dataResourceId=${txtDataResourceId?if_exists}&mapKey=SUMMARY&nodeTrailCsv=${nodeTrailCsv?if_exists}</@ofbizUrl>" class="submenutextright">${uiLabelMap.CommonUpdate}</a> </div> - <div class="boxhead"> ${uiLabelMap.EcommerceSummaryInformation}</div> - </div> + <h3>${uiLabelMap.EcommerceSummaryInformation}</h3> <div class="screenlet-body"> - <table width="100%" border="0" cellpadding="0" cellspacing='0'> - <tr><td align="right" nowrap><div class='tabletext'><b>${uiLabelMap.EcommerceSummary}</b></div></td><td> </td><td><div class='tabletext'> + <table> + <tr><td><div class='tabletext'>${uiLabelMap.EcommerceSummary}</div></td><td> </td><td><div class='tabletext'> ${summaryData?if_exists} <div></td></tr> </table> @@ -82,12 +80,10 @@ </div> <div class="screenlet"> - <div class="screenlet-header"> <div class="boxlink"> <a href="<@ofbizUrl>editaddforumdata?contentIdTo=${contentId?if_exists}&dataResourceId=${txtDataResourceId?if_exists}&mapKey=ARTICLE&nodeTrailCsv=${nodeTrailCsv?if_exists}</@ofbizUrl>" class="submenutextright">${uiLabelMap.CommonUpdate}</a> </div> - <div class="boxhead"> ${uiLabelMap.EcommerceArticleInformation}</div> - </div> + <h3> ${uiLabelMap.EcommerceArticleInformation}</h3> <div class="screenlet-body"> <table width="100%" border="0" cellpadding="0" cellspacing='0'> <tr><td align="right" nowrap><div class='tabletext'><b>Article</b></div></td><td> </td><td><div class='tabletext'> Modified: ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/forum/forums.ftl URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/forum/forums.ftl?rev=781606&r1=781605&r2=781606&view=diff ============================================================================== --- ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/forum/forums.ftl (original) +++ ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/forum/forums.ftl Wed Jun 3 22:14:08 2009 @@ -18,7 +18,7 @@ --> <div id="browse-forums" class="screenlet"> - <div class="screenlet-header boxhead">${uiLabelMap.ProductBrowseForums}</div> + <h3>${uiLabelMap.ProductBrowseForums}</h3> <div class="screenlet-body"> <ul class="browsecategorylist"> <#list forums as forum> Modified: ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/forum/messageDisplay.ftl URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/forum/messageDisplay.ftl?rev=781606&r1=781605&r2=781606&view=diff ============================================================================== --- ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/forum/messageDisplay.ftl (original) +++ ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/forum/messageDisplay.ftl Wed Jun 3 22:14:08 2009 @@ -33,7 +33,7 @@ <div class="tableheadtext"> ${forumMessage.description?if_exists} </div> - <hr/> + <#-- <#assign result = dispatcher.runSync("getPublicForumMessage", Static["org.ofbiz.base.util.UtilMisc"].toMap("contentId", contentId, "userLogin", userLogin))/> <#if (result.resultData)?exists> Modified: ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/forum/mostrecent.ftl URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/forum/mostrecent.ftl?rev=781606&r1=781605&r2=781606&view=diff ============================================================================== --- ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/forum/mostrecent.ftl (original) +++ ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/forum/mostrecent.ftl Wed Jun 3 22:14:08 2009 @@ -35,29 +35,29 @@ <#list entityList as content> <@checkPermission entityOperation="_ADMIN" targetOperation="CONTENT_PUBLISH" subContentId=forumId > <tr> - <td class="tabletext"> <b>${uiLabelMap.CommonId}:</b>${content.contentId} </td> - <td class="tabletext"> <b>${uiLabelMap.CommonName}:</b>${content.contentName} </td> + <td class="tabletext"> ${uiLabelMap.CommonId}:${content.contentId} </td> + <td class="tabletext"> ${uiLabelMap.CommonName}:${content.contentName} </td> <@injectNodeTrailCsv subContentId=content.contentId redo="true" contentAssocTypeId="PUBLISH_LINK"> <td> <a class="tabButton" href="<@ofbizUrl>showforumresponse?contentId=${content.contentId}&nodeTrailCsv=${nodeTrailCsv?if_exists}</@ofbizUrl>" >${uiLabelMap.CommonView}</a> </td> <td class="tabletext"> - <b>${uiLabelMap.CommonSubmitted}:</b> + ${uiLabelMap.CommonSubmitted}: <input type="radio" name="statusId_o_${row}" value="CTNT_IN_PROGRESS" checked/> </td> <td class="tabletext"> - <b>${uiLabelMap.CommonPublish}:</b> + ${uiLabelMap.CommonPublish}: <input type="radio" name="statusId_o_${row}" value="CTNT_PUBLISHED"/> </td> </tr> <input type="hidden" name="contentId_o_${row}" value="${content.contentId}"/> <tr> <td colspan="5" class="tabletext"> - <b>${uiLabelMap.CommonContent}:</b><br/> + ${uiLabelMap.CommonContent}:<br/> <@renderSubContentCache subContentId=content.contentId/> </td> </tr> - <tr> <td colspan="5"> <hr/> </td> </tr> + <#assign row = row + 1/> </@injectNodeTrailCsv > </@checkPermission > Modified: ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/forum/showblog.ftl URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/forum/showblog.ftl?rev=781606&r1=781605&r2=781606&view=diff ============================================================================== --- ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/forum/showblog.ftl (original) +++ ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/forum/showblog.ftl Wed Jun 3 22:14:08 2009 @@ -20,11 +20,11 @@ <#import "/includes/bloglib.ftl" as blog/> <div class="screenlet" > -<h1> ${uiLabelMap.EcommerceFromSite}:</h1><br/> -<div style="margin:10px;" > +<h1>${uiLabelMap.EcommerceFromSite}:</h1><br/> +<div> <@renderSiteAncestryPath trail=siteAncestorList?default([])/> <#if trailList?exists && 1 < trailList?size > -<h1> ${uiLabelMap.EcommerceFromParentArticle}:</h1><br/> +<h1>${uiLabelMap.EcommerceFromParentArticle}:</h1><br/> </#if> <#if trailList?has_content> <@blog.renderAncestryPath trail=trailList startIndex=1 endIndexOffset=1 /> @@ -57,7 +57,7 @@ </td> </tr> </table> -<hr/> + <#-- <@checkPermission mode="not-equals" subContentId=subContentId targetOperation="CONTENT_CREATE|CONTENT_RESPOND" contentPurposeList="RESPONSE" > ${permissionErrorMsg?if_exists} Modified: ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/forum/showforumresponse.ftl URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/forum/showforumresponse.ftl?rev=781606&r1=781605&r2=781606&view=diff ============================================================================== --- ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/forum/showforumresponse.ftl (original) +++ ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/forum/showforumresponse.ftl Wed Jun 3 22:14:08 2009 @@ -19,8 +19,8 @@ <#import "bloglib.ftl" as blog/> <div class="screenlet" > -<h1> {${uiLabelMap.EcommerceFromSite}</h1><br/> -<div style="margin:10px;" > +<h1>{${uiLabelMap.EcommerceFromSite}</h1><br/> +<div> <@blog.renderAncestryPath trail=ancestorList?default([]) endIndexOffset=1 /> <#-- Do this so that we don't have to find the content twice (again in renderSubContent) --> <#assign lastNode = globalNodeTrail?if_exists?last/> Modified: ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/includes/language.ftl URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/includes/language.ftl?rev=781606&r1=781605&r2=781606&view=diff ============================================================================== --- ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/includes/language.ftl (original) +++ ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/includes/language.ftl Wed Jun 3 22:14:08 2009 @@ -18,11 +18,9 @@ --> <div id="choose-language" class="screenlet"> - <div class="screenlet-header"> - <div class="boxhead">${uiLabelMap.CommonLanguageTitle}</div> - </div> - <div class="screenlet-body" style="text-align: center;"> - <form method="post" name="chooseLanguage" action="<@ofbizUrl>setSessionLocale</@ofbizUrl>" style="margin: 0;"> + <h3>${uiLabelMap.CommonLanguageTitle}</h3> + <div class="screenlet-body"> + <form method="post" name="chooseLanguage" action="<@ofbizUrl>setSessionLocale</@ofbizUrl>"> <select name="newLocale" class="selectBox" style="width:95%" onchange="submit()"> <#assign availableLocales = Static["org.ofbiz.base.util.UtilMisc"].availableLocales()/> <#list availableLocales as availableLocale> Modified: ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/quote/QuoteList.ftl URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/quote/QuoteList.ftl?rev=781606&r1=781605&r2=781606&view=diff ============================================================================== --- ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/quote/QuoteList.ftl (original) +++ ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/quote/QuoteList.ftl Wed Jun 3 22:14:08 2009 @@ -18,39 +18,37 @@ --> <div class="screenlet"> - <div class="screenlet-header"> - <div class="boxhead">${uiLabelMap.EcommerceQuoteHistory}</div> - </div> + <h3>${uiLabelMap.EcommerceQuoteHistory}</h3> <div class="screenlet-body"> - <table width="100%" cellpadding="1" cellspacing="0" border="0"> + <table> <tr> <td width="10%"> - <div class="tabletext"><b><span style="white-space: nowrap;">${uiLabelMap.OrderQuote} ${uiLabelMap.CommonNbr}</span></b></div> + <div class="tabletext"><span style="white-space: nowrap;">${uiLabelMap.OrderQuote} ${uiLabelMap.CommonNbr}</span></div> </td> <td width="10"> </td> <td width="20%"> - <div class="tabletext"><b>${uiLabelMap.CommonName}</b></div> + <div class="tabletext">${uiLabelMap.CommonName}</div> </td> <td width="10"> </td> <td width="40%"> - <div class="tabletext"><b>${uiLabelMap.CommonDescription}</b></div> + <div class="tabletext">${uiLabelMap.CommonDescription}</div> </td> <td width="10"> </td> <td width="10%"> - <div class="tabletext"><b>${uiLabelMap.CommonStatus}</b></div> + <div class="tabletext">${uiLabelMap.CommonStatus}</div> </td> <td width="10"> </td> <td width="20%"> - <div class="tabletext"><b>${uiLabelMap.OrderOrderQuoteIssueDate}</b></div> - <div class="tabletext"><b>${uiLabelMap.CommonValidFromDate}</b></div> - <div class="tabletext"><b>${uiLabelMap.CommonValidThruDate}</b></div> + <div class="tabletext">${uiLabelMap.OrderOrderQuoteIssueDate}</div> + <div class="tabletext">${uiLabelMap.CommonValidFromDate}</div> + <div class="tabletext">${uiLabelMap.CommonValidThruDate}</div> </td> <td width="10"> </td> <td width="10"> </td> </tr> <#list quoteList as quote> <#assign status = quote.getRelatedOneCache("StatusItem")> - <tr><td colspan="12"><hr/></td></tr> + <tr> <td> <div class="tabletext">${quote.quoteId}</div> Modified: ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/request/RequestList.ftl URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/request/RequestList.ftl?rev=781606&r1=781605&r2=781606&view=diff ============================================================================== --- ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/request/RequestList.ftl (original) +++ ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/request/RequestList.ftl Wed Jun 3 22:14:08 2009 @@ -18,36 +18,34 @@ --> <div class="screenlet"> - <div class="screenlet-header"> - <div class="boxhead">${uiLabelMap.EcommerceRequestHistory}</div> - </div> + <h3>${uiLabelMap.EcommerceRequestHistory}</h3> <div class="screenlet-body"> - <table width="100%" cellpadding="1" cellspacing="0" border="0"> + <table> <tr> <td width="10%"> - <div class="tabletext"><b><span style="white-space: nowrap;">${uiLabelMap.OrderRequest} ${uiLabelMap.CommonNbr}</span></b></div> + <div class="tabletext"><span style="white-space: nowrap;">${uiLabelMap.OrderRequest} ${uiLabelMap.CommonNbr}</span></div> </td> <td width="10"> </td> <td width="10%"> - <div class="tabletext"><b><span style="white-space: nowrap;">${uiLabelMap.CommonType}</span></b></div> + <div class="tabletext"><span style="white-space: nowrap;">${uiLabelMap.CommonType}</span></div> </td> <td width="10"> </td> <td width="20%"> - <div class="tabletext"><b>${uiLabelMap.CommonName}</b></div> + <div class="tabletext">${uiLabelMap.CommonName}</div> </td> <td width="10"> </td> <td width="40%"> - <div class="tabletext"><b>${uiLabelMap.CommonDescription}</b></div> + <div class="tabletext">${uiLabelMap.CommonDescription}</div> </td> <td width="10"> </td> <td width="10%"> - <div class="tabletext"><b>${uiLabelMap.CommonStatus}</b></div> + <div class="tabletext">${uiLabelMap.CommonStatus}</div> </td> <td width="10"> </td> <td width="20%"> - <div class="tabletext"><b>${uiLabelMap.OrderRequestDate}</b></div> - <div class="tabletext"><b>${uiLabelMap.OrderRequestCreatedDate}</b></div> - <div class="tabletext"><b>${uiLabelMap.OrderRequestLastModifiedDate}</b></div> + <div class="tabletext">${uiLabelMap.OrderRequestDate}</div> + <div class="tabletext">${uiLabelMap.OrderRequestCreatedDate}</div> + <div class="tabletext">${uiLabelMap.OrderRequestLastModifiedDate}</div> </td> <td width="10"> </td> <td width="10"> </td> @@ -55,7 +53,7 @@ <#list requestList as custRequest> <#assign status = custRequest.getRelatedOneCache("StatusItem")> <#assign type = custRequest.getRelatedOneCache("CustRequestType")> - <tr><td colspan="14"><hr/></td></tr> + <tr> <td> <div class="tabletext">${custRequest.custRequestId}</div> Modified: ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/shoppinglist/editShoppingList.ftl URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/shoppinglist/editShoppingList.ftl?rev=781606&r1=781605&r2=781606&view=diff ============================================================================== --- ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/shoppinglist/editShoppingList.ftl (original) +++ ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/shoppinglist/editShoppingList.ftl Wed Jun 3 22:14:08 2009 @@ -30,12 +30,10 @@ </script> <br/> <div class="screenlet"> - <div class="screenlet-header"> <div class="boxlink"> <a href="<@ofbizUrl>createEmptyShoppingList?productStoreId=${productStoreId}</@ofbizUrl>" class="submenutextright">${uiLabelMap.CommonCreateNew}</a> </div> - <div class="boxhead"> ${uiLabelMap.EcommerceShoppingLists}</div> - </div> + <h3> ${uiLabelMap.EcommerceShoppingLists}</h3> <div class="screenlet-body"> <#if shoppingLists?has_content> <form name="selectShoppingList" method="post" action="<@ofbizUrl>editShoppingList</@ofbizUrl>"> |
«
Return to OFBiz - Commits
|
1 view|%1 views
| Free forum by Nabble | Edit this page |