fixxed stuff

NyckJohnson · Nov 7, 2011 · 5566bf0 · 5566bf0
1 parent faafd25
commit 5566bf0
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 18 deletions.
diff --git a/main.html b/main.html
@@ -24,13 +24,15 @@ <h3 id="motd" class="jiggle">Please sign in at the main desk :)</h3>
   <div id="left"> 
     <div class="jiggle" style="height:100%">
       <h2 class="sectionhead">Currently Staffing</h2>
+      <div class="reloadcount" id="staffReloadCount">&nbsp;0</div>
       <iframe style="border:none" id="staff" border="0" height="80%" width="100%" src="http://hackerdojo-signin.appspot.com/staff"></iframe> 
     </div>
   </div>  
 
   <div id="right"> 
     <div class="jiggle" style="height:100%">
       <h2 class="sectionhead">Schedule</h2>
+      <div class="reloadcount" id="eventsReloadCount">&nbsp;0</div>
       <iframe id="events" src="http://events.hackerdojo.com/?base=mini" style="border-width:0;" width="100%" height="90%" frameborder="0" scrolling="no"></iframe>
     </div> 
   </div>

diff --git a/static/main.js b/static/main.js
@@ -13,27 +13,23 @@ function jiggly() {
 }
 
 function refreshStaff() {
-  $.ajax({
-    url: 'http://hackerdojo-signin.appspot.com/staff',
-    success: function(data) {
-      $('#staff').src(data);
-      window.oldStaffInt = setInterval(refreshPage, 2 * minutes);
-    }
-  });
+  $('#staff').attr('src', 'http://hackerdojo-signin.appspot.com/staff');
+  window.StaffCount++;
+  $('#staffReloadCount').html(" "+window.StaffCount);
+  window.oldStaffInt = setTimeout(refreshStaff, 2 * minutes);
 }
 
-function refreshEvent() {
-  $.ajax({
-    url: 'http://events.hackerdojo.com/?base=mini',
-    success: function(data) {
-      $('#events').src(data);
-      window.oldEventsInt = setInterval(refreshPage, 6 * 60 * minutes);
-    }
-  });
+function refreshEvents() {
+  $('#events').attr('src', 'http://events.hackerdojo.com/?base=mini');
+  window.EventsCount++;
+  $('#eventsReloadCount').html(" "+window.EventsCount);
+  window.oldEventsInt = setTimeout(refreshEvents, 6 * 60 * minutes);
 }
 
 $(document).ready(function(){
-    window.oldStaffInt = setInterval(refreshPage,2 * minutes);
-    window.oldEventsInt = setInterval(refreshPage,6 * 60 * minutes);
+    window.EventsCount = 0;
+    window.StaffCount = 0;
+    window.oldStaffInt = setTimeout(refreshStaff,0.25 * minutes);
+    window.oldEventsInt = setTimeout(refreshEvents,6 * 60 * minutes);
     letsDance();
 });
diff --git a/static/style.css b/static/style.css
@@ -28,4 +28,4 @@ h1,h2,h3 {margin-top:0;margin-bottom:.5em}
 .openline {color:green;}
 .closeline {color:red;}
 
-#reloadcount {position:absolute; top:3px; right:3px; color:#ddd}
+.reloadcount {position:absolute; top:3px; right:3px; color:#ddd}