svn commit: r1761135 [10/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 [10/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/email/GiftCardPurchase.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/ecommerce/template/email/GiftCardPurchase.ftl?rev=1761135&r1=1761134&r2=1761135&view=diff ============================================================================== --- ofbiz/trunk/specialpurpose/ecommerce/template/email/GiftCardPurchase.ftl (original) +++ ofbiz/trunk/specialpurpose/ecommerce/template/email/GiftCardPurchase.ftl Sat Sep 17 07:17:15 2016 @@ -23,16 +23,17 @@ under the License. --> <#if recipientName??>${recipientName},</#if> -<br /> +<br/> <#-- MyCompany.com (not a variable why?) must be adapted - JLR 1/6/5 --> -${uiLabelMap.EcommerceYouHaveBeenSent} MyCompany.com <#if senderName??> ${uiLabelMap.EcommerceGiftCardFrom} ${senderName}</#if>! -<br /><br /> +${uiLabelMap.EcommerceYouHaveBeenSent} MyCompany.com +<#if senderName??> ${uiLabelMap.EcommerceGiftCardFrom} ${senderName}</#if>! +<br/><br/> <#if giftMessage?has_content> ${uiLabelMap.OrderGiftMessage} - <br /><br /> + <br/><br/> ${giftMessage} - <br /><br /> + <br/><br/> </#if> <pre> Modified: ofbiz/trunk/specialpurpose/ecommerce/template/email/GiftCardReload.ftl URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/ecommerce/template/email/GiftCardReload.ftl?rev=1761135&r1=1761134&r2=1761135&view=diff ============================================================================== --- ofbiz/trunk/specialpurpose/ecommerce/template/email/GiftCardReload.ftl (original) +++ ofbiz/trunk/specialpurpose/ecommerce/template/email/GiftCardReload.ftl Sat Sep 17 07:17:15 2016 @@ -37,16 +37,16 @@ under the License. <#if processResult> <#-- success --> - <br /> + <br/> ${uiLabelMap.EcommerceYourGiftCard} ${displayNumber} ${uiLabelMap.EcommerceYourGiftCardReloaded} - <br /> + <br/> ${uiLabelMap.EcommerceGiftCardNewBalance} ${amount} ${uiLabelMap.CommonFrom} ${previousAmount} - <br /> + <br/> <#else> <#-- fail --> - <br /> + <br/> ${uiLabelMap.EcommerceGiftCardReloadFailed} ${responseCode} - <br /> + <br/> ${uiLabelMap.EcommerceGiftCardRefunded} - <br /> + <br/> </#if> Modified: ofbiz/trunk/specialpurpose/ecommerce/template/email/OrderNoticeEmail.ftl URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/ecommerce/template/email/OrderNoticeEmail.ftl?rev=1761135&r1=1761134&r2=1761135&view=diff ============================================================================== --- ofbiz/trunk/specialpurpose/ecommerce/template/email/OrderNoticeEmail.ftl (original) +++ ofbiz/trunk/specialpurpose/ecommerce/template/email/OrderNoticeEmail.ftl Sat Sep 17 07:17:15 2016 @@ -17,129 +17,127 @@ specific language governing permissions under the License. --> -<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> +<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" + "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> <html xmlns="http://www.w3.org/1999/xhtml"> <head> - <meta http-equiv="Content-Type" content="text/html; charset=UTF-8"/> - <title>${title!}</title> - <#-- this needs to be fully qualified to appear in email; the server must also be available --> - <style type="text/css"> - html, body, div, h1, h3, a, ul, - li, table, tbody, tfoot, thead, - tr, th, td { - border:0; - margin:0; - outline:0; - padding:0; - font-size: 100%; - background:transparent; - vertical-align: baseline; - } - - a, body, th { - font-style: normal; - font-weight: normal; - text-decoration: none; - } - - body, th { - text-align: left; - } - - ul { - list-style: none; - } - - div.screenlet { - background-color: #FFFFFF; - border: 0.1em solid #999999; - height: auto !important; - height: 1%; - margin-bottom: 1em; - } - - body { - background: #D4D0C8; - font-size: 62.5%; - position: relative; - line-height: 1; - color: black; - font-family: Verdana, Arial, Helvetica, sans-serif; - } - - h1 { - font-size: 1.6em; - font-weight: bold; - } - - h3 { - font-size: 1.1em; - font-weight: bold; - } - - /* IE7 fix */ - table { - font-size: 1em; - } - - div.screenlet ul { - margin: 10px; - } - - div.screenlet li { - line-height: 15px; - } - - div.screenlet h3 { - background:#1C334D none repeat scroll 0 0; - color:#FFFFFF; - height:auto !important; - padding:3px 4px 4px; - } - - .columnLeft { - width: 45%; - float: left; - margin-right: 10px; - } - - .columnRight { - width: 45%; - float: left; - margin-left: 10px; - clear: none; - } - - div.screenlet table { - width: 100%; - margin: 10px; - } - - div.screenlet table tfoot th { - text-align: right; - font-weight: bold; - } - - .clearBoth { - clear: both; - } - </style> + <meta http-equiv="Content-Type" content="text/html; charset=UTF-8"/> + <title>${title!}</title> + <#-- this needs to be fully qualified to appear in email; the server must also be available --> + <style type="text/css"> + html, body, div, h1, h3, a, ul, + li, table, tbody, tfoot, thead, + tr, th, td { + border: 0; + margin: 0; + outline: 0; + padding: 0; + font-size: 100%; + background: transparent; + vertical-align: baseline; + } + + a, body, th { + font-style: normal; + font-weight: normal; + text-decoration: none; + } + + body, th { + text-align: left; + } + + ul { + list-style: none; + } + + div.screenlet { + background-color: #FFFFFF; + border: 0.1em solid #999999; + height: auto !important; + height: 1%; + margin-bottom: 1em; + } + + body { + background: #D4D0C8; + font-size: 62.5%; + position: relative; + line-height: 1; + color: black; + font-family: Verdana, Arial, Helvetica, sans-serif; + } + + h1 { + font-size: 1.6em; + font-weight: bold; + } + + h3 { + font-size: 1.1em; + font-weight: bold; + } + + /* IE7 fix */ + table { + font-size: 1em; + } + + div.screenlet ul { + margin: 10px; + } + + div.screenlet li { + line-height: 15px; + } + + div.screenlet h3 { + background: #1C334D none repeat scroll 0 0; + color: #FFFFFF; + height: auto !important; + padding: 3px 4px 4px; + } + + .columnLeft { + width: 45%; + float: left; + margin-right: 10px; + } + + .columnRight { + width: 45%; + float: left; + margin-left: 10px; + clear: none; + } + + div.screenlet table { + width: 100%; + margin: 10px; + } + + div.screenlet table tfoot th { + text-align: right; + font-weight: bold; + } + + .clearBoth { + clear: both; + } + </style> </head> <body> - -<#-- custom logo or text can be inserted here --> - -<h1>${title!}</h1> -<#if !isDemoStore?? || isDemoStore><p>${uiLabelMap.OrderDemoFrontNote}.</p></#if> -<#if note??><p>${note}</p></#if> -<#if orderHeader??> -${screens.render("component://ecommerce/widget/OrderScreens.xml#orderheader")} -<br /> -${screens.render("component://ecommerce/widget/OrderScreens.xml#orderitems")} -<#else> -<h1>Order not found with ID [${orderId!}], or not allowed to view.</h1> -</#if> - + <#-- custom logo or text can be inserted here --> + <h1>${title!}</h1> + <#if !isDemoStore?? || isDemoStore><p>${uiLabelMap.OrderDemoFrontNote}.</p></#if> + <#if note??><p>${note}</p></#if> + <#if orderHeader??> + ${screens.render("component://ecommerce/widget/OrderScreens.xml#orderheader")} + <br/> + ${screens.render("component://ecommerce/widget/OrderScreens.xml#orderitems")} + <#else> + <h1>Order not found with ID [${orderId!}], or not allowed to view.</h1> + </#if> </body> </html> Modified: ofbiz/trunk/specialpurpose/ecommerce/template/email/ReturnAccept.ftl URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/ecommerce/template/email/ReturnAccept.ftl?rev=1761135&r1=1761134&r2=1761135&view=diff ============================================================================== --- ofbiz/trunk/specialpurpose/ecommerce/template/email/ReturnAccept.ftl (original) +++ ofbiz/trunk/specialpurpose/ecommerce/template/email/ReturnAccept.ftl Sat Sep 17 07:17:15 2016 @@ -18,17 +18,17 @@ under the License. --> <#-- ReturnHeader and a List of ReturnItem records is available to this template --> -<br /> +<br/> ${uiLabelMap.EcommerceReturnRequest} -<br /><br /> +<br/><br/> <pre> -<#list returnItems as item> - <#assign returnReason = item.getRelatedOne("ReturnReason", false)!> - <#assign returnType = item.getRelatedOne("ReturnType", false)!> - ${item.description?default("N/A")} - ${item.returnQuantity?string.number} @ ${item.returnPrice} -</#list> + <#list returnItems as item> + <#assign returnReason = item.getRelatedOne("ReturnReason", false)!> + <#assign returnType = item.getRelatedOne("ReturnType", false)!> + ${item.description?default("N/A")} - ${item.returnQuantity?string.number} @ ${item.returnPrice} + </#list> </pre> -<br /><br /> +<br/><br/> ${uiLabelMap.EcommerceReturnRequestAccepted} ${returnHeader.returnId} -<br /><br /> +<br/><br/> Modified: ofbiz/trunk/specialpurpose/ecommerce/template/email/ShipmentNotificationEmail.ftl URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/ecommerce/template/email/ShipmentNotificationEmail.ftl?rev=1761135&r1=1761134&r2=1761135&view=diff ============================================================================== --- ofbiz/trunk/specialpurpose/ecommerce/template/email/ShipmentNotificationEmail.ftl (original) +++ ofbiz/trunk/specialpurpose/ecommerce/template/email/ShipmentNotificationEmail.ftl Sat Sep 17 07:17:15 2016 @@ -18,46 +18,52 @@ under the License. --> <#if baseEcommerceSecureUrl??><#assign urlPrefix = baseEcommerceSecureUrl/></#if> -<#if shipment?has_content> - <div class="screenlet"> - <div class="screenlet-title-bar"> - <div class="h3">${title!}<br /><br /></div> - </div> - <table border="0" cellpadding="0" cellspacing="0"> - <tbody> - <tr> - <td><b>${uiLabelMap.OrderTrackingNumber}</b></td> - </tr> - <#list orderShipmentInfoSummaryList as orderShipmentInfoSummary> + <#if shipment?has_content> + <div class="screenlet"> + <div class="screenlet-title-bar"> + <div class="h3">${title!}<br/><br/></div> + </div> + <table border="0" cellpadding="0" cellspacing="0"> + <tbody> <tr> - <td> - Code: ${orderShipmentInfoSummary.trackingCode?default("[Not Yet Known]")} - <#if orderShipmentInfoSummary.carrierPartyId?has_content>(${uiLabelMap.ProductCarrier}: ${orderShipmentInfoSummary.carrierPartyId})</#if> - </td> + <td><b>${uiLabelMap.OrderTrackingNumber}</b></td> </tr> - </#list> - </tbody> - </table> - <br /> - <div class="screenlet-title-bar"> - <div class="h3"><b>${uiLabelMap.EcommerceShipmentItems}</b></div> - </div> - <div class="screenlet-body"> - <table width="100%" border="0" cellpadding="0"> - <tr valign="bottom"> - <td width="35%"><span class="tableheadtext"><b>${uiLabelMap.OrderProduct}</b></span></td> - <td width="10%" align="right"><span class="tableheadtext"><b>${uiLabelMap.OrderQuantity}</b></span></td> - </tr> - <tr><td colspan="10"><hr /></td></tr> - <#list shipmentItems as shipmentItem> - <#assign productId = shipmentItem.productId> - <#assign product = shipmentItem.getRelatedOne("Product", false)> - <tr> - <td colspan="1" valign="top"> ${productId!} - ${product.internalName!}</td> - <td align="right" valign="top"> ${shipmentItem.quantity!}</td> - </tr> - </#list> - <tr><td colspan="10"><hr /></td></tr> - </table> - </div> -</#if> + <#list orderShipmentInfoSummaryList as orderShipmentInfoSummary> + <tr> + <td> + Code: ${orderShipmentInfoSummary.trackingCode?default("[Not Yet Known]")} + <#if orderShipmentInfoSummary.carrierPartyId?has_content>(${uiLabelMap.ProductCarrier} + : ${orderShipmentInfoSummary.carrierPartyId}) + </#if> + </td> + </tr> + </#list> + </tbody> + </table> + <br/> + <div class="screenlet-title-bar"> + <div class="h3"><b>${uiLabelMap.EcommerceShipmentItems}</b></div> + </div> + <div class="screenlet-body"> + <table width="100%" border="0" cellpadding="0"> + <tr valign="bottom"> + <td width="35%"><span class="tableheadtext"><b>${uiLabelMap.OrderProduct}</b></span></td> + <td width="10%" align="right"><span class="tableheadtext"><b>${uiLabelMap.OrderQuantity}</b></span></td> + </tr> + <tr> + <td colspan="10"><hr/></td> + </tr> + <#list shipmentItems as shipmentItem> + <#assign productId = shipmentItem.productId> + <#assign product = shipmentItem.getRelatedOne("Product", false)> + <tr> + <td colspan="1" valign="top"> ${productId!} - ${product.internalName!}</td> + <td align="right" valign="top"> ${shipmentItem.quantity!}</td> + </tr> + </#list> + <tr> + <td colspan="10"><hr/></td> + </tr> + </table> + </div> + </#if> Modified: ofbiz/trunk/specialpurpose/ecommerce/template/email/TellAFriend.ftl URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/ecommerce/template/email/TellAFriend.ftl?rev=1761135&r1=1761134&r2=1761135&view=diff ============================================================================== --- ofbiz/trunk/specialpurpose/ecommerce/template/email/TellAFriend.ftl (original) +++ ofbiz/trunk/specialpurpose/ecommerce/template/email/TellAFriend.ftl Sat Sep 17 07:17:15 2016 @@ -19,12 +19,12 @@ under the License. <html> <head></head> <body> -${sendTo}, -<br /> -${sendFrom} ${uiLabelMap.EcommerceFollowingMessage} -<br /><br /> -<b>${message}</b> -<br /><br /> -<a href="${pageUrl}">${pageUrl}</a> + ${sendTo}, + <br /> + ${sendFrom} ${uiLabelMap.EcommerceFollowingMessage} + <br /><br /> + <b>${message}</b> + <br /><br /> + <a href="${pageUrl}">${pageUrl}</a> </body> </html> Modified: ofbiz/trunk/specialpurpose/ecommerce/template/forum/BlogLib.ftl URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/ecommerce/template/forum/BlogLib.ftl?rev=1761135&r1=1761134&r2=1761135&view=diff ============================================================================== --- ofbiz/trunk/specialpurpose/ecommerce/template/forum/BlogLib.ftl (original) +++ ofbiz/trunk/specialpurpose/ecommerce/template/forum/BlogLib.ftl Sat Sep 17 07:17:15 2016 @@ -18,178 +18,198 @@ under the License. --> <#macro renderBlog contentId="" targetPurpose="" stdWrapId=""> -<#if contentId?has_content> + <#if contentId?has_content> <#assign contentIdx = contentId/> -</#if> -<#assign viewIdx = "" /> -<#if requestParameters.viewIndex?has_content> -<#assign viewIdx = requestParameters.viewIndex! /> -</#if> -<#assign viewSz = "" /> -<#if requestParameters.viewSize?has_content> -<#assign viewSz = requestParameters.viewSize! /> -</#if> - -<#assign sz=0/> -<table border="0"> -<@loopSubContent contentId=contentIdx viewIndex=viewIdx viewSize=viewSz contentAssocTypeId="PUBLISH_LINK" - pickWhen="purposes.contains(\"ARTICLE\") && \"CTNT_PUBLISHED\".equals(content.get(\"statusId\"))" - returnAfterPickWhen="purposes.contains(\"ARTICLE\")" - followWhen="contentAssocTypeId != null && contentAssocTypeId.equals(\"never follow\")"> - <#assign thisNodeTrailCsv=nodeTrailCsv!/> - <#assign thisSubContentId=subContentId!/> - <#assign thisNode=globalNodeTrail?last/> - <#if thisNode?has_content> - <#assign thisOwnerContentId=thisNode.value.ownerContentId!/> </#if> - - <#assign userLoginId=""/> - <#if content?has_content && content.createdByUserLogin?has_content> - <#assign userLoginId=content.createdByUserLogin/> + <#assign viewIdx = "" /> + <#if requestParameters.viewIndex?has_content> + <#assign viewIdx = requestParameters.viewIndex! /> + </#if> + <#assign viewSz = "" /> + <#if requestParameters.viewSize?has_content> + <#assign viewSz = requestParameters.viewSize! /> </#if> - <#assign authorName=Static["org.apache.ofbiz.content.ContentManagementWorker"].getUserName(request,userLoginId!)/> - <tr> - <td width="40px"> </td> - <td class="blogtext" > - <div> - by:<#if authorName?has_content>${authorName!} - <#else> - <#if content?has_content>${content.createdByUserLogin!}</#if> - </#if> - - <#if thisNode?? && thisNode.fromDate??> - <#assign nowTime = thisNode.fromDate?string /> - <#assign shortTime = ""/> - <#if nowTime?has_content> - <#assign lastColon=nowTime?last_index_of(":") - 1/> - <#assign shortTime=nowTime[0..lastColon]/> - </#if> - ${shortTime!} - </#if> - </div> - </td> - <td > - <#if content?has_content>${content.contentName!}</#if> - -- - <#if content?has_content>${content.description!}</#if> - </td> - <td width="40px" valign="bottom"> -<a class="tabButton" href="<@ofbizUrl>showforumarticle?contentId=${thisSubContentId}&nodeTrailCsv=${thisNodeTrailCsv!}&forumId=${contentIdx!}</@ofbizUrl>" >${uiLabelMap.CommonView}</a> - </td> -<@checkPermission mode="equals" entityOperation="_UPDATE" subContentId=content.contentId targetOperation="CONTENT_UPDATE" contentPurposeList="ARTICLE"> - <td width="40px" valign="bottom"> -<a class="tabButton" style="height:14pt;" href="<@ofbizUrl>editforumarticle?contentIdTo=${content.contentId}&nodeTrailCsv=${contentIdx!},${content.contentId}</@ofbizUrl>" >${uiLabelMap.CommonEdit}</a> - </td> -</@checkPermission> - </tr> -<#assign sz=listSize/> - -</@loopSubContent> - - -<#if sz == 0 > - <tr><td align="center">${uiLabelMap.CommonNoRecordFound}</td></tr> -</#if> -<@wrapSubContentCache subContentId=contentIdx wrapTemplateId=stdWrapId contentPurposeList="ARTICLE"> -</@wrapSubContentCache> -</table> -<table border="0" class="summary"> -<#assign targOp="HAS_USER_ROLE"/> -<#assign pageTargOp=targetOperation!/> -<#if pageTargOp?has_content> - <#assign targOp=pageTargOp/> -</#if> -<@checkPermission mode="equals" entityOperation="_CREATE" subContentId=contentDept statusId="CTNT_PUBLISHED" targetOperation=targOp contentPurposeList="ARTICLE" quickCheckContentId=contentIdx> -<tr><td align="right"> -<a class="tabButton" style="height:14pt;" href="<@ofbizUrl>createforumarticle?forumId=${contentIdx!}&nodeTrailCsv=${contentIdx!}</@ofbizUrl>" >${uiLabelMap.ProductNewArticle}</a> -</td></tr> -</@checkPermission> -<@checkPermission mode="not-equals" entityOperation="_CREATE" subContentId=contentDept statusId="CTNT_PUBLISHED" targetOperation=targOp contentPurposeList="ARTICLE" quickCheckContentId=contentIdx> -<tr><td align="right"> -${uiLabelMap.EcommerceLoggedToPost} -</td></tr> -</@checkPermission> -</table> -<#-- -<@checkPermission mode="not-equals" entityOperation="_CREATE" subContentId=contentIdx statusId="CTNT_PUBLISHED" targetOperation="HAS_USER_ROLE" contentPurposeList="ARTICLE"> - ${permissionErrorMsg!} -</@checkPermission> ---> + <#assign sz=0/> + <table border="0"> + <@loopSubContent contentId=contentIdx viewIndex=viewIdx viewSize=viewSz contentAssocTypeId="PUBLISH_LINK" + pickWhen="purposes.contains(\"ARTICLE\") && \"CTNT_PUBLISHED\".equals(content.get(\"statusId\"))" + returnAfterPickWhen="purposes.contains(\"ARTICLE\")" + followWhen="contentAssocTypeId != null && contentAssocTypeId.equals(\"never follow\")"> + <#assign thisNodeTrailCsv=nodeTrailCsv!/> + <#assign thisSubContentId=subContentId!/> + <#assign thisNode=globalNodeTrail?last/> + <#if thisNode?has_content> + <#assign thisOwnerContentId=thisNode.value.ownerContentId!/> + </#if> + <#assign userLoginId=""/> + <#if content?has_content && content.createdByUserLogin?has_content> + <#assign userLoginId=content.createdByUserLogin/> + </#if> + <#assign authorName=Static["org.apache.ofbiz.content.ContentManagementWorker"].getUserName(request,userLoginId!)/> + + <tr> + <td width="40px"> </td> + <td class="blogtext"> + <div> + by:<#if authorName?has_content>${authorName!} + <#else> + <#if content?has_content>${content.createdByUserLogin!}</#if> + </#if> + + <#if thisNode?? && thisNode.fromDate??> + <#assign nowTime = thisNode.fromDate?string /> + <#assign shortTime = ""/> + <#if nowTime?has_content> + <#assign lastColon=nowTime?last_index_of(":") - 1/> + <#assign shortTime=nowTime[0..lastColon]/> + </#if> + ${shortTime!} + </#if> + </div> + </td> + <td> + <#if content?has_content>${content.contentName!}</#if> + -- + <#if content?has_content>${content.description!}</#if> + </td> + <td width="40px" valign="bottom"> + <a class="tabButton" + href="<@ofbizUrl>showforumarticle?contentId=${thisSubContentId}&nodeTrailCsv=${thisNodeTrailCsv!}&forumId=${contentIdx!}</@ofbizUrl>">${uiLabelMap.CommonView}</a> + </td> + <@checkPermission mode="equals" entityOperation="_UPDATE" subContentId=content.contentId targetOperation="CONTENT_UPDATE" contentPurposeList="ARTICLE"> + <td width="40px" valign="bottom"> + <a class="tabButton" style="height:14pt;" + href="<@ofbizUrl>editforumarticle?contentIdTo=${content.contentId}&nodeTrailCsv=${contentIdx!},${content.contentId}</@ofbizUrl>">${uiLabelMap.CommonEdit}</a> + </td> + </@checkPermission> + </tr> + <#assign sz=listSize/> + </@loopSubContent> + + <#if sz == 0 > + <tr> + <td align="center">${uiLabelMap.CommonNoRecordFound}</td> + </tr> + </#if> + <@wrapSubContentCache subContentId=contentIdx wrapTemplateId=stdWrapId contentPurposeList="ARTICLE"> + </@wrapSubContentCache> + </table> + <table border="0" class="summary"> + <#assign targOp="HAS_USER_ROLE"/> + <#assign pageTargOp=targetOperation!/> + <#if pageTargOp?has_content> + <#assign targOp=pageTargOp/> + </#if> + <@checkPermission mode="equals" entityOperation="_CREATE" subContentId=contentDept statusId="CTNT_PUBLISHED" + targetOperation=targOp contentPurposeList="ARTICLE" quickCheckContentId=contentIdx> + <tr> + <td align="right"> + <a class="tabButton" style="height:14pt;" + href="<@ofbizUrl>createforumarticle?forumId=${contentIdx!}&nodeTrailCsv=${contentIdx!}</@ofbizUrl>"> + ${uiLabelMap.ProductNewArticle} + </a> + </td> + </tr> + </@checkPermission> + <@checkPermission mode="not-equals" entityOperation="_CREATE" subContentId=contentDept statusId="CTNT_PUBLISHED" + targetOperation=targOp contentPurposeList="ARTICLE" quickCheckContentId=contentIdx> + <tr> + <td align="right"> + ${uiLabelMap.EcommerceLoggedToPost} + </td> + </tr> + </@checkPermission> + </table> + <#-- + <@checkPermission mode="not-equals" entityOperation="_CREATE" subContentId=contentIdx statusId="CTNT_PUBLISHED" + targetOperation="HAS_USER_ROLE" contentPurposeList="ARTICLE"> + ${permissionErrorMsg!} + </@checkPermission> + --> </#macro> <#macro renderAncestryPath trail startIndex=0 endIndexOffset=0 buttonTitle="${uiLabelMap.CommonBackTo}"> - <#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 > - ${indent} + <tr> + <td> + ${indent} <#if content.contentTypeId == "WEB_SITE_PUB_PT" > - <a class="tabButton" href="<@ofbizUrl>showforum?forumId=${content.contentId!}&nodeTrailCsv=${csv}</@ofbizUrl>" >${uiLabelMap.CommonBackTo}</a> ${content.contentName!} + <a class="tabButton" + href="<@ofbizUrl>showforum?forumId=${content.contentId!}&nodeTrailCsv=${csv}</@ofbizUrl>">${uiLabelMap.CommonBackTo}</a> + ${content.contentName!} <#else> - <a class="tabButton" href="<@ofbizUrl>showforumarticle?contentId=${content.contentId!}&nodeTrailCsv=${csv}</@ofbizUrl>" >${uiLabelMap.CommonBackTo}to</a> ${content.contentName!} + <a class="tabButton" + href="<@ofbizUrl>showforumarticle?contentId=${content.contentId!}&nodeTrailCsv=${csv}</@ofbizUrl>">${uiLabelMap.CommonBackTo} + to</a> ${content.contentName!} </#if> <#local indent = indent + " "> - [${content.contentId!}]</td> + [${content.contentId!}] + </td> </#if> - </tr> + </tr> </#if> <#local counter = counter + 1> - <#if 20 < counter > <#break/></#if> + <#if 20 < counter > <#break/></#if> </#list> - </table> + </table> </#macro> <#macro nextPrev listSize requestURL queryString lowIndex=0 highIndex=10 viewSize=10 viewIndex=0 > -<#assign lowIdx=lowIndex/> -<#assign highIdx=highIndex/> -<#assign viewSz=viewSize/> -<#assign viewIdx=viewIndex/> -<#assign listSz=listSize/> - -<#if !lowIdx?has_content><#assign lowIdx=0/></#if> -<#if !highIdx?has_content><#assign highIdx=0/></#if> -<#if !viewSz?has_content><#assign viewSz=10/></#if> -<#if !viewIdx?has_content><#assign viewIdx=10/></#if> -<#if !listSz?has_content><#assign listSz=0/></#if> + <#assign lowIdx=lowIndex/> + <#assign highIdx=highIndex/> + <#assign viewSz=viewSize/> + <#assign viewIdx=viewIndex/> + <#assign listSz=listSize/> + + <#if !lowIdx?has_content><#assign lowIdx=0/></#if> + <#if !highIdx?has_content><#assign highIdx=0/></#if> + <#if !viewSz?has_content><#assign viewSz=10/></#if> + <#if !viewIdx?has_content><#assign viewIdx=10/></#if> + <#if !listSz?has_content><#assign listSz=0/></#if> -<#if queryString?has_content> + <#if queryString?has_content> <#assign queryString = Static["org.apache.ofbiz.base.util.UtilHttp"].stripViewParamsFromQueryString(queryString)/> -</#if> + </#if> -<#assign lowIdxShow = lowIdx + 1 /> -<#if highIdx < lowIdxShow > - <#assign lowIdxShow = highIdx/> -</#if> -<table border="0" > -<tr><td> - <#if 0 < listSz?number> - <#if 0 < viewIdx?number> - <a href="${requestURL}?${queryString}&viewSz=${viewSz}&viewIdx=${viewIdx?number-1}" class="submenutext">${uiLabelMap.CommonPrevious}</a> - <#else> - <span class="submenutextdisabled">${uiLabelMap.CommonPrevious}</span> - </#if> - <#if 0 < listSz> - <span class="submenutextinfo">${lowIdxShow} - ${highIdx!} ${uiLabelMap.CommonOf} ${listSz!}</span> - </#if> - <#if highIdx!?number < listSz!?number> - <a href="${requestURL}?${queryString!}&viewSz=${viewSz!}&viewIdx=${viewIdx!?number+1}" class="submenutextright">${uiLabelMap.CommonNext}</a> - <#else> - <span class="submenutextrightdisabled">${uiLabelMap.CommonNext}</span> - </#if> - </#if> -</td></tr> - </table> + <#assign lowIdxShow = lowIdx + 1 /> + <#if highIdx < lowIdxShow > + <#assign lowIdxShow = highIdx/> + </#if> + <table border="0"> + <tr> + <td> + <#if 0 < listSz?number> + <#if 0 < viewIdx?number> + <a href="${requestURL}?${queryString}&viewSz=${viewSz}&viewIdx=${viewIdx?number-1}" + class="submenutext">${uiLabelMap.CommonPrevious}</a> + <#else> + <span class="submenutextdisabled">${uiLabelMap.CommonPrevious}</span> + </#if> + <#if 0 < listSz> + <span class="submenutextinfo">${lowIdxShow} - ${highIdx!} ${uiLabelMap.CommonOf} ${listSz!}</span> + </#if> + <#if highIdx!?number < listSz!?number> + <a href="${requestURL}?${queryString!}&viewSz=${viewSz!}&viewIdx=${viewIdx!?number+1}" + class="submenutextright">${uiLabelMap.CommonNext}</a> + <#else> + <span class="submenutextrightdisabled">${uiLabelMap.CommonNext}</span> + </#if> + </#if> + </td> + </tr> + </table> </#macro> Modified: ofbiz/trunk/specialpurpose/ecommerce/template/forum/ForumPaging.ftl URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/ecommerce/template/forum/ForumPaging.ftl?rev=1761135&r1=1761134&r2=1761135&view=diff ============================================================================== --- ofbiz/trunk/specialpurpose/ecommerce/template/forum/ForumPaging.ftl (original) +++ ofbiz/trunk/specialpurpose/ecommerce/template/forum/ForumPaging.ftl Sat Sep 17 07:17:15 2016 @@ -22,27 +22,35 @@ under the License. <#assign highIndex = viewIndex?int * viewSize?int + viewSize> <#--<br />== viewIndex: ${viewIndex} ==viewSize: ${viewSize} ==lowIndex: ${lowIndex}== highIndex: ${highIndex} == ListSize: ${listSize}--> <#if forumMessages?has_content && forumMessages?size gt 0> - <#assign listSize = forumMessages?size/> - <#if highIndex gt listSize><#assign highIndex = listSize></#if> - <div class="product-prevnext"> - <#assign r = listSize / viewSize /> - <#assign viewIndexMax = Static["java.lang.Math"].ceil(r)> - <select name="pageSelect" class="selectBox" onchange="window.location=this[this.selectedIndex].value;"> - <option value="#">${uiLabelMap.CommonPage} ${viewIndex?int+1} ${uiLabelMap.CommonOf} ${viewIndexMax}</option> - <#list 1..viewIndexMax as curViewNum> - <option value="<@ofbizUrl>showforum?forumId=${parameters.forumId}&VIEW_SIZE=${viewSize}&VIEW_INDEX=${curViewNum?int-1}</@ofbizUrl>">${uiLabelMap.CommonGotoPage} ${curViewNum}</option> - </#list> - </select> - <b> - <#if (viewIndex?int >0)> - <a href="<@ofbizUrl>showforum?forumId=${parameters.forumId}&VIEW_SIZE=${viewSize}&VIEW_INDEX=${viewIndex?int-1}</@ofbizUrl>" class="buttontext">${uiLabelMap.CommonPrevious}</a> | - </#if> - <#if (listSize?int > 0)> - <span>${lowIndex} - ${highIndex} ${uiLabelMap.CommonOf} ${listSize}</span> - </#if> - <#if highIndex?int < listSize?int> - | <a href="<@ofbizUrl>showforum?forumId=${parameters.forumId}&VIEW_SIZE=${viewSize}&VIEW_INDEX=${viewIndex?int+1}</@ofbizUrl>" class="buttontext">${uiLabelMap.CommonNext}</a> - </#if> - </b> - </div> + <#assign listSize = forumMessages?size/> + <#if highIndex gt listSize><#assign highIndex = listSize></#if> +<div class="product-prevnext"> + <#assign r = listSize / viewSize /> + <#assign viewIndexMax = Static["java.lang.Math"].ceil(r)> + <select name="pageSelect" class="selectBox" onchange="window.location=this[this.selectedIndex].value;"> + <option value="#">${uiLabelMap.CommonPage} ${viewIndex?int+1} ${uiLabelMap.CommonOf} ${viewIndexMax}</option> + <#list 1..viewIndexMax as curViewNum> + <option + value="<@ofbizUrl>showforum?forumId=${parameters.forumId}&VIEW_SIZE=${viewSize}&VIEW_INDEX=${curViewNum?int-1}</@ofbizUrl>"> + ${uiLabelMap.CommonGotoPage} ${curViewNum} + </option> + </#list> + </select> + <b> + <#if (viewIndex?int >0)> + <a href="<@ofbizUrl>showforum?forumId=${parameters.forumId}&VIEW_SIZE=${viewSize}&VIEW_INDEX=${viewIndex?int-1}</@ofbizUrl>" + class="buttontext"> + ${uiLabelMap.CommonPrevious} + </a> | + </#if> + <#if (listSize?int > 0)> + <span>${lowIndex} - ${highIndex} ${uiLabelMap.CommonOf} ${listSize}</span> + </#if> + <#if highIndex?int < listSize?int> + | <a + href="<@ofbizUrl>showforum?forumId=${parameters.forumId}&VIEW_SIZE=${viewSize}&VIEW_INDEX=${viewIndex?int+1}</@ofbizUrl>" + class="buttontext">${uiLabelMap.CommonNext}</a> + </#if> + </b> +</div> </#if> Modified: ofbiz/trunk/specialpurpose/ecommerce/template/forum/Forums.ftl URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/ecommerce/template/forum/Forums.ftl?rev=1761135&r1=1761134&r2=1761135&view=diff ============================================================================== --- ofbiz/trunk/specialpurpose/ecommerce/template/forum/Forums.ftl (original) +++ ofbiz/trunk/specialpurpose/ecommerce/template/forum/Forums.ftl Sat Sep 17 07:17:15 2016 @@ -26,11 +26,12 @@ under the License. </div> <div class="screenlet-body"> <ul class="browsecategorylist"> - <#list forums as forum> - <li class="browsecategorytext"> - <a href="<@ofbizUrl>showforum?forumId=${forum.contentId}</@ofbizUrl>" class="browsecategorybutton">${forum.contentName!forum.contentId}</a> - </li> - </#list> + <#list forums as forum> + <li class="browsecategorytext"> + <a href="<@ofbizUrl>showforum?forumId=${forum.contentId}</@ofbizUrl>" + class="browsecategorybutton">${forum.contentName!forum.contentId}</a> + </li> + </#list> </ul> </div> </div> \ No newline at end of file Modified: ofbiz/trunk/specialpurpose/ecommerce/template/forum/MessageDisplay.ftl URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/ecommerce/template/forum/MessageDisplay.ftl?rev=1761135&r1=1761134&r2=1761135&view=diff ============================================================================== --- ofbiz/trunk/specialpurpose/ecommerce/template/forum/MessageDisplay.ftl (original) +++ ofbiz/trunk/specialpurpose/ecommerce/template/forum/MessageDisplay.ftl Sat Sep 17 07:17:15 2016 @@ -16,38 +16,44 @@ KIND, either express or implied. See th specific language governing permissions and limitations under the License. --> - <#-- Thread content id equals contentId if contentAssocTypeId equals PUBLISH_LINK, else threadContentId = ownerContentId --> - <#assign threadContentId = forumMessage.contentId/> - <#if forumMessage.caContentAssocTypeId == "RESPONSE"> - <#assign threadContentId = forumMessage.ownerContentId!/> +<#-- Thread content id equals contentId if contentAssocTypeId equals PUBLISH_LINK, else threadContentId = ownerContentId --> +<#assign threadContentId = forumMessage.contentId/> +<#if forumMessage.caContentAssocTypeId == "RESPONSE"> + <#assign threadContentId = forumMessage.ownerContentId!/> +</#if> +<#if rsp??> + <#assign contentId = rsp.contentId> +<#else> + <#assign contentId = forumMessage.contentId> +</#if> +<div class="tableheadtext"> + ${uiLabelMap.CommonTitle} : ${forumMessage.contentName!} ${uiLabelMap.CommonBy}:${forumMessage.createdByUserLogin!} + ${uiLabelMap.CommonAt}: ${(forumMessage.createdDate.toString().substring(0,16))!} + <a href="ViewForumMessage?forumId=${parameters.forumId}&responseContentId=${forumMessage.contentId}&threadContentId=${threadContentId!}" + class="buttontext">${uiLabelMap.CommonView}</a> +</div> +<div class="tableheadtext"> + ${forumMessage.description!} +</div> + +<#-- + <#assign result = dispatcher.runSync("getPublicForumMessage", Static["org.apache.ofbiz.base.util.UtilMisc"] + .toMap("contentId", contentId, "userLogin", userLogin))/> + <#if (result.resultData)??> + <div class="tableheadtext"> + ${uiLabelMap.CommonTitle}: ${result.resultData.content.description!} + ${uiLabelMap.CommonBy}:${result.resultData.content.createdByUserLogin} ${uiLabelMap.CommonAt}: + ${result.resultData.content.createdDate.toString().substring(0,16)} + <a href="addForumMessage?forumId=${parameters.forumId}&forumMessageIdTo=${result.resultData.content.contentId}&threadView=${parameters.threadView!}" + class="buttontext">${uiLabelMap.PartyReply}</a> + </div> + <div> + <#if result.resultData.electronicText??> + ${result.resultData.electronicText.textData} </#if> - <#if rsp??> - <#assign contentId = rsp.contentId> - <#else> - <#assign contentId = forumMessage.contentId> - </#if> - <div class="tableheadtext"> - ${uiLabelMap.CommonTitle}: ${forumMessage.contentName!} ${uiLabelMap.CommonBy}:${forumMessage.createdByUserLogin!} ${uiLabelMap.CommonAt}: ${(forumMessage.createdDate.toString().substring(0,16))!} - <a href="ViewForumMessage?forumId=${parameters.forumId}&responseContentId=${forumMessage.contentId}&threadContentId=${threadContentId!}" class="buttontext">${uiLabelMap.CommonView}</a> - </div> - <div class="tableheadtext"> - ${forumMessage.description!} - </div> - - <#-- - <#assign result = dispatcher.runSync("getPublicForumMessage", Static["org.apache.ofbiz.base.util.UtilMisc"].toMap("contentId", contentId, "userLogin", userLogin))/> - <#if (result.resultData)??> - <div class="tableheadtext"> - ${uiLabelMap.CommonTitle}: ${result.resultData.content.description!} ${uiLabelMap.CommonBy}:${result.resultData.content.createdByUserLogin} ${uiLabelMap.CommonAt}: ${result.resultData.content.createdDate.toString().substring(0,16)} - <a href="addForumMessage?forumId=${parameters.forumId}&forumMessageIdTo=${result.resultData.content.contentId}&threadView=${parameters.threadView!}" class="buttontext">${uiLabelMap.PartyReply}</a> - </div> - <div> - <#if result.resultData.electronicText??> - ${result.resultData.electronicText.textData} - </#if> - </div> - <hr /> - <#else> - <div> ${result.errorMessage!}</div> - </#if> - --> + </div> + <hr /> + <#else> + <div> ${result.errorMessage!}</div> +</#if> +--> Modified: ofbiz/trunk/specialpurpose/ecommerce/template/forum/ShowForum.ftl URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/ecommerce/template/forum/ShowForum.ftl?rev=1761135&r1=1761134&r2=1761135&view=diff ============================================================================== --- ofbiz/trunk/specialpurpose/ecommerce/template/forum/ShowForum.ftl (original) +++ ofbiz/trunk/specialpurpose/ecommerce/template/forum/ShowForum.ftl Sat Sep 17 07:17:15 2016 @@ -18,5 +18,5 @@ under the License. --> <#list forumMessages! as forumMessage> - <#include "MessageDisplay.ftl"> + <#include "MessageDisplay.ftl"> </#list> Modified: ofbiz/trunk/specialpurpose/ecommerce/template/forum/ShowForumResponse.ftl URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/ecommerce/template/forum/ShowForumResponse.ftl?rev=1761135&r1=1761134&r2=1761135&view=diff ============================================================================== --- ofbiz/trunk/specialpurpose/ecommerce/template/forum/ShowForumResponse.ftl (original) +++ ofbiz/trunk/specialpurpose/ecommerce/template/forum/ShowForumResponse.ftl Sat Sep 17 07:17:15 2016 @@ -18,143 +18,156 @@ under the License. --> <#import "BlogLib.ftl" as blog/> -<div class="screenlet" > -<h1>{${uiLabelMap.EcommerceFromSite}</h1><br /> -<div> -<@blog.renderAncestryPath trail=ancestorList?default([]) endIndexOffset=1 /> -<#-- Do this so that we don't have to find the content twice (again in renderSubContent) --> -<#assign lastNode = globalNodeTrail!?last/> -<#if lastNode?has_content> - <#assign subContent=lastNode.value/> -<#else> -<#assign subContent = delegator.findOne("Content", Static["org.apache.ofbiz.base.util.UtilMisc"].toMap("contentId", subContentId), true)/> -<#assign dummy = globalNodeTrail.add(lastNode)/> -</#if> -<br /> -<h1>${uiLabelMap.EcommerceContentFor} [${subContentId}] ${subContent.contentName!} - ${subContent.description!}:</h1><br /> - -<#assign thisContentId=subContentId!> -<#if !thisContentId?has_content> - <#assign thisContentId=contentId!> -</#if> -<table border="0" width="100%" class="blogtext"> - <tr> - <td width="40"> </td> - <td> - <@renderSubContentCache subContentId=thisContentId /> - </td> - <td width="40" valign="bottom"> -<@checkPermission subContentId=subContentId targetOperation="HAS_USER_ROLE" contentPurposeList="RESPONSE" > -<a class="tabButton" href="<@ofbizUrl>createforumresponse?contentIdTo=${subContentId}&nodeTrailCsv=${nodeTrailCsv!}</@ofbizUrl>" >${uiLabelMap.EcommerceRespond}</a> -</@checkPermission> -<br /> - - </td> - </tr> -</table> -<hr /> -<#-- -<@checkPermission mode="not-equals" subContentId=subContentId targetOperation="CONTENT_CREATE|CONTENT_RESPOND" contentPurposeList="RESPONSE" > - ${permissionErrorMsg!} -</@checkPermission> ---> - -<table border="0" width="100%" class="tableheadtext"> -<!-- Note that the "...When" arguments in the loopSubContent must be compatible with those in - any embedded transformSubContent, because it will assume that the first node has already - had its conditions checked. - It is not convenient to have the traverseSubContent check or recheck the first node - because the associated ContentAssoc entity is not known. ---> - <h1>${uiLabelMap.EcommerceResponses}</h1><br /> -<@loopSubContent contentAssocTypeId="RESPONSE" contentId=subContentId mapKey="" - pickWhen="contentAssocTypeId != null && contentAssocTypeId.equals(\"RESPONSE\") && mapKey == null" - followWhen="contentAssocTypeId != null && contentAssocTypeId.equals(\"RESPONSE\")"> - <@traverseSubContentCache contentAssocTypeId="RESPONSE" - pickWhen="contentAssocTypeId != null && contentAssocTypeId.equals(\"RESPONSE\")" - followWhen="contentAssocTypeId != null && contentAssocTypeId.equals(\"RESPONSE\")" - wrapTemplateId=""> - <#assign indentStr=indent?default("0")/> - <#assign indent=indentStr?number/> - <#if 1 < indent > - <#assign fillRange=1..indent/> - <#assign indentFill=""/> - <#list fillRange as i> +<div class="screenlet"> + <h1>{${uiLabelMap.EcommerceFromSite}</h1><br/> + <div> + <@blog.renderAncestryPath trail=ancestorList?default([]) endIndexOffset=1 /> + <#-- Do this so that we don't have to find the content twice (again in renderSubContent) --> + <#assign lastNode = globalNodeTrail!?last/> + <#if lastNode?has_content> + <#assign subContent=lastNode.value/> + <#else> + <#assign subContent = delegator.findOne("Content", Static["org.apache.ofbiz.base.util.UtilMisc"] + .toMap("contentId", subContentId), true)/> + <#assign dummy = globalNodeTrail.add(lastNode)/> + </#if> + <br/> + <h1>${uiLabelMap.EcommerceContentFor} [${subContentId}] ${subContent.contentName!} + - ${subContent.description!}:</h1><br/> + + <#assign thisContentId=subContentId!> + <#if !thisContentId?has_content> + <#assign thisContentId=contentId!> + </#if> + <table border="0" width="100%" class="blogtext"> + <tr> + <td width="40"> </td> + <td> + <@renderSubContentCache subContentId=thisContentId /> + </td> + <td width="40" valign="bottom"> + <@checkPermission subContentId=subContentId targetOperation="HAS_USER_ROLE" contentPurposeList="RESPONSE" > + <a class="tabButton" + href="<@ofbizUrl>createforumresponse?contentIdTo=${subContentId}&nodeTrailCsv=${nodeTrailCsv!}</@ofbizUrl>"> + ${uiLabelMap.EcommerceRespond} + </a> + </@checkPermission> + <br/> + </td> + </tr> + </table> + <hr/> + <#-- + <@checkPermission mode="not-equals" subContentId=subContentId targetOperation="CONTENT_CREATE|CONTENT_RESPOND" + contentPurposeList="RESPONSE" > + ${permissionErrorMsg!} + </@checkPermission> + --> + + <table border="0" width="100%" class="tableheadtext"> + <!-- Note that the "...When" arguments in the loopSubContent must be compatible with those in + any embedded transformSubContent, because it will assume that the first node has already + had its conditions checked. + It is not convenient to have the traverseSubContent check or recheck the first node + because the associated ContentAssoc entity is not known. + --> + <h1>${uiLabelMap.EcommerceResponses}</h1><br/> + <@loopSubContent contentAssocTypeId="RESPONSE" contentId=subContentId mapKey="" + pickWhen="contentAssocTypeId != null && contentAssocTypeId.equals(\"RESPONSE\") && mapKey == null" + followWhen="contentAssocTypeId != null && contentAssocTypeId.equals(\"RESPONSE\")"> + <@traverseSubContentCache contentAssocTypeId="RESPONSE" + pickWhen="contentAssocTypeId != null && contentAssocTypeId.equals(\"RESPONSE\")" + followWhen="contentAssocTypeId != null && contentAssocTypeId.equals(\"RESPONSE\")" + wrapTemplateId=""> + <#assign indentStr=indent?default("0")/> + <#assign indent=indentStr?number/> + <#if 1 < indent > + <#assign fillRange=1..indent/> + <#assign indentFill=""/> + <#list fillRange as i> <#assign indentFill = indentFill + " " /> - </#list> - <#assign thisContentId = ""/> - <#if nodeTrailCsv??> + </#list> + <#assign thisContentId = ""/> + <#if nodeTrailCsv??> <#assign idList = nodeTrailCsv?split(",")/> <#if 0 < idList?size > - <#assign thisContentId = idList?last> + <#assign thisContentId = idList?last> </#if> + </#if> + <#if content??> + <tr> + <td> + ${indentFill} + <a class="tabButton" + href="<@ofbizUrl>ViewBlog?contentId=${thisContentId}&nodeTrailCsv=${nodeTrailCsv!}</@ofbizUrl>"> + ${uiLabelMap.CommonView} + </a> + ${content.contentId!}-${content.description!}<br/> + </td> + </tr> + </#if> </#if> - <#if content??> - <tr> - <td> - ${indentFill} - <a class="tabButton" href="<@ofbizUrl>ViewBlog?contentId=${thisContentId}&nodeTrailCsv=${nodeTrailCsv!}</@ofbizUrl>" >${uiLabelMap.CommonView}</a> - ${content.contentId!}-${content.description!}<br /> - </td> - </tr> - </#if> - </#if> - </@traverseSubContentCache> -</@loopSubContent> + </@traverseSubContentCache> + </@loopSubContent> -<#-- -<@wrapSubContentCache subContentId=subContentId wrapTemplateId="WRAP_NEXT_PREV" > -</@wrapSubContentCache > ---> + <#-- + <@wrapSubContentCache subContentId=subContentId wrapTemplateId="WRAP_NEXT_PREV" > + </@wrapSubContentCache > + --> -</table> -</div> + </table> + </div> </div> <#-- not used, will be deleted --> <#macro getCurrentContent > - <#assign globalNodeTrail=globalNodeTrail/> - <#if globalNodeTrail??> - <#assign currentNode=globalNodeTrail?last/> - <#if currentNode??> - <#assign currentValue=currentNode.value/> - <#if currentValue??> - <@wrapSubContentCache subContentId=currentValue.contentId wrapTemplateId="WRAP_ARTICLE" > - <@traverseSubContentCache contentAssocTypeId="SUB_CONTENT" - pickWhen="mapKey != null && mapKey.equals(\"ARTICLE\")" - returnAfterPickWhen="mapKey != null && mapKey.equals(\"ARTICLE\")" - followWhen="contentAssocTypeId != null && contentAssocTypeId.equals(\"_never_\")" - wrapTemplateId="" - > - <#assign description=currentValue.description?default("No description")/> -${uiLabelMap.CommonDescription}[${currentValue.contentId!}]:${description} -<a class="tabButton" href="<@ofbizUrl>ViewBlog?contentId=${thisContentId}&nodeTrailCsv=${nodeTrailCsv!}</@ofbizUrl>" >${uiLabelMap.CommonView}</a> - </@traverseSubContentCache > - </@wrapSubContentCache> - </#if> - </#if> + <#assign globalNodeTrail=globalNodeTrail/> + <#if globalNodeTrail??> + <#assign currentNode=globalNodeTrail?last/> + <#if currentNode??> + <#assign currentValue=currentNode.value/> + <#if currentValue??> + <@wrapSubContentCache subContentId=currentValue.contentId wrapTemplateId="WRAP_ARTICLE" > + <@traverseSubContentCache contentAssocTypeId="SUB_CONTENT" + pickWhen="mapKey != null && mapKey.equals(\"ARTICLE\")" + returnAfterPickWhen="mapKey != null && mapKey.equals(\"ARTICLE\")" + followWhen="contentAssocTypeId != null && contentAssocTypeId.equals(\"_never_\")" + wrapTemplateId=""> + <#assign description=currentValue.description?default("No description")/> + ${uiLabelMap.CommonDescription}[${currentValue.contentId!}]:${description} + <a class="tabButton" + href="<@ofbizUrl>ViewBlog?contentId=${thisContentId}&nodeTrailCsv=${nodeTrailCsv!}</@ofbizUrl>"> + ${uiLabelMap.CommonView} + </a> + </@traverseSubContentCache > + </@wrapSubContentCache> + </#if> </#if> + </#if> </#macro> <#macro renderSiteAncestryPath trail startIndex=0 > - <#assign indent = ""> - <#assign csv = ""> - <#assign counter = 0> - <#assign len = trail?size> - <table border="0" cellspacing="4"> + <#assign indent = ""> + <#assign csv = ""> + <#assign counter = 0> + <#assign len = trail?size> + <table border="0" cellspacing="4"> <#list trail as webSitePublishPoint> - <#if counter < len && startIndex <= counter > - <tr> - <td > - ${indent} - <a class="tabButton" href="<@ofbizUrl>main?pubPt=${webSitePublishPoint.contentId!}</@ofbizUrl>" >${uiLabelMap.CommonBackTo}</a> ${webSitePublishPoint.templateTitle!} - <#assign indent = indent + " "> - [${webSitePublishPoint.contentId!}]</td> - </#if> - </tr> - <#assign counter = counter + 1> - <#if 20 < counter > <#break/></#if> + <#if counter < len && startIndex <= counter > + <tr> + <td> + ${indent} + <a class="tabButton" + href="<@ofbizUrl>main?pubPt=${webSitePublishPoint.contentId!}</@ofbizUrl>">${uiLabelMap.CommonBackTo}</a> + ${webSitePublishPoint.templateTitle!} + <#assign indent = indent + " "> + [${webSitePublishPoint.contentId!}] + </td> + </#if> + </tr> + <#assign counter = counter + 1> + <#if 20 < counter > <#break/></#if> </#list> - </table> + </table> </#macro> Modified: ofbiz/trunk/specialpurpose/ecommerce/template/forum/ViewComboResponse.ftl URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/ecommerce/template/forum/ViewComboResponse.ftl?rev=1761135&r1=1761134&r2=1761135&view=diff ============================================================================== --- ofbiz/trunk/specialpurpose/ecommerce/template/forum/ViewComboResponse.ftl (original) +++ ofbiz/trunk/specialpurpose/ecommerce/template/forum/ViewComboResponse.ftl Sat Sep 17 07:17:15 2016 @@ -18,36 +18,40 @@ under the License. --> <#if requestAttributes._ERROR_MESSAGE_??> -<br /><div class='errorMessage'>${requestAttributes._ERROR_MESSAGE_}</div><br /> + <br/> + <div class='errorMessage'>${requestAttributes._ERROR_MESSAGE_}</div><br/> <#else> - <#if trailList??> - <#assign indent = ""> - <#assign csv = ""> - <#assign counter = 1> - <#assign len = trailList?size> - <#list trailList as pair> - <#if 0 < csv?length > - <#assign csv = csv + ","/> - </#if> - <#assign csv = csv + pair[0]!/> - <#if counter < len> - ${indent} - ${pair[0]!} - ${pair[1]!} - <a class="tabButton" href="<@ofbizUrl>ViewBlog?contentId=${pair[0]!}&nodeTrailCsv=${csv!}"></@ofbizUrl>${uiLabelMap.CommonView}</a> <br /> - <#assign indent = indent + " "> - <#else> - - <u>${uiLabelMap.EcommerceAddResponseFor}${pair[0]!} - ${pair[1]!}:</u><br /> - </#if> - <#assign counter = counter + 1> - </#list> + <#if trailList??> + <#assign indent = ""> + <#assign csv = ""> + <#assign counter = 1> + <#assign len = trailList?size> + <#list trailList as pair> + <#if 0 < csv?length > + <#assign csv = csv + ","/> + </#if> + <#assign csv = csv + pair[0]!/> + <#if counter < len> + ${indent} + ${pair[0]!} - ${pair[1]!} + <a class="tabButton" href="<@ofbizUrl>ViewBlog?contentId=${pair[0]!}&nodeTrailCsv=${csv!}"></@ofbizUrl> + ${uiLabelMap.CommonView} + </a> + <br/> + <#assign indent = indent + " "> + <#else> - <#if dataResourceId??> - <br /> - <img src="<@ofbizUrl>img?imgId=${dataResourceId}</@ofbizUrl>" alt=""/> - </#if> - <br /> + <u>${uiLabelMap.EcommerceAddResponseFor}${pair[0]!} - ${pair[1]!}:</u><br/> + </#if> + <#assign counter = counter + 1> + </#list> + + <#if dataResourceId??> + <br/> + <img src="<@ofbizUrl>img?imgId=${dataResourceId}</@ofbizUrl>" alt=""/> </#if> - ${singleWrapper.renderFormString()} -<br /> + <br/> + </#if> + ${singleWrapper.renderFormString()} + <br/> </#if> Modified: ofbiz/trunk/specialpurpose/ecommerce/template/includes/Footer.ftl URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/ecommerce/template/includes/Footer.ftl?rev=1761135&r1=1761134&r2=1761135&view=diff ============================================================================== --- ofbiz/trunk/specialpurpose/ecommerce/template/includes/Footer.ftl (original) +++ ofbiz/trunk/specialpurpose/ecommerce/template/includes/Footer.ftl Sat Sep 17 07:17:15 2016 @@ -19,20 +19,25 @@ under the License. <#assign nowTimestamp = Static["org.apache.ofbiz.base.util.UtilDateTime"].nowTimestamp()> - <br /> - <div class="footer"> - <div> - <a href="http://jigsaw.w3.org/css-validator/"><img style="border:0;width:88px;height:31px" src="<@ofbizContentUrl>/images/vcss.gif</@ofbizContentUrl>" alt="Valid CSS!"/></a> - <a href="http://validator.w3.org/check?uri=referer"><img style="border:0;width:88px;height:31px" src="<@ofbizContentUrl>/images/valid-xhtml10.png</@ofbizContentUrl>" alt="Valid XHTML 1.0!"/></a> - </div> - <br /> - <div> - <a href="http://ofbiz.apache.org">${uiLabelMap.EcommerceAboutUs}</a> - <div>Copyright (c) 2001-${nowTimestamp?string("yyyy")} The Apache Software Foundation - <a href="http://www.apache.org">www.apache.org</a></div> - <div>Powered by <a href="http://ofbiz.apache.org">Apache OFBiz</a></div> - - </div> - <br /> - <div><a href="<@ofbizUrl>policies</@ofbizUrl>">${uiLabelMap.EcommerceSeeStorePoliciesHere}</a></div> +<br/> +<div class="footer"> + <div> + <a href="http://jigsaw.w3.org/css-validator/"> + <img style="border:0;width:88px;height:31px" src="<@ofbizContentUrl>/images/vcss.gif</@ofbizContentUrl>" alt="Valid CSS!"/> + </a> + <a href="http://validator.w3.org/check?uri=referer"> + <img style="border:0;width:88px;height:31px"src="<@ofbizContentUrl>/images/valid-xhtml10.png</@ofbizContentUrl>" alt="Valid XHTML 1.0!"/> + </a> </div> + <br/> + <div> + <a href="http://ofbiz.apache.org">${uiLabelMap.EcommerceAboutUs}</a> + <div>Copyright (c) 2001-${nowTimestamp?string("yyyy")} The Apache Software Foundation - + <a href="http://www.apache.org">www.apache.org</a> + </div> + <div>Powered by <a href="http://ofbiz.apache.org">Apache OFBiz</a></div> + </div> + <br/> + <div><a href="<@ofbizUrl>policies</@ofbizUrl>">${uiLabelMap.EcommerceSeeStorePoliciesHere}</a></div> +</div> Modified: ofbiz/trunk/specialpurpose/ecommerce/template/includes/Header.ftl URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/ecommerce/template/includes/Header.ftl?rev=1761135&r1=1761134&r2=1761135&view=diff ============================================================================== --- ofbiz/trunk/specialpurpose/ecommerce/template/includes/Header.ftl (original) +++ ofbiz/trunk/specialpurpose/ecommerce/template/includes/Header.ftl Sat Sep 17 07:17:15 2016 @@ -18,64 +18,81 @@ under the License. --> - <div id="ecom-header"> - <div id="left"> - <#if sessionAttributes.overrideLogo??> - <img src="<@ofbizContentUrl>${sessionAttributes.overrideLogo}</@ofbizContentUrl>" alt="Logo"/> - <#elseif catalogHeaderLogo??> - <img src="<@ofbizContentUrl>${catalogHeaderLogo}</@ofbizContentUrl>" alt="Logo"/> - <#elseif layoutSettings.VT_HDR_IMAGE_URL?has_content> - <img src="<@ofbizContentUrl>${layoutSettings.VT_HDR_IMAGE_URL.get(0)}</@ofbizContentUrl>" alt="Logo"/> - </#if> - </div> - <div id="right"> - ${screens.render("component://ecommerce/widget/CartScreens.xml#microcart")} - </div> - <div id="middle"> - <#if !productStore??> - <h2>${uiLabelMap.EcommerceNoProductStore}</h2> - </#if> - <#if (productStore.title)??><div id="company-name">${productStore.title}</div></#if> - <#if (productStore.subtitle)??><div id="company-subtitle">${productStore.subtitle}</div></#if> - <div id="welcome-message"> - <#if sessionAttributes.autoName?has_content> - ${uiLabelMap.CommonWelcome} ${sessionAttributes.autoName?html}! - (${uiLabelMap.CommonNotYou}? <a href="<@ofbizUrl>autoLogout</@ofbizUrl>" class="linktext">${uiLabelMap.CommonClickHere}</a>) - <#else> - ${uiLabelMap.CommonWelcome}! - </#if> - </div> - </div> +<div id="ecom-header"> + <div id="left"> + <#if sessionAttributes.overrideLogo??> + <img src="<@ofbizContentUrl>${sessionAttributes.overrideLogo}</@ofbizContentUrl>" alt="Logo"/> + <#elseif catalogHeaderLogo??> + <img src="<@ofbizContentUrl>${catalogHeaderLogo}</@ofbizContentUrl>" alt="Logo"/> + <#elseif layoutSettings.VT_HDR_IMAGE_URL?has_content> + <img src="<@ofbizContentUrl>${layoutSettings.VT_HDR_IMAGE_URL.get(0)}</@ofbizContentUrl>" alt="Logo"/> + </#if> </div> + <div id="right"> + ${screens.render("component://ecommerce/widget/CartScreens.xml#microcart")} + </div> + <div id="middle"> + <#if !productStore??> + <h2>${uiLabelMap.EcommerceNoProductStore}</h2> + </#if> + <#if (productStore.title)??> + <div id="company-name">${productStore.title}</div> + </#if> + <#if (productStore.subtitle)??> + <div id="company-subtitle">${productStore.subtitle}</div> + </#if> + <div id="welcome-message"> + <#if sessionAttributes.autoName?has_content> + ${uiLabelMap.CommonWelcome} ${sessionAttributes.autoName?html}! + (${uiLabelMap.CommonNotYou}? + <a href="<@ofbizUrl>autoLogout</@ofbizUrl>" class="linktext">${uiLabelMap.CommonClickHere}</a>) + <#else> + ${uiLabelMap.CommonWelcome}! + </#if> + </div> + </div> +</div> - <div id="ecom-header-bar"> - <ul id="left-links"> - <#if userLogin?has_content && userLogin.userLoginId != "anonymous"> - <li id="header-bar-logout"><a href="<@ofbizUrl>logout</@ofbizUrl>">${uiLabelMap.CommonLogout}</a></li> - <#else> - <li id="header-bar-login"><a href="<@ofbizUrl>${checkLoginUrl}</@ofbizUrl>">${uiLabelMap.CommonLogin}</a></li> - <li id="header-bar-register"><a href="<@ofbizUrl>newcustomer</@ofbizUrl>">${uiLabelMap.EcommerceRegister}</a></li> - </#if> - <li id="header-bar-contactus"> - <#if userLogin?has_content && userLogin.userLoginId != "anonymous"> - <a href="<@ofbizUrl>contactus</@ofbizUrl>">${uiLabelMap.CommonContactUs}</a></li> - <#else> - <a href="<@ofbizUrl>AnonContactus</@ofbizUrl>">${uiLabelMap.CommonContactUs}</a></li> - </#if> - <li id="header-bar-main"><a href="<@ofbizUrl>main</@ofbizUrl>">${uiLabelMap.CommonMain}</a></li> - </ul> - <ul id="right-links"> - <!-- NOTE: these are in reverse order because they are stacked right to left instead of left to right --> - <#if !userLogin?has_content || (userLogin.userLoginId)! != "anonymous"> - <li id="header-bar-viewprofile"><a href="<@ofbizUrl>viewprofile</@ofbizUrl>">${uiLabelMap.CommonProfile}</a></li> - <li id="header-bar-ListMessages"><a href="<@ofbizUrl>messagelist</@ofbizUrl>">${uiLabelMap.CommonMessages}</a></li> - <li id="header-bar-ListQuotes"><a href="<@ofbizUrl>ListQuotes</@ofbizUrl>">${uiLabelMap.OrderOrderQuotes}</a></li> - <li id="header-bar-ListRequests"><a href="<@ofbizUrl>ListRequests</@ofbizUrl>">${uiLabelMap.OrderRequests}</a></li> - <li id="header-bar-editShoppingList"><a href="<@ofbizUrl>editShoppingList</@ofbizUrl>">${uiLabelMap.EcommerceShoppingLists}</a></li> - <li id="header-bar-orderhistory"><a href="<@ofbizUrl>orderhistory</@ofbizUrl>">${uiLabelMap.EcommerceOrderHistory}</a></li> - </#if> - <#if catalogQuickaddUse> - <li id="header-bar-quickadd"><a href="<@ofbizUrl>quickadd</@ofbizUrl>">${uiLabelMap.CommonQuickAdd}</a></li> - </#if> - </ul> - </div> \ No newline at end of file +<div id="ecom-header-bar"> + <ul id="left-links"> + <#if userLogin?has_content && userLogin.userLoginId != "anonymous"> + <li id="header-bar-logout"><a href="<@ofbizUrl>logout</@ofbizUrl>">${uiLabelMap.CommonLogout}</a></li> + <#else> + <li id="header-bar-login"><a href="<@ofbizUrl>${checkLoginUrl}</@ofbizUrl>">${uiLabelMap.CommonLogin}</a></li> + <li id="header-bar-register"><a href="<@ofbizUrl>newcustomer</@ofbizUrl>">${uiLabelMap.EcommerceRegister}</a></li> + </#if> + <li id="header-bar-contactus"> + <#if userLogin?has_content && userLogin.userLoginId != "anonymous"> + <a href="<@ofbizUrl>contactus</@ofbizUrl>">${uiLabelMap.CommonContactUs}</a></li> + <#else> + <a href="<@ofbizUrl>AnonContactus</@ofbizUrl>">${uiLabelMap.CommonContactUs}</a></li> + </#if> + <li id="header-bar-main"><a href="<@ofbizUrl>main</@ofbizUrl>">${uiLabelMap.CommonMain}</a></li> + </ul> + <ul id="right-links"> + <!-- NOTE: these are in reverse order because they are stacked right to left instead of left to right --> + <#if !userLogin?has_content || (userLogin.userLoginId)! != "anonymous"> + <li id="header-bar-viewprofile"> + <a href="<@ofbizUrl>viewprofile</@ofbizUrl>">${uiLabelMap.CommonProfile}</a> + </li> + <li id="header-bar-ListMessages"> + <a href="<@ofbizUrl>messagelist</@ofbizUrl>">${uiLabelMap.CommonMessages}</a> + </li> + <li id="header-bar-ListQuotes"> + <a href="<@ofbizUrl>ListQuotes</@ofbizUrl>">${uiLabelMap.OrderOrderQuotes}</a> + </li> + <li id="header-bar-ListRequests"> + <a href="<@ofbizUrl>ListRequests</@ofbizUrl>">${uiLabelMap.OrderRequests}</a> + </li> + <li id="header-bar-editShoppingList"> + <a href="<@ofbizUrl>editShoppingList</@ofbizUrl>">${uiLabelMap.EcommerceShoppingLists}</a> + </li> + <li id="header-bar-orderhistory"> + <a href="<@ofbizUrl>orderhistory</@ofbizUrl>">${uiLabelMap.EcommerceOrderHistory}</a> + </li> + </#if> + <#if catalogQuickaddUse> + <li id="header-bar-quickadd"><a href="<@ofbizUrl>quickadd</@ofbizUrl>">${uiLabelMap.CommonQuickAdd}</a></li> + </#if> + </ul> +</div> \ No newline at end of file Modified: ofbiz/trunk/specialpurpose/ecommerce/template/includes/HeaderHead.ftl URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/ecommerce/template/includes/HeaderHead.ftl?rev=1761135&r1=1761134&r2=1761135&view=diff ============================================================================== --- ofbiz/trunk/specialpurpose/ecommerce/template/includes/HeaderHead.ftl (original) +++ ofbiz/trunk/specialpurpose/ecommerce/template/includes/HeaderHead.ftl Sat Sep 17 07:17:15 2016 @@ -19,40 +19,47 @@ under the License. <#assign docLangAttr = locale.toString()?replace("_", "-")> <#assign langDir = "ltr"> <#if "ar.iw"?contains(docLangAttr?substring(0, 2))> - <#assign langDir = "rtl"> + <#assign langDir = "rtl"> </#if> <html lang="${docLangAttr}" dir="${langDir}" xmlns="http://www.w3.org/1999/xhtml"> <head> <meta http-equiv="Content-Type" content="text/html; charset=UTF-8"/> - <title><#if title?has_content>${title}<#elseif titleProperty?has_content>${uiLabelMap.get(titleProperty)}</#if>: ${(productStore.storeName)!}</title> + <title><#if title?has_content>${title}<#elseif titleProperty?has_content>${uiLabelMap.get(titleProperty)}</#if> + : ${(productStore.storeName)!} + </title> <#if layoutSettings.VT_SHORTCUT_ICON?has_content> <#assign shortcutIcon = layoutSettings.VT_SHORTCUT_ICON.get(0)/> <#elseif layoutSettings.shortcutIcon?has_content> <#assign shortcutIcon = layoutSettings.shortcutIcon/> </#if> <#if shortcutIcon?has_content> - <link rel="shortcut icon" href="<@ofbizContentUrl>${StringUtil.wrapString(shortcutIcon)}</@ofbizContentUrl>" /> + <link rel="shortcut icon" href="<@ofbizContentUrl>${StringUtil.wrapString(shortcutIcon)}</@ofbizContentUrl>"/> </#if> <#if layoutSettings.styleSheets?has_content> - <#--layoutSettings.styleSheets is a list of style sheets. So, you can have a user-specified "main" style sheet, AND a component style sheet.--> + <#--layoutSettings.styleSheets is a list of style sheets. So, you can have a user-specified "main" style sheet, + AND a component style sheet.--> <#list layoutSettings.styleSheets as styleSheet> - <link rel="stylesheet" href="<@ofbizContentUrl>${StringUtil.wrapString(styleSheet)}</@ofbizContentUrl>" type="text/css"/> + <link rel="stylesheet" href="<@ofbizContentUrl>${StringUtil.wrapString(styleSheet)}</@ofbizContentUrl>" + type="text/css"/> </#list> </#if> <#if layoutSettings.VT_STYLESHEET?has_content> <#list layoutSettings.VT_STYLESHEET as styleSheet> - <link rel="stylesheet" href="<@ofbizContentUrl>${StringUtil.wrapString(styleSheet)}</@ofbizContentUrl>" type="text/css"/> + <link rel="stylesheet" href="<@ofbizContentUrl>${StringUtil.wrapString(styleSheet)}</@ofbizContentUrl>" + type="text/css"/> </#list> </#if> <#if layoutSettings.rtlStyleSheets?has_content && langDir == "rtl"> - <#--layoutSettings.rtlStyleSheets is a list of rtl style sheets.--> + <#--layoutSettings.rtlStyleSheets is a list of rtl style sheets.--> <#list layoutSettings.rtlStyleSheets as styleSheet> - <link rel="stylesheet" href="<@ofbizContentUrl>${StringUtil.wrapString(styleSheet)}</@ofbizContentUrl>" type="text/css"/> + <link rel="stylesheet" href="<@ofbizContentUrl>${StringUtil.wrapString(styleSheet)}</@ofbizContentUrl>" + type="text/css"/> </#list> </#if> <#if layoutSettings.VT_RTL_STYLESHEET?has_content && langDir == "rtl"> <#list layoutSettings.VT_RTL_STYLESHEET as styleSheet> - <link rel="stylesheet" href="<@ofbizContentUrl>${StringUtil.wrapString(styleSheet)}</@ofbizContentUrl>" type="text/css"/> + <link rel="stylesheet" href="<@ofbizContentUrl>${StringUtil.wrapString(styleSheet)}</@ofbizContentUrl>" + type="text/css"/> </#list> </#if> <#-- Append CSS for catalog --> @@ -65,17 +72,19 @@ under the License. </#if> <#if layoutSettings.VT_HDR_JAVASCRIPT?has_content> <#list layoutSettings.VT_HDR_JAVASCRIPT as javaScript> - <script type="text/javascript" src="<@ofbizContentUrl>${StringUtil.wrapString(javaScript)}</@ofbizContentUrl>"></script> + <script type="text/javascript" + src="<@ofbizContentUrl>${StringUtil.wrapString(javaScript)}</@ofbizContentUrl>"></script> </#list> </#if> <#if layoutSettings.javaScripts?has_content> - <#--layoutSettings.javaScripts is a list of java scripts. --> - <#-- use a Set to make sure each javascript is declared only once, but iterate the list to maintain the correct order --> + <#--layoutSettings.javaScripts is a list of java scripts. --> + <#-- use a Set to make sure each javascript is declared only once, but iterate the list to maintain the correct order --> <#assign javaScriptsSet = Static["org.apache.ofbiz.base.util.UtilMisc"].toSet(layoutSettings.javaScripts)/> <#list layoutSettings.javaScripts as javaScript> <#if javaScriptsSet.contains(javaScript)> <#assign nothing = javaScriptsSet.remove(javaScript)/> - <script type="text/javascript" src="<@ofbizContentUrl>${StringUtil.wrapString(javaScript)}</@ofbizContentUrl>"></script> + <script type="text/javascript" + src="<@ofbizContentUrl>${StringUtil.wrapString(javaScript)}</@ofbizContentUrl>"></script> </#if> </#list> </#if> @@ -87,7 +96,7 @@ under the License. </#if> <#-- Meta tags if defined by the page action --> - <meta name="generator" content="Apache OFBiz - eCommerce"/> + <meta name="generator" content="Apache OFBiz - eCommerce"/> <#if metaDescription??> <meta name="description" content="${metaDescription}"/> </#if> @@ -96,11 +105,11 @@ under the License. </#if> <#if webAnalyticsConfigs?has_content> <script language="JavaScript" type="text/javascript"> - <#list webAnalyticsConfigs as webAnalyticsConfig> - <#if webAnalyticsConfig.webAnalyticsTypeId != "BACKEND_ANALYTICS"> - ${StringUtil.wrapString(webAnalyticsConfig.webAnalyticsCode!)} - </#if> - </#list> + <#list webAnalyticsConfigs as webAnalyticsConfig> + <#if webAnalyticsConfig.webAnalyticsTypeId != "BACKEND_ANALYTICS"> + ${StringUtil.wrapString(webAnalyticsConfig.webAnalyticsCode!)} + </#if> + </#list> </script> </#if> </head> Modified: ofbiz/trunk/specialpurpose/ecommerce/template/includes/Language.ftl URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/ecommerce/template/includes/Language.ftl?rev=1761135&r1=1761134&r2=1761135&view=diff ============================================================================== --- ofbiz/trunk/specialpurpose/ecommerce/template/includes/Language.ftl (original) +++ ofbiz/trunk/specialpurpose/ecommerce/template/includes/Language.ftl Sat Sep 17 07:17:15 2016 @@ -34,9 +34,13 @@ under the License. <#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> + <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 +</div> Modified: ofbiz/trunk/specialpurpose/ecommerce/template/order/AnonymousCheckoutLinks.ftl URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/ecommerce/template/order/AnonymousCheckoutLinks.ftl?rev=1761135&r1=1761134&r2=1761135&view=diff ============================================================================== --- ofbiz/trunk/specialpurpose/ecommerce/template/order/AnonymousCheckoutLinks.ftl (original) +++ ofbiz/trunk/specialpurpose/ecommerce/template/order/AnonymousCheckoutLinks.ftl Sat Sep 17 07:17:15 2016 @@ -17,35 +17,53 @@ specific language governing permissions under the License. --> <script language="javascript" type="text/javascript"> -function submitForm(form) { - form.submit(); -} + function submitForm(form) { + form.submit(); + } </script> <div> - <a href="<@ofbizUrl>setCustomer</@ofbizUrl>" <#if callSubmitForm??>onclick="javascript:submitForm(document.${parameters.formNameValue!});"</#if>>Personal Info</a> - <#if (enableShippingAddress)??> - <a href="<@ofbizUrl>setShipping</@ofbizUrl>" <#if callSubmitForm??>onclick="javascript:submitForm(document.${parameters.formNameValue!});"</#if>>Shipping Address</a> - <#else> - <span class="buttontextdisabled">Shipping Address</span> - </#if> - <#if (enableShipmentMethod)??> - <a href="<@ofbizUrl>setShipOptions</@ofbizUrl>" <#if callSubmitForm??>onclick="javascript:submitForm(document.${parameters.formNameValue!});"</#if>>Shipping Options</a> - <#else> - <span class="buttontextdisabled">Shipping Options</span> - </#if> - <#if (enablePaymentOptions)??> - <a href="<@ofbizUrl>setPaymentOption</@ofbizUrl>" <#if callSubmitForm??>onclick="javascript:submitForm(document.${parameters.formNameValue!});"</#if>>Payment Options</a> - <#else> - <span class="buttontextdisabled">Payment Options</span> - </#if> - <#if (enablePaymentInformation)??> - <a href="<@ofbizUrl>setPaymentInformation?paymentMethodTypeId=${requestParameters.paymentMethodTypeId!}</@ofbizUrl>" <#if callSubmitForm??>onclick="javascript:submitForm(document.${parameters.formNameValue!});"</#if>>Payment Information</a> - <#else> - <span class="buttontextdisabled">Payment Information</span> - </#if> - <#if (enableReviewOrder)??> - <a href="<@ofbizUrl>reviewOrder</@ofbizUrl>" <#if callSubmitForm??>onclick="javascript:submitForm(document.${parameters.formNameValue!});"</#if>>Review Order</a> - <#else> - <span class="buttontextdisabled">Review Order</span> - </#if> + <a href="<@ofbizUrl>setCustomer</@ofbizUrl>" + <#if callSubmitForm??>onclick="javascript:submitForm(document.${parameters.formNameValue!});"</#if>> + Personal Info + </a> +<#if (enableShippingAddress)??> + <a href="<@ofbizUrl>setShipping</@ofbizUrl>" + <#if callSubmitForm??>onclick="javascript:submitForm(document.${parameters.formNameValue!});"</#if>> + Shipping Address + </a> +<#else> + <span class="buttontextdisabled">Shipping Address</span> +</#if> +<#if (enableShipmentMethod)??> + <a href="<@ofbizUrl>setShipOptions</@ofbizUrl>" + <#if callSubmitForm??>onclick="javascript:submitForm(document.${parameters.formNameValue!});"</#if>> + Shipping Options + </a> +<#else> + <span class="buttontextdisabled">Shipping Options</span> +</#if> +<#if (enablePaymentOptions)??> + <a href="<@ofbizUrl>setPaymentOption</@ofbizUrl>" + <#if callSubmitForm??>onclick="javascript:submitForm(document.${parameters.formNameValue!});"</#if>> + Payment Options + </a> +<#else> + <span class="buttontextdisabled">Payment Options</span> +</#if> +<#if (enablePaymentInformation)??> + <a href="<@ofbizUrl>setPaymentInformation?paymentMethodTypeId=${requestParameters.paymentMethodTypeId!}</@ofbizUrl>" + <#if callSubmitForm??>onclick="javascript:submitForm(document.${parameters.formNameValue!});"</#if>> + Payment Information + </a> +<#else> + <span class="buttontextdisabled">Payment Information</span> +</#if> +<#if (enableReviewOrder)??> + <a href="<@ofbizUrl>reviewOrder</@ofbizUrl>" + <#if callSubmitForm??>onclick="javascript:submitForm(document.${parameters.formNameValue!});"</#if>> + Review Order + </a> +<#else> + <span class="buttontextdisabled">Review Order</span> +</#if> </div> Modified: ofbiz/trunk/specialpurpose/ecommerce/template/order/AnonymousTrail.ftl URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/ecommerce/template/order/AnonymousTrail.ftl?rev=1761135&r1=1761134&r2=1761135&view=diff ============================================================================== --- ofbiz/trunk/specialpurpose/ecommerce/template/order/AnonymousTrail.ftl (original) +++ ofbiz/trunk/specialpurpose/ecommerce/template/order/AnonymousTrail.ftl Sat Sep 17 07:17:15 2016 @@ -17,4 +17,18 @@ specific language governing permissions under the License. --> -<#if shipAddr??><a href="<@ofbizUrl>setShipping</@ofbizUrl>" class="${trailClass.shipAddr}">${uiLabelMap.EcommerceChangeShippingAddress}</a><#if shipOptions??><a href="<@ofbizUrl>setShipOptions</@ofbizUrl>" class="${trailClass.shipOptions}">${uiLabelMap.EcommerceChangeShippingOptions}</a><#if billing??><a href="<@ofbizUrl>setBilling?resetType=Y</@ofbizUrl>" class="${trailClass.paymentType}">${uiLabelMap.EcommerceChangePaymentInfo}</a></#if></#if></#if> +<#if shipAddr??> + <a href="<@ofbizUrl>setShipping</@ofbizUrl>" class="${trailClass.shipAddr}"> + ${uiLabelMap.EcommerceChangeShippingAddress} + </a> + <#if shipOptions??> + <a href="<@ofbizUrl>setShipOptions</@ofbizUrl>" class="${trailClass.shipOptions}"> + ${uiLabelMap.EcommerceChangeShippingOptions} + </a> + <#if billing??> + <a href="<@ofbizUrl>setBilling?resetType=Y</@ofbizUrl>" class="${trailClass.paymentType}"> + ${uiLabelMap.EcommerceChangePaymentInfo} + </a> + </#if> + </#if> +</#if> |
«
Return to OFBiz - Commits
|
1 view|%1 views
| Free forum by Nabble | Edit this page |