You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ofbiz.apache.org by jl...@apache.org on 2009/05/08 10:41:54 UTC
svn commit: r772887 - in /ofbiz/trunk/specialpurpose:
hhfacility/webapp/hhfacility/includes/messages.ftl
webpos/webapp/webpos/includes/Messages.ftl
Author: jleroux
Date: Fri May 8 08:41:53 2009
New Revision: 772887
URL: http://svn.apache.org/viewvc?rev=772887&view=rev
Log:
Generalize r767694 to allow better error messages rendering in UI.
Actually I was more interested to solve the same issue in BizznessTime but StringUtil.wrapString is not working there
Modified:
ofbiz/trunk/specialpurpose/hhfacility/webapp/hhfacility/includes/messages.ftl
ofbiz/trunk/specialpurpose/webpos/webapp/webpos/includes/Messages.ftl
Modified: ofbiz/trunk/specialpurpose/hhfacility/webapp/hhfacility/includes/messages.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/hhfacility/webapp/hhfacility/includes/messages.ftl?rev=772887&r1=772886&r2=772887&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/hhfacility/webapp/hhfacility/includes/messages.ftl (original)
+++ ofbiz/trunk/specialpurpose/hhfacility/webapp/hhfacility/includes/messages.ftl Fri May 8 08:41:53 2009
@@ -37,14 +37,14 @@
<#-- display the error messages -->
<#if (errorMessage?has_content || errorMessageList?has_content)>
- <div class="errorMessage">Errors Occurred:</div><br/>
+ <div class="errorMessage">${uiLabelMap.CommonFollowingErrorsOccurred}:</div><br/>
<ul>
<#if errorMessage?has_content>
- <li class="errorMessage">${errorMessage}</li>
+ <li class="errorMessage">${StringUtil.wrapString(errorMessage)}</li>
</#if>
<#if errorMessageList?has_content>
<#list errorMessageList as errorMsg>
- <li class="errorMessage">${errorMsg}</li>
+ <li class="errorMessage">${StringUtil.wrapString(errorMsg)}</li>
</#list>
</#if>
</ul>
@@ -53,14 +53,14 @@
<#-- display the event messages -->
<#if (eventMessage?has_content || eventMessageList?has_content)>
- <div class="eventMessage">Events:</div><br/>
+ <div class="eventMessage">${uiLabelMap.CommonFollowingOccurred}:</div><br/>
<ul>
<#if eventMessage?has_content>
- <li class="eventMessage">${eventMessage}</li>
+ <li class="eventMessage">${StringUtil.wrapString(eventMessage)}</li>
</#if>
<#if eventMessageList?has_content>
<#list eventMessageList as eventMsg>
- <li class="eventMessage">${eventMsg}</li>
+ <li class="eventMessage">${StringUtil.wrapString(eventMsg)}</li>
</#list>
</#if>
</ul>
Modified: ofbiz/trunk/specialpurpose/webpos/webapp/webpos/includes/Messages.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/webpos/webapp/webpos/includes/Messages.ftl?rev=772887&r1=772886&r2=772887&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/webpos/webapp/webpos/includes/Messages.ftl (original)
+++ ofbiz/trunk/specialpurpose/webpos/webapp/webpos/includes/Messages.ftl Fri May 8 08:41:53 2009
@@ -39,11 +39,11 @@
<#if (errorMessage?has_content || errorMessageList?has_content)>
<div class="errorPosMessage">
<#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>
@@ -53,11 +53,11 @@
<#if (eventMessage?has_content || eventMessageList?has_content)>
<div class="errorPosMessage">
<#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>