Changeset 825 for trunk

Timestamp:

Feb 24, 2011, 5:09:48 PM (14 years ago)

Author:

gav

Message:

Add jQuery AJAX util js and css, part 2.

Location:

trunk

Files:

• grails-app/i18n/messages.properties (modified) (1 diff)
• grails-app/views/layouts/main.gsp (modified) (1 diff)
• web-app/css/main.css (modified) (1 diff)
• web-app/js/application.js (modified) (1 diff)

trunk/grails-app/i18n/messages.properties

@@ -321 +321 @@
 default.create.failure={0} could not be created.
 default.create.revision.failure=Could not create revision.
+default.could.not.perform.operation=Could not perform operation.
 default.optimistic.locking.failure=Another user has updated this item while you were editing, please check the updated values.
 default.file.over.max.size=Supplied file is greater than max size of {0} {1}.

trunk/grails-app/views/layouts/main.gsp

@@ -28 +28 @@
                     <img src="${resource(dir:'images',file:'loading_bar.gif')}" alt="Spinner" />
                 </div>
+                <div id="jQueryAjaxLoading" class="jQueryAjaxLoading" style="display:none;">
+                    <img src="${resource(dir:'images',file:'loading.gif')}" alt="Loading" title="Loading" />
+                </div>
+                <div id="jQueryAjaxDefaultError" class="message_error" style="display:none;">
+                    <g:message code="default.could.not.perform.operation" />
+                </div>'
                 <g:if env="production">
                     <div id="Header">

trunk/web-app/css/main.css

@@ -231 +231 @@
 .jQueryAjaxLoading {
     margin: 10px 0 5px 0;
-    padding: 5px 5px 5px 0px
+    padding: 5px 5px 5px 0px;
 }
 

trunk/web-app/js/application.js

@@ -15 +15 @@
 // jQuery AJAX utils.
 
-function getLoadingHtml() {
-    var imgSrc = getContextPath()+"/images/loading.gif";
-    return '<div class="jQueryAjaxLoading"><img src="'+imgSrc+'" />.</div>';
+function loadingIndication() {
+    return jQuery('#jQueryAjaxLoading').clone();
 }
 
-function getErrorHtml() {
-    var html =  '<div class="message_error">Could not perform operation.</div>';
-    return html;
+function errorIndication() {
+    return jQuery('#jQueryAjaxDefaultError').clone();
 }