svn commit: r1761135 [6/13] - in /ofbiz/trunk/specialpurpose: ebay/template/find/ ecommerce/template/blog/ ecommerce/template/cart/ ecommerce/template/catalog/ ecommerce/template/content/ ecommerce/template/customer/ ecommerce/template/customer/pr
Locked
svn commit: r1761135 [6/13] - in /ofbiz/trunk/specialpurpose: ebay/template/find/ ecommerce/template/blog/ ecommerce/template/cart/ ecommerce/template/catalog/ ecommerce/template/content/ ecommerce/template/customer/ ecommerce/template/customer/pr
 
|
Modified: ofbiz/trunk/specialpurpose/ecommerce/template/catalog/SideDeepCategory.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/ecommerce/template/catalog/SideDeepCategory.ftl?rev=1761135&r1=1761134&r2=1761135&view=diff ============================================================================== --- ofbiz/trunk/specialpurpose/ecommerce/template/catalog/SideDeepCategory.ftl (original) +++ ofbiz/trunk/specialpurpose/ecommerce/template/catalog/SideDeepCategory.ftl Sat Sep 17 07:17:15 2016 @@ -22,12 +22,14 @@ under the License. <#-- looping macro --> <#macro categoryList parentCategory category wrapInBox> - <#if catContentWrappers?? && catContentWrappers[category.productCategoryId]?? && catContentWrappers[category.productCategoryId].get("CATEGORY_NAME", "html")??> + <#if catContentWrappers?? && catContentWrappers[category.productCategoryId]?? && + catContentWrappers[category.productCategoryId].get("CATEGORY_NAME", "html")??> <#assign categoryName = catContentWrappers[category.productCategoryId].get("CATEGORY_NAME", "html")> <#else> <#assign categoryName = category.categoryName!> </#if> - <#if catContentWrappers?? && catContentWrappers[category.productCategoryId]?? && catContentWrappers[category.productCategoryId].get("DESCRIPTION", "html")??> + <#if catContentWrappers?? && catContentWrappers[category.productCategoryId]?? && + catContentWrappers[category.productCategoryId].get("DESCRIPTION", "html")??> <#assign categoryDescription = catContentWrappers[category.productCategoryId].get("DESCRIPTION", "html")> <#else> <#assign categoryDescription = category.description!> @@ -41,53 +43,69 @@ under the License. <div id="sidedeepcategory" class="screenlet"> <div class="screenlet-title-bar"> <ul> - <li class="h3"><#if categoryDescription?has_content>${categoryDescription}<#else>${categoryName?default("")}</#if></li> + <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> - <#assign parentCategoryId = parentCategory.productCategoryId/> - <#else> - <#assign parentCategoryId = ""/> - </#if> - <a href="<@ofbizCatalogAltUrl productCategoryId=category.productCategoryId previousCategoryId=parentCategoryId/>" class="${browseCategoryButtonClass}"><#if categoryName?has_content>${categoryName}<#else>${categoryDescription?default("")}</#if></a> + <li class="browsecategorytext"> + <#if parentCategory?has_content> + <#assign parentCategoryId = parentCategory.productCategoryId/> + <#else> + <#assign parentCategoryId = ""/> + </#if> + <a href="<@ofbizCatalogAltUrl productCategoryId=category.productCategoryId + previousCategoryId=parentCategoryId/>" class="${browseCategoryButtonClass}"> + <#if categoryName?has_content> + ${categoryName} + <#else> + ${categoryDescription?default("")} + </#if> + </a> - <#if (Static["org.apache.ofbiz.product.category.CategoryWorker"].checkTrailItem(request, category.getString("productCategoryId"))) || (curCategoryId?? && curCategoryId == category.productCategoryId)> - <#local subCatList = Static["org.apache.ofbiz.product.category.CategoryWorker"].getRelatedCategoriesRet(request, "subCatList", category.getString("productCategoryId"), true)> - <#if subCatList??> - <#list subCatList as subCat> - <ul class="browsecategorylist"> - <@categoryList parentCategory=category category=subCat wrapInBox="N"/> - </ul> - </#list> + <#if (Static["org.apache.ofbiz.product.category.CategoryWorker"] + .checkTrailItem(request, category.getString("productCategoryId"))) || + (curCategoryId?? && curCategoryId == category.productCategoryId)> + <#local subCatList = Static["org.apache.ofbiz.product.category.CategoryWorker"] + .getRelatedCategoriesRet(request, "subCatList", category.getString("productCategoryId"), true)> + <#if subCatList??> + <#list subCatList as subCat> + <ul class="browsecategorylist"> + <@categoryList parentCategory=category category=subCat wrapInBox="N"/> + </ul> + </#list> + </#if> </#if> - </#if> </li> <#if wrapInBox == "Y"> + </div> </div> </div> - </div> </#if> </#macro> <#if topLevelList?has_content> -<div id="sidedeepcategory" class="screenlet"> - <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 id="sidedeepcategory" class="screenlet"> + <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> -</div> </#if> Modified: ofbiz/trunk/specialpurpose/ecommerce/template/catalog/TellAFriend.ftl URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/ecommerce/template/catalog/TellAFriend.ftl?rev=1761135&r1=1761134&r2=1761135&view=diff ============================================================================== --- ofbiz/trunk/specialpurpose/ecommerce/template/catalog/TellAFriend.ftl (original) +++ ofbiz/trunk/specialpurpose/ecommerce/template/catalog/TellAFriend.ftl Sat Sep 17 07:17:15 2016 @@ -18,49 +18,51 @@ under the License. --> <html> -<head> - <title>${uiLabelMap.EcommerceTellAFriend}</title> -</head> + <head> + <title>${uiLabelMap.EcommerceTellAFriend}</title> + </head> <body class="ecbody"> - <form name="tellafriend" action="<@ofbizUrl>emailFriend</@ofbizUrl>" method="post"> - <#if (requestParameters.productId)?? || (requestParameters.productId)??> - <input type="hidden" name="pageUrl" value="<@ofbizCatalogAltUrl fullPath="true" secure="false" productCategoryId=requestParameters.categoryId!"" productId=requestParameters.productId!""/>" /> - <#else> - <#assign cancel = "Y"> - </#if> - <input type="hidden" name="webSiteId" value="${context.webSiteId!}"> - <#if !cancel??> - <table> - <tr> - <td>${uiLabelMap.CommonYouremail}:</td> - <td><input type="text" name="sendFrom" size="30" /></td> - </tr> - <tr> - <td>${uiLabelMap.CommonEmailTo}:</td> - <td><input type="text" name="sendTo" size="30" /></td> - </tr> - <tr> - <td colspan="2" align="center">${uiLabelMap.CommonMessage}</td> - </tr> - <tr> - <td colspan="2" align="center"> - <textarea cols="40" rows="5" name="message"></textarea> - </td> - </tr> - <tr> - <td colspan="2" align="center"> - <input type="submit" value="${uiLabelMap.CommonSend}" /> - </td> - </tr> - </table> - <#else> - <script language="JavaScript" type="text/javascript"> + <form name="tellafriend" action="<@ofbizUrl>emailFriend</@ofbizUrl>" method="post"> + <#if (requestParameters.productId)?? || (requestParameters.productId)??> + <input type="hidden" name="pageUrl" value="<@ofbizCatalogAltUrl fullPath="true" + secure="false" productCategoryId=requestParameters.categoryId!"" + productId=requestParameters.productId!""/>"/> + <#else> + <#assign cancel = "Y"> + </#if> + <input type="hidden" name="webSiteId" value="${context.webSiteId!}"> + <#if !cancel??> + <table> + <tr> + <td>${uiLabelMap.CommonYouremail}:</td> + <td><input type="text" name="sendFrom" size="30"/></td> + </tr> + <tr> + <td>${uiLabelMap.CommonEmailTo}:</td> + <td><input type="text" name="sendTo" size="30"/></td> + </tr> + <tr> + <td colspan="2" align="center">${uiLabelMap.CommonMessage}</td> + </tr> + <tr> + <td colspan="2" align="center"> + <textarea cols="40" rows="5" name="message"></textarea> + </td> + </tr> + <tr> + <td colspan="2" align="center"> + <input type="submit" value="${uiLabelMap.CommonSend}"/> + </td> + </tr> + </table> + <#else> + <script language="JavaScript" type="text/javascript"> <!-- // window.close(); // --> - </script> - <div>${uiLabelMap.EcommerceTellAFriendSorry}</div> - </#if> - </form> + </script> + <div>${uiLabelMap.EcommerceTellAFriendSorry}</div> + </#if> + </form> </body> </html> Modified: ofbiz/trunk/specialpurpose/ecommerce/template/content/BlogLib.ftl URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/ecommerce/template/content/BlogLib.ftl?rev=1761135&r1=1761134&r2=1761135&view=diff ============================================================================== --- ofbiz/trunk/specialpurpose/ecommerce/template/content/BlogLib.ftl (original) +++ ofbiz/trunk/specialpurpose/ecommerce/template/content/BlogLib.ftl Sat Sep 17 07:17:15 2016 @@ -18,38 +18,49 @@ under the License. --> <#macro renderAncestryPath trail siteId startIndex=0 endIndexOffset=0 buttonTitle="Back to" searchOn="" > - <#local indent = ""> - <#local csv = ""> - <#local counter = 0> - <#local len = trail?size> - <table border="0" cellspacing="4"> + <#local indent = ""> + <#local csv = ""> + <#local counter = 0> + <#local len = trail?size> + <table border="0" cellspacing="4"> <#list trail as content> <#if counter < (len - endIndexOffset) && startIndex <= counter > <#if 0 < counter > - <#local csv = csv + ","/> + <#local csv = csv + ","/> </#if> <#local csv = csv + content.contentId/> <#if counter < len && startIndex <= counter > - <tr> - <td > + <tr> + <td> ${indent} <#if content.contentTypeId == "WEB_SITE_PUB_PT" > - <a class="tabButton" href="<@ofbizUrl>showcontenttree?contentId=${content.contentId!}&nodeTrailCsv=${csv}</@ofbizUrl>" >${uiLabelMap.CommonBackTo}</a> ${content.contentName!} + <a class="tabButton" + href="<@ofbizUrl>showcontenttree?contentId=${content.contentId!}&nodeTrailCsv=${csv}</@ofbizUrl>"> + ${uiLabelMap.CommonBackTo} + </a> + ${content.contentName!} <#else> - <a class="tabButton" href="<@ofbizUrl>showcontenttree?contentId=${siteId!}&nodeTrailCsv=${csv}</@ofbizUrl>" >${uiLabelMap.CommonBackTo}</a> ${content.contentName!} + <a class="tabButton" + href="<@ofbizUrl>showcontenttree?contentId=${siteId!}&nodeTrailCsv=${csv}</@ofbizUrl>"> + ${uiLabelMap.CommonBackTo} + </a> + ${content.contentName!} </#if> <#local indent = indent + " "> [${content.contentId!}] <#if searchOn?has_content && searchOn?lower_case == "true"> - - <a class="tabButton" href="<@ofbizUrl>searchContent?siteId=${siteId!}&nodeTrailCsv=${csv}</@ofbizUrl>" >${uiLabelMap.CommonSearch}</a> + + <a class="tabButton" + href="<@ofbizUrl>searchContent?siteId=${siteId!}&nodeTrailCsv=${csv}</@ofbizUrl>"> + ${uiLabelMap.CommonSearch} + </a> </#if> - </#if> - </td> - </tr> + </#if> + </td> + </tr> </#if> <#local counter = counter + 1> - <#if 20 < counter > <#break/></#if> + <#if 20 < counter > <#break/></#if> </#list> - </table> + </table> </#macro> Modified: ofbiz/trunk/specialpurpose/ecommerce/template/content/ContentCategories.ftl URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/ecommerce/template/content/ContentCategories.ftl?rev=1761135&r1=1761134&r2=1761135&view=diff ============================================================================== --- ofbiz/trunk/specialpurpose/ecommerce/template/content/ContentCategories.ftl (original) +++ ofbiz/trunk/specialpurpose/ecommerce/template/content/ContentCategories.ftl Sat Sep 17 07:17:15 2016 @@ -42,10 +42,13 @@ under the License. <#assign count_1=0/> <@loopSubContent contentId=contentRootId viewIndex=0 viewSize=9999 orderBy="contentName"> <li class="browsecategorytext"> - <a href="<@ofbizUrl>showcontenttree?contentId=${subContentId}&nodeTrailCsv=${subContentId}</@ofbizUrl>" class="browsecategorybutton">${content.contentName}</a> + <a href="<@ofbizUrl>showcontenttree?contentId=${subContentId}&nodeTrailCsv=${subContentId}</@ofbizUrl>" + class="browsecategorybutton"> + ${content.contentName} + </a> </li> <#assign count_1=(count_1 + 1)/> </@loopSubContent> </ul> </div> -</div> \ No newline at end of file +</div> Modified: ofbiz/trunk/specialpurpose/ecommerce/template/content/MiniPoll.ftl URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/ecommerce/template/content/MiniPoll.ftl?rev=1761135&r1=1761134&r2=1761135&view=diff ============================================================================== --- ofbiz/trunk/specialpurpose/ecommerce/template/content/MiniPoll.ftl (original) +++ ofbiz/trunk/specialpurpose/ecommerce/template/content/MiniPoll.ftl Sat Sep 17 07:17:15 2016 @@ -19,7 +19,8 @@ under the License. <#assign groupName = page.randomSurveyGroup!> <#if groupName?has_content> - <#assign randomSurvey = Static["org.apache.ofbiz.product.store.ProductStoreWorker"].getRandomSurveyWrapper(request, "testSurveyGroup")!> + <#assign randomSurvey = Static["org.apache.ofbiz.product.store.ProductStoreWorker"] + .getRandomSurveyWrapper(request, "testSurveyGroup")!> </#if> <#if randomSurvey?has_content> @@ -31,7 +32,9 @@ under the License. <br class="clear"/> </div> <div class="screenlet-body"> - <form method="post" action="<@ofbizUrl>minipoll<#if requestAttributes._CURRENT_VIEW_??>/${requestAttributes._CURRENT_VIEW_}</#if></@ofbizUrl>" style="margin: 0;"> + <form method="post" + action="<@ofbizUrl>minipoll<#if requestAttributes._CURRENT_VIEW_??>/${requestAttributes._CURRENT_VIEW_}</#if></@ofbizUrl>" + style="margin: 0;"> ${randomSurvey.render()} </form> </div> Modified: ofbiz/trunk/specialpurpose/ecommerce/template/content/RecentlyViewed.ftl URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/ecommerce/template/content/RecentlyViewed.ftl?rev=1761135&r1=1761134&r2=1761135&view=diff ============================================================================== --- ofbiz/trunk/specialpurpose/ecommerce/template/content/RecentlyViewed.ftl (original) +++ ofbiz/trunk/specialpurpose/ecommerce/template/content/RecentlyViewed.ftl Sat Sep 17 07:17:15 2016 @@ -28,9 +28,11 @@ under the License. <div class="screenlet-body"> <#list mrvList as mrvArr> <div class="browsecategorytext"> - <a href="<@ofbizUrl>viewcontent?contentId=${mrvArr[0]}</@ofbizUrl>" class="browsecategorybutton">${mrvArr[1]}</a> + <a href="<@ofbizUrl>viewcontent?contentId=${mrvArr[0]}</@ofbizUrl>" class="browsecategorybutton"> + ${mrvArr[1]} + </a> </div> </#list> </div> </div> -</#if> \ No newline at end of file +</#if> Modified: ofbiz/trunk/specialpurpose/ecommerce/template/content/SearchContent.ftl URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/ecommerce/template/content/SearchContent.ftl?rev=1761135&r1=1761134&r2=1761135&view=diff ============================================================================== --- ofbiz/trunk/specialpurpose/ecommerce/template/content/SearchContent.ftl (original) +++ ofbiz/trunk/specialpurpose/ecommerce/template/content/SearchContent.ftl Sat Sep 17 07:17:15 2016 @@ -19,80 +19,80 @@ under the License. <form method="post" action="<@ofbizUrl>searchContent</@ofbizUrl>" name="searchQuery"> -<table border="0" cellpadding="2" cellspacing="0"> - -<tr> -<td width="20%" align="right"> -<span class="tableheadtext">${uiLabelMap.EcommerceEnterQueryParameters}</span> -</td> -<td> </td> -<td width="80%"> -<input type="text" class="inputBox" name="queryLine" size="60"/> -</td> -</tr> -<tr> - - -<!-- category form --> -<tr> - <table> + <table border="0" cellpadding="2" cellspacing="0"> <tr> - <td align="right" valign="middle"> - <div>${uiLabelMap.ProductFeatures}:</div> + <td width="20%" align="right"> + <span class="tableheadtext">${uiLabelMap.EcommerceEnterQueryParameters}</span> </td> - <td align="right" valign="middle"> - <div> - ${uiLabelMap.CommonAll} <input type="radio" name="any_or_all" value="all" checked="checked" /> - ${uiLabelMap.CommonAny} <input type="radio" name="any_or_all" value="any" /> - </div> + <td> </td> + <td width="80%"> + <input type="text" class="inputBox" name="queryLine" size="60"/> </td> </tr> - <#list productFeatureTypeIdsOrdered as productFeatureTypeId> - <#assign findPftMap = Static["org.apache.ofbiz.base.util.UtilMisc"].toMap("productFeatureTypeId", productFeatureTypeId)> - <#assign productFeatureType = delegator.findOne("ProductFeatureType", findPftMap, true)> - <#assign productFeatures = productFeaturesByTypeMap[productFeatureTypeId]> + <tr> + <!-- category form --> + <tr> + <table> <tr> <td align="right" valign="middle"> - <div>${(productFeatureType.get("description",locale))!}:</div> + <div>${uiLabelMap.ProductFeatures}:</div> </td> - <td valign="middle"> + <td align="right" valign="middle"> <div> - <select class="selectBox" name="pft_${productFeatureTypeId}"> - <option value="">- ${uiLabelMap.CommonSelectAny} -</option> - <#list productFeatures as productFeature> - <option value="${productFeature.productFeatureId}">${productFeature.description?default("No Description")} [${productFeature.productFeatureId}]</option> - </#list> - </select> + ${uiLabelMap.CommonAll} <input type="radio" name="any_or_all" value="all" checked="checked" /> + ${uiLabelMap.CommonAny} <input type="radio" name="any_or_all" value="any" /> </div> </td> </tr> - </#list> - <#if searchConstraintStrings?has_content> - <tr> - <td align="right" valign="top"> - <div>${uiLabelMap.ProductLastSearch}:</div> - </td> - <td valign="top"> + <#list productFeatureTypeIdsOrdered as productFeatureTypeId> + <#assign findPftMap = Static["org.apache.ofbiz.base.util.UtilMisc"] + .toMap("productFeatureTypeId", productFeatureTypeId)> + <#assign productFeatureType = delegator.findOne("ProductFeatureType", findPftMap, true)> + <#assign productFeatures = productFeaturesByTypeMap[productFeatureTypeId]> + <tr> + <td align="right" valign="middle"> + <div>${(productFeatureType.get("description",locale))!}:</div> + </td> + <td valign="middle"> + <div> + <select class="selectBox" name="pft_${productFeatureTypeId}"> + <option value="">- ${uiLabelMap.CommonSelectAny} -</option> + <#list productFeatures as productFeature> + <option value="${productFeature.productFeatureId}"> + ${productFeature.description?default("No Description")} [${productFeature.productFeatureId}] + </option> + </#list> + </select> + </div> + </td> + </tr> + </#list> + <#if searchConstraintStrings?has_content> + <tr> + <td align="right" valign="top"> + <div>${uiLabelMap.ProductLastSearch}:</div> + </td> + <td valign="top"> <#list searchConstraintStrings as searchConstraintString> - <div> - ${searchConstraintString}</div> + <div> - ${searchConstraintString}</div> </#list> <div>${uiLabelMap.ProductSortedBy}: ${searchSortOrderString}</div> <div> - ${uiLabelMap.ProductNewSearch}<input type="radio" name="clearSearch" value="Y" checked="checked" /> - ${uiLabelMap.CommonRefineSearch}<input type="radio" name="clearSearch" value="N" /> + ${uiLabelMap.ProductNewSearch} + <input type="radio" name="clearSearch" value="Y" checked="checked" /> + ${uiLabelMap.CommonRefineSearch} + <input type="radio" name="clearSearch" value="N" /> </div> - </td> + </td> + </tr> + </#if> + <td width="20%" align="right"> </td> + <td> </td> + <td width="80%" colspan="4"> + <input type="submit" class="smallSubmit" name="submitButton" value="${uiLabelMap.CommonQuery}"/> + </td> </tr> - </#if> -<td width="20%" align="right"> - </td> -<td> </td> -<td width="80%" colspan="4"> -<input type="submit" class="smallSubmit" name="submitButton" value="${uiLabelMap.CommonQuery}"/> -</td> - -</tr> -</table> + </table> </form> @@ -107,8 +107,8 @@ under the License. <#local indent = indent + " "/> </#list> </#if> -<@loopSubContent contentId=contentId viewIndex=0 viewSize=9999 returnAfterPickWhen="1==1";> - <option value="${content.contentId?lower_case}">${indent}${content.description}</option> - <@listSiteIds contentId=content.contentId indentIndex=indentIndex + 1 /> -</@loopSubContent> + <@loopSubContent contentId=contentId viewIndex=0 viewSize=9999 returnAfterPickWhen="1==1";> + <option value="${content.contentId?lower_case}">${indent}${content.description}</option> + <@listSiteIds contentId=content.contentId indentIndex=indentIndex + 1 /> + </@loopSubContent> </#macro> Modified: ofbiz/trunk/specialpurpose/ecommerce/template/content/ShowContentTree.ftl URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/ecommerce/template/content/ShowContentTree.ftl?rev=1761135&r1=1761134&r2=1761135&view=diff ============================================================================== --- ofbiz/trunk/specialpurpose/ecommerce/template/content/ShowContentTree.ftl (original) +++ ofbiz/trunk/specialpurpose/ecommerce/template/content/ShowContentTree.ftl Sat Sep 17 07:17:15 2016 @@ -23,22 +23,26 @@ under the License. <@renderAncestryPath trail=ancestorList?default([]) endIndexOffset=1 siteId=siteId searchOn="true"/> <#if ancestorList?has_content && (0 < ancestorList?size) > - <#assign lastContent=ancestorList?last /> - <h1>[${lastContent.contentId}] ${lastContent.description} - <a class="tabButton" href="<@ofbizUrl>searchContent?siteId=${lastContent.contentId!}</@ofbizUrl>" >${uiLabelMap.CommonSearch}</a> - </h1> + <#assign lastContent=ancestorList?last /> + <h1>[${lastContent.contentId}] ${lastContent.description} + <a class="tabButton" + href="<@ofbizUrl>searchContent?siteId=${lastContent.contentId!}</@ofbizUrl>"> + ${uiLabelMap.CommonSearch} + </a> + </h1> </#if> <#assign viewIdx = "" /> <#if requestParameters.viewIndex?has_content> -<#assign viewIdx = requestParameters.viewIndex! /> + <#assign viewIdx = requestParameters.viewIndex! /> </#if> <#assign viewSz = "" /> <#if requestParameters.viewSize?has_content> -<#assign viewSz = requestParameters.viewSize! /> + <#assign viewSz = requestParameters.viewSize! /> </#if> <#assign nodeTrailCsv=requestParameters.nodeTrailCsv!/> -<#assign dummy=Static["org.apache.ofbiz.base.util.Debug"].logInfo("in showcontenttree, nodeTrailCsv(0):" + nodeTrailCsv, "")/> +<#assign dummy=Static["org.apache.ofbiz.base.util.Debug"] + .logInfo("in showcontenttree, nodeTrailCsv(0):" + nodeTrailCsv, "")/> <#assign nodeTrail=[]/> <#assign firstContentId=""/> <#if nodeTrailCsv?has_content> @@ -54,58 +58,75 @@ under the License. --> <div> - <@renderCategoryBrowse contentId=siteId indentIndex=1 nodeTrail=nodeTrail /> + <@renderCategoryBrowse contentId=siteId indentIndex=1 nodeTrail=nodeTrail /> </div> <#macro renderCategoryBrowse contentId="" indentIndex=0 nodeTrail=[] viewSz=9999 viewIdx=0> - <!-- start of renderCategoryBrowse for contentId=${contentId} --> + <!-- start of renderCategoryBrowse for contentId=${contentId} --> - <#local contentIdx = contentId! /> - <#if (!contentIdx?? || contentIdx?length == 0)> - <#local contentIdx = page.contentIdx! /> - <#if (!contentIdx?? || contentIdx?length == 0)> - </#if> - </#if> - - <#local thisContentId=nodeTrail[indentIndex]!/> - - <#local thisNodeTrailCsv = "" /> - <#local listUpper = (indentIndex - 1) /> - <#if nodeTrail?size < listUpper > - <#local listUpper = (nodeTrail?size - 1)> - </#if> - <#list 0..listUpper as idx> - <#if thisNodeTrailCsv?has_content> - <#local thisNodeTrailCsv = thisNodeTrailCsv + ","/> - </#if> - <#if nodeTrail[idx]??> - <#local thisNodeTrailCsv = thisNodeTrailCsv + nodeTrail[idx]> - </#if> - </#list> - - <!-- in showcontenttree, contentIdx: ${contentIdx} --> - - <!-- Look for content first --> - <@loopSubContent contentId=contentIdx viewIndex=viewIdx viewSize=viewSz contentAssocTypeId="PUBLISH_LINK" returnAfterPickWhen="1==1"> - <#assign dummy=Static["org.apache.ofbiz.base.util.Debug"].logInfo("in showcontenttree, nodeTrailCsv(1):" + nodeTrailCsv, "")/> - <#local thisCsv=thisNodeTrailCsv + "," + subContentId /> - <a class="tabButton" href="<@ofbizUrl>viewcontent?contentId=${subContentId!}&nodeTrailCsv=${thisCsv}</@ofbizUrl>">${uiLabelMap.CommonView}</a> ${content.description!}<br /> - </@loopSubContent> - - - <!-- Look for sub-topics --> - <@loopSubContent contentId=contentIdx viewIndex=viewIdx viewSize=viewSz returnAfterPickWhen="1==1" orderBy="contentName"> - <#local plusMinus="+"/> - <#if thisContentId == subContentId> - <#local plusMinus="-"/> - </#if> - <#local thisCsv=thisNodeTrailCsv /> - <#local thisCsv=thisNodeTrailCsv + "," + subContentId /> - <a class="tabButton" href="<@ofbizUrl>showcontenttree?contentId=${siteId!}&nodeTrailCsv=${thisCsv}</@ofbizUrl>" >${plusMinus}</a> ${content.description!} - <a class="tabButton" href="<@ofbizUrl>searchContent?siteId=${subContentId!}&nodeTrailCsv=${thisCsv}</@ofbizUrl>" >${uiLabelMap.CommonSearch}</a> <br /> - <#if thisContentId == subContentId> - <#assign catTrail = nodeTrail + [subContentId]/> - <div><@renderCategoryBrowse contentId=subContentId indentIndex=(indentIndex + 1) nodeTrail=catTrail viewSz=viewSz viewIdx=viewIdx /></div> - </#if> - </@loopSubContent> + <#local contentIdx = contentId! /> + <#if (!contentIdx?? || contentIdx?length == 0)> + <#local contentIdx = page.contentIdx! /> + <#if (!contentIdx?? || contentIdx?length == 0)> + </#if> + </#if> + + <#local thisContentId=nodeTrail[indentIndex]!/> + + <#local thisNodeTrailCsv = "" /> + <#local listUpper = (indentIndex - 1) /> + <#if nodeTrail?size < listUpper > + <#local listUpper = (nodeTrail?size - 1)> + </#if> + <#list 0..listUpper as idx> + <#if thisNodeTrailCsv?has_content> + <#local thisNodeTrailCsv = thisNodeTrailCsv + ","/> + </#if> + <#if nodeTrail[idx]??> + <#local thisNodeTrailCsv = thisNodeTrailCsv + nodeTrail[idx]> + </#if> + </#list> + + <!-- in showcontenttree, contentIdx: ${contentIdx} --> + + <!-- Look for content first --> + <@loopSubContent contentId=contentIdx viewIndex=viewIdx viewSize=viewSz + contentAssocTypeId="PUBLISH_LINK" returnAfterPickWhen="1==1"> + <#assign dummy=Static["org.apache.ofbiz.base.util.Debug"] + .logInfo("in showcontenttree, nodeTrailCsv(1):" + nodeTrailCsv, "")/> + <#local thisCsv=thisNodeTrailCsv + "," + subContentId /> + <a class="tabButton" + href="<@ofbizUrl>viewcontent?contentId=${subContentId!}&nodeTrailCsv=${thisCsv}</@ofbizUrl>"> + ${uiLabelMap.CommonView} + </a> ${content.description!} + <br/> + </@loopSubContent> + + + <!-- Look for sub-topics --> + <@loopSubContent contentId=contentIdx viewIndex=viewIdx viewSize=viewSz + returnAfterPickWhen="1==1" orderBy="contentName"> + <#local plusMinus="+"/> + <#if thisContentId == subContentId> + <#local plusMinus="-"/> + </#if> + <#local thisCsv=thisNodeTrailCsv /> + <#local thisCsv=thisNodeTrailCsv + "," + subContentId /> + <a class="tabButton" + href="<@ofbizUrl>showcontenttree?contentId=${siteId!}&nodeTrailCsv=${thisCsv}</@ofbizUrl>"> + ${plusMinus} + </a> ${content.description!} + <a class="tabButton" + href="<@ofbizUrl>searchContent?siteId=${subContentId!}&nodeTrailCsv=${thisCsv}</@ofbizUrl>"> + ${uiLabelMap.CommonSearch} + </a> + <br/> + <#if thisContentId == subContentId> + <#assign catTrail = nodeTrail + [subContentId]/> + <div> + <@renderCategoryBrowse contentId=subContentId indentIndex=(indentIndex + 1) + nodeTrail=catTrail viewSz=viewSz viewIdx=viewIdx /> + </div> + </#if> + </@loopSubContent> </#macro> Modified: ofbiz/trunk/specialpurpose/ecommerce/template/content/TplMbContent.ftl URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/ecommerce/template/content/TplMbContent.ftl?rev=1761135&r1=1761134&r2=1761135&view=diff ============================================================================== --- ofbiz/trunk/specialpurpose/ecommerce/template/content/TplMbContent.ftl (original) +++ ofbiz/trunk/specialpurpose/ecommerce/template/content/TplMbContent.ftl Sat Sep 17 07:17:15 2016 @@ -20,14 +20,13 @@ under the License. <#recurse doc> - <#macro "ask:document"> <#recurse .node> </#macro> <#macro "ask:title"> -<h2>${.node}</h2> -<p/> + <h2>${.node}</h2> + <p/> </#macro> <#macro "ask:body"> @@ -48,18 +47,23 @@ under the License. </#macro> <#macro @text> -${.node?html} + ${.node?html} </#macro> <#-- <#macro content> - <#assign contentId="ECMC" + .node.@id[0]/> - <DataResource dataResourceId="${contentId}" dataResourceTypeId="ELECTRONIC_TEXT" dataTemplateTypeId="NONE" dataSourceId="ECM" mimeTypeId="text/html"/> - <ElectronicText dataResourceId="${contentId}"> -<textData><![CDATA[ -${.node.content_text} -]]></textData> - </ElectronicText> - <Content contentId="${contentId}" contentTypeId="DOCUMENT" dataResourceId="${contentId}" contentName="${.node.@name[0]}" description="${.node.content_desc?html}" mimeTypeId="text/xml" templateDataResourceId="TPL_XML_MB"/> + <#assign contentId="ECMC" + .node.@id[0]/> + <DataResource dataResourceId="${contentId}" dataResourceTypeId="ELECTRONIC_TEXT" + dataTemplateTypeId="NONE" dataSourceId="ECM" mimeTypeId="text/html"/> + <ElectronicText dataResourceId="${contentId}"> + <textData> + <![CDATA[ + ${.node.content_text} + ]]> + </textData> + </ElectronicText> + <Content contentId="${contentId}" contentTypeId="DOCUMENT" dataResourceId="${contentId}" + contentName="${.node.@name[0]}" description="${.node.content_desc?html}" mimeTypeId="text/xml" + templateDataResourceId="TPL_XML_MB"/> </#macro> --> Modified: ofbiz/trunk/specialpurpose/ecommerce/template/content/ViewContent.ftl URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/ecommerce/template/content/ViewContent.ftl?rev=1761135&r1=1761134&r2=1761135&view=diff ============================================================================== --- ofbiz/trunk/specialpurpose/ecommerce/template/content/ViewContent.ftl (original) +++ ofbiz/trunk/specialpurpose/ecommerce/template/content/ViewContent.ftl Sat Sep 17 07:17:15 2016 @@ -18,119 +18,135 @@ under the License. --> <div class="screenlet"> -<div style="margin:10px;"> -<#-- Do this so that we don't have to find the content twice (again in renderSubContent) --> -<#assign subContentId=requestParameters.contentId!/> -<#assign nodeTrailCsv=requestParameters.nodeTrailCsv!/> -<#-- <#assign dummy=Static["org.apache.ofbiz.base.util.Debug"].logInfo("in viewcontent, nodeTrailCsv:" + nodeTrailCsv, "")/> --> -<#if ancestorList?has_content && (0 < ancestorList?size) > + <div style="margin:10px;"> + <#-- Do this so that we don't have to find the content twice (again in renderSubContent) --> + <#assign subContentId=requestParameters.contentId!/> + <#assign nodeTrailCsv=requestParameters.nodeTrailCsv!/> + <#-- <#assign dummy=Static["org.apache.ofbiz.base.util.Debug"] + .logInfo("in viewcontent, nodeTrailCsv:" + nodeTrailCsv, "")/> --> + <#if ancestorList?has_content && (0 < ancestorList?size) > <#assign lastContent=ancestorList?last /> <#assign firstContent=ancestorList[0] /> -</#if> -<#if firstContent?has_content> + </#if> + <#if firstContent?has_content> <#assign siteId = firstContent.contentId/> -</#if> -<#if siteId?has_content> + </#if> + <#if siteId?has_content> <@renderAncestryPath trail=ancestorList?default([]) endIndexOffset=1 siteId=siteId/> -</#if> + </#if> -<#if lastContent?has_content> + <#if lastContent?has_content> <h1>[${lastContent.contentId}] ${lastContent.description!}</h1> -</#if> -<#-- -<#assign globalNodeTrail=[]/> -<#assign firstContentId=""/> -<#if nodeTrailCsv?has_content> - <#assign globalNodeTrail=Static["org.apache.ofbiz.base.util.StringUtil"].split(nodeTrailCsv, ",") /> - <#if 0 < globalNodeTrail?size> - <#assign firstContentId=globalNodeTrail[0]?string/> </#if> -</#if> -<#assign globalNodeTrail=requestParameters.globalNodeTrail?default([])/> ---> -<#if globalNodeTrail?has_content && (0 < globalNodeTrail?size) > + <#-- + <#assign globalNodeTrail=[]/> + <#assign firstContentId=""/> + <#if nodeTrailCsv?has_content> + <#assign globalNodeTrail=Static["org.apache.ofbiz.base.util.StringUtil"].split(nodeTrailCsv, ",") /> + <#if 0 < globalNodeTrail?size> + <#assign firstContentId=globalNodeTrail[0]?string/> + </#if> + </#if> + <#assign globalNodeTrail=requestParameters.globalNodeTrail?default([])/> + --> + <#if globalNodeTrail?has_content && (0 < globalNodeTrail?size) > <#assign lastNode = globalNodeTrail?last/> <#if lastNode?has_content> <#assign subContent=lastNode.value/> </#if> -<#else> - <#assign subContent = delegator.findOne("Content", Static["org.apache.ofbiz.base.util.UtilMisc"].toMap("contentId", subContentId), true)/> -</#if> -<#assign dummy=Static["org.apache.ofbiz.base.util.Debug"].logInfo("in viewcontent, subContent:" + subContent, "")/> -<br /> -<h1>${uiLabelMap.EcommerceContentFor} [${subContentId}] ${subContent.contentName!} - ${subContent.description!}:</h1><br /> -<table border="0" class="blogtext"> - <tr> - <td width="40"> </td> - <td> - <@renderSubContentCache subContentId=subContentId /> - </td> - <td width="40" valign="bottom"> -<#-- -<@wrapSubContentCache subContentId=subContentId wrapTemplateId="WRAP_VIEW" > -</@wrapSubContentCache > -<@checkPermission mode="equals" entityOperation="_CREATE" targetOperation="HAS_USER_ROLE" > - <a class="tabButton" href="<@ofbizUrl>createforumresponse?contentIdTo=${requestParameters.contentId}&nodeTrailCsv=${nodeTrailCsv!}</@ofbizUrl>" >Respond</a> -</@checkPermission> ---> -<br /> - - </td> - </tr> - <#assign thisContentId = subContentId/> - <@loopSubContent contentId=thisContentId viewIndex=0 viewSize=9999 contentAssocTypeId="RELATED_CONTENT"> - <#assign thisNodeTrailCsv = nodeTrailCsv /> + <#else> + <#assign subContent = delegator.findOne("Content", + Static["org.apache.ofbiz.base.util.UtilMisc"].toMap("contentId", subContentId), true)/> + </#if> + <#assign dummy=Static["org.apache.ofbiz.base.util.Debug"] + .logInfo("in viewcontent, subContent:" + subContent, "")/> + <br/> + <h1>${uiLabelMap.EcommerceContentFor} [${subContentId}] ${subContent.contentName!} + - ${subContent.description!}:</h1><br/> + <table border="0" class="blogtext"> <tr> - <td colspan="3" align="right"> - <a class="tabButton" href="<@ofbizUrl>viewcontent?contentId=${subContentId}&nodeTrailCsv=${thisNodeTrailCsv!}</@ofbizUrl>" >${content.contentName!}</a> + <td width="40"> </td> + <td> + <@renderSubContentCache subContentId=subContentId /> + </td> + <td width="40" valign="bottom"> + <#-- + <@wrapSubContentCache subContentId=subContentId wrapTemplateId="WRAP_VIEW" > + </@wrapSubContentCache > + <@checkPermission mode="equals" entityOperation="_CREATE" targetOperation="HAS_USER_ROLE" > + <a class="tabButton" href="<@ofbizUrl>createforumresponse?contentIdTo=${requestParameters.contentId}&nodeTrailCsv=${nodeTrailCsv!}</@ofbizUrl>" >Respond</a> + </@checkPermission> + --> + <br/> </td> </tr> - </@loopSubContent> -</table> -<hr /> -<#-- -<@checkPermission mode="not-equals" subContentId=subContentId targetOperation="CONTENT_CREATE|CONTENT_RESPOND" contentPurposeList="RESPONSE" > - ${permissionErrorMsg!} -</@checkPermission> ---> + <#assign thisContentId = subContentId/> + <@loopSubContent contentId=thisContentId viewIndex=0 viewSize=9999 contentAssocTypeId="RELATED_CONTENT"> + <#assign thisNodeTrailCsv = nodeTrailCsv /> + <tr> + <td colspan="3" align="right"> + <a class="tabButton" + href="<@ofbizUrl>viewcontent?contentId=${subContentId}&nodeTrailCsv=${thisNodeTrailCsv!}</@ofbizUrl>">${content.contentName!}</a> + </td> + </tr> + </@loopSubContent> + </table> + <hr/> + <#-- + <@checkPermission mode="not-equals" subContentId=subContentId + targetOperation="CONTENT_CREATE|CONTENT_RESPOND" contentPurposeList="RESPONSE" > + ${permissionErrorMsg!} + </@checkPermission> + --> -</div> + </div> </div> <#macro renderAncestryPath trail siteId startIndex=0 endIndexOffset=0 buttonTitle="Back to" searchOn="" > - <#local indent = ""> - <#local csv = ""> - <#local counter = 0> - <#local len = trail?size> - <table border="0" cellspacing="4"> + <#local indent = ""> + <#local csv = ""> + <#local counter = 0> + <#local len = trail?size> + <table border="0" cellspacing="4"> <#list trail as content> <#if counter < (len - endIndexOffset) && startIndex <= counter > <#if 0 < counter > - <#local csv = csv + ","/> + <#local csv = csv + ","/> </#if> <#local csv = csv + content.contentId/> <#if counter < len && startIndex <= counter > - <tr> - <td> + <tr> + <td> ${indent} <#if content.contentTypeId == "WEB_SITE_PUB_PT" > - <a class="tabButton" href="<@ofbizUrl>showcontenttree?contentId=${content.contentId!}&nodeTrailCsv=${csv}</@ofbizUrl>" >${uiLabelMap.CommonBackTo}</a> ${content.contentName!} + <a class="tabButton" + href="<@ofbizUrl>showcontenttree?contentId=${content.contentId!}&nodeTrailCsv=${csv}</@ofbizUrl>"> + ${uiLabelMap.CommonBackTo} + </a> + ${content.contentName!} <#else> - <a class="tabButton" href="<@ofbizUrl>viewcontent?contentId=${content.contentId!}&nodeTrailCsv=${csv}</@ofbizUrl>" >${uiLabelMap.CommonBackTo}</a> ${content.contentName!} + <a class="tabButton" + href="<@ofbizUrl>viewcontent?contentId=${content.contentId!}&nodeTrailCsv=${csv}</@ofbizUrl>"> + ${uiLabelMap.CommonBackTo} + </a> + ${content.contentName!} </#if> <#local indent = indent + " "> [${content.contentId!}] <#if searchOn?has_content && searchOn?lower_case == "true"> - - <a class="tabButton" href="<@ofbizUrl>searchContent?siteId=${siteId!}&nodeTrailCsv=${csv}</@ofbizUrl>" >${uiLabelMap.CommonSearch}</a> + + <a class="tabButton" + href="<@ofbizUrl>searchContent?siteId=${siteId!}&nodeTrailCsv=${csv}</@ofbizUrl>"> + ${uiLabelMap.CommonSearch} + </a> </#if> - </#if> - </td> - </tr> + </#if> + </td> + </tr> </#if> <#local counter = counter + 1> - <#if 20 < counter > <#break/></#if> + <#if 20 < counter > <#break/></#if> </#list> - </table> + </table> </#macro> Modified: ofbiz/trunk/specialpurpose/ecommerce/template/customer/AnonContactus.ftl URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/ecommerce/template/customer/AnonContactus.ftl?rev=1761135&r1=1761134&r2=1761135&view=diff ============================================================================== --- ofbiz/trunk/specialpurpose/ecommerce/template/customer/AnonContactus.ftl (original) +++ ofbiz/trunk/specialpurpose/ecommerce/template/customer/AnonContactus.ftl Sat Sep 17 07:17:15 2016 @@ -18,63 +18,83 @@ under the License. --> <div class="screenlet"> - <div class="screenlet-title-bar"> - <h3>${uiLabelMap.CommonContactUs}</h3> - </div> - <script type="text/javascript" language="JavaScript"> + <div class="screenlet-title-bar"> + <h3>${uiLabelMap.CommonContactUs}</h3> + </div> + <script type="text/javascript" language="JavaScript"> <!-- - function reloadCaptcha(fieldName) { - var captchaUri = "<@ofbizUrl>captcha.jpg?captchaCodeId=" + fieldName + "&unique=_PLACEHOLDER_</@ofbizUrl>"; - var unique = Date.now(); - captchaUri = captchaUri.replace("_PLACEHOLDER_", unique); - document.getElementById(fieldName).src = captchaUri; - } + function reloadCaptcha(fieldName) { + var captchaUri = "<@ofbizUrl>captcha.jpg?captchaCodeId=" + fieldName + "&unique=_PLACEHOLDER_</@ofbizUrl>"; + var unique = Date.now(); + captchaUri = captchaUri.replace("_PLACEHOLDER_", unique); + document.getElementById(fieldName).src = captchaUri; + } //--> - </script> - <div class="screenlet-body"> - <form id="contactForm" method="post" action="<@ofbizUrl>submitAnonContact</@ofbizUrl>"> - <input type="hidden" name="partyIdFrom" value="${(userLogin.partyId)!}" /> - <input type="hidden" name="partyIdTo" value="${productStore.payToPartyId!}"/> - <input type="hidden" name="contactMechTypeId" value="WEB_ADDRESS" /> - <input type="hidden" name="communicationEventTypeId" value="WEB_SITE_COMMUNICATI" /> - <input type="hidden" name="productStoreId" value="${productStore.productStoreId}" /> - <input type="hidden" name="emailType" value="CONT_NOTI_EMAIL" /> - <table class="basic-table" cellspacing="0"> - <tbody> - <tr> - <td class="label">${uiLabelMap.EcommerceSubject}</td> - <td><input type="text" name="subject" id="subject" class="required" value="${requestParameters.subject!}"/>*</td> - </tr> - <tr> - <td class="label">${uiLabelMap.CommonMessage}</td> - <td><textarea name="content" id="message" class="required" cols="50" rows="5">${requestParameters.content!}</textarea>*</td> - </tr> - <tr> - <td class="label">${uiLabelMap.FormFieldTitle_emailAddress}</td> - <td><input type="text" name="emailAddress" id="emailAddress" class="required" value="${requestParameters.emailAddress!}"/>*</td> - </tr> - <tr> - <td class="label">${uiLabelMap.PartyFirstName}</td> - <td><input type="text" name="firstName" id="firstName" class="required" value="${requestParameters.firstName!}"/></td> - </tr> - <tr> - <td class="label">${uiLabelMap.PartyLastName}</td> - <td><input type="text" name="lastName" id="lastName" class="required" value="${requestParameters.lastName!}"/></td> - </tr> - <tr> - <td class="label">${uiLabelMap.CommonCaptchaCode}</td> - <td><div><img id="captchaImage" src="<@ofbizUrl>captcha.jpg?captchaCodeId=captchaImage&unique=${nowTimestamp.getTime()}</@ofbizUrl>" alt="" /></div><a href="javascript:reloadCaptcha('captchaImage');">${uiLabelMap.CommonReloadCaptchaCode}</a></td> - </tr> - <tr> - <td class="label">${uiLabelMap.CommonVerifyCaptchaCode}</td> - <td><input type="text" autocomplete="off" maxlength="30" size="23" name="captcha"/>*</td> - </tr> - <tr> - <td class="label"></td> - <td><input type="submit" value="${uiLabelMap.CommonSubmit}" /></td> - </tr> - </tbody> - </table> - </form> - </div> + </script> + <div class="screenlet-body"> + <form id="contactForm" method="post" action="<@ofbizUrl>submitAnonContact</@ofbizUrl>"> + <input type="hidden" name="partyIdFrom" value="${(userLogin.partyId)!}"/> + <input type="hidden" name="partyIdTo" value="${productStore.payToPartyId!}"/> + <input type="hidden" name="contactMechTypeId" value="WEB_ADDRESS"/> + <input type="hidden" name="communicationEventTypeId" value="WEB_SITE_COMMUNICATI"/> + <input type="hidden" name="productStoreId" value="${productStore.productStoreId}"/> + <input type="hidden" name="emailType" value="CONT_NOTI_EMAIL"/> + <table class="basic-table" cellspacing="0"> + <tbody> + <tr> + <td class="label">${uiLabelMap.EcommerceSubject}</td> + <td> + <input type="text" name="subject" id="subject" class="required" value="${requestParameters.subject!}"/>* + </td> + </tr> + <tr> + <td class="label">${uiLabelMap.CommonMessage}</td> + <td> + <textarea name="content" id="message" class="required" cols="50" rows="5"> + ${requestParameters.content!} + </textarea>* + </td> + </tr> + <tr> + <td class="label">${uiLabelMap.FormFieldTitle_emailAddress}</td> + <td> + <input type="text" name="emailAddress" id="emailAddress" class="required" + value="${requestParameters.emailAddress!}"/>* + </td> + </tr> + <tr> + <td class="label">${uiLabelMap.PartyFirstName}</td> + <td> + <input type="text" name="firstName" id="firstName" class="required" value="${requestParameters.firstName!}"/> + </td> + </tr> + <tr> + <td class="label">${uiLabelMap.PartyLastName}</td> + <td> + <input type="text" name="lastName" id="lastName" class="required" value="${requestParameters.lastName!}"/> + </td> + </tr> + <tr> + <td class="label">${uiLabelMap.CommonCaptchaCode}</td> + <td> + <div> + <img id="captchaImage" + src="<@ofbizUrl>captcha.jpg?captchaCodeId=captchaImage&unique=${nowTimestamp.getTime()}</@ofbizUrl>" + alt=""/> + </div> + <a href="javascript:reloadCaptcha('captchaImage');">${uiLabelMap.CommonReloadCaptchaCode}</a> + </td> + </tr> + <tr> + <td class="label">${uiLabelMap.CommonVerifyCaptchaCode}</td> + <td><input type="text" autocomplete="off" maxlength="30" size="23" name="captcha"/>*</td> + </tr> + <tr> + <td class="label"></td> + <td><input type="submit" value="${uiLabelMap.CommonSubmit}"/></td> + </tr> + </tbody> + </table> + </form> + </div> </div> Modified: ofbiz/trunk/specialpurpose/ecommerce/template/customer/ChangePassword.ftl URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/ecommerce/template/customer/ChangePassword.ftl?rev=1761135&r1=1761134&r2=1761135&view=diff ============================================================================== --- ofbiz/trunk/specialpurpose/ecommerce/template/customer/ChangePassword.ftl (original) +++ ofbiz/trunk/specialpurpose/ecommerce/template/customer/ChangePassword.ftl Sat Sep 17 07:17:15 2016 @@ -19,9 +19,11 @@ under the License. <div class="screenlet"> <div class="screenlet-title-bar"> <h3>${uiLabelMap.PartyChangePassword}</h3> - </div> - <a id="CommonGoBack1" href="<@ofbizUrl>${donePage}</@ofbizUrl>" class="button">${uiLabelMap.CommonGoBack}</a> - <a id="CommonSave1" href="javascript:document.getElementById('changepasswordform').submit()" class="button">${uiLabelMap.CommonSave}</a> + </div> + <a id="CommonGoBack1" href="<@ofbizUrl>${donePage}</@ofbizUrl>" class="button">${uiLabelMap.CommonGoBack}</a> + <a id="CommonSave1" href="javascript:document.getElementById('changepasswordform').submit()" class="button"> + ${uiLabelMap.CommonSave} + </a> <p/> <div class="screenlet-body"> <form id="changepasswordform" method="post" action="<@ofbizUrl>updatePassword/${donePage}</@ofbizUrl>"> @@ -40,12 +42,15 @@ under the License. </div> <div> <label for="passwordHint">${uiLabelMap.PartyPasswordHint}</label> - <input type="text" class='inputBox' maxlength="100" name="passwordHint" id="passwordHint" value="${userLoginData.passwordHint!}" /> + <input type="text" class='inputBox' maxlength="100" name="passwordHint" + id="passwordHint" value="${userLoginData.passwordHint!}" /> </div> <label>${uiLabelMap.CommonFieldsMarkedAreRequired}</label> </fieldset> </form> <a href="<@ofbizUrl>${donePage}</@ofbizUrl>" class="button">[${uiLabelMap.CommonGoBack}]</a> - <a href="javascript:document.getElementById('changepasswordform').submit()" class="button">[${uiLabelMap.CommonSave}]</a> + <a href="javascript:document.getElementById('changepasswordform').submit()" class="button"> + [${uiLabelMap.CommonSave}] + </a> </div> </div> Modified: ofbiz/trunk/specialpurpose/ecommerce/template/customer/CustomerSurvey.ftl URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/ecommerce/template/customer/CustomerSurvey.ftl?rev=1761135&r1=1761134&r2=1761135&view=diff ============================================================================== --- ofbiz/trunk/specialpurpose/ecommerce/template/customer/CustomerSurvey.ftl (original) +++ ofbiz/trunk/specialpurpose/ecommerce/template/customer/CustomerSurvey.ftl Sat Sep 17 07:17:15 2016 @@ -18,17 +18,18 @@ under the License. --> <div class="screenlet"> - <div class="screenlet-title-bar"> - <div class="h3">${survey.surveyName}</div> - </div> - <div class="screenlet-body"> - <#-- Render the survey --> - <#if surveyWrapper?has_content> - <form method="post" enctype="multipart/form-data" action="<@ofbizUrl>profilesurvey/profilesurvey</@ofbizUrl>" style="margin: 0;"> - ${surveyWrapper.render()} - </form> - <#else> - <h1>${uiLabelMap.OrderNothingToDoHere}</h1> - </#if> - </div> + <div class="screenlet-title-bar"> + <div class="h3">${survey.surveyName}</div> + </div> + <div class="screenlet-body"> + <#-- Render the survey --> + <#if surveyWrapper?has_content> + <form method="post" enctype="multipart/form-data" action="<@ofbizUrl>profilesurvey/profilesurvey</@ofbizUrl>" + style="margin: 0;"> + ${surveyWrapper.render()} + </form> + <#else> + <h1>${uiLabelMap.OrderNothingToDoHere}</h1> + </#if> + </div> </div> Modified: ofbiz/trunk/specialpurpose/ecommerce/template/customer/DigitalProductEdit.ftl URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/ecommerce/template/customer/DigitalProductEdit.ftl?rev=1761135&r1=1761134&r2=1761135&view=diff ============================================================================== --- ofbiz/trunk/specialpurpose/ecommerce/template/customer/DigitalProductEdit.ftl (original) +++ ofbiz/trunk/specialpurpose/ecommerce/template/customer/DigitalProductEdit.ftl Sat Sep 17 07:17:15 2016 @@ -20,76 +20,98 @@ under the License. <#assign productPrice = productPriceList[0]!/> <div class="screenlet"> - <div class="screenlet-title-bar"> - <div class="h3">${uiLabelMap.PageTitleDigitalProductEdit}</div> - </div> - <div class="screenlet-body"> -<#if !supplierProduct?has_content && parameters.productId?has_content> - <div><h3>${uiLabelMap.EcommerceMessage1} [${parameters.productId}] ${uiLabelMap.EcommerceMessage2}</h3></div> -<#else> - + <div class="screenlet-title-bar"> + <div class="h3">${uiLabelMap.PageTitleDigitalProductEdit}</div> + </div> + <div class="screenlet-body"> + <#if !supplierProduct?has_content && parameters.productId?has_content> + <div><h3>${uiLabelMap.EcommerceMessage1} [${parameters.productId}] ${uiLabelMap.EcommerceMessage2}</h3></div> + <#else> <#if !supplierProduct??> <h1>${uiLabelMap.EcommerceAddNewDigitalProduct}</h1> - <form method="post" action="<@ofbizUrl>createCustomerDigitalDownloadProduct</@ofbizUrl>" name="editdigitaluploadform" style="margin: 0;"> - <input type="hidden" name="productStoreId" value="${productStore.productStoreId}" /> + <form method="post" action="<@ofbizUrl>createCustomerDigitalDownloadProduct</@ofbizUrl>" + name="editdigitaluploadform" style="margin: 0;"> + <input type="hidden" name="productStoreId" value="${productStore.productStoreId}"/> <#else> <h1>${uiLabelMap.EcommerceUpdateDigitalProduct}</h1> - <form method="post" action="<@ofbizUrl>updateCustomerDigitalDownloadProduct</@ofbizUrl>" name="editdigitaluploadform" style="margin: 0;"> - <input type="hidden" name="productId" value="${parameters.productId}" /> - <input type="hidden" name="currencyUomId" value="${parameters.currencyUomId}" /> - <input type="hidden" name="minimumOrderQuantity" value="${parameters.minimumOrderQuantity}" /> - <input type="hidden" name="availableFromDate" value="${parameters.availableFromDate}" /> - </#if> - <a href="<@ofbizUrl>digitalproductlist</@ofbizUrl>" class="buttontext">${uiLabelMap.CommonBackToList}</a> - - <table width="90%" border="0" cellpadding="2" cellspacing="0"> - <tr> - <td width="26%" align="right" valign="top"><div>${uiLabelMap.ProductProductName}</div></td> - <td width="5"> </td> - <td width="74%"><input type="text" class="inputBox" size="30" maxlength="60" name="productName" value="${(product.productName)!}"/>*</td> - </tr> - <tr> - <td width="26%" align="right" valign="top"><div>${uiLabelMap.ProductProductDescription}</div></td> - <td width="5"> </td> - <td width="74%"><input type="text" class="inputBox" size="30" maxlength="60" name="description" value="${(product.description)!}"/></td> - </tr> - <tr> - <td width="26%" align="right" valign="top"><div>${uiLabelMap.ProductPrice}</div></td> - <td width="5"> </td> - <td width="74%"><input type="text" class="inputBox" size="30" maxlength="60" name="price" value="${(productPrice.price)!}"/>*</td> - </tr> - <tr> - <td width="26%" align="right" valign="top"><div> </div></td> - <td width="5"> </td> - <td width="74%"><a href="javascript:document.editdigitaluploadform.submit()" class="buttontext">${uiLabelMap.CommonSave}</a></td> - </tr> - </table> - </form> -</#if> - </div> + <form method="post" action="<@ofbizUrl>updateCustomerDigitalDownloadProduct</@ofbizUrl>" + name="editdigitaluploadform" style="margin: 0;"> + <input type="hidden" name="productId" value="${parameters.productId}"/> + <input type="hidden" name="currencyUomId" value="${parameters.currencyUomId}"/> + <input type="hidden" name="minimumOrderQuantity" value="${parameters.minimumOrderQuantity}"/> + <input type="hidden" name="availableFromDate" value="${parameters.availableFromDate}"/> + </#if> + <a href="<@ofbizUrl>digitalproductlist</@ofbizUrl>" class="buttontext">${uiLabelMap.CommonBackToList}</a> + <table width="90%" border="0" cellpadding="2" cellspacing="0"> + <tr> + <td width="26%" align="right" valign="top"> + <div>${uiLabelMap.ProductProductName}</div> + </td> + <td width="5"> </td> + <td width="74%"> + <input type="text" class="inputBox" size="30" maxlength="60" + name="productName" value="${(product.productName)!}"/>* + </td> + </tr> + <tr> + <td width="26%" align="right" valign="top"> + <div>${uiLabelMap.ProductProductDescription}</div> + </td> + <td width="5"> </td> + <td width="74%"> + <input type="text" class="inputBox" size="30" maxlength="60" + name="description" value="${(product.description)!}"/> + </td> + </tr> + <tr> + <td width="26%" align="right" valign="top"> + <div>${uiLabelMap.ProductPrice}</div> + </td> + <td width="5"> </td> + <td width="74%"> + <input type="text" class="inputBox" size="30" maxlength="60" name="price" value="${(productPrice.price)!}"/>* + </td> + </tr> + <tr> + <td width="26%" align="right" valign="top"> + <div> </div> + </td> + <td width="5"> </td> + <td width="74%"> + <a href="javascript:document.editdigitaluploadform.submit()" + class="buttontext">${uiLabelMap.CommonSave}</a> + </td> + </tr> + </table> + </form> + </#if> + </div> </div> <#if supplierProduct?has_content> -<div class="screenlet"> + <div class="screenlet"> <div class="screenlet-title-bar"> - <div class="h3">${uiLabelMap.OrderDigitalProductFiles}</div> + <div class="h3">${uiLabelMap.OrderDigitalProductFiles}</div> </div> <div class="screenlet-body"> - <#list productContentAndInfoList as productContentAndInfo> - <div> - ${productContentAndInfo.contentName} (${uiLabelMap.CommonSince}: ${productContentAndInfo.fromDate}) - <a href="<@ofbizUrl>removeCustomerDigitalDownloadProductFile?contentId=${productContentAndInfo.contentId}&productContentTypeId=${productContentAndInfo.productContentTypeId}&fromDate=${productContentAndInfo.fromDate}&productId=${parameters.productId}&currencyUomId=${parameters.currencyUomId}&minimumOrderQuantity=${parameters.minimumOrderQuantity}&availableFromDate=${parameters.availableFromDate}</@ofbizUrl>" class="buttontext">${uiLabelMap.CommonRemove}</a> - </div> - </#list> - - <div><hr /></div> - <div class="tableheadtext">${uiLabelMap.EcommerceDigitalAddFromMyFiles}</div> + <#list productContentAndInfoList as productContentAndInfo> <div> - <form method="post" action="<@ofbizUrl>addCustomerDigitalDownloadProductFile</@ofbizUrl>" name="adddigitaluploadfile" style="margin: 0;"> - <input type="hidden" name="productId" value="${parameters.productId}" /> - <input type="hidden" name="currencyUomId" value="${parameters.currencyUomId}" /> - <input type="hidden" name="minimumOrderQuantity" value="${parameters.minimumOrderQuantity}" /> - <input type="hidden" name="availableFromDate" value="${parameters.availableFromDate}" /> + ${productContentAndInfo.contentName} (${uiLabelMap.CommonSince}: ${productContentAndInfo.fromDate}) + <a href="<@ofbizUrl>removeCustomerDigitalDownloadProductFile?contentId=${productContentAndInfo.contentId}&productContentTypeId=${productContentAndInfo.productContentTypeId}&fromDate=${productContentAndInfo.fromDate}&productId=${parameters.productId}&currencyUomId=${parameters.currencyUomId}&minimumOrderQuantity=${parameters.minimumOrderQuantity}&availableFromDate=${parameters.availableFromDate}</@ofbizUrl>" + class="buttontext">${uiLabelMap.CommonRemove}</a> + </div> + </#list> + <div> + <hr/> + </div> + <div class="tableheadtext">${uiLabelMap.EcommerceDigitalAddFromMyFiles}</div> + <div> + <form method="post" action="<@ofbizUrl>addCustomerDigitalDownloadProductFile</@ofbizUrl>" + name="adddigitaluploadfile" style="margin: 0;"> + <input type="hidden" name="productId" value="${parameters.productId}"/> + <input type="hidden" name="currencyUomId" value="${parameters.currencyUomId}"/> + <input type="hidden" name="minimumOrderQuantity" value="${parameters.minimumOrderQuantity}"/> + <input type="hidden" name="availableFromDate" value="${parameters.availableFromDate}"/> <select name="contentId" class="selectBox"> <#list ownerContentAndRoleList as ownerContentAndRole> <option value="${ownerContentAndRole.contentId}">${ownerContentAndRole.contentName}</option> @@ -97,8 +119,8 @@ under the License. </select> <a href="javascript:document.adddigitaluploadfile.submit()" class="buttontext">${uiLabelMap.CommonAdd}</a> </form> - </div> - <a href="<@ofbizUrl>digitalproductlist</@ofbizUrl>" class="buttontext">${uiLabelMap.CommonBackToList}</a> + </div> + <a href="<@ofbizUrl>digitalproductlist</@ofbizUrl>" class="buttontext">${uiLabelMap.CommonBackToList}</a> </div> -</div> + </div> </#if> Modified: ofbiz/trunk/specialpurpose/ecommerce/template/customer/DigitalProductList.ftl URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/ecommerce/template/customer/DigitalProductList.ftl?rev=1761135&r1=1761134&r2=1761135&view=diff ============================================================================== --- ofbiz/trunk/specialpurpose/ecommerce/template/customer/DigitalProductList.ftl (original) +++ ofbiz/trunk/specialpurpose/ecommerce/template/customer/DigitalProductList.ftl Sat Sep 17 07:17:15 2016 @@ -18,52 +18,67 @@ under the License. --> <div class="screenlet"> - <div class="screenlet-title-bar"> - <div class="h3">${uiLabelMap.PageTitleDigitalProductList}</div> - </div> - <div class="screenlet-body"> - <div> <a href="<@ofbizUrl>digitalproductedit</@ofbizUrl>" class="buttontext">${uiLabelMap.EcommerceDigitalNewProduct}</a></div> - <table width="100%" cellpadding="1" cellspacing="0" border="0"> - <tr> - <td width="30%"> - <div><b>${uiLabelMap.ProductProductName}</b></div> - </td> - <td width="5"> </td> - <td width="45%"> - <div><b>${uiLabelMap.CommonDescription}</b></div> - </td> - <td width="5"> </td> - <td width="20%"> </td> - </tr> - <#list supplierProductList as supplierProduct> - <#assign product = supplierProduct.getRelatedOne("Product", true)/> - <tr><td colspan="5"><hr /></td></tr> - <tr> - <td> - <div>${(product.productName)!}</div> - </td> - <td width="5"> </td> - <td> - <div>${(product.description)!}</div> - </td> - <td width="5"> </td> - <td align="right"> - <a href="<@ofbizUrl>digitalproductedit?productId=${supplierProduct.productId}&currencyUomId=${supplierProduct.currencyUomId}&minimumOrderQuantity=${supplierProduct.minimumOrderQuantity}&availableFromDate=${supplierProduct.availableFromDate}</@ofbizUrl>" class="buttontext">Edit</a> - </td> - </tr> - </#list> - <#if !supplierProductList?has_content> - <tr><td colspan="5"><h3>${uiLabelMap.EcommerceNoDigitalProductsFound}</h3></td></tr> - </#if> - </table> + <div class="screenlet-title-bar"> + <div class="h3">${uiLabelMap.PageTitleDigitalProductList}</div> + </div> + <div class="screenlet-body"> + <div> + <a href="<@ofbizUrl>digitalproductedit</@ofbizUrl>" class="buttontext"> + ${uiLabelMap.EcommerceDigitalNewProduct} + </a> </div> + <table width="100%" cellpadding="1" cellspacing="0" border="0"> + <tr> + <td width="30%"> + <div><b>${uiLabelMap.ProductProductName}</b></div> + </td> + <td width="5"> </td> + <td width="45%"> + <div><b>${uiLabelMap.CommonDescription}</b></div> + </td> + <td width="5"> </td> + <td width="20%"> </td> + </tr> + <#list supplierProductList as supplierProduct> + <#assign product = supplierProduct.getRelatedOne("Product", true)/> + <tr> + <td colspan="5"> + <hr/> + </td> + </tr> + <tr> + <td> + <div>${(product.productName)!}</div> + </td> + <td width="5"> </td> + <td> + <div>${(product.description)!}</div> + </td> + <td width="5"> </td> + <td align="right"> + <a href="<@ofbizUrl>digitalproductedit?productId=${supplierProduct.productId}&currencyUomId=${supplierProduct.currencyUomId}&minimumOrderQuantity=${supplierProduct.minimumOrderQuantity}&availableFromDate=${supplierProduct.availableFromDate}</@ofbizUrl>" + class="buttontext">Edit</a> + </td> + </tr> + </#list> + <#if !supplierProductList?has_content> + <tr> + <td colspan="5"><h3>${uiLabelMap.EcommerceNoDigitalProductsFound}</h3></td> + </tr> + </#if> + </table> + </div> </div> <div class="screenlet"> - <div class="screenlet-title-bar"> - <div class="h3">${uiLabelMap.EcommerceDigitalProductPurchaseHistoryCommission}</div> - </div> - <div class="screenlet-body"> - <div> <a href="<@ofbizUrl>digitalproductedit</@ofbizUrl>" class="buttontext">${uiLabelMap.EcommerceDigitalNewProduct}</a></div> + <div class="screenlet-title-bar"> + <div class="h3">${uiLabelMap.EcommerceDigitalProductPurchaseHistoryCommission}</div> + </div> + <div class="screenlet-body"> + <div> + <a href="<@ofbizUrl>digitalproductedit</@ofbizUrl>" class="buttontext"> + ${uiLabelMap.EcommerceDigitalNewProduct} + </a> </div> + </div> </div> |
«
Return to OFBiz - Commits
|
1 view|%1 views
| Free forum by Nabble | Edit this page |