svn commit: r959960 - in /ofbiz/trunk/framework: common/webcommon/includes/messages.ftl images/webapp/images/selectall.js

Previous Topic Next Topic
 
classic Classic list List threaded Threaded
1 message Options
Reply | Threaded
Open this post in threaded view
|

svn commit: r959960 - in /ofbiz/trunk/framework: common/webcommon/includes/messages.ftl images/webapp/images/selectall.js

erwan
Author: erwan
Date: Fri Jul  2 12:10:58 2010
New Revision: 959960

URL: http://svn.apache.org/viewvc?rev=959960&view=rev
Log:
When an error message is displayed, clicking on it will make it disappear

Modified:
    ofbiz/trunk/framework/common/webcommon/includes/messages.ftl
    ofbiz/trunk/framework/images/webapp/images/selectall.js

Modified: ofbiz/trunk/framework/common/webcommon/includes/messages.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/common/webcommon/includes/messages.ftl?rev=959960&r1=959959&r2=959960&view=diff
==============================================================================
--- ofbiz/trunk/framework/common/webcommon/includes/messages.ftl (original)
+++ ofbiz/trunk/framework/common/webcommon/includes/messages.ftl Fri Jul  2 12:10:58 2010
@@ -37,7 +37,7 @@ under the License.
 
 <#-- display the error messages -->
 <#if (errorMessage?has_content || errorMessageList?has_content)>
-  <div class="content-messages errorMessage">
+  <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>
@@ -52,7 +52,7 @@ under the License.
 
 <#-- display the event messages -->
 <#if (eventMessage?has_content || eventMessageList?has_content)>
-  <div class="content-messages eventMessage">
+  <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>

Modified: ofbiz/trunk/framework/images/webapp/images/selectall.js
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/images/webapp/images/selectall.js?rev=959960&r1=959959&r2=959960&view=diff
==============================================================================
--- ofbiz/trunk/framework/images/webapp/images/selectall.js (original)
+++ ofbiz/trunk/framework/images/webapp/images/selectall.js Fri Jul  2 12:10:58 2010
@@ -312,13 +312,17 @@ function submitFormInBackground(form, ar
 function ajaxSubmitFormUpdateAreas(form, areaCsvString) {
     submitFormDisableSubmits($(form));
     waitSpinnerShow();
+    hideErrorContainer = function() {
+        $('content-messages').removeClassName('errorMessage');
+        new Effect.Fade('content-messages',{duration: 0.0});
+    }
     updateFunction = function(transport) {
         var data = transport.responseText.evalJSON(true);
         if (data._ERROR_MESSAGE_LIST_ != undefined || data._ERROR_MESSAGE_ != undefined) {
             if(!$('content-messages')) {
                //add this div just after app-navigation
                if($('content-main-section')){
-                   $('content-main-section' ).insert({before: '<div id="content-messages"></div>'});
+                   $('content-main-section' ).insert({before: '<div id="content-messages" onclick="hideErrorContainer()"></div>'});
                }
             }
            $('content-messages').addClassName('errorMessage');
@@ -331,6 +335,7 @@ function ajaxSubmitFormUpdateAreas(form,
             }
             ajaxUpdateAreas(areaCsvString);
         }
+        waitSpinnerHide();
     }
     new Ajax.Request($(form).action, {
         parameters: $(form).serialize(true),