Author: jleroux
Date: Wed Oct 30 17:11:21 2013
New Revision: 1537179
URL: http://svn.apache.org/r1537179
Log:
A patch from Christian Carlow for "Wrap error messages in
StringUtil.wrapString() for framework/common/webcommon/includes/messages.ftl"
https://issues.apache.org/jira/browse/OFBIZ-5376
Without wrapping error messages in StringUtil.wrapString() the <br/> element
appears part of the error message.
Modified:
ofbiz/trunk/framework/common/webcommon/includes/messages.ftl
Modified: ofbiz/trunk/framework/common/webcommon/includes/messages.ftl
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/framework/common/webcommon/includes/messages.ftl?rev=1537179&r1=1537178&r2=1537179&view=diff
==============================================================================
--- ofbiz/trunk/framework/common/webcommon/includes/messages.ftl (original)
+++ ofbiz/trunk/framework/common/webcommon/includes/messages.ftl Wed Oct 30
17:11:21 2013
@@ -40,26 +40,25 @@ under the License.
<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>${errorMessage}</p>
+ <p>${StringUtil.wrapString(errorMessage)}</p>
</#if>
<#if errorMessageList?has_content>
<#list errorMessageList as errorMsg>
- <p>${errorMsg}</p>
+ <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>${eventMessage}</p>
+ <p>${StringUtil.wrapString(eventMessage)}</p>
</#if>
<#if eventMessageList?has_content>
<#list eventMessageList as eventMsg>
- <p>${eventMsg}</p>
+ <p>${StringUtil.wrapString(eventMsg)}</p>
</#list>
</#if>
</div>
