You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ofbiz.apache.org by jl...@apache.org on 2010/12/07 11:42:19 UTC
svn commit: r1042964 [7/9] - in /ofbiz/branches/jquery: ./
applications/accounting/data/ applications/accounting/servicedef/
applications/accounting/src/org/ofbiz/accounting/tax/
applications/content/data/ applications/content/src/org/ofbiz/content/dat...
Modified: ofbiz/branches/jquery/specialpurpose/ecommerce/webapp/ecommerce/catalog/minilastviewedproducts.ftl
URL: http://svn.apache.org/viewvc/ofbiz/branches/jquery/specialpurpose/ecommerce/webapp/ecommerce/catalog/minilastviewedproducts.ftl?rev=1042964&r1=1042963&r2=1042964&view=diff
==============================================================================
--- ofbiz/branches/jquery/specialpurpose/ecommerce/webapp/ecommerce/catalog/minilastviewedproducts.ftl (original)
+++ ofbiz/branches/jquery/specialpurpose/ecommerce/webapp/ecommerce/catalog/minilastviewedproducts.ftl Tue Dec 7 10:42:16 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/branches/jquery/specialpurpose/ecommerce/webapp/ecommerce/catalog/productdetail.ftl
URL: http://svn.apache.org/viewvc/ofbiz/branches/jquery/specialpurpose/ecommerce/webapp/ecommerce/catalog/productdetail.ftl?rev=1042964&r1=1042963&r2=1042964&view=diff
==============================================================================
--- ofbiz/branches/jquery/specialpurpose/ecommerce/webapp/ecommerce/catalog/productdetail.ftl (original)
+++ ofbiz/branches/jquery/specialpurpose/ecommerce/webapp/ecommerce/catalog/productdetail.ftl Tue Dec 7 10:42:16 2010
@@ -94,14 +94,19 @@ ${virtualJavaScript?if_exists}
}
}
- function popupDetail() {
- var defaultDetailImage = "${firstDetailImage?default(mainDetailImageUrl?default("_NONE_"))}";
- if (defaultDetailImage == null || defaultDetailImage == "null" || defaultDetailImage == "") {
- defaultDetailImage = "_NONE_";
- }
+ function popupDetail(specificDetailImageUrl) {
+ if( specificDetailImageUrl ) {
+ detailImageUrl = specificDetailImageUrl;
+ }
+ else {
+ var defaultDetailImage = "${firstDetailImage?default(mainDetailImageUrl?default("_NONE_"))}";
+ if (defaultDetailImage == null || defaultDetailImage == "null" || defaultDetailImage == "") {
+ defaultDetailImage = "_NONE_";
+ }
- if (detailImageUrl == null || detailImageUrl == "null") {
- detailImageUrl = defaultDetailImage;
+ if (detailImageUrl == null || detailImageUrl == "null") {
+ detailImageUrl = defaultDetailImage;
+ }
}
if (detailImageUrl == "_NONE_") {
@@ -111,7 +116,7 @@ ${virtualJavaScript?if_exists}
return;
}
detailImageUrl = detailImageUrl.replace(/\&\#47;/g, "/");
- popUp("<@ofbizUrl>detailImage?detail=" + detailImageUrl + "</...@ofbizUrl>", 'detailImage', '400', '550');
+ popUp("<@ofbizUrl>detailImage?detail=" + detailImageUrl + "</...@ofbizUrl>", 'detailImage', '600', '600');
}
function toggleAmt(toggle) {
@@ -170,6 +175,9 @@ ${virtualJavaScript?if_exists}
// using the selected index locate the sku
var sku = document.forms["addform"].elements[name].options[indexSelected].value;
+
+ // display alternative packaging dropdown
+ ajaxUpdateArea("product_uom", "<@o...@ofbizUrl>", "productId=" + sku);
// set the product ID
setAddProductId(sku);
@@ -259,6 +267,18 @@ ${virtualJavaScript?if_exists}
block2.style.display = "none";
}
</#if>
+
+ function displayProductVirtualVariantId(variantId) {
+ document.addform.product_id.value = variantId;
+ var elem = document.getElementById('product_id_display');
+ var txt = document.createTextNode(variantId);
+ if(elem.hasChildNodes()) {
+ elem.replaceChild(txt, elem.firstChild);
+ } else {
+ elem.appendChild(txt);
+ }
+ setVariantPrice(variantId);
+ }
//]]>
</script>
@@ -307,7 +327,7 @@ ${virtualJavaScript?if_exists}
<#assign productLargeImageUrl = firstLargeImage />
</#if>
<#if productLargeImageUrl?string?has_content>
- <a href="javascript:popupDetail();"><img id="detailImage" src="<@o...@ofbizContentUrl>" name="mainImage" vspace="5" hspace="5" width="200" alt="" /></a>
+ <a href="javascript:popupDetail('${firstDetailImage?default(mainDetailImageUrl?default("_NONE_"))}');"><img id="detailImage" src="<@o...@ofbizContentUrl>" name="mainImage" vspace="5" hspace="5" alt="" /></a>
<input type="hidden" id="originalImage" name="originalImage" value="<@o...@ofbizContentUrl>" />
</#if>
<#if !productLargeImageUrl?string?has_content>
@@ -316,26 +336,71 @@ ${virtualJavaScript?if_exists}
</div>
<div id="additionalImageBox">
<#if productAdditionalImage1?string?has_content>
+ <#assign productAdditionalImage1Small = productContentWrapper.get("XTRA_IMG_1_SMALL")?if_exists />
+ <#assign productAdditionalImage1Large = productContentWrapper.get("XTRA_IMG_1_LARGE")?if_exists />
+ <#assign productAdditionalImage1Detail = productContentWrapper.get("XTRA_IMG_1_DETAIL")?if_exists />
<div class="additionalImage">
+ <#if productAdditionalImage1Small?string?has_content && productAdditionalImage1Large?string?has_content>
+ <#if productAdditionalImage1Detail?string?has_content>
+ <a href="javascript:popupDetail('${productAdditionalImage1Detail}');" swapDetail="<@o...@ofbizContentUrl>"><img src="<@o...@ofbizContentUrl>" vspace="5" hspace="5" alt="" /></a>
+ <#else>
+ <a href="javascript:void(0);" swapDetail="<@o...@ofbizContentUrl>"><img src="<@o...@ofbizContentUrl>" vspace="5" hspace="5" alt="" /></a>
+ </#if>
+ <#else>
<a href="javascript:void(0);" swapDetail="<@o...@ofbizContentUrl>"><img src="<@o...@ofbizContentUrl>" vspace="5" hspace="5" width="200" alt="" /></a>
+ </#if>
</div>
</#if>
<#if productAdditionalImage2?string?has_content>
+ <#assign productAdditionalImage2Small = productContentWrapper.get("XTRA_IMG_2_SMALL")?if_exists />
+ <#assign productAdditionalImage2Large = productContentWrapper.get("XTRA_IMG_2_LARGE")?if_exists />
+ <#assign productAdditionalImage2Detail = productContentWrapper.get("XTRA_IMG_2_DETAIL")?if_exists />
<div class="additionalImage">
+ <#if productAdditionalImage2Small?string?has_content && productAdditionalImage2Large?string?has_content>
+ <#if productAdditionalImage2Detail?string?has_content>
+ <a href="javascript:popupDetail('${productAdditionalImage2Detail}');" swapDetail="<@o...@ofbizContentUrl>"><img src="<@o...@ofbizContentUrl>" vspace="5" hspace="5" alt="" /></a>
+ <#else>
+ <a href="javascript:void(0);" swapDetail="<@o...@ofbizContentUrl>"><img src="<@o...@ofbizContentUrl>" vspace="5" hspace="5" alt="" /></a>
+ </#if>
+ <#else>
<a href="javascript:void(0);" swapDetail="<@o...@ofbizContentUrl>"><img src="<@o...@ofbizContentUrl>" vspace="5" hspace="5" width="200" alt="" /></a>
+ </#if>
</div>
</#if>
<#if productAdditionalImage3?string?has_content>
+ <#assign productAdditionalImage3Small = productContentWrapper.get("XTRA_IMG_3_SMALL")?if_exists />
+ <#assign productAdditionalImage3Large = productContentWrapper.get("XTRA_IMG_3_LARGE")?if_exists />
+ <#assign productAdditionalImage3Detail = productContentWrapper.get("XTRA_IMG_3_DETAIL")?if_exists />
<div class="additionalImage">
+ <#if productAdditionalImage3Small?string?has_content && productAdditionalImage3Large?string?has_content>
+ <#if productAdditionalImage3Detail?string?has_content>
+ <a href="javascript:popupDetail('${productAdditionalImage3Detail}');" swapDetail="<@o...@ofbizContentUrl>"><img src="<@o...@ofbizContentUrl>" vspace="5" hspace="5" alt="" /></a>
+ <#else>
+ <a href="javascript:void(0);" swapDetail="<@o...@ofbizContentUrl>"><img src="<@o...@ofbizContentUrl>" vspace="5" hspace="5" alt="" /></a>
+ </#if>
+ <#else>
<a href="javascript:void(0);" swapDetail="<@o...@ofbizContentUrl>"><img src="<@o...@ofbizContentUrl>" vspace="5" hspace="5" width="200" alt="" /></a>
+ </#if>
</div>
</#if>
<#if productAdditionalImage4?string?has_content>
+ <#assign productAdditionalImage4Small = productContentWrapper.get("XTRA_IMG_4_SMALL")?if_exists />
+ <#assign productAdditionalImage4Large = productContentWrapper.get("XTRA_IMG_4_LARGE")?if_exists />
+ <#assign productAdditionalImage4Detail = productContentWrapper.get("XTRA_IMG_4_DETAIL")?if_exists />
<div class="additionalImage">
+ <#if productAdditionalImage4Small?string?has_content && productAdditionalImage4Large?string?has_content>
+ <#if productAdditionalImage4Detail?string?has_content>
+ <a href="javascript:popupDetail('${productAdditionalImage4Detail}');" swapDetail="<@o...@ofbizContentUrl>"><img src="<@o...@ofbizContentUrl>" vspace="5" hspace="5" alt="" /></a>
+ <#else>
+ <a href="javascript:void(0);" swapDetail="<@o...@ofbizContentUrl>"><img src="<@o...@ofbizContentUrl>" vspace="5" hspace="5" alt="" /></a>
+ </#if>
+ <#else>
<a href="javascript:void(0);" swapDetail="<@o...@ofbizContentUrl>"><img src="<@o...@ofbizContentUrl>" vspace="5" hspace="5" width="200" alt="" /></a>
+ </#if>
</div>
</#if>
</div>
+ </div>
<div id="productDetailBox">
<h2>${productContentWrapper.get("PRODUCT_NAME")?if_exists}</h2>
<div>${productContentWrapper.get("DESCRIPTION")?if_exists}</div>
@@ -462,7 +527,7 @@ ${virtualJavaScript?if_exists}
<div> </div>
</#if>
</div>
-</div>
+
<div id="addItemForm">
<form method="post" action="<@o...@ofbizUrl>" name="addform" style="margin: 0;">
<fieldset>
@@ -483,13 +548,13 @@ ${virtualJavaScript?if_exists}
</div>
</#list>
<input type="hidden" name="add_product_id" value="${product.productId}" />
- <div id="addCart1" style="display:none;>
+ <div id="addCart1" style="display:none;">
<span style="white-space: nowrap;"><strong>${uiLabelMap.CommonQuantity}:</strong></span>
<input type="text" size="5" name="quantity" value="1" />
<a href="javascript:javascript:addItem();" class="buttontext"><span style="white-space: nowrap;">${uiLabelMap.OrderAddToCart}</span></a>
</div>
- <div id="addCart2" style="display:block;>
+ <div id="addCart2" style="display:block;">
<span style="white-space: nowrap;"><strong>${uiLabelMap.CommonQuantity}:</strong></span>
<input type="text" size="5" value="1" disabled="disabled" />
<a href="javascript:alert('Please select all features first');" class="buttontext"><span style="white-space: nowrap;">${uiLabelMap.OrderAddToCart}</span></a>
@@ -505,6 +570,8 @@ ${virtualJavaScript?if_exists}
</select>
</div>
</#list>
+ <span id="product_uom"></span>
+ <input type="hidden" name="product_id" value="${product.productId}"/>
<input type="hidden" name="add_product_id" value="NULL"/>
<div>
<strong><span id="product_id_display"> </span></strong>
@@ -695,6 +762,7 @@ ${virtualJavaScript?if_exists}
</#if>
<#-- Upgrades/Up-Sell/Cross-Sell -->
<#macro associated assocProducts beforeName showName afterName formNamePrefix targetRequestName>
+ <#assign pageProduct = product />
<#assign targetRequest = "product" />
<#if targetRequestName?has_content>
<#assign targetRequest = targetRequestName />
@@ -724,6 +792,7 @@ ${virtualJavaScript?if_exists}
${setRequestAttribute("targetRequestName", targetRequestName)}
</#if>
${screens.render(productsummaryScreen)}
+ <#assign product = pageProduct />
<#local listIndex = listIndex + 1 />
</#list>
</div>
Modified: ofbiz/branches/jquery/specialpurpose/ecommerce/webapp/ecommerce/catalog/sidedeepcategory.ftl
URL: http://svn.apache.org/viewvc/ofbiz/branches/jquery/specialpurpose/ecommerce/webapp/ecommerce/catalog/sidedeepcategory.ftl?rev=1042964&r1=1042963&r2=1042964&view=diff
==============================================================================
--- ofbiz/branches/jquery/specialpurpose/ecommerce/webapp/ecommerce/catalog/sidedeepcategory.ftl (original)
+++ ofbiz/branches/jquery/specialpurpose/ecommerce/webapp/ecommerce/catalog/sidedeepcategory.ftl Tue Dec 7 10:42:16 2010
@@ -23,25 +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">
- <h3><#if categoryDescription?has_content>${categoryDescription}<#else>${categoryName?default("")}</#if></h3>
- <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>
@@ -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/branches/jquery/specialpurpose/ecommerce/webapp/ecommerce/content/content_categories.ftl
URL: http://svn.apache.org/viewvc/ofbiz/branches/jquery/specialpurpose/ecommerce/webapp/ecommerce/content/content_categories.ftl?rev=1042964&r1=1042963&r2=1042964&view=diff
==============================================================================
--- ofbiz/branches/jquery/specialpurpose/ecommerce/webapp/ecommerce/content/content_categories.ftl (original)
+++ ofbiz/branches/jquery/specialpurpose/ecommerce/webapp/ecommerce/content/content_categories.ftl Tue Dec 7 10:42:16 2010
@@ -31,16 +31,21 @@ under the License.
</#if>
<div id="content_catagories" class="screenlet">
- <h3>${uiLabelMap.ProductBrowseContent}</h3>
- <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-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/>
+ <@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/branches/jquery/specialpurpose/ecommerce/webapp/ecommerce/content/factoids.ftl
URL: http://svn.apache.org/viewvc/ofbiz/branches/jquery/specialpurpose/ecommerce/webapp/ecommerce/content/factoids.ftl?rev=1042964&r1=1042963&r2=1042964&view=diff
==============================================================================
--- ofbiz/branches/jquery/specialpurpose/ecommerce/webapp/ecommerce/content/factoids.ftl (original)
+++ ofbiz/branches/jquery/specialpurpose/ecommerce/webapp/ecommerce/content/factoids.ftl Tue Dec 7 10:42:16 2010
@@ -31,16 +31,21 @@ under the License.
</#if>
<div id="factoids" class="screenlet">
- <h3>${uiLabelMap.EcommerceFactoids}</h3>
- <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-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/>
+ <@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/branches/jquery/specialpurpose/ecommerce/webapp/ecommerce/content/minipoll.ftl
URL: http://svn.apache.org/viewvc/ofbiz/branches/jquery/specialpurpose/ecommerce/webapp/ecommerce/content/minipoll.ftl?rev=1042964&r1=1042963&r2=1042964&view=diff
==============================================================================
--- ofbiz/branches/jquery/specialpurpose/ecommerce/webapp/ecommerce/content/minipoll.ftl (original)
+++ ofbiz/branches/jquery/specialpurpose/ecommerce/webapp/ecommerce/content/minipoll.ftl Tue Dec 7 10:42:16 2010
@@ -23,12 +23,17 @@ under the License.
</#if>
<#if randomSurvey?has_content>
-<div id="minipoll" class="screenlet">
- <h3>${randomSurvey.getSurveyName()?if_exists}</h3>
+ <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>
+ <form method="post" action="<@ofbizUrl>minipoll<#if requestAttributes._CURRENT_VIEW_?exists>/${requestAttributes._CURRENT_VIEW_}</#...@ofbizUrl>" style="margin: 0;">
+ ${randomSurvey.render()}
+ </form>
</div>
-</div>
+ </div>
</#if>
Modified: ofbiz/branches/jquery/specialpurpose/ecommerce/webapp/ecommerce/content/recentlyviewed.ftl
URL: http://svn.apache.org/viewvc/ofbiz/branches/jquery/specialpurpose/ecommerce/webapp/ecommerce/content/recentlyviewed.ftl?rev=1042964&r1=1042963&r2=1042964&view=diff
==============================================================================
--- ofbiz/branches/jquery/specialpurpose/ecommerce/webapp/ecommerce/content/recentlyviewed.ftl (original)
+++ ofbiz/branches/jquery/specialpurpose/ecommerce/webapp/ecommerce/content/recentlyviewed.ftl Tue Dec 7 10:42:16 2010
@@ -18,14 +18,19 @@ under the License.
-->
<#if mrvList?has_content>
- <div id="recentlyviewed" class="screenlet">
- <h3>${uiLabelMap.EcommerceLastContent}</h3>
- <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/branches/jquery/specialpurpose/ecommerce/webapp/ecommerce/customer/miniSignUpForContactList.ftl
URL: http://svn.apache.org/viewvc/ofbiz/branches/jquery/specialpurpose/ecommerce/webapp/ecommerce/customer/miniSignUpForContactList.ftl?rev=1042964&r1=1042963&r2=1042964&view=diff
==============================================================================
--- ofbiz/branches/jquery/specialpurpose/ecommerce/webapp/ecommerce/customer/miniSignUpForContactList.ftl (original)
+++ ofbiz/branches/jquery/specialpurpose/ecommerce/webapp/ecommerce/customer/miniSignUpForContactList.ftl Tue Dec 7 10:42:16 2010
@@ -19,16 +19,22 @@ 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">
- <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,7 +82,5 @@ under the License.
</fieldset>
</form>
</#if>
-</div>
-
-
-
+ </div>
+</div>
\ No newline at end of file
Modified: ofbiz/branches/jquery/specialpurpose/ecommerce/webapp/ecommerce/forum/forums.ftl
URL: http://svn.apache.org/viewvc/ofbiz/branches/jquery/specialpurpose/ecommerce/webapp/ecommerce/forum/forums.ftl?rev=1042964&r1=1042963&r2=1042964&view=diff
==============================================================================
--- ofbiz/branches/jquery/specialpurpose/ecommerce/webapp/ecommerce/forum/forums.ftl (original)
+++ ofbiz/branches/jquery/specialpurpose/ecommerce/webapp/ecommerce/forum/forums.ftl Tue Dec 7 10:42:16 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>
+ <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>
\ No newline at end of file
Modified: ofbiz/branches/jquery/specialpurpose/ecommerce/webapp/ecommerce/includes/language.ftl
URL: http://svn.apache.org/viewvc/ofbiz/branches/jquery/specialpurpose/ecommerce/webapp/ecommerce/includes/language.ftl?rev=1042964&r1=1042963&r2=1042964&view=diff
==============================================================================
--- ofbiz/branches/jquery/specialpurpose/ecommerce/webapp/ecommerce/includes/language.ftl (original)
+++ ofbiz/branches/jquery/specialpurpose/ecommerce/webapp/ecommerce/includes/language.ftl Tue Dec 7 10:42:16 2010
@@ -18,20 +18,25 @@ under the License.
-->
<div id="choose-language" class="screenlet">
- <h3>${uiLabelMap.CommonLanguageTitle}</h3>
- <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-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()">
+ <#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