svn commit: r921212 - /ofbiz/trunk/specialpurpose/ec
Locked
 
|
Author: doogie
Date: Wed Mar 10 02:43:50 2010 New Revision: 921212 URL: http://svn.apache.org/viewvc?rev=921212&view=rev Log: Fix all br to be proper xhtml. Modified: ofbiz/trunk/specialpurpose/ecommerce/templates/email/OrderNoticeEmail.ftl ofbiz/trunk/specialpurpose/ecommerce/templates/email/ShipmentNotificationEmail.ftl ofbiz/trunk/specialpurpose/ecommerce/templates/email/emailpayretry.ftl ofbiz/trunk/specialpurpose/ecommerce/templates/email/giftcardpurchase.ftl ofbiz/trunk/specialpurpose/ecommerce/templates/email/giftcardreload.ftl ofbiz/trunk/specialpurpose/ecommerce/templates/email/registration.ftl ofbiz/trunk/specialpurpose/ecommerce/templates/email/returnaccept.ftl ofbiz/trunk/specialpurpose/ecommerce/templates/email/returncancel.ftl ofbiz/trunk/specialpurpose/ecommerce/templates/email/returncomplete.ftl ofbiz/trunk/specialpurpose/ecommerce/templates/email/tellafriend.ftl Modified: ofbiz/trunk/specialpurpose/ecommerce/templates/email/OrderNoticeEmail.ftl URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/ecommerce/templates/email/OrderNoticeEmail.ftl?rev=921212&r1=921211&r2=921212&view=diff ============================================================================== --- ofbiz/trunk/specialpurpose/ecommerce/templates/email/OrderNoticeEmail.ftl (original) +++ ofbiz/trunk/specialpurpose/ecommerce/templates/email/OrderNoticeEmail.ftl Wed Mar 10 02:43:50 2010 @@ -135,7 +135,7 @@ under the License. <#if note?exists><p class="tabletext">${note}</p></#if> <#if orderHeader?exists> ${screens.render("component://ecommerce/widget/OrderScreens.xml#orderheader")} -<br/> +<br /> ${screens.render("component://ecommerce/widget/OrderScreens.xml#orderitems")} <#else> <h1>Order not found with ID [${orderId?if_exists}], or not allowed to view.</h1> Modified: ofbiz/trunk/specialpurpose/ecommerce/templates/email/ShipmentNotificationEmail.ftl URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/ecommerce/templates/email/ShipmentNotificationEmail.ftl?rev=921212&r1=921211&r2=921212&view=diff ============================================================================== --- ofbiz/trunk/specialpurpose/ecommerce/templates/email/ShipmentNotificationEmail.ftl (original) +++ ofbiz/trunk/specialpurpose/ecommerce/templates/email/ShipmentNotificationEmail.ftl Wed Mar 10 02:43:50 2010 @@ -21,7 +21,7 @@ under the License. <#if shipment?has_content> <div class="screenlet"> <div class="screenlet-title-bar"> - <div class="h3">${title?if_exists}<br/><br/></div> + <div class="h3">${title?if_exists}<br /><br /></div> </div> <table border="0" cellpadding="0" cellspacing="0"> <tbody> @@ -38,7 +38,7 @@ under the License. </#list> </tbody> </table> - <br/> + <br /> <div class="screenlet-title-bar"> <div class="h3"><b>${uiLabelMap.EcommerceShipmentItems}</b></div> </div> Modified: ofbiz/trunk/specialpurpose/ecommerce/templates/email/emailpayretry.ftl URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/ecommerce/templates/email/emailpayretry.ftl?rev=921212&r1=921211&r2=921212&view=diff ============================================================================== --- ofbiz/trunk/specialpurpose/ecommerce/templates/email/emailpayretry.ftl (original) +++ ofbiz/trunk/specialpurpose/ecommerce/templates/email/emailpayretry.ftl Wed Mar 10 02:43:50 2010 @@ -17,13 +17,13 @@ specific language governing permissions under the License. --> -<BR> +<br /> <#if orderHeader.statusId == "ORDER_REJECTED"> - ${uiLabelMap.OrderEmailProblemWithYourPaymentMethod} ${orderHeader.orderId}.<br/> - ${uiLabelMap.OrderEmailProblemCancelledNotProcessed}<br/> + ${uiLabelMap.OrderEmailProblemWithYourPaymentMethod} ${orderHeader.orderId}.<br /> + ${uiLabelMap.OrderEmailProblemCancelledNotProcessed}<br /> <#elseif orderHeader.statusId == "ORDER_APPROVED"> ${uiLabelMap.OrderEmailPaymentOK} ${orderHeader.orderId} ${uiLabelMap.OrderEmailAccepted} <#else> - ${uiLabelMap.OrderEmailSorry} ${orderHeader.orderId}.<br/> + ${uiLabelMap.OrderEmailSorry} ${orderHeader.orderId}.<br /> </#if> - <br/>${uiLabelMap.OrderEmailCustomerService} ([hidden email])<br/> <#-- Customer service email (not a variable why?) must be adapted - JLR 1/6/5 --> + <br />${uiLabelMap.OrderEmailCustomerService} ([hidden email])<br /> <#-- Customer service email (not a variable why?) must be adapted - JLR 1/6/5 --> Modified: ofbiz/trunk/specialpurpose/ecommerce/templates/email/giftcardpurchase.ftl URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/ecommerce/templates/email/giftcardpurchase.ftl?rev=921212&r1=921211&r2=921212&view=diff ============================================================================== --- ofbiz/trunk/specialpurpose/ecommerce/templates/email/giftcardpurchase.ftl (original) +++ ofbiz/trunk/specialpurpose/ecommerce/templates/email/giftcardpurchase.ftl Wed Mar 10 02:43:50 2010 @@ -23,16 +23,16 @@ under the License. --> <#if recipientName?exists>${recipientName},</#if> -<br/> +<br /> <#-- MyCompany.com (not a variable why?) must be adapted - JLR 1/6/5 --> ${uiLabelMap.EcommerceYouHaveBeenSent} MyCompany.com <#if senderName?exists> ${uiLabelMap.EcommerceGiftCardFrom} ${senderName}</#if>! -<br/><br/> +<br /><br /> <#if giftMessage?has_content> ${uiLabelMap.OrderGiftMessage} - <br/><br/> + <br /><br /> ${giftMessage} - <br/><br/> + <br /><br /> </#if> <pre> Modified: ofbiz/trunk/specialpurpose/ecommerce/templates/email/giftcardreload.ftl URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/ecommerce/templates/email/giftcardreload.ftl?rev=921212&r1=921211&r2=921212&view=diff ============================================================================== --- ofbiz/trunk/specialpurpose/ecommerce/templates/email/giftcardreload.ftl (original) +++ ofbiz/trunk/specialpurpose/ecommerce/templates/email/giftcardreload.ftl Wed Mar 10 02:43:50 2010 @@ -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/templates/email/registration.ftl URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/ecommerce/templates/email/registration.ftl?rev=921212&r1=921211&r2=921212&view=diff ============================================================================== --- ofbiz/trunk/specialpurpose/ecommerce/templates/email/registration.ftl (original) +++ ofbiz/trunk/specialpurpose/ecommerce/templates/email/registration.ftl Wed Mar 10 02:43:50 2010 @@ -20,16 +20,16 @@ under the License. <#-- All fields from Person and UserLogin are available to this template --> ${person.firstName}, -<br/><br/> +<br /><br /> ${uiLabelMap.EcommerceThankForRegistering} MyStore.com. <#-- MyStore.com (not a variable why?) must be adapted - JLR 1/6/5 --> -<br/><br/><br/> +<br /><br /><br /> -${uiLabelMap.EcommerceAccountLogin} ${userLogin.userLoginId}<br/> -${uiLabelMap.EcommercePassword}<br/><br/> +${uiLabelMap.EcommerceAccountLogin} ${userLogin.userLoginId}<br /> +${uiLabelMap.EcommercePassword}<br /><br /> -${uiLabelMap.EcommerceLosePassword}<br/><br/> +${uiLabelMap.EcommerceLosePassword}<br /><br /> -${uiLabelMap.EcommerceThankYou},<br/> +${uiLabelMap.EcommerceThankYou},<br /> MyStore.com <#-- MyStore.com (not a variable why?) must be adapted - JLR 1/6/5 --> -<br/><br/> +<br /><br /> Modified: ofbiz/trunk/specialpurpose/ecommerce/templates/email/returnaccept.ftl URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/ecommerce/templates/email/returnaccept.ftl?rev=921212&r1=921211&r2=921212&view=diff ============================================================================== --- ofbiz/trunk/specialpurpose/ecommerce/templates/email/returnaccept.ftl (original) +++ ofbiz/trunk/specialpurpose/ecommerce/templates/email/returnaccept.ftl Wed Mar 10 02:43:50 2010 @@ -18,9 +18,9 @@ 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")?if_exists> @@ -28,7 +28,7 @@ ${uiLabelMap.EcommerceReturnRequest} ${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/templates/email/returncancel.ftl URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/ecommerce/templates/email/returncancel.ftl?rev=921212&r1=921211&r2=921212&view=diff ============================================================================== --- ofbiz/trunk/specialpurpose/ecommerce/templates/email/returncancel.ftl (original) +++ ofbiz/trunk/specialpurpose/ecommerce/templates/email/returncancel.ftl Wed Mar 10 02:43:50 2010 @@ -19,6 +19,6 @@ under the License. <#-- ReturnHeader and a List of ReturnItem records is available to this template --> -<br/> +<br /> ${uiLabelMap.EcommerceReturnRequestNb} ${returnHeader.returnId} ${uiLabelMap.EcommerceReturnRequestCancelled} -<br/> +<br /> Modified: ofbiz/trunk/specialpurpose/ecommerce/templates/email/returncomplete.ftl URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/ecommerce/templates/email/returncomplete.ftl?rev=921212&r1=921211&r2=921212&view=diff ============================================================================== --- ofbiz/trunk/specialpurpose/ecommerce/templates/email/returncomplete.ftl (original) +++ ofbiz/trunk/specialpurpose/ecommerce/templates/email/returncomplete.ftl Wed Mar 10 02:43:50 2010 @@ -19,6 +19,6 @@ under the License. <#-- ReturnHeader and a List of ReturnItem records is available to this template --> -<br/> +<br /> ${uiLabelMap.EcommerceReturnRequestNb} ${returnHeader.returnId} ${uiLabelMap.EcommerceReturnRequestCompleted} -<br/> +<br /> Modified: ofbiz/trunk/specialpurpose/ecommerce/templates/email/tellafriend.ftl URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/ecommerce/templates/email/tellafriend.ftl?rev=921212&r1=921211&r2=921212&view=diff ============================================================================== --- ofbiz/trunk/specialpurpose/ecommerce/templates/email/tellafriend.ftl (original) +++ ofbiz/trunk/specialpurpose/ecommerce/templates/email/tellafriend.ftl Wed Mar 10 02:43:50 2010 @@ -20,11 +20,11 @@ under the License. <head></head> <body> ${sendTo}, -<br/> +<br /> ${sendFrom} ${uiLabelMap.EcommerceFollowingMessage} -<br/><br/> +<br /><br /> <b>${message}</b> -<br/><br/> +<br /><br /> <a href="${pageUrl}">${pageUrl}</a> </body> </html> |
«
Return to OFBiz - Commits
|
1 view|%1 views
| Free forum by Nabble | Edit this page |