Changeset 1333

Timestamp:

Jan 5, 2011, 1:31:21 PM (12 years ago)

Author:

work@…

Message:

• updating to ajaxflow 0.1.12
• changed 'please wait' behaviour conform ajaxflow 0.1.12

Location:

trunk

Files:

• application.properties (modified) (3 diffs)
• grails-app/conf/Config.groovy (modified) (2 diffs)
• grails-app/views/studyWizard/common/_please_wait.gsp (modified) (1 diff)
• web-app/css/ajaxflow.css (modified) (1 diff)
• web-app/images/ajaxflow/ajax-loader.gif (added)
• web-app/images/ajaxflow/spinner-large.gif (deleted)

trunk/application.properties

@@ -1 +1 @@
 #Grails Metadata file
-#Tue Jan 04 13:44:33 CET 2011
+#Wed Jan 05 13:27:00 CET 2011
 app.build.display.info=0
 app.build.svn.revision=1079
@@ -9 +9 @@
 app.servlet.version=2.4
 app.version=0.6.1
-plugins.ajaxflow=0.1.10
+plugins.ajaxflow=0.1.12
 plugins.crypto=2.0
 plugins.db-util=0.4
@@ -17 +17 @@
 plugins.jquery=1.4.4
 plugins.jumpbar=0.1.4
-plugins.mail=1.0-SNAPSHOT
+plugins.mail=0.9
 plugins.oauth=0.10
 plugins.searchable=0.5.5.1

trunk/grails-app/conf/Config.groovy

@@ -243 +243 @@
 grails.views.javascript.library = "jquery"
 
+// see http://jira.codehaus.org/browse/GRAILSPLUGINS-2711
+jquery.version = "1.4.4"
+
 // Needed for the Spring Security Core plugin:
 grails.plugins.springsecurity.userLookup.userDomainClassName = 'dbnp.authentication.SecUser'
@@ -287 +290 @@
         }
 }
-
-// see http://jira.codehaus.org/browse/GRAILSPLUGINS-2711
-jquery.version = "1.4.4"

trunk/grails-app/views/studyWizard/common/_please_wait.gsp

@@ -16 +16 @@
 %>
 <div id="ajaxFlowWait" class="ajaxFlow" style="display:none;">
-        <span class="wait">
-                <span class="title">Please Wait...</span>
-                <span class="spinner"></span>
+        <span class="waitBackground"></span>
+        <span class="waiter">
+                <span class="wait">
+                        <span class="title">Please Wait...</span>
+                        <span class="spinner"></span>
+                </span>
         </span>
 </div>

trunk/web-app/css/ajaxflow.css

@@ -136 +136 @@
 
 /** START :: please wait **/
-.ajaxFlow .wait { }
-.ajaxFlow .wait .title {
+.ajaxFlow .waitBackground {
+        background-color: black;
+        width: 100%;
+        height: 100%;
+        position: fixed;
+        z-index: 100000;
+        top: 0px;
+        left: 0px;
+
+        filter: alpha(opacity:0.6);
+        KHTMLOpacity: 0.6;
+        MozOpacity: 0.6;
+        -khtml-opacity:.60;
+        -ms-filter:"alpha(opacity=60)";
+        -moz-opacity:.60;
+        filter:alpha(opacity=60);
+        opacity:.60;
+}
+
+.ajaxFlow .waiter {
+        width: 100%;
+        height: 100%;
+        position: fixed;
+        z-index: 100001;
+        top: 0px;
+        left: 0px;
+}
+
+.ajaxFlow .waiter .wait {
+        display: inline-block;
+        zoom: 1; /* IE 6 & 7 hack */
+        *display: inline; /* IE 6 & 7 hack */
+        width: 100%;
+        position:relative;
+        top: 40%;
+        left: 25%;
+        width: 50%;
+        height: 100px;
+        background-color: white;
+        z-index: 100001;
+        -moz-border-radius: 15px;
+        border-radius: 15px;
+}
+.ajaxFlow .waiter .wait .title {
     color: #006dba;
     font-weight: normal;
     font-size: 24px;
     margin: .8em 0 .3em 0;
-    display: block;
+    display: inline-block;
+        zoom: 1; /* IE 6 & 7 hack */
+        *display: inline; /* IE 6 & 7 hack */
     width: 100%;
     text-align: center;
 }
-.ajaxFlow .wait .spinner {
-        background: url(../images/ajaxflow/spinner-large.gif) no-repeat center top;
+.ajaxFlow .waiter .wait .spinner {
+        background: url(../images/ajaxflow/ajax-loader.gif) no-repeat center top;
         margin-top: 0px;
         margin-bottom: 0px;