svn commit: r1210196 - in /ofbiz/branches/release11.04: ./ themes/bizznesstime/includes/messages.ftl

Author: jleroux
Date: Sun Dec  4 20:14:31 2011
New Revision: 1210196

URL: http://svn.apache.org/viewvc?rev=1210196&view=rev
Log:
"Applied fix from trunk for revision: 1210193"
------------------------------------------------------------------------
r1210193 | jleroux | 2011-12-04 21:12:14 +0100 (dim., 04 déc. 2011) | 5 lines

Fixes an issue reported by andrewzn: "Error messages are never displayed with BIZZNESS_TIME theme" at https://issues.apache.org/jira/browse/OFBIZ-4607

The reason is outdated JS in messages.ftl

jleroux: I did not use andrewzn's solution because it overrode another part of the screen. I tried to understand why humanMsg, which has been adapted during jQuery move, did not work. I guess it's simply because biznessTime application.js is not loaded; though it's declared in BizznessTimeThemeData.xml as VT_HDR_JAVASCRIPT. At this stage, as I was missing time, I decided to simply reuse the same way than in webcommon messages.ftl
------------------------------------------------------------------------


Modified:
    ofbiz/branches/release11.04/   (props changed)
    ofbiz/branches/release11.04/themes/bizznesstime/includes/messages.ftl

Propchange: ofbiz/branches/release11.04/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sun Dec  4 20:14:31 2011
@@ -2,4 +2,4 @@
 /ofbiz/branches/dojo1.4:951708-952957
 /ofbiz/branches/jquery:952958-1044489
 /ofbiz/branches/multitenant20100310:921280-927264
-/ofbiz/trunk:1100197,1100880,1104423,1131144,1131396,1132496,1132749,1133353,1134990,1135199,1135686,1135929,1137201,1137433,1137435,1138463,1138485,1139346,1139385,1139504,1139521,1140358,1140362,1140375,1140469,1144537,1144791,1153073,1153768,1158124,1158126,1158608,1159080,1163036,1163093,1163533,1165130,1166591,1167116,1167314,1167480,1167501,1167510,1167517,1167606,1172213,1172243,1174964,1175130,1175135,1175143,1177128,1178175,1178199,1180398,1181878,1182259,1182310,1182731,1182858,1183651,1184906,1184996,1184999,1185179,1187515,1187528,1187933,1187944,1188042,1188564,1189592,1189601,1190134,1194958,1196778,1199276,1199450,1200207,1201110,1201125,1201941,1203350,1203776,1206507,1206690,1208335,1209250,1209362
+/ofbiz/trunk:1100197,1100880,1104423,1131144,1131396,1132496,1132749,1133353,1134990,1135199,1135686,1135929,1137201,1137433,1137435,1138463,1138485,1139346,1139385,1139504,1139521,1140358,1140362,1140375,1140469,1144537,1144791,1153073,1153768,1158124,1158126,1158608,1159080,1163036,1163093,1163533,1165130,1166591,1167116,1167314,1167480,1167501,1167510,1167517,1167606,1172213,1172243,1174964,1175130,1175135,1175143,1177128,1178175,1178199,1180398,1181878,1182259,1182310,1182731,1182858,1183651,1184906,1184996,1184999,1185179,1187515,1187528,1187933,1187944,1188042,1188564,1189592,1189601,1190134,1194958,1196778,1199276,1199450,1200207,1201110,1201125,1201941,1203350,1203776,1206507,1206690,1208335,1209250,1209362,1210193

Modified: ofbiz/branches/release11.04/themes/bizznesstime/includes/messages.ftl
URL: http://svn.apache.org/viewvc/ofbiz/branches/release11.04/themes/bizznesstime/includes/messages.ftl?rev=1210196&r1=1210195&r2=1210196&view=diff
==============================================================================
--- ofbiz/branches/release11.04/themes/bizznesstime/includes/messages.ftl (original)
+++ ofbiz/branches/release11.04/themes/bizznesstime/includes/messages.ftl Sun Dec  4 20:14:31 2011
@@ -36,20 +36,30 @@ under the License.
 
 <#-- display the error messages -->
 <#if (errorMessage?has_content || errorMessageList?has_content)>
-<script type="text/javascript">
-    document.observe('dom:loaded', function() {
-        humanMsg.displayMsg('<div class="errorMessage"><#if errorMessage?has_content><p>${errorMessage}</p></#if><#if errorMessageList?has_content><#list errorMessageList as errorMsg><p>${errorMsg}</p></#list></#if></p></div>');
-        return false;
-    });
-</script>
+  <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>
+    </#if>
+    <#if errorMessageList?has_content>
+      <#list errorMessageList as errorMsg>
+        <p>${errorMsg}</p>
+      </#list>
+    </#if>
+  </div>
 </#if>
 
 <#-- display the event messages -->
 <#if (eventMessage?has_content || eventMessageList?has_content)>
-<script type="text/javascript">
-    document.observe('dom:loaded', function() {
-        humanMsg.displayMsg('<div class="eventMessage"><#if eventMessage?has_content><p>${eventMessage}</p></#if><#if eventMessageList?has_content><#list eventMessageList as eventMsg><p>${eventMsg}</p></#list></#if></div>');
-        return false;
-    });
-</script>
+  <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>
+    </#if>
+    <#if eventMessageList?has_content>
+      <#list eventMessageList as eventMsg>
+        <p>${eventMsg}</p>
+      </#list>
+    </#if>
+  </div>
 </#if>