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:51:59 UTC
svn commit: r1042136 - in /ofbiz/trunk:
applications/order/webapp/ordermgr/entry/catalog/
specialpurpose/ecommerce/webapp/ecommerce/blog/
specialpurpose/ecommerce/webapp/ecommerce/catalog/
specialpurpose/ecommerce/webapp/ecommerce/content/ specialpurpo...
Author: buscob
Date: Sat Dec 4 10:51:59 2010
New Revision: 1042136
URL: http://svn.apache.org/viewvc?rev=1042136&view=rev
Log:
No funtional changes. Only code formatting.
Modified:
ofbiz/trunk/applications/order/webapp/ordermgr/entry/catalog/compareproductslist.ftl
ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/blog/blogs.ftl
ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/catalog/minilastviewedcategories.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=1042136&r1=1042135&r2=1042136&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:51:59 2010
@@ -24,8 +24,8 @@ under the License.
<br class="clear"/>
</div>
<div class="screenlet-body">
-<#assign productCompareList = Static["org.ofbiz.product.product.ProductEvents"].getProductCompareList(request)/>
-<#if productCompareList?has_content>
+ <#assign productCompareList = Static["org.ofbiz.product.product.ProductEvents"].getProductCompareList(request)/>
+ <#if productCompareList?has_content>
<table>
<#list productCompareList as product>
<tr>
@@ -53,4 +53,4 @@ under the License.
</div>
</#if>
</div>
-</div>
+</div>
\ No newline at end of file
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=1042136&r1=1042135&r2=1042136&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:51:59 2010
@@ -24,13 +24,13 @@ under the License.
</ul>
<br class="clear"/>
</div>
- <div class="screenlet-body">
- <ul class="browsecategorylist">
- <#list blogs as blog>
- <li class="browsecategorytext">
- <a href="<@o...@ofbizUrl>" class="browsecategorybutton">${blog.contentName}</a>
- </li>
- </#list>
- </ul>
- </div>
+ <div class="screenlet-body">
+ <ul class="browsecategorylist">
+ <#list blogs as blog>
+ <li class="browsecategorytext">
+ <a href="<@o...@ofbizUrl>" class="browsecategorybutton">${blog.contentName}</a>
+ </li>
+ </#list>
+ </ul>
+ </div>
</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=1042136&r1=1042135&r2=1042136&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:51:59 2010
@@ -20,34 +20,32 @@ under the License.
<#assign maxToShow = 8/>
<#assign lastViewedCategories = sessionAttributes.lastViewedCategories?if_exists/>
<#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-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>
- <#assign category = delegator.findByPrimaryKeyCache("ProductCategory", Static["org.ofbiz.base.util.UtilMisc"].toMap("productCategoryId", categoryId))?if_exists>
- <#if category?has_content>
- <li class="browsecategorytext">
- <#if catContentWrappers?exists && catContentWrappers[category.productCategoryId]?exists && catContentWrappers[category.productCategoryId].get("CATEGORY_NAME")?exists>
- <a href="<@o...@ofbizUrl>" class="browsecategorybutton">${catContentWrappers[category.productCategoryId].get("CATEGORY_NAME")}</a>
- <#elseif catContentWrappers?exists && catContentWrappers[category.productCategoryId]?exists && catContentWrappers[category.productCategoryId].get("DESCRIPTION")?exists>
- <a href="<@o...@ofbizUrl>" class="browsecategorybutton">${catContentWrappers[category.productCategoryId].get("DESCRIPTION")}</a>
- <#else>
- <a href="<@o...@ofbizUrl>" class="browsecategorybutton">${category.description?if_exists}</a>
- </#if>
- </li>
- </#if>
- </#list>
- </ul>
- </div>
+ <#if (lastViewedCategories?size > maxToShow)><#assign limit=maxToShow/><#else><#assign limit=(lastViewedCategories?size-1)/></#if>
+ <div id="minilastviewedcategories" class="screenlet">
+ <div class="screenlet-title-bar">
+ <ul>
+ <li class="h3">${uiLabelMap.EcommerceLastCategories}</li>
+ <li><a href="<@o...@ofbizUrl>">[${uiLabelMap.CommonClear}]</a></li>
+ </ul>
+ <br class="clear"/>
+ </div>
+ <div class="screenlet-body">
+ <ul 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>
+ <li class="browsecategorytext">
+ <#if catContentWrappers?exists && catContentWrappers[category.productCategoryId]?exists && catContentWrappers[category.productCategoryId].get("CATEGORY_NAME")?exists>
+ <a href="<@o...@ofbizUrl>" class="browsecategorybutton">${catContentWrappers[category.productCategoryId].get("CATEGORY_NAME")}</a>
+ <#elseif catContentWrappers?exists && catContentWrappers[category.productCategoryId]?exists && catContentWrappers[category.productCategoryId].get("DESCRIPTION")?exists>
+ <a href="<@o...@ofbizUrl>" class="browsecategorybutton">${catContentWrappers[category.productCategoryId].get("DESCRIPTION")}</a>
+ <#else>
+ <a href="<@o...@ofbizUrl>" class="browsecategorybutton">${category.description?if_exists}</a>
+ </#if>
+ </li>
+ </#if>
+ </#list>
+ </ul>
</div>
-</#if>
+ </div>
+</#if>
\ No newline at end of file
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=1042136&r1=1042135&r2=1042136&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:51:59 2010
@@ -23,30 +23,30 @@ under the License.
<#-- looping macro -->
<#macro categoryList parentCategory category wrapInBox>
<#if catContentWrappers?exists && catContentWrappers[category.productCategoryId]?exists && catContentWrappers[category.productCategoryId].get("CATEGORY_NAME")?exists>
- <#assign categoryName = catContentWrappers[category.productCategoryId].get("CATEGORY_NAME")>
+ <#assign categoryName = catContentWrappers[category.productCategoryId].get("CATEGORY_NAME")>
<#else>
- <#assign categoryName = category.categoryName?if_exists>
+ <#assign categoryName = category.categoryName?if_exists>
</#if>
<#if catContentWrappers?exists && catContentWrappers[category.productCategoryId]?exists && catContentWrappers[category.productCategoryId].get("DESCRIPTION")?exists>
- <#assign categoryDescription = catContentWrappers[category.productCategoryId].get("DESCRIPTION")>
+ <#assign categoryDescription = catContentWrappers[category.productCategoryId].get("DESCRIPTION")>
<#else>
- <#assign categoryDescription = category.description?if_exists>
+ <#assign categoryDescription = category.description?if_exists>
</#if>
<#if curCategoryId?exists && curCategoryId == category.productCategoryId>
- <#assign browseCategoryButtonClass = "browsecategorybuttondisabled">
+ <#assign browseCategoryButtonClass = "browsecategorybuttondisabled">
<#else>
- <#assign browseCategoryButtonClass = "browsecategorybutton">
+ <#assign browseCategoryButtonClass = "browsecategorybutton">
</#if>
<#if wrapInBox == "Y">
- <div id="sidedeepcategory" class="screenlet">
- <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">
+ <div id="sidedeepcategory" class="screenlet">
+ <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>
<li class="browsecategorytext">
<#if parentCategory?has_content>
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=1042136&r1=1042135&r2=1042136&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:51:59 2010
@@ -37,15 +37,15 @@ under the License.
</ul>
<br class="clear"/>
</div>
- <div class="screenlet-body">
- <ul class="browsecategorylist">
- <#assign count_1=0/>
- <@loopSubContent contentId=contentRootId viewIndex=0 viewSize=9999 orderBy="contentName">
- <li class="browsecategorytext">
- <a href="<@o...@ofbizUrl>" class="browsecategorybutton">${content.contentName}</a>
- </li>
- <#assign count_1=(count_1 + 1)/>
- </...@loopSubContent>
- </ul>
- </div>
-</div>
+ <div class="screenlet-body">
+ <ul class="browsecategorylist">
+ <#assign count_1=0/>
+ <@loopSubContent contentId=contentRootId viewIndex=0 viewSize=9999 orderBy="contentName">
+ <li class="browsecategorytext">
+ <a href="<@o...@ofbizUrl>" class="browsecategorybutton">${content.contentName}</a>
+ </li>
+ <#assign count_1=(count_1 + 1)/>
+ </...@loopSubContent>
+ </ul>
+ </div>
+</div>
\ No newline at end of file
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=1042136&r1=1042135&r2=1042136&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:51:59 2010
@@ -37,15 +37,15 @@ under the License.
</ul>
<br class="clear"/>
</div>
- <div class="screenlet-body">
- <ul class="browsecategorylist">
- <#assign count_1=0/>
- <@limitedSubContent contentId=factoidRootId viewIndex=0 viewSize=9999 orderBy="contentName" limitSize="2">
- <li class="browsecategorytext">
- <@renderSubContentCache subContentId=subContentId/>
- </li>
- <#assign count_1=(count_1 + 1)/>
- </...@limitedSubContent>
- </ul>
- </div>
-</div>
+ <div class="screenlet-body">
+ <ul class="browsecategorylist">
+ <#assign count_1=0/>
+ <@limitedSubContent contentId=factoidRootId viewIndex=0 viewSize=9999 orderBy="contentName" limitSize="2">
+ <li class="browsecategorytext">
+ <@renderSubContentCache subContentId=subContentId/>
+ </li>
+ <#assign count_1=(count_1 + 1)/>
+ </...@limitedSubContent>
+ </ul>
+ </div>
+</div>
\ No newline at end of file
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=1042136&r1=1042135&r2=1042136&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:51:59 2010
@@ -23,17 +23,17 @@ under the License.
</#if>
<#if randomSurvey?has_content>
-<div id="minipoll" class="screenlet">
- <div class="screenlet-title-bar">
- <ul>
- <li class="h3">${randomSurvey.getSurveyName()?if_exists}</li>
- </ul>
- <br class="clear"/>
+ <div id="minipoll" class="screenlet">
+ <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>
- <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=1042136&r1=1042135&r2=1042136&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:51:59 2010
@@ -18,19 +18,19 @@ under the License.
-->
<#if mrvList?has_content>
- <div id="recentlyviewed" class="screenlet">
- <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">
- <a href="<@o...@ofbizUrl>" class="browsecategorybutton">${mrvArr[1]}</a>
- </div>
- </#list>
+ <div id="recentlyviewed" class="screenlet">
+ <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">
+ <a href="<@o...@ofbizUrl>" class="browsecategorybutton">${mrvArr[1]}</a>
</div>
+ </#list>
</div>
-</#if>
+ </div>
+</#if>
\ No newline at end of file
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=1042136&r1=1042135&r2=1042136&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:51:59 2010
@@ -19,12 +19,12 @@ 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>
+ <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">
@@ -83,7 +83,4 @@ under the License.
</form>
</#if>
</div>
-</div>
-
-
-
+</div>
\ No newline at end of file
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=1042136&r1=1042135&r2=1042136&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:51:59 2010
@@ -28,9 +28,9 @@ under the License.
<ul class="browsecategorylist">
<#list forums as forum>
<li class="browsecategorytext">
- <a href="<@o...@ofbizUrl>" class="browsecategorybutton">${forum.contentName!forum.contentId}</a>
+ <a href="<@o...@ofbizUrl>" class="browsecategorybutton">${forum.contentName!forum.contentId}</a>
</li>
</#list>
</ul>
</div>
-</div>
+</div>
\ No newline at end of file
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=1042136&r1=1042135&r2=1042136&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:51:59 2010
@@ -24,19 +24,19 @@ under the License.
</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()">
- <#assign availableLocales = Static["org.ofbiz.base.util.UtilMisc"].availableLocales()/>
- <#list availableLocales as availableLocale>
- <#assign langAttr = availableLocale.toString()?replace("_", "-")>
- <#assign langDir = "ltr">
- <#if "ar.iw"?contains(langAttr?substring(0, 2))>
- <#assign langDir = "rtl">
- </#if>
- <option lang="${langAttr}" dir="${langDir}" value="${availableLocale.toString()}"<#if locale.toString() = availableLocale.toString()> selected="selected"</#if>>${availableLocale.getDisplayName(availableLocale)}</option>
- </#list>
- </select>
- </form>
- </div>
-</div>
+ <div class="screenlet-body">
+ <form method="post" name="chooseLanguage" action="<@o...@ofbizUrl>">
+ <select name="newLocale" class="selectBox" style="width:95%" onchange="submit()">
+ <#assign availableLocales = Static["org.ofbiz.base.util.UtilMisc"].availableLocales()/>
+ <#list availableLocales as availableLocale>
+ <#assign langAttr = availableLocale.toString()?replace("_", "-")>
+ <#assign langDir = "ltr">
+ <#if "ar.iw"?contains(langAttr?substring(0, 2))>
+ <#assign langDir = "rtl">
+ </#if>
+ <option lang="${langAttr}" dir="${langDir}" value="${availableLocale.toString()}"<#if locale.toString() = availableLocale.toString()> selected="selected"</#if>>${availableLocale.getDisplayName(availableLocale)}</option>
+ </#list>
+ </select>
+ </form>
+ </div>
+</div>
\ No newline at end of file