X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=tools%2Fhtdocs%2Fmkws.js;h=64ff66b46599033f28c9bf980e01420b46e255bd;hb=8e78d0045dc5281b24adf7f2452a32bf5adc43e5;hp=42585ea8e14ee642c23598f5c1d4f61032b5b44e;hpb=467abe4a0821d9fd9fe08d691c9eea4b001b927c;p=mkws-moved-to-github.git

diff --git a/tools/htdocs/mkws.js b/tools/htdocs/mkws.js
index 42585ea..64ff66b 100644
--- a/tools/htdocs/mkws.js
+++ b/tools/htdocs/mkws.js
@@ -259,15 +259,10 @@ function team($, teamName) {
     function my_onshow(data, teamName) {
 	debug("show");
 	m_totalRec = data.merged;
-	// move it out
-	var pager = document.getElementById("mkwsPager");
-	if (pager) {
-	    pager.innerHTML = "";
-	    pager.innerHTML +='<div style="float: right">' + M('Displaying') + ': '
-		+ (data.start + 1) + ' ' + M('to') + ' ' + (data.start + data.num) +
-		' ' + M('of') + ' ' + data.merged + ' (' + M('found') + ': '
-		+ data.total + ')</div>';
-	    drawPager(pager);
+
+	var pager = $(".mkwsPager.mkwsTeam_" + m_teamName);
+	if (pager.length) {
+	    pager.html(drawPager(data))
 	}
 
 	// navi
@@ -426,7 +421,6 @@ function team($, teamName) {
 	});
 
 	if (document.mkwsSelect) {
-	    debug("messing with mkwsSelect");
 	    if (document.mkwsSelect.mkwsSort)
 		document.mkwsSelect.mkwsSort.onchange = onSelectDdChange;
 	    if (document.mkwsSelect.mkwsPerpage)
@@ -461,7 +455,7 @@ function team($, teamName) {
 	resetPage(); // ### the globals it resents should be indexed by windowid
 	loadSelect(); // ### should use windowid
 	triggerSearch(query, sort, targets, windowid);
-	mkws.switchView(m_teamName, 'records'); // In case it's configured to start off as hidden
+	that.switchView('records'); // In case it's configured to start off as hidden
 	m_submitted = true;
     }
 
@@ -641,8 +635,13 @@ function team($, teamName) {
     }
 
 
-    function drawPager (pagerDiv)
+    function drawPager (data)
     {
+	var s = '<div style="float: right">' + M('Displaying') + ': '
+	    + (data.start + 1) + ' ' + M('to') + ' ' + (data.start + data.num) +
+	    ' ' + M('of') + ' ' + data.merged + ' (' + M('found') + ': '
+	    + data.total + ')</div>';
+
 	//client indexes pages from 1 but pz2 from 0
 	var onsides = 6;
 	var pages = Math.ceil(m_totalRec / m_recPerPage);
@@ -683,8 +682,10 @@ function team($, teamName) {
 	if (lastClkbl < pages)
             postdots = '...';
 
-	pagerDiv.innerHTML += '<div style="float: clear">'
+	s += '<div style="float: clear">'
             + prev + predots + middle + postdots + next + '</div>';
+
+	return s;
     }
 
 
@@ -711,13 +712,11 @@ function team($, teamName) {
 
 
     // switching view between targets and records
-    mkws.switchView = function(tname, view) {
-	debug("switchView(" + tname + ", " + view + ")");
-
-	var targets = $('.mkwsTargets.mkwsTeam_' + tname);
-	var results = $('.mkwsResults.mkwsTeam_' + tname + ',.mkwsRecords.mkwsTeam_' + tname);
-	var blanket = $('.mkwsBlanket.mkwsTeam_' + tname);
-	var motd    = $('.mkwsMOTD.mkwsTeam_' + tname);
+    that.switchView = function(view) {
+	var targets = $('.mkwsTargets.mkwsTeam_' + m_teamName);
+	var results = $('.mkwsResults.mkwsTeam_' + m_teamName + ',.mkwsRecords.mkwsTeam_' + m_teamName);
+	var blanket = $('.mkwsBlanket.mkwsTeam_' + m_teamName);
+	var motd    = $('.mkwsMOTD.mkwsTeam_' + m_teamName);
 
 	switch(view) {
         case 'targets':
@@ -733,7 +732,7 @@ function team($, teamName) {
             if (motd) motd.css('display', 'none');
             break;
 	case 'none':
-	    alert("mkws.switchView(" + tname + ", 'none') shouldn't happen");
+	    alert("mkws.switchView(" + m_teamName + ", 'none') shouldn't happen");
             if (targets) targets.css('display', 'none');
             if (results) results.css('display', 'none');
             if (blanket) blanket.css('display', 'none');
@@ -764,6 +763,7 @@ function team($, teamName) {
             return;
 	}
 	// request the record
+	debug("showDetails() requesting record '" + recId + "'");
 	m_paz.record(recId);
     }
 
@@ -931,9 +931,10 @@ function team($, teamName) {
 </table>');
 	}
 
-	if ($("#mkwsRanking").length) {
+	var node = $(".mkwsRanking.mkwsTeam_" + m_teamName);
+	if (node.length) {
 	    var ranking_data = '';
-	    ranking_data += '<form name="mkwsSelect" id="mkwsSelect" action="" >';
+	    ranking_data += '<form name="mkwsSelect" class="mkwsSelect mkwsTeam_' + m_teamName + '" action="" >';
 	    if (mkws_config.show_sort) {
 		ranking_data +=  M('Sort by') + ' ' + mkws_html_sort() + ' ';
 	    }
@@ -942,7 +943,7 @@ function team($, teamName) {
 	    }
             ranking_data += '</form>';
 
-	    $("#mkwsRanking").html(ranking_data);
+	    node.html(ranking_data);
 	}
 
 	mkws_html_switch();
@@ -955,15 +956,12 @@ function team($, teamName) {
 	    $(document).ready(function() { mkws.resize_page() });
 	}
 
-	debug("before domReady()");
 	domReady();
-	debug("after domReady()");
 
 	// on first page, hide the termlist
 	$(document).ready(function() { $(".mkwsTermlists.mkwsTeam_" + m_teamName).hide(); });
 	var motd = $(".mkwsMOTD.mkwsTeam_" + m_teamName);
 	var container = $(".mkwsMOTDContainer.mkwsTeam_" + m_teamName);
-	debug("for team '" + m_teamName + "', motd=" + motd + "(" + motd.length + "), container=" + container + "(" + container.length + ")");
 	if (motd.length && container.length) {
 	    // Move the MOTD from the provided element down into the container
 	    motd.appendTo(container);
@@ -1330,6 +1328,10 @@ function _mkws_jquery_plugin ($) {
     };
 
 
+    mkws.switchView = function(tname, view) {
+	mkws.teams[tname].switchView(view);
+    }
+
     mkws.showDetails = function (tname, prefixRecId) {
 	mkws.teams[tname].showDetails(prefixRecId);
     }
@@ -1489,9 +1491,7 @@ function _mkws_jquery_plugin ($) {
 	$('[class^="mkws"],[class*=" mkws"]').each(function () {
 	    var node = this;
 	    mkws.handle_node_with_team(node, function(tname) {
-		if (mkws.teams[tname]) {
-		    log("MKWS team '" + tname + "' already exists, skipping");
-		} else {
+		if (!mkws.teams[tname]) {
 		    mkws.teams[tname] = team(j, tname);
 		    log("Made MKWS team '" + tname + "'");
 		}