Changeset 452 for trunk/modules/user_guide

Timestamp:

08/30/2007 01:06:24 AM (15 months ago)

Author:

Shadowhand

Message:

Updated User Guide styles and effects, slightly less annoying now with the loading thingy. I need to sleep.....zz...

Location:

trunk/modules/user_guide/views/user_guide

Files:

• css/layout.php (modified) (2 diffs)
• js/effects.php (modified) (3 diffs)

trunk/modules/user_guide/views/user_guide/css/layout.php

@@ -22 +22 @@
 Template Styles
 */
-#loading { position: absolute; top: 0; left: 50%; z-index: 9999; width: 12em; margin-left: -6em; padding: 0.5em 2em; background: #fff; border: solid 1 #444; border-top: 0; text-align: center; font-size: 2em; color: #494; }
 #container { position: relative; width: 70%; min-width: 30em; max-width: 60em; margin: 0 auto; }
 #menu { position: absolute; right: -10.1em; width: 10em; padding: 0.2em 0; }
@@ -37 +36 @@
 #body ul { list-style: circle; }
 #body li { padding: 0.1em 0; }
+#loading { position: absolute; top: 0; right: 0; z-index: 9999; padding: 0.5em 2em; background: #fff; border: solid 0 #aaa; border-width: 0 0 1px 1px; text-align: center; text-transform: uppercase; font-size: 0.7em; }
+#loading span { color: #400; }
 /*
 Content Styles

trunk/modules/user_guide/views/user_guide/js/effects.php

@@ -2 +2 @@
 $(document).ready(function(){
         // Append the AJAX loader
-        $('body').append('<div id="loading">&hellip;loading&hellip;</div>');
+        $('#container').append('<div id="loading"><span>&hellip;loading</span></div>');
         // To prevent extra querying
         Kohana.loading = $('#loading').hide().css('opacity', 0.85);
@@ -39 +39 @@
                 // Fetch the current link
                 var link = $(this);
-                // Remove the "lite" class from the active link
-                $('#menu li.active li.lite').removeClass('lite');
                 // Make AJAX request
                 $.get(link.attr('href'), {ajax: 'true'}, function(data) {
                         // Add the "lite" class to the current link
+                        $('#menu li.active li.lite').removeClass('lite');
                         link.parent().addClass('lite');
                         // Load new AJAX content
@@ -63 +62 @@
                 // If we are waiting for an animation, retry in 5ms
                 if (Kohana.waiting == true) {
-                        setTimeout('Kohana.toggleLoading('+on+')', 5);
+                        setTimeout('Kohana.toggleLoading('+on+')', 100);
                         return false;
                 }