You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ofbiz.apache.org by bu...@apache.org on 2010/12/04 11:34:47 UTC
svn commit: r1042133 - in /ofbiz/trunk:
applications/order/webapp/ordermgr/entry/catalog/
framework/images/webapp/images/
specialpurpose/ecommerce/webapp/ecommerce/blog/
specialpurpose/ecommerce/webapp/ecommerce/catalog/
specialpurpose/ecommerce/webapp...
Author: buscob
Date: Sat Dec 4 10:34:47 2010
New Revision: 1042133
URL: http://svn.apache.org/viewvc?rev=1042133&view=rev
Log:
Changed several ecommerce ftl files rendering screenlets so that the HTML is the same as the one that is rendered by the screenlet widget.
Added screenlet styles to the ecommain.css
Added several missin screenlet-body tags.
This allows better and more omogeneus rendering when mixing together FTL and screenlet widgets.
To be continued...
Modified:
ofbiz/trunk/applications/order/webapp/ordermgr/entry/catalog/compareproductslist.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/catalog/choosecatalog.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/sidedeepcategory.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/customer/miniSignUpForContactList.ftl
ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/forum/forums.ftl
ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/includes/language.ftl
Modified: ofbiz/trunk/applications/order/webapp/ordermgr/entry/catalog/compareproductslist.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/webapp/ordermgr/entry/catalog/compareproductslist.ftl?rev=1042133&r1=1042132&r2=1042133&view=diff
==============================================================================
--- ofbiz/trunk/applications/order/webapp/ordermgr/entry/catalog/compareproductslist.ftl (original)
+++ ofbiz/trunk/applications/order/webapp/ordermgr/entry/catalog/compareproductslist.ftl Sat Dec 4 10:34:47 2010
@@ -18,7 +18,10 @@ under the License.
-->
<div id="productcomparelist" class="screenlet">
<div class="screenlet-title-bar">
- <div class="h3">${uiLabelMap.ProductCompareProducts}</div>
+ <ul>
+ <li class="h3">${uiLabelMap.ProductCompareProducts}</li>
+ </ul>
+ <br class="clear"/>
</div>
<div class="screenlet-body">
<#assign productCompareList = Static["org.ofbiz.product.product.ProductEvents"].getProductCompareList(request)/>
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=1042133&r1=1042132&r2=1042133&view=diff
==============================================================================
--- ofbiz/trunk/applications/order/webapp/ordermgr/entry/catalog/keywordsearchbox.ftl (original)
+++ ofbiz/trunk/applications/order/webapp/ordermgr/entry/catalog/keywordsearchbox.ftl Sat Dec 4 10:34:47 2010
@@ -19,7 +19,10 @@ under the License.
<div id="keywordsearchbox" class="screenlet">
<div class="screenlet-title-bar">
- <h3>${uiLabelMap.ProductSearchCatalog}</h3>
+ <ul>
+ <li class="h3">${uiLabelMap.ProductSearchCatalog}</li>
+ </ul>
+ <br class="clear"/>
</div>
<div class="screenlet-body">
<form name="keywordsearchform" id="keywordsearchbox_keywordsearchform" method="post" action="<@o...@ofbizUrl>">
Modified: ofbiz/trunk/framework/images/webapp/images/ecommain.css
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/images/webapp/images/ecommain.css?rev=1042133&r1=1042132&r2=1042133&view=diff
==============================================================================
--- ofbiz/trunk/framework/images/webapp/images/ecommain.css (original)
+++ ofbiz/trunk/framework/images/webapp/images/ecommain.css Sat Dec 4 10:34:47 2010
@@ -1114,3 +1114,118 @@ width:10%
.quickaddtable span.qty {
width:10%
}
+
+/* ================================ */
+/* ===== Used to clear floats ===== */
+/* ================================ */
+
+.clear {
+clear: both;
+height: 0;
+visibility: hidden;
+}
+
+.no-clear .clear {
+/* Used in container elements to override the clear class
+in contained elements. */
+clear: none;
+}
+
+/* ================================================= */
+/* ===== Screenlet Title Bar/Navigation Styles ===== */
+/* ================================================= */
+
+.screenlet-title-bar {
+background-color: #000099;
+background-image: url(/images/gradient_sub_uns.gif);
+background-repeat: repeat-x;
+color: #ffffff;
+height: 1%; /* IE fix */
+min-height: 1.5em;
+}
+
+.screenlet-title-bar .h1,
+.screenlet-title-bar .h2,
+.screenlet-title-bar .h3,
+.screenlet-title-bar h1,
+.screenlet-title-bar h2,
+.screenlet-title-bar h3 {
+background: none;
+color: #ffffff;
+font-weight: bold;
+padding: 0.1em 0.5em 0.2em 0.5em;
+}
+
+.screenlet-title-bar ul {
+display: inline; /* IE Fix */
+}
+
+.screenlet-title-bar ul li {
+background: none;
+color: #ffffff;
+float: right;
+font-size: 1em;
+font-weight: bold;
+padding: 0.1em 0.5em 0.2em 0.5em;
+}
+
+.screenlet-title-bar ul h1,
+.screenlet-title-bar ul h2,
+.screenlet-title-bar ul h3,
+.screenlet-title-bar ul .h1,
+.screenlet-title-bar ul .h2,
+.screenlet-title-bar ul .h3 {
+border-left: none;
+float: left;
+}
+
+.screenlet-title-bar .h1 {
+font-size: 1.6em;
+}
+
+.screenlet-title-bar .h2 {
+font-size: 1.3em;
+}
+
+.screenlet-title-bar .h3,
+.screenlet-title-bar .head4 {
+font-size: 1.2em;
+}
+
+.screenlet-title-bar .h3 a {
+color: #ffff66;
+display: inline;
+}
+
+.screenlet-title-bar ul a {
+color: #ffff66;
+display: block;
+}
+
+.screenlet-title-bar ul a:visited {
+color: #ffff66;
+}
+
+.screenlet-title-bar ul .disabled {
+color: #CCCCCC;
+}
+
+.screenlet-title-bar ul .collapsed,
+.screenlet-title-bar ul .collapsed:hover {
+background: url(/images/expand.gif) no-repeat center center;
+min-height: 1.1em;
+min-width: 1.1em;
+}
+
+.screenlet-title-bar ul .expanded,
+.screenlet-title-bar ul .expanded:hover {
+background: url(/images/collapse.gif) no-repeat center center;
+min-height: 1.1em;
+min-width: 1.1em;
+}
+
+.screenlet-title-bar ul .collapsed a,
+.screenlet-title-bar ul .expanded a {
+/* IE fix */
+cursor: default;
+}
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=1042133&r1=1042132&r2=1042133&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/blog/blogs.ftl (original)
+++ ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/blog/blogs.ftl Sat Dec 4 10:34:47 2010
@@ -18,7 +18,12 @@ under the License.
-->
<div id="browse-blogs" class="screenlet">
- <h3>${uiLabelMap.ProductBrowseBlogs}</h3>
+ <div class="screenlet-title-bar">
+ <ul>
+ <li class="h3">${uiLabelMap.ProductBrowseBlogs}</li>
+ </ul>
+ <br class="clear"/>
+ </div>
<div class="screenlet-body">
<ul class="browsecategorylist">
<#list blogs as blog>
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=1042133&r1=1042132&r2=1042133&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/catalog/choosecatalog.ftl (original)
+++ ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/catalog/choosecatalog.ftl Sat Dec 4 10:34:47 2010
@@ -23,16 +23,23 @@ under the License.
<#-- Only show if there is more than 1 (one) catalog, no sense selecting when there is only one option... -->
<#if (catalogCol?size > 1)>
<div id ="choosecatalog" class="screenlet">
- <h3>${uiLabelMap.ProductChooseCatalog}</h3>
- <form name="choosecatalogform" method="post" action="<@o...@ofbizUrl>">
- <select name='CURRENT_CATALOG_ID' class='selectBox' onchange="submit()">
- <option value='${currentCatalogId}'>${currentCatalogName}</option>
- <option value='${currentCatalogId}'></option>
- <#list catalogCol as catalogId>
- <#assign thisCatalogName = Static["org.ofbiz.product.catalog.CatalogWorker"].getCatalogName(request, catalogId)>
- <option value='${catalogId}'>${thisCatalogName}</option>
- </#list>
- </select>
- </form>
+ <div class="screenlet-title-bar">
+ <ul>
+ <li class="h3">${uiLabelMap.ProductChooseCatalog}</li>
+ </ul>
+ <br class="clear"/>
+ </div>
+ <div class="screenlet-body">
+ <form name="choosecatalogform" method="post" action="<@o...@ofbizUrl>">
+ <select name='CURRENT_CATALOG_ID' class='selectBox' onchange="submit()">
+ <option value='${currentCatalogId}'>${currentCatalogName}</option>
+ <option value='${currentCatalogId}'></option>
+ <#list catalogCol as catalogId>
+ <#assign thisCatalogName = Static["org.ofbiz.product.catalog.CatalogWorker"].getCatalogName(request, catalogId)>
+ <option value='${catalogId}'>${thisCatalogName}</option>
+ </#list>
+ </select>
+ </form>
+ </div>
</div>
</#if>
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=1042133&r1=1042132&r2=1042133&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/catalog/minilastviewedcategories.ftl (original)
+++ ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/catalog/minilastviewedcategories.ftl Sat Dec 4 10:34:47 2010
@@ -22,11 +22,15 @@ under the License.
<#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="boxlink">
- <a href="<@o...@ofbizUrl>" class="lightbuttontextsmall">[${uiLabelMap.CommonClear}]</a>
- </div>
- <h3>${uiLabelMap.EcommerceLastCategories}</h3>
+ <div class="screenlet-title-bar">
+ <ul>
+ <li class="h3">${uiLabelMap.EcommerceLastCategories}</li>
+ <li>
+ <a href="<@o...@ofbizUrl>">[${uiLabelMap.CommonClear}]</a>
+ </li>
+ </ul>
+ <br class="clear"/>
+ </div>
<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=1042133&r1=1042132&r2=1042133&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/catalog/minilastviewedproducts.ftl (original)
+++ ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/catalog/minilastviewedproducts.ftl Sat Dec 4 10:34:47 2010
@@ -21,23 +21,28 @@ under the License.
<#assign lastViewedProducts = sessionAttributes.lastViewedProducts?if_exists/>
<#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="boxlink">
- <a href="<@o...@ofbizUrl>" class="lightbuttontextsmall">[${uiLabelMap.CommonClear}]</a>
- <#if (lastViewedProducts?size > maxToShow)>
- <a href="<@o...@ofbizUrl>" class="lightbuttontextsmall">[${uiLabelMap.CommonMore}]</a>
- </#if>
+ <div id="minilastviewedproducts" class="screenlet">
+ <div class="screenlet-title-bar">
+ <ul>
+ <li class="h3">${uiLabelMap.EcommerceLastProducts}</li>
+ <li><a href="<@o...@ofbizUrl>">[${uiLabelMap.CommonClear}]</a></li>
+ <#if (lastViewedProducts?size > maxToShow)>
+ <li><a href="<@o...@ofbizUrl>">[${uiLabelMap.CommonMore}]</a></li>
+ </#if>
+ </ul>
+ <br class="clear"/>
+ </div>
+ <div class="screenlet-body">
+ <ul>
+ <#list lastViewedProducts[0..limit] as productId>
+ <li>
+ ${setRequestAttribute("miniProdQuantity", "1")}
+ ${setRequestAttribute("optProductId", productId)}
+ ${setRequestAttribute("miniProdFormName", "lastviewed" + productId_index + "form")}
+ ${screens.render("component://ecommerce/widget/CatalogScreens.xml#miniproductsummary")}
+ </li>
+ </#list>
+ </ul>
</div>
- <h3>${uiLabelMap.EcommerceLastProducts}</h3>
- <ul>
- <#list lastViewedProducts[0..limit] as productId>
- <li>
- ${setRequestAttribute("miniProdQuantity", "1")}
- ${setRequestAttribute("optProductId", productId)}
- ${setRequestAttribute("miniProdFormName", "lastviewed" + productId_index + "form")}
- ${screens.render("component://ecommerce/widget/CatalogScreens.xml#miniproductsummary")}
- </li>
- </#list>
- </ul>
</div>
</#if>
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=1042133&r1=1042132&r2=1042133&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/catalog/sidedeepcategory.ftl (original)
+++ ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/catalog/sidedeepcategory.ftl Sat Dec 4 10:34:47 2010
@@ -39,7 +39,12 @@ under the License.
</#if>
<#if wrapInBox == "Y">
<div id="sidedeepcategory" class="screenlet">
- <h3><#if categoryDescription?has_content>${categoryDescription}<#else>${categoryName?default("")}</#if></h3>
+ <div class="screenlet-title-bar">
+ <ul>
+ <li class="h3"><#if categoryDescription?has_content>${categoryDescription}<#else>${categoryName?default("")}</#if></li>
+ </ul>
+ <br class="clear"/>
+ </div>
<div class="screenlet-body">
<div class="browsecategorylist">
</#if>
@@ -71,13 +76,18 @@ under the License.
<#if topLevelList?has_content>
<div id="sidedeepcategory" class="screenlet">
- <h3>${uiLabelMap.ProductBrowseCategories}</h3>
- <div class="screenlet-body">
- <ul class="browsecategorylist">
- <#list topLevelList as category>
- <@categoryList parentCategory="" category=category wrapInBox="N"/>
- </#list>
- </ul>
- </div>
+ <div class="screenlet-title-bar">
+ <ul>
+ <li class="h3">${uiLabelMap.ProductBrowseCategories}</li>
+ </ul>
+ <br class="clear"/>
+ </div>
+ <div class="screenlet-body">
+ <ul class="browsecategorylist">
+ <#list topLevelList as category>
+ <@categoryList parentCategory="" category=category wrapInBox="N"/>
+ </#list>
+ </ul>
+ </div>
</div>
</#if>
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=1042133&r1=1042132&r2=1042133&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/content/content_categories.ftl (original)
+++ ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/content/content_categories.ftl Sat Dec 4 10:34:47 2010
@@ -31,7 +31,12 @@ under the License.
</#if>
<div id="content_catagories" class="screenlet">
- <h3>${uiLabelMap.ProductBrowseContent}</h3>
+ <div class="screenlet-title-bar">
+ <ul>
+ <li class="h3">${uiLabelMap.ProductBrowseContent}</li>
+ </ul>
+ <br class="clear"/>
+ </div>
<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=1042133&r1=1042132&r2=1042133&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/content/factoids.ftl (original)
+++ ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/content/factoids.ftl Sat Dec 4 10:34:47 2010
@@ -31,7 +31,12 @@ under the License.
</#if>
<div id="factoids" class="screenlet">
- <h3>${uiLabelMap.EcommerceFactoids}</h3>
+ <div class="screenlet-title-bar">
+ <ul>
+ <li class="h3">${uiLabelMap.EcommerceFactoids}</li>
+ </ul>
+ <br class="clear"/>
+ </div>
<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=1042133&r1=1042132&r2=1042133&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/content/minipoll.ftl (original)
+++ ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/content/minipoll.ftl Sat Dec 4 10:34:47 2010
@@ -24,11 +24,16 @@ under the License.
<#if randomSurvey?has_content>
<div id="minipoll" class="screenlet">
- <h3>${randomSurvey.getSurveyName()?if_exists}</h3>
- <div class="screenlet-body">
- <form method="post" action="<@ofbizUrl>minipoll<#if requestAttributes._CURRENT_VIEW_?exists>/${requestAttributes._CURRENT_VIEW_}</#...@ofbizUrl>" style="margin: 0;">
- ${randomSurvey.render()}
- </form>
- </div>
+ <div class="screenlet-title-bar">
+ <ul>
+ <li class="h3">${randomSurvey.getSurveyName()?if_exists}</li>
+ </ul>
+ <br class="clear"/>
+ </div>
+ <div class="screenlet-body">
+ <form method="post" action="<@ofbizUrl>minipoll<#if requestAttributes._CURRENT_VIEW_?exists>/${requestAttributes._CURRENT_VIEW_}</#...@ofbizUrl>" style="margin: 0;">
+ ${randomSurvey.render()}
+ </form>
+ </div>
</div>
</#if>
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=1042133&r1=1042132&r2=1042133&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/content/recentlyviewed.ftl (original)
+++ ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/content/recentlyviewed.ftl Sat Dec 4 10:34:47 2010
@@ -19,7 +19,12 @@ under the License.
<#if mrvList?has_content>
<div id="recentlyviewed" class="screenlet">
- <h3>${uiLabelMap.EcommerceLastContent}</h3>
+ <div class="screenlet-title-bar">
+ <ul>
+ <li class="h3">${uiLabelMap.EcommerceLastContent}</li>
+ </ul>
+ <br class="clear"/>
+ </div>
<div class="screenlet-body">
<#list mrvList as mrvArr>
<div class="browsecategorytext">
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=1042133&r1=1042132&r2=1042133&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/customer/miniSignUpForContactList.ftl (original)
+++ ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/customer/miniSignUpForContactList.ftl Sat Dec 4 10:34:47 2010
@@ -28,7 +28,13 @@ under the License.
</#macro>
<div id="miniSignUpForContactList" class="screenlet">
- <h3>${uiLabelMap.EcommerceSignUpForContactList}</h3>
+ <div class="screenlet-title-bar">
+ <ul>
+ <li class="h3">${uiLabelMap.EcommerceSignUpForContactList}</li>
+ </ul>
+ <br class="clear"/>
+ </div>
+ <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">
@@ -76,6 +82,7 @@ under the License.
</fieldset>
</form>
</#if>
+ </div>
</div>
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=1042133&r1=1042132&r2=1042133&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/forum/forums.ftl (original)
+++ ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/forum/forums.ftl Sat Dec 4 10:34:47 2010
@@ -18,14 +18,19 @@ under the License.
-->
<div id="browse-forums" class="screenlet">
- <h3>${uiLabelMap.ProductBrowseForums}</h3>
- <div class="screenlet-body">
- <ul class="browsecategorylist">
- <#list forums as forum>
- <li class="browsecategorytext">
- <a href="<@o...@ofbizUrl>" class="browsecategorybutton">${forum.contentName!forum.contentId}</a>
- </li>
- </#list>
- </ul>
- </div>
+ <div class="screenlet-title-bar">
+ <ul>
+ <li class="h3">${uiLabelMap.ProductBrowseForums}</li>
+ </ul>
+ <br class="clear"/>
+ </div>
+ <div class="screenlet-body">
+ <ul class="browsecategorylist">
+ <#list forums as forum>
+ <li class="browsecategorytext">
+ <a href="<@o...@ofbizUrl>" class="browsecategorybutton">${forum.contentName!forum.contentId}</a>
+ </li>
+ </#list>
+ </ul>
+ </div>
</div>
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=1042133&r1=1042132&r2=1042133&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/includes/language.ftl (original)
+++ ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/includes/language.ftl Sat Dec 4 10:34:47 2010
@@ -18,7 +18,12 @@ under the License.
-->
<div id="choose-language" class="screenlet">
- <h3>${uiLabelMap.CommonLanguageTitle}</h3>
+ <div class="screenlet-title-bar">
+ <ul>
+ <li class="h3">${uiLabelMap.CommonLanguageTitle}</li>
+ </ul>
+ <br class="clear"/>
+ </div>
<div class="screenlet-body">
<form method="post" name="chooseLanguage" action="<@o...@ofbizUrl>">
<select name="newLocale" class="selectBox" style="width:95%" onchange="submit()">