From 8d04e9f9f8618c33b10228962f27eeccf34c3207 Mon Sep 17 00:00:00 2001
From: Patrick Davison <snapwilliam@gmail.com>
Date: Wed, 16 May 2012 13:17:48 -0700
Subject: More tweaks to the achievements page

---
 css/maps.css           |  4 +++
 pages/achievements.php | 91 ++++++++++++--------------------------------------
 2 files changed, 25 insertions(+), 70 deletions(-)

diff --git a/css/maps.css b/css/maps.css
index 3032c34..cbc0a3b 100644
--- a/css/maps.css
+++ b/css/maps.css
@@ -151,6 +151,10 @@
 	background: url(../images/OverlayTileFaceted30.png);
 }
 
+.grid_td_active {
+	background: url(../images/OverlayTileFaceted30.png);
+}
+
 .grid_td_start {
 	background: url(../images/OverlayStart50b.png);
 	background-color: #fbfefb; 
diff --git a/pages/achievements.php b/pages/achievements.php
index 191473e..4b508eb 100644
--- a/pages/achievements.php
+++ b/pages/achievements.php
@@ -370,21 +370,27 @@ function displayUnlockItem($uType, $item) {
 		$unlockTitle = "$item[name]";
 	
 	$border = 'border: 1px solid #000; border-width: 2px 0px 2px 0px;';
+	$border = 'border: 1px solid #000;';
+	$class = 'grid_td_walls';
 	switch ($uType) {
 	case 1:
-		if ($GLOBALS['wallColor'] == $item[value])
-			$border = 'border: 2px solid #26b;';
-		$r .= "<td id='color_$item[id]' title='$unlockTitle' onClick='colorclick(this,\"$item[value]\", \"$item[id]\")' style='padding: 0px;background-color:$item[value];$border' class='grid_td_walls'></td>";
+		if ($GLOBALS['wallColor'] == $item[value]) {
+			$class = 'grid_td_active';
+			$border = 'border: 1px solid #26b;';
+		}
+		$r .= "<td class='grid_td $class' id='color_$item[id]' title='$unlockTitle' onClick='colorclick(this,\"$item[value]\", \"$item[id]\")' style='padding: 0px;background-color:$item[value];$border'></td>";
 		break;
 	case 2:
-		if ($GLOBALS['wallEmblem'] == $item[value])
-			$border = 'border: 2px solid #26b;';
+		if ($GLOBALS['wallEmblem'] == $item[value]) {
+			$class = 'grid_td_active';
+			$border = 'border: 1px solid #26b;';
+		}
 		$r .= "<td class='grid_td_walls' title='$unlockTitle' id='' onClick='emblemclick(this,\"$item[value]\", \"$item[id]\")' style='background: #999 url(../images/marks/$item[value]);$border' >
-			<div class='grid_inner grid_td_walls'></div></td>";
+			<div class='grid_inner $class grid_td_walls'></div></td>";
 		break;
 	case 3:
 		if ($GLOBALS['nameColor'] == $item[value])
-			$border = 'border: 2px solid #26b;';
+			$border = 'border: 1px solid #26b;';
 		$r .= "<td class='name_color_select'><span title='$unlockTitle' onClick='namecolorclick(this,\"$item[value]\", \"$item[id]\")' style='color:$item[value]; margin-right:15px;$border'>";
 		$r .= "&nbsp;$item[name]&nbsp;";
 		$r .= "</span></td>";
@@ -394,10 +400,10 @@ function displayUnlockItem($uType, $item) {
 }
 
 
-
 if (isset($unlocks)) {
 	echo "<h2>Unlocks</h2>";
 	
+	//Define some names
 	$uTypeNames[1] = "Wall Colors";
 	$uTypeNames[2] = "Emblems";
 	$uTypeNames[3] = "Username Colors";
@@ -408,17 +414,20 @@ if (isset($unlocks)) {
 	$uSubtypeNames[2][0] = "Simple";
 	$uSubtypeNames[2][1] = "Complicated";
 	
+	//For every unlock type that the user has.
 	foreach ($unlocks as $uType => $unlock) {
 		$subtype = array();
 		echo "<h3>$uTypeNames[$uType] unlocked:</h3>";
 		
 		foreach ($unlock as $item) {
-			$subtype[$item['subtype']] .= displayUnlockItem($uType, $item);
+			$subtype[$item['subtype']][] = displayUnlockItem($uType, $item);
+			if ((sizeof($subtype[$item['subtype']]) + 1) % 14 == 0)
+				$subtype[$item['subtype']][] = '</tr></table><table><tr>';
 		}
-		$uSubtypeNames[$uType][0];
 		
-		echo "<table>";
+ 		echo "<table>";
 		foreach($subtype as $key => $content) {
+			$content = implode($content);
 			$tmpName = $uSubtypeNames[$uType][$key];
 			if (count($subtype) > 1)
 				echo "</table><strong>$tmpName</strong><table>";
@@ -429,65 +438,7 @@ if (isset($unlocks)) {
 }
 
 
-echo "<br><br>";
-
-//!! Depreciated
-//Type 1; wall unlocks:
-if (isset($unlocks[1]) AND 1 == 2) {
-	
-	echo "<h3>Wall colors unlocked:</h3>
-	<table><tr>";
-	//Default color:
-	echo "<td id='color_0' title='Default Charcoal' onClick='colorclick(this,\"#666666\", \"0\")' style='background-color:#666666;' class='grid_td_walls'></td>";
-	foreach ($unlocks[1] as $item) {
-		echo displayUnlockItem(1, $item);
-		//echo "<td id='color_$item[id]' title='$item[name]' onClick='colorclick(this,\"$item[value]\", \"$item[id]\")' style='background-color:$item[value];' class='grid_td_walls'></td>";
-	}
-	echo "</tr></table>";
-	echo "<div id='color_data' style='visibility:hidden;display:none'>";
-	$item[id];
-	echo "</div>";
-}
-//Type 2; emblem unlocks:
-if (isset($unlocks[2]) AND 1 == 2) {
-
-	//Default Emblem
-	$subtype[0] = "<td class='grid_td_walls' title='Default Blank' onClick='emblemclick(this,\"blank.png\", \"0\")' style='background: #999 url(../images/marks/blank.png);' >
-			<div class='grid_inner grid_td_walls'></div></td>";
-	foreach ($unlocks[2] as $item) {
-		$subtype[$item['subtype']] .= "<td class='grid_td_walls' title='$item[name]' id='' onClick='emblemclick(this,\"$item[value]\", \"$item[id]\")' style='background: #999 url(../images/marks/$item[value]);' >
-			<div class='grid_inner grid_td_walls'></div></td>";
-	}
-	echo "<h3>Emblems unlocked:</h3>";
-	if ($subtype[0] !== '') {
-		echo "<strong>Simple</strong>";
-		echo "<table><tr>$subtype[0]
-		</tr></table>";
-	}
-	if ($subtype[1] !== '') {
-		echo "<strong>Complicated</strong>";
-		echo "<table><tr>$subtype[1]
-		</tr></table>";
-	}
-}
-//Type 3; display-name color unlocks.
-if (isset($unlocks[3]) AND 1 == 2) {
-	echo "<h3>Username colors unlocked:</h3>";
-	echo "<div class='name_color_select'>";
-
-	echo "<span onClick='namecolorclick(this,\"#cccccc\", \"0\");' style='color:#cccccc; margin-right:15px;'>";
-	echo "Default";
-	echo "</span>";
-	
-	foreach ($unlocks[3] as $item) {
-		echo "<span onClick='namecolorclick(this,\"$item[value]\", \"$item[id]\")' style='color:$item[value]; margin-right:15px;'>";
-		echo "&nbsp;$item[name]&nbsp;";
-		echo "</span>";
-	}
-
-	echo "</div>";
-	echo "<br />";
-}
+echo "<br />";
 
 
 if (!$viewer) {
-- 
cgit v1.2.3