svn commit: r789170 - in /ofbiz/trunk/specialpurpose/ec
Locked
svn commit: r789170 - in /ofbiz/trunk/specialpurpose/ec
 
|
Author: apatel
Date: Sun Jun 28 23:13:37 2009 New Revision: 789170 URL: http://svn.apache.org/viewvc?rev=789170&view=rev Log: Markup reformatted. Modified: ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/cart/minipromotext.ftl ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/catalog/choosecatalog.ftl ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/catalog/minilastproductsearches.ftl ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/catalog/minilastviewedproducts.ftl ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/customer/miniSignUpForContactList.ftl 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=789170&r1=789169&r2=789170&view=diff ============================================================================== --- ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/cart/minipromotext.ftl (original) +++ ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/cart/minipromotext.ftl Sun Jun 28 23:13:37 2009 @@ -19,20 +19,20 @@ <#if showPromoText> <div id="minipromotext"> - <h3>${uiLabelMap.OrderSpecialOffers}</h3> - <#-- show promotions text --> - <ul> - <#list productPromos as productPromo> - <li> - <p> - <a href="<@ofbizUrl>showPromotionDetails?productPromoId=${productPromo.productPromoId}</@ofbizUrl>" class="linktext">${uiLabelMap.CommonDetails}</a> - ${StringUtil.wrapString(productPromo.promoText?if_exists)} - </p> - </li> - </#list> - <li> - <a href="<@ofbizUrl>showAllPromotions</@ofbizUrl>" class="button">${uiLabelMap.OrderViewAllPromotions}</a> - </li> - </ul> + <h3>${uiLabelMap.OrderSpecialOffers}</h3> + <#-- show promotions text --> + <ul> + <#list productPromos as productPromo> + <li> + <p> + <a href="<@ofbizUrl>showPromotionDetails?productPromoId=${productPromo.productPromoId}</@ofbizUrl>" class="linktext">${uiLabelMap.CommonDetails}</a> + ${StringUtil.wrapString(productPromo.promoText?if_exists)} + </p> + </li> + </#list> + <li> + <a href="<@ofbizUrl>showAllPromotions</@ofbizUrl>" class="button">${uiLabelMap.OrderViewAllPromotions}</a> + </li> + </ul> </div> </#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=789170&r1=789169&r2=789170&view=diff ============================================================================== --- ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/catalog/choosecatalog.ftl (original) +++ ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/catalog/choosecatalog.ftl Sun Jun 28 23:13:37 2009 @@ -23,16 +23,16 @@ <#-- 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="<@ofbizUrl>main</@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> + <h3>${uiLabelMap.ProductChooseCatalog}</h3> + <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> + <#list catalogCol as catalogId> + <#assign thisCatalogName = Static["org.ofbiz.product.catalog.CatalogWorker"].getCatalogName(request, catalogId)> + <option value='${catalogId}'>${thisCatalogName}</option> + </#list> + </select> + </form> </div> </#if> 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=789170&r1=789169&r2=789170&view=diff ============================================================================== --- ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/catalog/minilastproductsearches.ftl (original) +++ ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/catalog/minilastproductsearches.ftl Sun Jun 28 23:13:37 2009 @@ -22,31 +22,30 @@ <#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="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> - <h3>${uiLabelMap.OrderLastSearches}...</h3> - - <ul> - <#list searchOptionsHistoryList[0..limit] as searchOptions> - <#-- searchOptions type is ProductSearchSession.ProductSearchOptions --> + <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> + <h3>${uiLabelMap.OrderLastSearches}...</h3> + <ul> + <#list searchOptionsHistoryList[0..limit] as searchOptions> + <#-- searchOptions type is ProductSearchSession.ProductSearchOptions --> + <li> + ${uiLabelMap.EcommerceSearchNumber} ${searchOptions_index + 1} + <ul> <li> - ${uiLabelMap.EcommerceSearchNumber} ${searchOptions_index + 1} - <ul> - <li> - <a href="<@ofbizUrl>setCurrentSearchFromHistoryAndSearch?searchHistoryIndex=${searchOptions_index}&clearSearch=N</@ofbizUrl>" class="button">${uiLabelMap.CommonSearch}</a> - <a href="<@ofbizUrl>setCurrentSearchFromHistory?searchHistoryIndex=${searchOptions_index}</@ofbizUrl>" class="button">${uiLabelMap.CommonRefine}</a> - </li> - <#assign constraintStrings = searchOptions.searchGetConstraintStrings(false, delegator, locale)> - <#list constraintStrings as constraintString> - <li>${constraintString}</li> - </#list> - </ul> - </#list> - </ul> + <a href="<@ofbizUrl>setCurrentSearchFromHistoryAndSearch?searchHistoryIndex=${searchOptions_index}&clearSearch=N</@ofbizUrl>" class="button">${uiLabelMap.CommonSearch}</a> + <a href="<@ofbizUrl>setCurrentSearchFromHistory?searchHistoryIndex=${searchOptions_index}</@ofbizUrl>" class="button">${uiLabelMap.CommonRefine}</a> + </li> + <#assign constraintStrings = searchOptions.searchGetConstraintStrings(false, delegator, locale)> + <#list constraintStrings as constraintString> + <li>${constraintString}</li> + </#list> + </ul> + </li> + </#list> + </ul> </div> </#if> 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=789170&r1=789169&r2=789170&view=diff ============================================================================== --- ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/catalog/minilastviewedproducts.ftl (original) +++ ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/catalog/minilastviewedproducts.ftl Sun Jun 28 23:13:37 2009 @@ -20,25 +20,24 @@ <#assign maxToShow = 4/> <#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="<@ofbizUrl>clearLastViewed</@ofbizUrl>" class="lightbuttontextsmall">[${uiLabelMap.CommonClear}]</a> - <#if (lastViewedProducts?size > maxToShow)> - <a href="<@ofbizUrl>lastviewedproducts</@ofbizUrl>" class="lightbuttontextsmall">[${uiLabelMap.CommonMore}]</a> - </#if> - </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> + <#if (lastViewedProducts?size > maxToShow)><#assign limit=maxToShow/><#else><#assign limit=(lastViewedProducts?size-1)/></#if> + <div id="minilastviewedproducts" class="screenlet"> + <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> + <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/customer/miniSignUpForContactList.ftl URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/customer/miniSignUpForContactList.ftl?rev=789170&r1=789169&r2=789170&view=diff ============================================================================== --- ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/customer/miniSignUpForContactList.ftl (original) +++ ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/customer/miniSignUpForContactList.ftl Sun Jun 28 23:13:37 2009 @@ -28,44 +28,42 @@ </#macro> <div id="miniSignUpForContactList" class="screenlet"> - <h3>${uiLabelMap.EcommerceSignUpForContactList}</h3> - <#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"> - <fieldset> - <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"/> - </fieldset> - </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"> - <fieldset> - <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"/> - </fieldset> - </form> - </#if> + <h3>${uiLabelMap.EcommerceSignUpForContactList}</h3> + <#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"> + <fieldset> + <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="button"/> + </fieldset> + </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>">${uiLabelMap.CommonLogin}</a> ${sessionAttributes.autoName}</p> + <p>(${uiLabelMap.CommonNotYou}? <a href="<@ofbizUrl>autoLogout</@ofbizUrl>">${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"> + <fieldset> + <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"/> + </fieldset> + </form> + </#if> </div> |
«
Return to OFBiz - Commits
|
1 view|%1 views
| Free forum by Nabble | Edit this page |