1 files changed, 43 insertions, 21 deletions

diff --git a/js/scores.js b/js/scores.js
index 32f7c7f..f67f2c8 100644
--- a/js/scores.js
+++ b/js/scores.js
@@ -220,8 +220,9 @@ function scoresFormatPageNavi(JO) {
 //Memberlist related functions:

 var membersPages = new Object;

 var membersCurrentPage = 1;

-var membersOrderBy = 'joined';

-var membersOrder = 'ASC';

+var membersPageDivide = 50;

+var membersOrderBy = 'dateJoined';

+var membersOrder = 'DESC';

 

 function membersRequestPage(page) {

 	console.log('membersRequestPage', page);

@@ -241,7 +242,12 @@ function membersRequestPage(page) {
 	

 	//console.log("Requesting Page", page, ajax.inUse);

 	// == Additionally, check for achievements.

-	ajax.requestFile = "do.php?r=reqMemberPage&reqPage="+page+"&orderBy="+membersOrderBy+"&order="+membersOrder;

+	

+	var requestString = "do.php?r=reqMemberPage&reqPage="+page+"&orderBy="+membersOrderBy

+	requestString += "&order="+membersOrder

+	requestString += "&membersPageDivide="+membersPageDivide

+	

+	ajax.requestFile = requestString;

 	ajax.onCompletion = membersRequestPageDone; // Specify function to be executed on response.

 	//ajax.onLoading = '';

 	//ajax.onLoaded = '';

@@ -264,7 +270,7 @@ function membersToggleOrder() {
 		membersOrder = 'ASC';

 }

 

-function membersShowPage(page, orderBy) {

+function membersShowPage(page, orderBy, force) {

 

 	if (orderBy) {

 		if (membersOrderBy == orderBy)

@@ -291,7 +297,7 @@ function membersShowPage(page, orderBy) {
 	

 	//Also; update the page

 	

-	if (page != membersCurrentPage || orderBy) {

+	if (page != membersCurrentPage || orderBy || force) {

 		membersRequestPage(page);

 	}

 	membersCurrentPage = page;

@@ -370,23 +376,39 @@ function membersFormatPage(JO) {
 	// console.log("Formating page");

 	

 	var p = "<table class='membersList score'>";

+	var navi = '';

 	if (JO.pageCount > 1) {

-		var navi = membersFormatPageNavi(JO);

-		p = p+"<tr><th colspan='10' style='text-align:center;'>"+navi+"</th></tr>";

+		navi = "<tr><th colspan='10' style='text-align:center;'>"+membersFormatPageNavi(JO)+"</th></tr>"; 

+		p = p+navi;

 	}

-

+	

+	var headers = new Object;

+	headers['display'] = 'Name';

+	headers['championPoints'] = 'Points';

+	headers['totalMazes'] = 'Mazes';

+	headers['totalMoves'] = 'Moves';

+	headers['totalMovesThisWeek'] = 'Past Week';

+	headers['totalTies'] = 'Ties';

+	headers['totalWins'] = 'Wins';

+	headers['dateJoined'] = 'Joined';

+	headers['dateLogin'] = 'Last Login';

+	

+	

 	p = p+"<tr title='Updated "+JO.updateTime+"'>";

 	p = p+"<th>Rank</th>";

-	p = p+"<th style='width:185px; overflow:hidden; text-align:left; padding-left:42px;'>";

-	p = p+"	<a href='javascript:membersShowPage("+membersCurrentPage+",\"display\")'>Name</a></th>";

-	p = p+"<th><a title='Champion Points' href='javascript:membersShowPage("+membersCurrentPage+",\"championPoints\")'>CP</a></th>";

-	p = p+"<th><a href='javascript:membersShowPage("+membersCurrentPage+",\"totalMazes\")'>Mazes</a></th>";

-	p = p+"<th><a href='javascript:membersShowPage("+membersCurrentPage+",\"totalMoves\")'>Moves</a></th>";

-	p = p+"<th><a href='javascript:membersShowPage("+membersCurrentPage+",\"totalMovesThisWeek\")'>Past Week</a></th>";

-	p = p+"<th><a href='javascript:membersShowPage("+membersCurrentPage+",\"totalWins\")'>Wins</a></th>";

-	p = p+"<th><a href='javascript:membersShowPage("+membersCurrentPage+",\"totalTies\")'>Ties</a></th>";

-	p = p+"<th><a href='javascript:membersShowPage("+membersCurrentPage+",\"dateJoined\")'>Joined</a> &#8679;</th>";

-	p = p+"<th><a href='javascript:membersShowPage("+membersCurrentPage+",\"dateLogin\")'>Last Login</a> &#8681</th>";

+

+	var sortIndicator;

+	for (var i in headers) {

+		sortIndicator = '';

+		if (i == membersOrderBy) {

+			if (membersOrder == 'DESC')

+				sortIndicator = ' &#8679;';

+			else 

+				sortIndicator = ' &#8681;';

+		}

+		p = p+"<th class='"+i+"'><a title='' href='javascript:membersShowPage("+membersCurrentPage+",\""+i+"\")'>"+headers[i]+"</a>"+sortIndicator+"</th>";

+	}

+

 	p = p+"</tr>";

 	

 	var showedLastUser = true;

@@ -417,22 +439,22 @@ function membersFormatPage(JO) {
 		p = p+ "	 <div style='background-color:transparent;' class='grid_td_inner grid_td_rocks'>";

 		p = p+ "	 </div>";

 		p = p+ "	</div>";

-		p = p+ " <span class='scoreName' style='float:left;'><a href='achievements?id="+u.ID+"' style='color:"+u.displayColor+"'>"+u.display+"</a></span>";

+		p = p+ " <span class='memberName' style='float:left;'><a href='achievements?id="+u.ID+"' style='color:"+u.displayColor+"'>"+u.display+"</a></span>";

 		p = p+ "</td>";

 		

 		p = p+ "<td style='text-align:right;'>"+u.championPoints+"</td>";

 		p = p+ "<td style='text-align:right;'>"+u.totalMazes+"</td>";

 		p = p+ "<td style='text-align:right;'>"+u.totalMoves+"</td>";

 		p = p+ "<td style='text-align:right;'>"+u.totalMovesThisWeek+"</td>";

-		p = p+ "<td style='text-align:right;'>"+u.totalWins+"</td>";

 		p = p+ "<td style='text-align:right;'>"+u.totalTies+"</td>";

+		p = p+ "<td style='text-align:right;'>"+u.totalWins+"</td>";

 		p = p+ "<td style='text-align:right;'>"+u.dateJoined+"</td>";

 		p = p+ "<td style='text-align:right;'>"+u.dateLogin+"</td>";

 		p = p+ "</tr>";

 		

 		previousI = i;

 	}

-	p = p+"<tr><th colspan='10' style='text-align:center;'>"+navi+"</th></td>";

+	p = p+navi

 	p = p+"</table>";

 	return p;

 }