Merge branch 'master' of github.com:thallada/whats-open

website/static/css/style.css

@@ -44,11 +44,6 @@ div.container{
     text-align:center;
 }
 
-.clock{
-    text-align: center;
-    font-size: 25px;
-    font-family:"Courier New", Courier, monospace;
-}
 .search-row{
     text-align: center;
 }

website/static/js/grid.js

@@ -30,6 +30,8 @@ function construct_grid(restaurants) {
 $.ajax({
     url: '/ajax/schedule/',
 }).done(function (data) {
+    // Hide footer while generating grid to prevent it flying across the screen
+    $('#footer').hide();
     $('#grid').empty();
     $('#grid').html('<div class="row"></div>');
     var restaurants = data.data;
@@ -99,4 +101,5 @@ $.ajax({
         });
     });
     construct_grid(restaurants);
+    $('#footer').show();
 });

whats_open/templates/base.html

@@ -68,7 +68,7 @@
 
     </div>
 
-    <div id="footer">
+    <div id="footer" style="display:none">
         A project of <a href="http://srct.gmu.edu">GMU SRCT</a>. <a href="http://opensource.org/licenses/MIT/">Some rights reserved</a>. &nbsp; &nbsp; | &nbsp; &nbsp;
 
         George Mason University <a href="http://dining.gmu.edu/">Dining Services</a>