svn commit: r1610427 - in /ofbiz/branches/release12.04: ./ framework/common/webcommon/includes/messages.ftl

Author: jleroux
Date: Mon Jul 14 15:13:06 2014
New Revision: 1610427

URL: http://svn.apache.org/r1610427
Log:
"Applied fix from trunk for revision: 1610425"
------------------------------------------------------------------------
r1610425 | jleroux | 2014-07-14 17:12:13 +0200 (lun. 14 juil. 2014) | 2 lignes

XML escape changed (at least) CommonFollowingErrorsOccurred messages (seen in French). Those are safe to not be escaped
Also indentation of the escape
------------------------------------------------------------------------


Modified:
    ofbiz/branches/release12.04/   (props changed)
    ofbiz/branches/release12.04/framework/common/webcommon/includes/messages.ftl

Propchange: ofbiz/branches/release12.04/
------------------------------------------------------------------------------
  Merged /ofbiz/trunk:r1610425

Modified: ofbiz/branches/release12.04/framework/common/webcommon/includes/messages.ftl
URL: http://svn.apache.org/viewvc/ofbiz/branches/release12.04/framework/common/webcommon/includes/messages.ftl?rev=1610427&r1=1610426&r2=1610427&view=diff
==============================================================================
--- ofbiz/branches/release12.04/framework/common/webcommon/includes/messages.ftl (original)
+++ ofbiz/branches/release12.04/framework/common/webcommon/includes/messages.ftl Mon Jul 14 15:13:06 2014
@@ -17,50 +17,50 @@ specific language governing permissions
 under the License.
 -->
 <#escape x as x?html>
-<#if requestAttributes.errorMessageList?has_content><#assign errorMessageList=requestAttributes.errorMessageList></#if>
-<#if requestAttributes.eventMessageList?has_content><#assign eventMessageList=requestAttributes.eventMessageList></#if>
-<#if requestAttributes.serviceValidationException?exists><#assign serviceValidationException = requestAttributes.serviceValidationException></#if>
-<#if requestAttributes.uiLabelMap?has_content><#assign uiLabelMap = requestAttributes.uiLabelMap></#if>
-
-<#if !errorMessage?has_content>
-  <#assign errorMessage = requestAttributes._ERROR_MESSAGE_?if_exists>
-</#if>
-<#if !errorMessageList?has_content>
-  <#assign errorMessageList = requestAttributes._ERROR_MESSAGE_LIST_?if_exists>
-</#if>
-<#if !eventMessage?has_content>
-  <#assign eventMessage = requestAttributes._EVENT_MESSAGE_?if_exists>
-</#if>
-<#if !eventMessageList?has_content>
-  <#assign eventMessageList = requestAttributes._EVENT_MESSAGE_LIST_?if_exists>
-</#if>
-
-<#-- display the error messages -->
-<#if (errorMessage?has_content || errorMessageList?has_content)>
-  <div id="content-messages" class="content-messages errorMessage" onclick="document.getElementById('content-messages').parentNode.removeChild(this)">
-    <p>${uiLabelMap.CommonFollowingErrorsOccurred}:</p>
-    <#if errorMessage?has_content>
-      <p>${StringUtil.wrapString(errorMessage)}</p>
-    </#if>
-    <#if errorMessageList?has_content>
-      <#list errorMessageList as errorMsg>
-        <p>${StringUtil.wrapString(errorMsg)}</p>
-      </#list>
-    </#if>
-  </div>
-</#if>
-<#-- display the event messages -->
-<#if (eventMessage?has_content || eventMessageList?has_content)>
-  <div id="content-messages" class="content-messages eventMessage" onclick="document.getElementById('content-messages').parentNode.removeChild(this)">
-    <p>${uiLabelMap.CommonFollowingOccurred}:</p>
-    <#if eventMessage?has_content>
-      <p>${StringUtil.wrapString(eventMessage)}</p>
-    </#if>
-    <#if eventMessageList?has_content>
-      <#list eventMessageList as eventMsg>
-        <p>${StringUtil.wrapString(eventMsg)}</p>
-      </#list>
-    </#if>
-  </div>
-</#if>
-</#escape>
\ No newline at end of file
+  <#if requestAttributes.errorMessageList?has_content><#assign errorMessageList=requestAttributes.errorMessageList></#if>
+  <#if requestAttributes.eventMessageList?has_content><#assign eventMessageList=requestAttributes.eventMessageList></#if>
+  <#if requestAttributes.serviceValidationException?exists><#assign serviceValidationException = requestAttributes.serviceValidationException></#if>
+  <#if requestAttributes.uiLabelMap?has_content><#assign uiLabelMap = requestAttributes.uiLabelMap></#if>
+  
+  <#if !errorMessage?has_content>
+    <#assign errorMessage = requestAttributes._ERROR_MESSAGE_?if_exists>
+  </#if>
+  <#if !errorMessageList?has_content>
+    <#assign errorMessageList = requestAttributes._ERROR_MESSAGE_LIST_?if_exists>
+  </#if>
+  <#if !eventMessage?has_content>
+    <#assign eventMessage = requestAttributes._EVENT_MESSAGE_?if_exists>
+  </#if>
+  <#if !eventMessageList?has_content>
+    <#assign eventMessageList = requestAttributes._EVENT_MESSAGE_LIST_?if_exists>
+  </#if>
+  
+  <#-- display the error messages -->
+  <#if (errorMessage?has_content || errorMessageList?has_content)>
+    <div id="content-messages" class="content-messages errorMessage" onclick="document.getElementById('content-messages').parentNode.removeChild(this)">
+      <#noescape><p>${uiLabelMap.CommonFollowingErrorsOccurred}:</p></#noescape>
+      <#if errorMessage?has_content>
+        <p>${StringUtil.wrapString(errorMessage)}</p>
+      </#if>
+      <#if errorMessageList?has_content>
+        <#list errorMessageList as errorMsg>
+          <p>${StringUtil.wrapString(errorMsg)}</p>
+        </#list>
+      </#if>
+    </div>
+  </#if>
+  <#-- display the event messages -->
+  <#if (eventMessage?has_content || eventMessageList?has_content)>
+    <div id="content-messages" class="content-messages eventMessage" onclick="document.getElementById('content-messages').parentNode.removeChild(this)">
+      <#noescape><p>${uiLabelMap.CommonFollowingOccurred}:</p></#noescape>
+      <#if eventMessage?has_content>
+        <p>${StringUtil.wrapString(eventMessage)}</p>
+      </#if>
+      <#if eventMessageList?has_content>
+        <#list eventMessageList as eventMsg>
+          <p>${StringUtil.wrapString(eventMsg)}</p>
+        </#list>
+      </#if>
+    </div>
+  </#if>
+</#escape>