X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=tools%2Fhtdocs%2Fmkws.js;h=d325f71ced218913b3eb233a2082ec2795f36977;hb=b9f4617ba1b2ab18cb2ddc920bf15658c0504e15;hp=b113625518e61a8566ed784ebf9cf7952cca004d;hpb=84fbbeebeed760bfdd11e2c0ad8fb57b61990fb4;p=mkws-moved-to-github.git

diff --git a/tools/htdocs/mkws.js b/tools/htdocs/mkws.js
index b113625..d325f71 100644
--- a/tools/htdocs/mkws.js
+++ b/tools/htdocs/mkws.js
@@ -290,15 +290,15 @@ function team($, teamName) {
 
     function my_onstat(data, teamName) {
 	debug("stat for " + teamName);
-	var stat = document.getElementById("mkwsStat");
-	if (stat == null)
+	var stat = $('.mkwsStat.mkwsTeam_' + teamName);
+	if (stat.length === 0)
 	    return;
 
-	stat.innerHTML = '<span class="head">' + M('Status info') + '</span>' +
+	stat.html('<span class="head">' + M('Status info') + '</span>' +
 	    ' -- ' +
 	    '<span class="clients">' + M('Active clients') + ': ' + data.activeclients + '/' + data.clients + '</span>' +
 	    ' -- ' +
-            '<span class="records">' + M('Retrieved records') + ': ' + data.records + '/' + data.hits + '</span>';
+	    '<span class="records">' + M('Retrieved records') + ': ' + data.records + '/' + data.hits + '</span>');
     }
 
 
@@ -902,19 +902,19 @@ function team($, teamName) {
 	    $(".mkwsResults.mkwsTeam_" + m_teamName).html('\
 <table width="100%" border="0" cellpadding="6" cellspacing="0">\
   <tr>\
-    <td id="mkwsTermlistContainer1" class="mkwsTermlistContainer1 mkwsTeam_AUTO" width="250" valign="top">\
-      <div id="mkwsTermlists" class="mkwsTermlists mkwsTeam_AUTO"></div>\
+    <td id="mkwsTermlistContainer1" class="mkwsTermlistContainer1 mkwsTeam_' + m_teamName + '" width="250" valign="top">\
+      <div id="mkwsTermlists" class="mkwsTermlists mkwsTeam_' + m_teamName + '"></div>\
     </td>\
     <td id="mkwsMOTDContainer" valign="top">\
-      <div id="mkwsRanking" class="mkwsRanking mkwsTeam_AUTO"></div>\
-      <div id="mkwsPager" class="mkwsPager mkwsTeam_AUTO"></div>\
-      <div id="mkwsNavi" class="mkwsNavi mkwsTeam_AUTO"></div>\
-      <div id="mkwsRecords" class="mkwsRecords mkwsTeam_AUTO"></div>\
+      <div id="mkwsRanking" class="mkwsRanking mkwsTeam_' + m_teamName + '"></div>\
+      <div id="mkwsPager" class="mkwsPager mkwsTeam_' + m_teamName + '"></div>\
+      <div id="mkwsNavi" class="mkwsNavi mkwsTeam_' + m_teamName + '"></div>\
+      <div id="mkwsRecords" class="mkwsRecords mkwsTeam_' + m_teamName + '"></div>\
     </td>\
   </tr>\
   <tr>\
     <td colspan="2">\
-      <div id="mkwsTermlistContainer2" class="mkwsTermlistContainer2 mkwsTeam_AUTO"></div>\
+      <div id="mkwsTermlistContainer2" class="mkwsTermlistContainer2 mkwsTeam_' + m_teamName + '"></div>\
     </td>\
   </tr>\
 </table>');
@@ -939,9 +939,9 @@ function team($, teamName) {
 	if (mkws_config.responsive_design_width) {
 	    // Responsive web design - change layout on the fly based on
 	    // current screen width. Required for mobile devices.
-	    $(window).resize(function(e) { mkws_resize_page() });
+	    $(window).resize(function(e) { mkws.resize_page() });
 	    // initial check after page load
-	    $(document).ready(function() { mkws_resize_page() });
+	    $(document).ready(function() { mkws.resize_page() });
 	}
 
 	domReady();
@@ -1050,18 +1050,18 @@ function team($, teamName) {
 
 	/* display a list of configured languages, or all */
 	var lang_options = mkws_config.lang_options || [];
-	var hash = {};
+	var toBeIncluded = {};
 	for (var i = 0; i < lang_options.length; i++) {
-	    hash[lang_options[i]] = 1;
+	    toBeIncluded[lang_options[i]] = true;
 	}
 
 	for (var k in mkws.locale_lang) {
-	    if (hash[k] == 1 || lang_options.length == 0)
+	    if (toBeIncluded[k] || lang_options.length == 0)
 		list.push(k);
 	}
 
 	// add english link
-	if (lang_options.length == 0 || hash[lang_default] == 1)
+	if (lang_options.length == 0 || toBeIncluded[lang_default])
             list.push(lang_default);
 
 	debug("Language menu for: " + list.join(", "));
@@ -1081,38 +1081,10 @@ function team($, teamName) {
 	    }
 	}
 
-	$("#mkwsLang").html(data);
+	$(".mkwsLang.mkwsTeam_" + m_teamName).html(data);
     }
 
 
-    function mkws_resize_page () {
-	var list = ["mkwsSwitch"];
-
-	var width = mkws_config.responsive_design_width;
-	var parentId = $("#mkwsTermlists").parent().attr('id');
-
-	if ($(window).width() <= width &&
-	    parentId === "mkwsTermlistContainer1") {
-	    debug("changing from wide to narrow: " + $(window).width());
-	    $("#mkwsTermlists").appendTo($("#mkwsTermlistContainer2"));
-	    $("#mkwsTermlistContainer1").hide();
-	    $("#mkwsTermlistContainer2").show();
-	    for(var i = 0; i < list.length; i++) {
-		$("#" + list[i]).hide(); // ### make team-aware
-	    }
-	} else if ($(window).width() > width &&
-		   parentId === "mkwsTermlistContainer2") {
-	    debug("changing from narrow to wide: " + $(window).width());
-	    $("#mkwsTermlists").appendTo($("#mkwsTermlistContainer1"));
-	    $("#mkwsTermlistContainer1").show();
-	    $("#mkwsTermlistContainer2").hide();
-	    for(var i = 0; i < list.length; i++) {
-		$("#" + list[i]).show(); // ### make team-aware
-	    }
-	}
-    };
-
-
     /* locale */
     function M(word) {
 	var lang = mkws_config.lang;
@@ -1365,6 +1337,34 @@ function _mkws_jquery_plugin ($) {
     }
 
 
+    mkws.resize_page = function () {
+	var list = ["mkwsSwitch"];
+
+	var width = mkws_config.responsive_design_width;
+	var parentId = $("#mkwsTermlists").parent().attr('id');
+
+	if ($(window).width() <= width &&
+	    parentId === "mkwsTermlistContainer1") {
+	    log("changing from wide to narrow: " + $(window).width());
+	    $("#mkwsTermlists").appendTo($("#mkwsTermlistContainer2"));
+	    $("#mkwsTermlistContainer1").hide();
+	    $("#mkwsTermlistContainer2").show();
+	    for(var i = 0; i < list.length; i++) {
+		$("#" + list[i]).hide(); // ### make team-aware
+	    }
+	} else if ($(window).width() > width &&
+		   parentId === "mkwsTermlistContainer2") {
+	    log("changing from narrow to wide: " + $(window).width());
+	    $("#mkwsTermlists").appendTo($("#mkwsTermlistContainer1"));
+	    $("#mkwsTermlistContainer1").show();
+	    $("#mkwsTermlistContainer2").hide();
+	    for(var i = 0; i < list.length; i++) {
+		$("#" + list[i]).show(); // ### make team-aware
+	    }
+	}
+    };
+
+
     mkws.showDetails = function (prefixRecId, tname) {
 	mkws.teams[tname].showDetails(prefixRecId);
     }