Merge branch 'HEAD' of ssh://git@git.raylu.net/pathery

Conflicts:
	css/challenge.css

1 files changed, 4 insertions, 6 deletions

diff --git a/pages/challenge.php b/pages/challenge.php
index 8d312d1..ceefebe 100644
--- a/pages/challenge.php
+++ b/pages/challenge.php
@@ -6,7 +6,7 @@ htmlHeader(
 

 include_once ('./includes/maps.php');

 include_once ('./includes/mapoftheday.php');

-include_once ('./includes/db.inc.php');

+include_once ('./includes/sqlEmbedded.php');

 include_once ('./includes/datas.php');

 

 //Get custom wall colors;

@@ -131,21 +131,19 @@ function displayChallenges($challengeResultset)
 {

 	echo '<div id="challenges">';

 	echo '<div id="challenges_title">Challenges</div>';

-	echo '<div id="challenges_listing"><ol>';

+	echo '<div id="challenges_listing"><ul class="challenge_ulist">';

 	while($challenge = mysql_fetch_array($challengeResultset))

 	{

 		$mapID = $_GET["mapID"];

 		$challengeId = $challenge["challengeID"];

-		echo "<li>";

 		if($challenge["dateSolved"] !== NULL)

 			$cssClass = "challenge_complete";

 		else

 			$cssClass = "challenge_incomplete";

 		$loadSolutionString = "<a href='javascript:requestChallengeSolution(\"$mapID\", \"$challengeId\");'> Load this solution</a>";

-		echo "<span class='$cssClass' id='challenge_id_$challengeId'>" . getChallengeDisplayString($challenge) . " $loadSolutionString </span>";

-		echo "</li>";

+		echo "<li class='$cssClass' id='challenge_id_$challengeId'>" . getChallengeDisplayString($challenge) . " $loadSolutionString </li>";

 	}

-	echo "</ol></div></div>";

+	echo "</ul></div></div>";

 }

 

 /**