X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=tools%2Fhtdocs%2Fmkws.js;h=fe4e1c90c5246cb4a362384f4d4c4c0fcf38cf81;hb=9e3ca1f868ae9bd98adf6450b64a751f407b4d42;hp=a96fd32fd08fb9b71bf8e0700ad5a7a4cd123dae;hpb=23efd7251999817caf5e29ee9361e17c4b417dff;p=mkws-moved-to-github.git

diff --git a/tools/htdocs/mkws.js b/tools/htdocs/mkws.js
index a96fd32..fe4e1c9 100644
--- a/tools/htdocs/mkws.js
+++ b/tools/htdocs/mkws.js
@@ -329,11 +329,13 @@ function team($, teamName) {
 	for (var i = 0; i < data.length && i < max; i++) {
 	    acc.push('<div class="term">');
             acc.push('<a href="#" ');
-	    var action;
+	    var action = '';
 	    if (!pzIndex) {
 		// Special case: target selection
 		acc.push('target_id='+data[i].id+' ');
-		action = 'mkws.limitTarget(\'' + m_teamName + '\', this.getAttribute(\'target_id\'),this.firstChild.nodeValue)';
+		if (!target_filtered(data[i].id)) {
+		    action = 'mkws.limitTarget(\'' + m_teamName + '\', this.getAttribute(\'target_id\'),this.firstChild.nodeValue)';
+		}
 	    } else {
 		action = 'mkws.limitQuery(\'' + m_teamName + '\', \'' + pzIndex + '\', this.firstChild.nodeValue)';
 	    }
@@ -345,6 +347,17 @@ function team($, teamName) {
     }
 
 
+    function target_filtered(id) {
+	for (var i = 0; i < m_filters.length; i++) {
+	    if (m_filters[i].id === id ||
+		m_filters[i].id === 'pz:id=' + id) {
+		return true;
+	    }
+	}
+	return false;
+    }
+
+
     function my_onrecord(data, args, teamName) {
 	debug("record: teamName=" + teamName + ", m_teamName=" + m_teamName);
 	// FIXME: record is async!!
@@ -849,8 +862,6 @@ function team($, teamName) {
 	if (mkws_config.show_lang)
 	    mkws_html_lang();
 
-	// For some reason, doing this programmatically results in
-	// document.mkwsSearchForm.mkwsQuery being undefined, hence the raw HTML.
 	debug("HTML search form");
 	// ### There is only one match here by design: fix not to bother looping
 	$('.mkwsSearch.mkwsTeam_' + m_teamName).each(function (i, obj) {
@@ -858,8 +869,8 @@ function team($, teamName) {
 	    mkws.handle_node_with_team(node, function(tname) {
 		$(node).html('\
 <form name="mkwsSearchForm" class="mkwsSearchForm mkwsTeam_' + tname + '" action="" >\
-  <input id="mkwsQuery" class="mkwsQuery mkwsTeam_' + tname + '" type="text" size="' + mkws_config.query_width + '" />\
-  <input id="mkwsButton" class="mkwsButton mkwsTeam_' + tname + '" type="submit" value="' + M('Search') + '" />\
+  <input class="mkwsQuery mkwsTeam_' + tname + '" type="text" size="' + mkws_config.query_width + '" />\
+  <input class="mkwsButton mkwsTeam_' + tname + '" type="submit" value="' + M('Search') + '" />\
 </form>');
 	    });
 	});
@@ -879,13 +890,13 @@ function team($, teamName) {
 <table width="100%" border="0" cellpadding="6" cellspacing="0">\
   <tr>\
     <td class="mkwsTermlistContainer1 mkwsTeam_' + m_teamName + '" width="250" valign="top">\
-      <div id="mkwsTermlists" class="mkwsTermlists mkwsTeam_' + m_teamName + '"></div>\
+      <div class="mkwsTermlists mkwsTeam_' + m_teamName + '"></div>\
     </td>\
     <td class="mkwsMOTDContainer mkwsTeam_' + m_teamName + '" valign="top">\
-      <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>\
+      <div class="mkwsRanking mkwsTeam_' + m_teamName + '"></div>\
+      <div class="mkwsPager mkwsTeam_' + m_teamName + '"></div>\
+      <div class="mkwsNavi mkwsTeam_' + m_teamName + '"></div>\
+      <div class="mkwsRecords mkwsTeam_' + m_teamName + '"></div>\
     </td>\
   </tr>\
   <tr>\
@@ -1106,141 +1117,6 @@ function team($, teamName) {
 };
 
 
-/*
- * implement jQuery plugin $.pazpar2({})
- */
-function _mkws_jquery_plugin ($) {
-    function debug (string) {
-	mkws.debug("jquery.pazpar2: " + string);
-    }
-
-    function init_popup(obj) {
-	var config = obj ? obj : {};
-
-	var height = config.height || 760;
-	var width = config.width || 880;
-	var id_button = config.id_button || "input#mkwsButton";
-	var id_popup = config.id_popup || "#mkwsPopup";
-
-	debug("popup height: " + height + ", width: " + width);
-
-	// make sure that jquery-ui was loaded afte jQuery core lib, e.g.:
-	// <script src="http://code.jquery.com/ui/1.10.3/jquery-ui.min.js"></script>
-	if (!$.ui) {
-	    debug("Error: jquery-ui.js is missing, did you include it after jQuery core in the HTML file?");
-	    return;
-	}
-
-	$(id_popup).dialog({
-	    closeOnEscape: true,
-	    autoOpen: false,
-	    height: height,
-	    width: width,
-	    modal: true,
-	    resizable: true,
-	    buttons: {
-		Cancel: function() {
-		    $(this).dialog("close");
-		}
-	    },
-	    close: function() { }
-	});
-
-	$(id_button)
-	    .button()
-	    .click(function() {
-		$(id_popup).dialog("open");
-	    });
-    };
-
-    $.extend({
-
-	// service-proxy or pazpar2
-	pazpar2: function(config) {
-	    var id_popup = config.id_popup || "#mkwsPopup";
-	    id_popup = id_popup.replace(/^#/, "");
-
-	    // simple layout
-	    var div = '\
-<div id="mkwsSwitch"></div>\
-<div id="mkwsLang"></div>\
-<div id="mkwsSearch"></div>\
-<div id="mkwsResults"></div>\
-<div id="mkwsTargets"></div>\
-<div id="mkwsStat"></div>';
-
-	    // new table layout
-	    var table = '\
-<style type="text/css">\
-  #mkwsTermlists div.facet {\
-  float:left;\
-  width: 30%;\
-  margin: 0.3em;\
-  }\
-  #mkwsStat {\
-  text-align: right;\
-  }\
-</style>\
-    \
-<table width="100%" border="0">\
-  <tr>\
-    <td>\
-      <div id="mkwsSwitch"></div>\
-      <div id="mkwsLang"></div>\
-      <div id="mkwsSearch"></div>\
-    </td>\
-  </tr>\
-  <tr>\
-    <td>\
-      <div style="height:500px; overflow: auto">\
-	<div id="mkwsPager"></div>\
-	<div id="mkwsNavi"></div>\
-	<div id="mkwsRecords"></div>\
-	<div id="mkwsTargets"></div>\
-	<div id="mkwsRanking"></div>\
-      </div>\
-    </td>\
-  </tr>\
-  <tr>\
-    <td>\
-      <div style="height:300px; overflow: hidden">\
-	<div id="mkwsTermlists"></div>\
-      </div>\
-    </td>\
-  </tr>\
-  <tr>\
-    <td>\
-      <div id="mkwsStat"></div>\
-    </td>\
-  </tr>\
-</table>';
-
-	    var popup = '\
-<div id="mkwsSearch"></div>\
-<div id="' + id_popup + '">\
-  <div id="mkwsSwitch"></div>\
-  <div id="mkwsLang"></div>\
-  <div id="mkwsResults"></div>\
-  <div id="mkwsTargets"></div>\
-  <div id="mkwsStat"></div>\
-</div>'
-
-	    if (config && config.layout == 'div') {
-		debug("jquery plugin layout: div");
-		document.write(div);
-	    } else if (config && config.layout == 'popup') {
-		debug("jquery plugin layout: popup with id: " + id_popup);
-		document.write(popup);
-		$(document).ready(function() { init_popup(config); });
-	    } else {
-		debug("jquery plugin layout: table");
-		document.write(table);
-	    }
-	}
-    });
-};
-
-
 // wrapper to call team() after page load
 (function (j) {
     mkws.debug = function (string) {
@@ -1262,10 +1138,6 @@ function _mkws_jquery_plugin ($) {
     var debug = mkws.debug;
 
 
-    // enable before page load, so we could call it before mkws() runs
-    _mkws_jquery_plugin(j);
-
-
     mkws.handle_node_with_team = function(node, callback) {
 	var classes = node.className;
  	var list = classes.split(/\s+/)