X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=tools%2Fhtdocs%2Fmkws.js;h=ae26ff1ce2bf201ba5fc9d078dac3a3ff75a7a53;hb=05aca72f00e7b0c1e49a143885fc3b044ec170a6;hp=a15bfcd77b50bd3363719b88af9e11bb41e2d01a;hpb=ecd223d99857e8509e5fd3ae4d8e9e6d15ce73e0;p=mkws-moved-to-github.git

diff --git a/tools/htdocs/mkws.js b/tools/htdocs/mkws.js
index a15bfcd..ae26ff1 100644
--- a/tools/htdocs/mkws.js
+++ b/tools/htdocs/mkws.js
@@ -258,10 +258,8 @@ function team($, teamName) {
 
     function onBytarget(data, teamName) {
 	debug("target");
-	var targetDiv = findnode('.mkwsBytarget');
-	if (!targetDiv) {
-	    return;
-	}
+	var node = findnode('.mkwsBytarget');
+	if (node.length === 0) return;
 
 	var table ='<table><thead><tr>' +
 	    '<td>' + M('Target ID') + '</td>' +
@@ -280,17 +278,16 @@ function team($, teamName) {
 	}
 
 	table += '</tbody></table>';
-	targetDiv.html(table);
+	node.html(table);
     }
 
 
     function onStat(data, teamName) {
 	debug("stat");
-	var stat = findnode('.mkwsStat');
-	if (stat.length === 0)
-	    return;
+	var node = findnode('.mkwsStat');
+	if (node.length === 0) return;
 
-	stat.html('<span class="head">' + M('Status info') + '</span>' +
+	node.html('<span class="head">' + M('Status info') + '</span>' +
 	    ' -- ' +
 	    '<span class="clients">' + M('Active clients') + ': ' + data.activeclients + '/' + data.clients + '</span>' +
 	    ' -- ' +
@@ -362,7 +359,7 @@ function team($, teamName) {
 
 
     function onRecord(data, args, teamName) {
-	debug("record: teamName=" + teamName + ", m_teamName=" + m_teamName);
+	debug("record");
 	// FIXME: record is async!!
 	clearTimeout(m_paz.recordTimer);
 	// in case on_show was faster to redraw element
@@ -410,6 +407,60 @@ function team($, teamName) {
     }
 
 
+    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_perpage);
+
+	var firstClkbl = (m_curPage - onsides > 0)
+            ? m_curPage - onsides
+            : 1;
+
+	var lastClkbl = firstClkbl + 2*onsides < pages
+            ? firstClkbl + 2*onsides
+            : pages;
+
+	var prev = '<span class="mkwsPrev">&#60;&#60; ' + M('Prev') + '</span><b> | </b>';
+	if (m_curPage > 1)
+            prev = '<a href="#" class="mkwsPrev" onclick="mkws.pagerPrev(\'' + m_teamName + '\');">'
+            +'&#60;&#60; ' + M('Prev') + '</a><b> | </b>';
+
+	var middle = '';
+	for(var i = firstClkbl; i <= lastClkbl; i++) {
+            var numLabel = i;
+            if(i == m_curPage)
+		numLabel = '<b>' + i + '</b>';
+
+            middle += '<a href="#" onclick="mkws.showPage(\'' + m_teamName + '\', ' + i + ')"> '
+		+ numLabel + ' </a>';
+	}
+
+	var next = '<b> | </b><span class="mkwsNext">' + M('Next') + ' &#62;&#62;</span>';
+	if (pages - m_curPage > 0)
+            next = '<b> | </b><a href="#" class="mkwsNext" onclick="mkws.pagerNext(\'' + m_teamName + '\')">'
+            + M('Next') + ' &#62;&#62;</a>';
+
+	var predots = '';
+	if (firstClkbl > 1)
+            predots = '...';
+
+	var postdots = '';
+	if (lastClkbl < pages)
+            postdots = '...';
+
+	s += '<div style="float: clear">'
+            + prev + predots + middle + postdots + next + '</div>';
+
+	return s;
+    }
+
+
     ////////////////////////////////////////////////////////////////////////////////
     ////////////////////////////////////////////////////////////////////////////////
 
@@ -452,6 +503,31 @@ function team($, teamName) {
     }
 
 
+    function redrawNavi ()
+    {
+	var navi = findnode('.mkwsNavi');
+	if (!navi) return;
+
+	var text = "";
+	for (var i in m_filters) {
+	    if (text) {
+		text += " | ";
+	    }
+	    var filter = m_filters[i];
+	    if (filter.id) {
+		text += M('source') + ': <a class="crossout" href="#" onclick="mkws.delimitTarget(\'' + m_teamName +
+		    "', '" + filter.id + "'" + ');return false;">' + filter.name + '</a>';
+	    } else {
+		text += M(filter.field) + ': <a class="crossout" href="#" onclick="mkws.delimitQuery(\'' + m_teamName +
+		    "', '" + filter.field + "', '" + filter.value + "'" +
+		    ');return false;">' + filter.value + '</a>';
+	    }
+	}
+
+	navi.html(text);
+    }
+
+
     function resetPage()
     {
 	m_curPage = 1;
@@ -459,6 +535,21 @@ function team($, teamName) {
     }
 
 
+    function loadSelect ()
+    {
+	var node = findnode('.mkwsSort');
+	if (node.length && node.val() != m_sort) {
+	    debug("changing m_sort from " + m_sort + " to " + node.val());
+	    m_sort = node.val();
+	}
+	node = findnode('.mkwsPerpage');
+	if (node.length && node.val() != m_perpage) {
+	    debug("changing m_perpage from " + m_perpage + " to " + node.val());
+	    m_perpage = node.val();
+	}
+    }
+
+
     function triggerSearch (query, sort, targets)
     {
 	var pp2filter = "";
@@ -506,21 +597,6 @@ function team($, teamName) {
     }
 
 
-    function loadSelect ()
-    {
-	var node = findnode('.mkwsSort');
-	if (node.length && node.val() != m_sort) {
-	    debug("changing m_sort from " + m_sort + " to " + node.val());
-	    m_sort = node.val();
-	}
-	node = findnode('.mkwsPerpage');
-	if (node.length && node.val() != m_perpage) {
-	    debug("changing m_perpage from " + m_perpage + " to " + node.val());
-	    m_perpage = node.val();
-	}
-    }
-
-
     // limit by target functions
     that.limitTarget  = function (id, name)
     {
@@ -595,85 +671,6 @@ function team($, teamName) {
     }
 
 
-    function redrawNavi ()
-    {
-	var navi = findnode('.mkwsNavi');
-	if (!navi) return;
-
-	var text = "";
-	for (var i in m_filters) {
-	    if (text) {
-		text += " | ";
-	    }
-	    var filter = m_filters[i];
-	    if (filter.id) {
-		text += M('source') + ': <a class="crossout" href="#" onclick="mkws.delimitTarget(\'' + m_teamName +
-		    "', '" + filter.id + "'" + ');return false;">' + filter.name + '</a>';
-	    } else {
-		text += M(filter.field) + ': <a class="crossout" href="#" onclick="mkws.delimitQuery(\'' + m_teamName +
-		    "', '" + filter.field + "', '" + filter.value + "'" +
-		    ');return false;">' + filter.value + '</a>';
-	    }
-	}
-
-	navi.html(text);
-    }
-
-
-    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_perpage);
-
-	var firstClkbl = (m_curPage - onsides > 0)
-            ? m_curPage - onsides
-            : 1;
-
-	var lastClkbl = firstClkbl + 2*onsides < pages
-            ? firstClkbl + 2*onsides
-            : pages;
-
-	var prev = '<span class="mkwsPrev">&#60;&#60; ' + M('Prev') + '</span><b> | </b>';
-	if (m_curPage > 1)
-            prev = '<a href="#" class="mkwsPrev" onclick="mkws.pagerPrev(\'' + m_teamName + '\');">'
-            +'&#60;&#60; ' + M('Prev') + '</a><b> | </b>';
-
-	var middle = '';
-	for(var i = firstClkbl; i <= lastClkbl; i++) {
-            var numLabel = i;
-            if(i == m_curPage)
-		numLabel = '<b>' + i + '</b>';
-
-            middle += '<a href="#" onclick="mkws.showPage(\'' + m_teamName + '\', ' + i + ')"> '
-		+ numLabel + ' </a>';
-	}
-
-	var next = '<b> | </b><span class="mkwsNext">' + M('Next') + ' &#62;&#62;</span>';
-	if (pages - m_curPage > 0)
-            next = '<b> | </b><a href="#" class="mkwsNext" onclick="mkws.pagerNext(\'' + m_teamName + '\')">'
-            + M('Next') + ' &#62;&#62;</a>';
-
-	var predots = '';
-	if (firstClkbl > 1)
-            predots = '...';
-
-	var postdots = '';
-	if (lastClkbl < pages)
-            postdots = '...';
-
-	s += '<div style="float: clear">'
-            + prev + predots + middle + postdots + next + '</div>';
-
-	return s;
-    }
-
-
     that.showPage = function (pageNum)
     {
 	m_curPage = pageNum;