corrected fade in of footer and content

diff --git a/public/index.html b/public/index.html
index 698aa5b80a5ef10e99409febfa4ebcc1e0f47011..cc1bb4b8b9f8f5bed4822c6ebbe895da7492180d 100644 (file)
--- a/public/index.html
+++ b/public/index.html
@@ -1070,7 +1070,7 @@ FinalsClub d0t org</p>
                     Sorry, there is no content for this page.
                 </div>
 
-            <div id="g-footer">
+            <div id="g-footer" style="display: none">
                 <nav id="g-nav-footer">
                     <ul>
                         <li><a href="/conduct">Conduct</a></li>

diff --git a/public/javascripts/main.js b/public/javascripts/main.js
index 09f255d79ba0455ee03c65b364c39ee9076f19e3..64aa16e08b1a51b9ee76b7f6b27bba6beeaa3d48 100644 (file)
--- a/public/javascripts/main.js
+++ b/public/javascripts/main.js
@@ -75,7 +75,7 @@ function render(pageId, response) {
     $('#profile_link').hide();
                $('#sign_up-link').show();
   }
-  //if (asdfasdfasdf){
+
   if (response) {
     if (response instanceof Array) {
       $.each(response, function() {
@@ -87,7 +87,9 @@ function render(pageId, response) {
       ProtoDiv.replicate("PROTO_" + response.id, response.data)
     }
   }
-  $("#pg_" + pageId).fadeIn(100);
+       $("#pg_" + pageId).fadeIn(function() {
+               $("#g-footer").fadeIn(); // we don't want the footer jumping up and down
+       });
 }
 
 function message(type, msg) {
@@ -144,7 +146,9 @@ router.add('schools', function(data, cb) {
     data: data.schools
   }
 
-  $('#pg_schools').fadeIn();
+  $('#pg_schools').fadeIn(function() {
+               $('#g-footer').fadeIn();
+       });
   $('#schoolTmpl').tmpl( data.schools ).appendTo("#pg_schools #schools");
 });
 
@@ -505,6 +509,7 @@ router.add('conduct', false, function(cb) {
 function showPage(y) {
 
     $('.page').hide(); //(100);// hide all pseudo pages
+               $('#g-footer').hide();
 
     var
     path = document.location.pathname,