svn commit: r1746691 - in /ofbiz/trunk: applications/accounting/template/reports/ applications/content/template/survey/ applications/order/template/entry/ applications/order/template/entry/catalog/ applications/order/template/return/ applications/party...

[Deepak Dixit-5]

Author: deepak
Date: Fri Jun  3 08:59:56 2016
New Revision: 1746691

URL: http://svn.apache.org/viewvc?rev=1746691&view=rev
Log:
(OFBIZ-7164) Fix typo in freemarker else tag.

Modified:
    ofbiz/trunk/applications/accounting/template/reports/SalesInvoiceByProductCategorySummary.ftl
    ofbiz/trunk/applications/content/template/survey/EditSurveyQuestions.ftl
    ofbiz/trunk/applications/content/template/survey/GenericSurvey.ftl
    ofbiz/trunk/applications/order/template/entry/CheckoutOptions.ftl
    ofbiz/trunk/applications/order/template/entry/CustomerTaxInfo.ftl
    ofbiz/trunk/applications/order/template/entry/catalog/CompareProducts.ftl
    ofbiz/trunk/applications/order/template/entry/catalog/CompareProductsList.ftl
    ofbiz/trunk/applications/order/template/entry/catalog/ProductDetail.ftl
    ofbiz/trunk/applications/order/template/return/ReturnReportContactMechs.fo.ftl
    ofbiz/trunk/applications/party/template/visit/VisitDetail.ftl
    ofbiz/trunk/applications/product/template/facility/PicklistManage.ftl
    ofbiz/trunk/applications/product/template/find/FindProductById.ftl
    ofbiz/trunk/applications/product/template/inventory/ReceiveInventory.ftl
    ofbiz/trunk/applications/product/template/shipment/PackingSlip.fo.ftl
    ofbiz/trunk/framework/common/template/portal/ListPortalPortlets.ftl
    ofbiz/trunk/framework/common/template/portal/ShowPortlet.ftl
    ofbiz/trunk/framework/webtools/template/artifactinfo/ArtifactInfo.ftl
    ofbiz/trunk/framework/webtools/template/entity/ViewGeneric.ftl
    ofbiz/trunk/framework/widget/templates/HtmlTreeMacroLibrary.ftl
    ofbiz/trunk/specialpurpose/ecommerce/template/cart/MicroCart.ftl
    ofbiz/trunk/specialpurpose/ecommerce/template/customer/MessageList.ftl
    ofbiz/trunk/specialpurpose/ecommerce/template/customer/NewCustomer.ftl
    ofbiz/trunk/specialpurpose/ecommerce/template/includes/Header.ftl
    ofbiz/trunk/specialpurpose/ecommerce/template/order/CheckoutShippingOptions.ftl
    ofbiz/trunk/specialpurpose/ecommerce/template/quote/CreateOrderQuote.ftl
    ofbiz/trunk/themes/flatgrey/template/Header.ftl
    ofbiz/trunk/themes/multiflex/template/Header.ftl

Modified: ofbiz/trunk/applications/accounting/template/reports/SalesInvoiceByProductCategorySummary.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/template/reports/SalesInvoiceByProductCategorySummary.ftl?rev=1746691&r1=1746690&r2=1746691&view=diff
==============================================================================
--- ofbiz/trunk/applications/accounting/template/reports/SalesInvoiceByProductCategorySummary.ftl (original)
+++ ofbiz/trunk/applications/accounting/template/reports/SalesInvoiceByProductCategorySummary.ftl Fri Jun  3 08:59:56 2016
@@ -19,8 +19,8 @@ under the License.
 
 <#macro resultSummary resultMap>
     <#if resultMap?has_content>
-        ${resultMap.quantityTotal?default(0)}:${resultMap.amountTotal?default(0)}:<#if (resultMap.quantityTotal?? && resultMap.quantityTotal > 0)>${resultMap.amountTotal/resultMap.quantityTotal}<#else/>0</#if>
-    <#else/>
+        ${resultMap.quantityTotal?default(0)}:${resultMap.amountTotal?default(0)}:<#if (resultMap.quantityTotal?? && resultMap.quantityTotal > 0)>${resultMap.amountTotal/resultMap.quantityTotal}<#else>0</#if>
+    <#else>
         0:0:0
     </#if>
 </#macro>

Modified: ofbiz/trunk/applications/content/template/survey/EditSurveyQuestions.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/content/template/survey/EditSurveyQuestions.ftl?rev=1746691&r1=1746690&r2=1746691&view=diff
==============================================================================
--- ofbiz/trunk/applications/content/template/survey/EditSurveyQuestions.ftl (original)
+++ ofbiz/trunk/applications/content/template/survey/EditSurveyQuestions.ftl Fri Jun  3 08:59:56 2016
@@ -50,7 +50,7 @@ under the License.
           <#assign currentSurveyMultiResp = surveyQuestionAndAppl.getRelatedOne("SurveyMultiResp", true)!/>
           <#if currentSurveyMultiResp?has_content>
             <#assign currentSurveyMultiRespColumns = currentSurveyMultiResp.getRelated("SurveyMultiRespColumn", null, null, false)/>
-          <#else/>
+          <#else>
             <#assign currentSurveyMultiRespColumns = []/>
           </#if>
           
@@ -102,7 +102,7 @@ under the License.
                   </#list>
                 </select>
               </td>
-              <#else/>
+              <#else>
                 <td><input type="text" name="surveyMultiRespColId" size="4" value="${surveyQuestionAndAppl.surveyMultiRespColId!}"/></td>
               </#if>
               <td>

Modified: ofbiz/trunk/applications/content/template/survey/GenericSurvey.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/content/template/survey/GenericSurvey.ftl?rev=1746691&r1=1746690&r2=1746691&view=diff
==============================================================================
--- ofbiz/trunk/applications/content/template/survey/GenericSurvey.ftl (original)
+++ ofbiz/trunk/applications/content/template/survey/GenericSurvey.ftl Fri Jun  3 08:59:56 2016
@@ -27,7 +27,7 @@ under the License.
 <#macro renderSurveyQuestionRequired surveyQuestionAndAppl>
   <#if surveyQuestionAndAppl.requiredField?default("N") == "Y">
     <span>*[required]</span>
-  <#else/>
+  <#else>
     <span>[optional]</span>
   </#if>
 </#macro>
@@ -133,7 +133,7 @@ under the License.
     <select name="${questionFieldName}">
       ${screens.render("component://common/widget/CommonScreens.xml#countries")}
     </select>
-  <#else/>
+  <#else>
     <div>Unsupported question type : ${surveyQuestionAndAppl.surveyQuestionTypeId}</div>
   </#if>
 </#macro>
@@ -185,7 +185,7 @@ under the License.
         <#assign closeMultiRespHeader = true/>
       </#if>
       <#assign lastSurveyMultiRespId = surveyMultiResp.surveyMultiRespId/>
-    <#else/>
+    <#else>
       <#if lastSurveyMultiRespId?has_content><#assign closeMultiRespHeader = true/></#if>
       <#assign lastSurveyMultiRespId = ""/>
     </#if>
@@ -229,14 +229,14 @@ under the License.
             if there is a surveyMultiRespColId on the surveyQuestionAndAppl use the corresponding surveyQuestionId;
             these should be in the same order as the surveyQuestionAndAppls List, so just see if it matches the first in the list
           -->
-          <#if sqaaWithColIdList?has_content><#assign nextSqaaWithColId = sqaaWithColIdList?first/><#else/><#assign nextSqaaWithColId = []></#if>
+          <#if sqaaWithColIdList?has_content><#assign nextSqaaWithColId = sqaaWithColIdList?first/><#else><#assign nextSqaaWithColId = []></#if>
           <#if surveyQuestionAndAppl.surveyMultiRespColId?has_content &&
               nextSqaaWithColId?has_content &&
               nextSqaaWithColId.surveyMultiRespColId = surveyMultiRespColumn.surveyMultiRespColId>
             <#assign dummySqaaWithColId = Static["org.ofbiz.base.util.UtilMisc"].removeFirst(sqaaWithColIdList)/>
             <#assign changed = alreadyShownSqaaPkWithColId.add(nextSqaaWithColId.getPrimaryKey())/>
             <#assign questionFieldName = "answers_" + nextSqaaWithColId.surveyQuestionId + "_" + surveyMultiRespColumn.surveyMultiRespColId/>
-          <#else/>
+          <#else>
             <#assign questionFieldName = "answers_" + surveyQuestionAndAppl.surveyQuestionId + "_" + surveyMultiRespColumn.surveyMultiRespColId/>
           </#if>
           <@renderSurveyQuestionInput surveyQuestionAndAppl=surveyQuestionAndAppl questionFieldName=questionFieldName/>
@@ -246,7 +246,7 @@ under the License.
         <@renderSurveyQuestionRequired surveyQuestionAndAppl=surveyQuestionAndAppl/>
       </td>
     </tr>
-  <#else/>
+  <#else>
     <#-- special formatting for select boxes -->
     <#assign align = "left"/>
     <#if surveyQuestionAndAppl?? && surveyQuestionAndAppl.surveyQuestionTypeId?has_content>
@@ -272,7 +272,7 @@ under the License.
         <td colspan="5"><div>${surveyQuestionAndAppl.question!}</div></td>
       <#elseif surveyQuestionAndAppl.surveyQuestionTypeId == "SEPERATOR_LINE"/>
         <td colspan="5"><hr /></td>
-      <#else/>
+      <#else>
         <#-- standard question options -->
         <td align="right">
           <@renderSurveyQuestionText surveyQuestionAndAppl=surveyQuestionAndAppl/>
@@ -301,6 +301,6 @@ under the License.
   <tr>
     <td>&nbsp;</td>
     <td>&nbsp;</td>
-    <td colspan="2"><input type="submit" class="smallSubmit" value="<#if survey.submitCaption?has_content>${survey.submitCaption}<#else/>Submit</#if>"/></td>
+    <td colspan="2"><input type="submit" class="smallSubmit" value="<#if survey.submitCaption?has_content>${survey.submitCaption}<#else>Submit</#if>"/></td>
   </tr>
 </table>

Modified: ofbiz/trunk/applications/order/template/entry/CheckoutOptions.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/template/entry/CheckoutOptions.ftl?rev=1746691&r1=1746690&r2=1746691&view=diff
==============================================================================
--- ofbiz/trunk/applications/order/template/entry/CheckoutOptions.ftl (original)
+++ ofbiz/trunk/applications/order/template/entry/CheckoutOptions.ftl Fri Jun  3 08:59:56 2016
@@ -219,7 +219,7 @@ function submitForm(form, mode, value) {
                     </td>
                   </tr>
                   <tr><td colspan="2"><hr /></td></tr>
-                 <#else/>
+                 <#else>
                     <input type="hidden" name="shipping_method" value="NO_SHIPPING@_NA_"/>
                     <input type="hidden" name="may_split" value="false"/>
                     <input type="hidden" name="is_gift" value="false"/>
@@ -257,7 +257,7 @@ function submitForm(form, mode, value) {
                       <textarea cols="30" rows="3" wrap="hard" name="gift_message">${shoppingCart.getGiftMessage()!}</textarea>
                     </td>
                   </tr>
-                  <#else/>
+                  <#else>
                   <input type="hidden" name="is_gift" value="false"/>
                   </#if>
                  </#if>

Modified: ofbiz/trunk/applications/order/template/entry/CustomerTaxInfo.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/template/entry/CustomerTaxInfo.ftl?rev=1746691&r1=1746690&r2=1746691&view=diff
==============================================================================
--- ofbiz/trunk/applications/order/template/entry/CustomerTaxInfo.ftl (original)
+++ ofbiz/trunk/applications/order/template/entry/CustomerTaxInfo.ftl Fri Jun  3 08:59:56 2016
@@ -35,7 +35,7 @@ under the License.
 
         <#if productStore.showTaxIsExempt?default("Y") == "Y">
         <span>${uiLabelMap.PartyTaxIsExempt} </span><input type="checkbox" name="isExempt" value="Y"/>
-        <#else/>
+        <#else>
         <input type="hidden" name="isExempt" value="N"/>
         </#if>
     </div>

Modified: ofbiz/trunk/applications/order/template/entry/catalog/CompareProducts.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/template/entry/catalog/CompareProducts.ftl?rev=1746691&r1=1746690&r2=1746691&view=diff
==============================================================================
--- ofbiz/trunk/applications/order/template/entry/catalog/CompareProducts.ftl (original)
+++ ofbiz/trunk/applications/order/template/entry/catalog/CompareProducts.ftl Fri Jun  3 08:59:56 2016
@@ -67,7 +67,7 @@ under the License.
     <#-- check to see if the product requires an amount -->
     <#elseif product.requireAmount?? && product.requireAmount == "Y"/>
                 <a href="javascript:doGetViaParent('${productUrl}');" class="buttontext">${uiLabelMap.OrderChooseAmount}...</a>
-    <#else/>
+    <#else>
                 <form method="post" action="<@ofbizUrl secure="${request.isSecure()?string}">additem</@ofbizUrl>" name="compareFormAdd${product_index}">
                     <input type="hidden" name="add_product_id" value="${product.productId}"/>
                     <input type="text" size="5" name="quantity" value="1"/>
@@ -171,7 +171,7 @@ under the License.
     <#-- check to see if the product requires an amount -->
     <#elseif product.requireAmount?? && product.requireAmount == "Y"/>
                 <a href="javascript:doGetViaParent('${productUrl}');" class="buttontext">${uiLabelMap.OrderChooseAmount}...</a>
-    <#else/>
+    <#else>
                 <form method="post" action="<@ofbizUrl secure="${request.isSecure()?string}">additem</@ofbizUrl>" name="compare2FormAdd${product_index}">
                     <input type="hidden" name="add_product_id" value="${product.productId}"/>
                     <input type="text" size="5" name="quantity" value="1"/>

Modified: ofbiz/trunk/applications/order/template/entry/catalog/CompareProductsList.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/template/entry/catalog/CompareProductsList.ftl?rev=1746691&r1=1746690&r2=1746691&view=diff
==============================================================================
--- ofbiz/trunk/applications/order/template/entry/catalog/CompareProductsList.ftl (original)
+++ ofbiz/trunk/applications/order/template/entry/catalog/CompareProductsList.ftl Fri Jun  3 08:59:56 2016
@@ -47,7 +47,7 @@ under the License.
   <div>
     <a href="javascript:popUp('<@ofbizUrl secure="${request.isSecure()?string}">compareProducts</@ofbizUrl>', 'compareProducts', '650', '750')" class="buttontext">${uiLabelMap.ProductCompareProducts}</a>
   </div>
-<#else/>
+<#else>
   <div>
     ${uiLabelMap.ProductNoProductsToCompare}
   </div>

Modified: ofbiz/trunk/applications/order/template/entry/catalog/ProductDetail.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/template/entry/catalog/ProductDetail.ftl?rev=1746691&r1=1746690&r2=1746691&view=diff
==============================================================================
--- ofbiz/trunk/applications/order/template/entry/catalog/ProductDetail.ftl (original)
+++ ofbiz/trunk/applications/order/template/entry/catalog/ProductDetail.ftl Fri Jun  3 08:59:56 2016
@@ -543,7 +543,7 @@ ${virtualJavaScript!}
                       <td><input type="text" size="5" name="quantity" value="1"/></td>
                   </tr>
                 </table>
-            <#else/>
+            <#else>
                 <input type="text" size="5" name="quantity" value="1"<#if product.isVirtual!?upper_case == "Y"> disabled="disabled"</#if>/>
             </#if>
             <#-- This calls addItem() so that variants of virtual products cant be added before distinguishing features are selected, it should not be changed to additemSubmit() -->

Modified: ofbiz/trunk/applications/order/template/return/ReturnReportContactMechs.fo.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/template/return/ReturnReportContactMechs.fo.ftl?rev=1746691&r1=1746690&r2=1746691&view=diff
==============================================================================
--- ofbiz/trunk/applications/order/template/return/ReturnReportContactMechs.fo.ftl (original)
+++ ofbiz/trunk/applications/order/template/return/ReturnReportContactMechs.fo.ftl Fri Jun  3 08:59:56 2016
@@ -34,7 +34,7 @@ under the License.
               <fo:table-body>
                 <fo:table-row><fo:table-cell border-style="solid" border-width="0.2pt" padding="1mm"><fo:block font-weight="bold">${uiLabelMap.OrderReturnFromAddress}</fo:block></fo:table-cell></fo:table-row>
                 <fo:table-row><fo:table-cell padding="1mm">
-                  <fo:block white-space-collapse="false"><#if fromPartyNameResult.fullName?has_content>${fromPartyNameResult.fullName}<#else/><#if postalAddressFrom??><#if (postalAddressFrom.toName)?has_content>${postalAddressFrom.toName}</#if><#if (postalAddressFrom.attnName)?has_content>
+                  <fo:block white-space-collapse="false"><#if fromPartyNameResult.fullName?has_content>${fromPartyNameResult.fullName}<#else><#if postalAddressFrom??><#if (postalAddressFrom.toName)?has_content>${postalAddressFrom.toName}</#if><#if (postalAddressFrom.attnName)?has_content>
 ${postalAddressFrom.attnName}</#if></#if></#if><#if postalAddressFrom??>
 ${postalAddressFrom.address1}<#if (postalAddressFrom.address2)?has_content>
 ${postalAddressFrom.address2}</#if>
@@ -54,7 +54,7 @@ ${postalAddressFrom.city}<#if (postalAdd
               <fo:table-body>
                 <fo:table-row><fo:table-cell padding="1mm" border-style="solid" border-width="0.2pt"><fo:block font-weight="bold">${uiLabelMap.OrderReturnToAddress}</fo:block></fo:table-cell></fo:table-row>
                 <fo:table-row><fo:table-cell padding="1mm">
-                  <fo:block white-space-collapse="false"><#if toPartyNameResult.fullName?has_content>${toPartyNameResult.fullName}<fo:block /><#else/><#if postalAddressTo??><#if (postalAddressTo.toName)?has_content>${postalAddressTo.toName}</#if><#if (postalAddressTo.attnName)?has_content>
+                  <fo:block white-space-collapse="false"><#if toPartyNameResult.fullName?has_content>${toPartyNameResult.fullName}<fo:block /><#else><#if postalAddressTo??><#if (postalAddressTo.toName)?has_content>${postalAddressTo.toName}</#if><#if (postalAddressTo.attnName)?has_content>
 ${postalAddressTo.attnName}</#if></#if></#if><#if postalAddressTo??>
 ${postalAddressTo.address1}<#if (postalAddressTo.address2)?has_content>
 ${postalAddressTo.address2}</#if>

Modified: ofbiz/trunk/applications/party/template/visit/VisitDetail.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/party/template/visit/VisitDetail.ftl?rev=1746691&r1=1746690&r2=1746691&view=diff
==============================================================================
--- ofbiz/trunk/applications/party/template/visit/VisitDetail.ftl (original)
+++ ofbiz/trunk/applications/party/template/visit/VisitDetail.ftl Fri Jun  3 08:59:56 2016
@@ -144,7 +144,7 @@ under the License.
           <#-- toggle the row color -->
           <#assign alt_row = !alt_row>
         </#list>
-        <#else/>
+        <#else>
           <tr>
             <td colspan="6">${uiLabelMap.PartyNoServerHitsFound}</td>
           </tr>

Modified: ofbiz/trunk/applications/product/template/facility/PicklistManage.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/template/facility/PicklistManage.ftl?rev=1746691&r1=1746690&r2=1746691&view=diff
==============================================================================
--- ofbiz/trunk/applications/product/template/facility/PicklistManage.ftl (original)
+++ ofbiz/trunk/applications/product/template/facility/PicklistManage.ftl Fri Jun  3 08:59:56 2016
@@ -256,7 +256,7 @@ under the License.
           <hr />
         </#if>
       </#list>
-    <#else/>
+    <#else>
       <h3>${uiLabelMap.ProductNoPicksStarted}.</h3>
     </#if>
   </div>

Modified: ofbiz/trunk/applications/product/template/find/FindProductById.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/template/find/FindProductById.ftl?rev=1746691&r1=1746690&r2=1746691&view=diff
==============================================================================
--- ofbiz/trunk/applications/product/template/find/FindProductById.ftl (original)
+++ ofbiz/trunk/applications/product/template/find/FindProductById.ftl Fri Jun  3 08:59:56 2016
@@ -31,7 +31,7 @@ under the License.
         <#if !goodIdentifications?has_content && !idProduct?has_content>
           <br />
           <h2>&nbsp;${uiLabelMap.ProductNoResultsFound}.</h2>
-        <#else/>
+        <#else>
           <table cellspacing="0" class="basic-table">
             <#assign rowClass = "1">
             <#if idProduct?has_content>

Modified: ofbiz/trunk/applications/product/template/inventory/ReceiveInventory.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/template/inventory/ReceiveInventory.ftl?rev=1746691&r1=1746690&r2=1746691&view=diff
==============================================================================
--- ofbiz/trunk/applications/product/template/inventory/ReceiveInventory.ftl (original)
+++ ofbiz/trunk/applications/product/template/inventory/ReceiveInventory.ftl Fri Jun  3 08:59:56 2016
@@ -363,7 +363,7 @@ under the License.
                 <tr>
                   <td colspan="2">${uiLabelMap.ProductNoItemsPoReceive}.</td>
                 </tr>
-              <#else/>
+              <#else>
                 <tr>
                   <td>
                     <h3>${uiLabelMap.ProductReceivePurchaseOrder} #${purchaseOrder.orderId}</h3>

Modified: ofbiz/trunk/applications/product/template/shipment/PackingSlip.fo.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/template/shipment/PackingSlip.fo.ftl?rev=1746691&r1=1746690&r2=1746691&view=diff
==============================================================================
--- ofbiz/trunk/applications/product/template/shipment/PackingSlip.fo.ftl (original)
+++ ofbiz/trunk/applications/product/template/shipment/PackingSlip.fo.ftl Fri Jun  3 08:59:56 2016
@@ -119,7 +119,7 @@ under the License.
                                 <fo:table-cell padding="2pt" background-color="${rowColor}">
                                     <#if line.product?has_content>
                                         <fo:block>${line.product.internalName?default("Internal Name Not Set!")} [${line.product.productId}]</fo:block>
-                                    <#else/>
+                                    <#else>
                                         <fo:block>${line.getClass().getName()}&nbsp;</fo:block>
                                     </#if>
                                 </fo:table-cell>

Modified: ofbiz/trunk/framework/common/template/portal/ListPortalPortlets.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/common/template/portal/ListPortalPortlets.ftl?rev=1746691&r1=1746690&r2=1746691&view=diff
==============================================================================
--- ofbiz/trunk/framework/common/template/portal/ListPortalPortlets.ftl (original)
+++ ofbiz/trunk/framework/common/template/portal/ListPortalPortlets.ftl Fri Jun  3 08:59:56 2016
@@ -63,7 +63,7 @@ under the License.
         <#assign leftColumn = !leftColumn/>
       </#list>
     </table>
-    <#else/>
+    <#else>
     <h2>${uiLabelMap.CommonNoPortletsInCategory}</h2>
   </#if>
   </div>

Modified: ofbiz/trunk/framework/common/template/portal/ShowPortlet.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/common/template/portal/ShowPortlet.ftl?rev=1746691&r1=1746690&r2=1746691&view=diff
==============================================================================
--- ofbiz/trunk/framework/common/template/portal/ShowPortlet.ftl (original)
+++ ofbiz/trunk/framework/common/template/portal/ShowPortlet.ftl Fri Jun  3 08:59:56 2016
@@ -26,6 +26,6 @@ under the License.
     </div>
   </td></tr>
 </table>
-<#else/>
+<#else>
 <h2>Portlet '${parameters.portalPortletId!}' not found. You may not have the necessary seed or other data for it.</h2>
 </#if>

Modified: ofbiz/trunk/framework/webtools/template/artifactinfo/ArtifactInfo.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/webtools/template/artifactinfo/ArtifactInfo.ftl?rev=1746691&r1=1746690&r2=1746691&view=diff
==============================================================================
--- ofbiz/trunk/framework/webtools/template/artifactinfo/ArtifactInfo.ftl (original)
+++ ofbiz/trunk/framework/webtools/template/artifactinfo/ArtifactInfo.ftl Fri Jun  3 08:59:56 2016
@@ -75,7 +75,7 @@ under the License.
     </div>
     </#if>
 
-<#else/>
+<#else>
 
     <h1>${uiLabelMap.WebtoolsArtifactInfo} (${artifactInfo.getDisplayType()}): ${artifactInfo.getDisplayName()}</h1>
     <#if artifactInfo.getLocationURL()??>
@@ -136,7 +136,7 @@ under the License.
             <tr><td>Name</td><td>Type</td><td>Optional</td><td>Mode</td><td>Entity.field</td></tr>
         <#list artifactInfo.modelService.getAllParamNames() as paramName>
             <#assign modelParam = artifactInfo.modelService.getParam(paramName)/>
-            <tr><td>${modelParam.getName()}<#if modelParam.getInternal()> (internal)</#if></td><td>${modelParam.getType()}</td><td><#if modelParam.isOptional()>optional<#else/>required</#if></td><td>${modelParam.getMode()}</td><td>${modelParam.getEntityName()!}.${modelParam.getFieldName()!}</td></tr>
+            <tr><td>${modelParam.getName()}<#if modelParam.getInternal()> (internal)</#if></td><td>${modelParam.getType()}</td><td><#if modelParam.isOptional()>optional<#else>required</#if></td><td>${modelParam.getMode()}</td><td>${modelParam.getEntityName()!}.${modelParam.getFieldName()!}</td></tr>
         </#list>
         </table>
 

Modified: ofbiz/trunk/framework/webtools/template/entity/ViewGeneric.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/webtools/template/entity/ViewGeneric.ftl?rev=1746691&r1=1746690&r2=1746691&view=diff
==============================================================================
--- ofbiz/trunk/framework/webtools/template/entity/ViewGeneric.ftl (original)
+++ ofbiz/trunk/framework/webtools/template/entity/ViewGeneric.ftl Fri Jun  3 08:59:56 2016
@@ -256,7 +256,7 @@ function ShowTab(lname) {
             <#else>
               <#if "one" = relation.type>
               <b>${uiLabelMap.WebtoolsNoValueFoundFor}</b> ${relation.title}${relation.relatedTable}.
-              <#else/>
+              <#else>
               <a href="<@ofbizUrl>FindGeneric?${relation.encodeRelatedEntityFindString}&amp;find=true</@ofbizUrl>" class="buttontext">${uiLabelMap.CommonFind}</a>
               </#if>
             </#if>

Modified: ofbiz/trunk/framework/widget/templates/HtmlTreeMacroLibrary.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/widget/templates/HtmlTreeMacroLibrary.ftl?rev=1746691&r1=1746690&r2=1746691&view=diff
==============================================================================
--- ofbiz/trunk/framework/widget/templates/HtmlTreeMacroLibrary.ftl (original)
+++ ofbiz/trunk/framework/widget/templates/HtmlTreeMacroLibrary.ftl Fri Jun  3 08:59:56 2016
@@ -53,7 +53,7 @@ under the License.
 <#if name?has_content> name="${name}"</#if><#rt/>
 <#if title?has_content> title="${title}"</#if><#rt/>
 <#if targetWindow?has_content> target="${targetWindow}</#if><#if linkUrl?has_content> href="${linkUrl}"<#else> href="javascript:void(0);"</#if>><#rt/>
-<#if imgStr?has_content>${imgStr}<#elseif linkText?has_content/>${linkText}<#else/>&nbsp;</#if></a><#rt/>
+<#if imgStr?has_content>${imgStr}<#elseif linkText?has_content/>${linkText}<#else>&nbsp;</#if></a><#rt/>
 </#macro>
 
 <#macro renderImage src id style wid hgt border alt urlString>

Modified: ofbiz/trunk/specialpurpose/ecommerce/template/cart/MicroCart.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/ecommerce/template/cart/MicroCart.ftl?rev=1746691&r1=1746690&r2=1746691&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/ecommerce/template/cart/MicroCart.ftl (original)
+++ ofbiz/trunk/specialpurpose/ecommerce/template/cart/MicroCart.ftl Fri Jun  3 08:59:56 2016
@@ -26,7 +26,7 @@ under the License.
         <#if (shoppingCartSize > 0)>
             <p id="microCartNotEmpty">
                 ${uiLabelMap.EcommerceCartHas} <strong id="microCartQuantity">${shoppingCart.getTotalQuantity()}</strong>
-                <#if shoppingCart.getTotalQuantity() == 1>${uiLabelMap.OrderItem}<#else/>${uiLabelMap.OrderItems}</#if>,
+                <#if shoppingCart.getTotalQuantity() == 1>${uiLabelMap.OrderItem}<#else>${uiLabelMap.OrderItems}</#if>,
                 <strong id="microCartTotal"><@ofbizCurrency amount=shoppingCart.getDisplayGrandTotal() isoCode=shoppingCart.getCurrency()/></strong>
             </p>
             <span id="microCartEmpty" style="display:none">${uiLabelMap.OrderShoppingCartEmpty}</span>

Modified: ofbiz/trunk/specialpurpose/ecommerce/template/customer/MessageList.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/ecommerce/template/customer/MessageList.ftl?rev=1746691&r1=1746690&r2=1746691&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/ecommerce/template/customer/MessageList.ftl (original)
+++ ofbiz/trunk/specialpurpose/ecommerce/template/customer/MessageList.ftl Fri Jun  3 08:59:56 2016
@@ -20,12 +20,12 @@ under the License.
 <#macro showMessage communicationEvent isSentMessage index>
   <#if communicationEvent.partyIdFrom?has_content>
     <#assign partyNameFrom = Static["org.ofbiz.party.party.PartyHelper"].getPartyName(delegator, communicationEvent.partyIdFrom, true)>
-  <#else/>
+  <#else>
     <#assign partyNameFrom = "${uiLabelMap.CommonNA}">
   </#if>
   <#if communicationEvent.partyIdTo?has_content>
     <#assign partyNameTo = Static["org.ofbiz.party.party.PartyHelper"].getPartyName(delegator, communicationEvent.partyIdTo, true)>
-  <#else/>
+  <#else>
     <#assign partyNameTo = "${uiLabelMap.CommonNA}">
   </#if>
               <tr>
@@ -64,7 +64,7 @@ under the License.
         <table width="100%" border="0" cellpadding="1">
           <#if (!receivedCommunicationEvents?has_content && !sentCommunicationEvents?has_content)>
             <tr><td><div>${uiLabelMap.EcommerceNoMessages}.</div></td></tr>
-          <#else/>
+          <#else>
             <tr>
               <td><div class="tableheadtext">${uiLabelMap.CommonFrom}</div></td>
               <td><div class="tableheadtext">${uiLabelMap.CommonTo}</div></td>

Modified: ofbiz/trunk/specialpurpose/ecommerce/template/customer/NewCustomer.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/ecommerce/template/customer/NewCustomer.ftl?rev=1746691&r1=1746690&r2=1746691&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/ecommerce/template/customer/NewCustomer.ftl (original)
+++ ofbiz/trunk/specialpurpose/ecommerce/template/customer/NewCustomer.ftl Fri Jun  3 08:59:56 2016
@@ -385,7 +385,7 @@ will generally always be reserved for th
         <@fieldErrors fieldName="PASSWORD_HINT"/>
         <input type="text" class='inputBox' name="PASSWORD_HINT" id="PASSWORD_HINT" value="${requestParameters.PASSWORD_HINT!}" maxlength="100"/>
       </div>
-    <#else/>
+    <#else>
       <div>
         <label>${uiLabelMap.PartyReceivePasswordByEmail}.</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=1746691&r1=1746690&r2=1746691&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/ecommerce/template/includes/Header.ftl (original)
+++ ofbiz/trunk/specialpurpose/ecommerce/template/includes/Header.ftl Fri Jun  3 08:59:56 2016
@@ -41,7 +41,7 @@ under the License.
         <#if sessionAttributes.autoName?has_content>
           ${uiLabelMap.CommonWelcome}&nbsp;${sessionAttributes.autoName?html}!
           (${uiLabelMap.CommonNotYou}?&nbsp;<a href="<@ofbizUrl>autoLogout</@ofbizUrl>" class="linktext">${uiLabelMap.CommonClickHere}</a>)
-        <#else/>
+        <#else>
           ${uiLabelMap.CommonWelcome}!
         </#if>
       </div>
@@ -52,7 +52,7 @@ under the License.
     <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/>
+      <#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>

Modified: ofbiz/trunk/specialpurpose/ecommerce/template/order/CheckoutShippingOptions.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/ecommerce/template/order/CheckoutShippingOptions.ftl?rev=1746691&r1=1746690&r2=1746691&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/ecommerce/template/order/CheckoutShippingOptions.ftl (original)
+++ ofbiz/trunk/specialpurpose/ecommerce/template/order/CheckoutShippingOptions.ftl Fri Jun  3 08:59:56 2016
@@ -160,7 +160,7 @@ function submitForm(form, mode, value) {
                   <textarea class="textAreaBox" cols="30" rows="3" wrap="hard" name="gift_message">${shoppingCart.getGiftMessage()!}</textarea>
                 </td>
               </tr>
-              <#else/>
+              <#else>
               <input type="hidden" name="is_gift" value="false"/>
               </#if>
               <tr><td colspan="2"><hr /></td></tr>

Modified: ofbiz/trunk/specialpurpose/ecommerce/template/quote/CreateOrderQuote.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/ecommerce/template/quote/CreateOrderQuote.ftl?rev=1746691&r1=1746690&r2=1746691&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/ecommerce/template/quote/CreateOrderQuote.ftl (original)
+++ ofbiz/trunk/specialpurpose/ecommerce/template/quote/CreateOrderQuote.ftl Fri Jun  3 08:59:56 2016
@@ -21,7 +21,7 @@ under the License.
     <#if quote??>
         <#if quote.statusId == "QUO_APPROVED">
             <a href="<@ofbizUrl>loadCartFromQuote?quoteId=${quote.quoteId}&amp;finalizeMode=init</@ofbizUrl>" class="buttontext">${uiLabelMap.OrderCreateOrder}</a>
-        <#else/>
+        <#else>
             <span class="buttontextdisabled">${uiLabelMap.OrderCreateOrder}</span>
         </#if>
     </#if>

Modified: ofbiz/trunk/themes/flatgrey/template/Header.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/themes/flatgrey/template/Header.ftl?rev=1746691&r1=1746690&r2=1746691&view=diff
==============================================================================
--- ofbiz/trunk/themes/flatgrey/template/Header.ftl (original)
+++ ofbiz/trunk/themes/flatgrey/template/Header.ftl Fri Jun  3 08:59:56 2016
@@ -145,7 +145,7 @@ under the License.
               <li>${userLogin.userLoginId}</li>
             </#if>
             <li><a href="<@ofbizUrl>logout</@ofbizUrl>">${uiLabelMap.CommonLogout}</a></li>
-          <#else/>
+          <#else>
             <li>${uiLabelMap.CommonWelcome}! <a href="<@ofbizUrl>${checkLoginUrl}</@ofbizUrl>">${uiLabelMap.CommonLogin}</a></li>
           </#if>
           <#---if webSiteId?? && requestAttributes._CURRENT_VIEW_?? && helpTopic??-->

Modified: ofbiz/trunk/themes/multiflex/template/Header.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/themes/multiflex/template/Header.ftl?rev=1746691&r1=1746690&r2=1746691&view=diff
==============================================================================
--- ofbiz/trunk/themes/multiflex/template/Header.ftl (original)
+++ ofbiz/trunk/themes/multiflex/template/Header.ftl Fri Jun  3 08:59:56 2016
@@ -66,7 +66,7 @@ under the License.
           <#if sessionAttributes.autoName?has_content>
             ${uiLabelMap.CommonWelcome}&nbsp;${sessionAttributes.autoName}!
             (${uiLabelMap.CommonNotYou}?&nbsp;<a href="<@ofbizUrl>autoLogout</@ofbizUrl>" class="buttontext">${uiLabelMap.CommonClickHere}</a>)
-          <#else/>
+          <#else>
             ${uiLabelMap.CommonWelcome}!
           </#if>
           </h2>
@@ -85,7 +85,7 @@ under the License.
             <ul>
               <li><a href="<@ofbizUrl>logout</@ofbizUrl>">${uiLabelMap.CommonLogout}</a></li>
             </ul>
-          <#else/>
+          <#else>
             <!-- Navigation item -->
             <ul>
               <li><a href="<@ofbizUrl>${checkLoginUrl}</@ofbizUrl>">${uiLabelMap.CommonLogin}</a></li>