From 1c65a1a164008e993fba099723fc3039c2332a9c Mon Sep 17 00:00:00 2001
From: Patrick Davison <snapwilliam@gmail.com>
Date: Wed, 20 Feb 2013 02:05:02 -0800
Subject: Restyled and fixed some bugs in the scoreboard.

---
 pages/scores.php | 64 +++++++++++++++++++++++++++++++-------------------------
 1 file changed, 36 insertions(+), 28 deletions(-)

(limited to 'pages')

diff --git a/pages/scores.php b/pages/scores.php
index 933873c..f3ce459 100644
--- a/pages/scores.php
+++ b/pages/scores.php
@@ -49,7 +49,6 @@ var pointerMapID = -1;
 var goToPointer = true;
 function start() {
 	var hash = window.location.hash.substring(1);
-	console.log("HASH:", hash);
 	if (hash !== '') {
 		hashParts = hash.split('_')
 		dateSplit = hashParts[0].split("-");
@@ -83,7 +82,7 @@ function displayMapScores(mapID) {
 	}
 	scoresShowPage(1, mapID);
 	$("#mapDisplay").fadeOut('fast');
-	displayMap(mapID, "mapDisplay", 595);
+	displayMap(mapID, "mapDisplay", 622);
 }
 
 
@@ -96,32 +95,33 @@ function updateHash() {
 }
 
 var pointerDate;
-function getMapIDs(request) {	
+function getMapIDs(request) {
 	switch (request) {
 		case "next":
-		if (pointerTime.getTime() > serverTime.getTime()) {
-			alert("Tomorrow hasn't happened yet. Alerts are bad. - TMP!");
-			return;
-		}
-		pointerTime.setTime(pointerTime.getTime() + (24*60*60*1000));
-		pointerDate = pointerTime.format("yyyy-mm-dd");
+		if (pointerTime.getTime() + (24*60*60*1000) < serverTime.getTime()) {
+			pointerTime.setTime(pointerTime.getTime() + (24*60*60*1000));
+			pointerDate = pointerTime.format("yyyy-mm-dd");
+		} else return;
 		break;
 		case "prev":
-		
-		if (pointerTime.getTime() - (24*60*60*1000) > serverTime.getTime()) {
-			alert("Tomorrow hasn't happened yet. Alerts are bad. - TMP!");
-			return;
-		}
-		pointerTime.setTime(pointerTime.getTime() - (24*60*60*1000));
-		pointerDate = pointerTime.format("yyyy-mm-dd");
+		if (pointerTime.getTime() + (24*60*60*1000) > 1) {
+			pointerTime.setTime(pointerTime.getTime() - (24*60*60*1000));
+			pointerDate = pointerTime.format("yyyy-mm-dd");
+		} else return;
 		break;
 	}
-	$('#displayDate').html(pointerTime.format("dddd, mmmm ddS, yyyy"));
+	$('#displayDate').html(pointerTime.format("dddd, mmmm dS, yyyy"));
+	if (pointerTime.getTime() + (1*24*60*60*1000) > serverTime.getTime()) {
+		$('#mapNavRight').removeClass('mapNavActive');
+		$('#mapNavRight').addClass('mapNavDisabled');
+	} else {
+		$('#mapNavRight').addClass('mapNavActive');
+		$('#mapNavRight').removeClass('mapNavDisabled');
+	}
 	
-	var urlString = "ajax/scores.ajax.php?getmapidsbydate="+pointerDate;
 	
+	var urlString = "ajax/scores.ajax.php?getmapidsbydate="+pointerDate;
 	updateHash();
-
 	$.ajax({
 		type: "GET",  
 		url: urlString,
@@ -136,18 +136,22 @@ var mapsInNav = new Array();
 function getMapIDsResponse(response) {
 	var json = decryptJSON(response);
 	
+	json.reverse();
+	
 	//Delete removed maps
+	$("#mapNavigation").hide(0);
 	//console.log("going through mapsInNav", mapsInNav);
 	mapsInNav = $.grep(mapsInNav, function(mapID, key) {
-		console.log("del: compare:", key, mapID, json, jQuery.inArray(mapID, json));
+		//console.log("del: compare:", key, mapID, json, jQuery.inArray(mapID, json));
 		if (jQuery.inArray(mapID, json) < 0 && typeof(mapID) != 'undefined') {
 			removeMapFromNav(mapID);
-			return false
+			return false;
 		} else return true;
 	});
 	
 	//Add non-existing maps
 	//console.log("going through json", json);
+	
 	$.each(json, function(key, mapID) {
 		//console.log("add: compare:", mapID, mapsInNav);
 		if (jQuery.inArray(mapID, mapsInNav) == -1) {
@@ -157,6 +161,10 @@ function getMapIDsResponse(response) {
 			}
 		}
 	});
+	//Don't queue animations...
+	if ($('#mapNavigation').is(':animated')) {
+		$("#mapNavigation").show(0);
+	} else $("#mapNavigation").fadeIn('300');
 	
 	if (goToPointer == true) {
 		goToPointer = false;
@@ -166,9 +174,10 @@ function getMapIDsResponse(response) {
 
 function addMapToNav(mapID) {
 	//console.log("adding map to nav:", mapID);
-	var $newdiv1 = $("<div style='float:left;' id='thumb_"+mapID+"'/>");
+	var $newdiv1 = $("<div style='float:left;min-width:120px;' id='thumb_"+mapID+"'/>");
 
-	$("#mapNavigation").append($newdiv1);
+	//$("#mapNavigation").append($newdiv1);
+	$("#mapNavigation").prepend($newdiv1);
 	
 	//var URLString = 'map/'+mapID+'.js';
 	var URLString = 'map/'+mapID;
@@ -183,11 +192,11 @@ function addMapToNav(mapID) {
 			$("#thumb_"+mapID).html(mapThumbnailHTML(decryptJSON(data.responseText), 120)).show();
 		}
 	});
-	mapsInNav.push(mapID);
+	mapsInNav.unshift(mapID);
 }
 
 function removeMapFromNav(mapID) {
-	console.log("remove map:", mapID, mapsInNav.indexOf(mapID));
+	//console.log("remove map:", mapID, mapsInNav.indexOf(mapID));
 	$("#thumb_"+mapID).hide('fast', function(){ $("#thumb_"+mapID).remove(); });
 }
 
@@ -218,7 +227,6 @@ function mapThumbnailHTML(map, targetWidth) {
 	var mapClass = '';
 	var toolTip = 'Inactive map';
 	var mapDate = new Date(map.dateExpires*1000);
-	console.log("Dates: ", map.ID, mapDate, serverTime);
 	if (mapDate.getTime() > serverTime.getTime()) {
 		mapClass = ' current';
 		toolTip = 'This map can still be played.';
@@ -262,8 +270,8 @@ topbar($Links);
 	</div>
 
 	<div class='mapNavCon'>
-		<div class='mapNavLeft mapNavBtn' onclick='javascript:getMapIDs("prev");'>&lt;</div>
-		<div class='mapNavRight mapNavBtn' onclick='javascript:getMapIDs("next");'>&gt;</div>
+		<div id='mapNavLeft' class='mapNavLeft mapNavActive' onclick='javascript:getMapIDs("prev");'>&lt;</div>
+		<div id='mapNavRight' class='mapNavRight mapNavActive' onclick='javascript:getMapIDs("next");'>&gt;</div>
 		<div class='mapNavCenter'>
 			<div id='mapNavigation'></div>
 		</div>
-- 
cgit v1.2.3