X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=tools%2Fhtdocs%2Fmkws.js;h=e90ff29b2f8e9d3ee08eed394902b61234adc701;hb=d3b9f1529768e96c18dc8ce2e092c46e55495826;hp=b7b9479225f63530384e5ba5b18e788b7233451c;hpb=f7a0e4885adb4779f54b0010803e2a58d3074ab3;p=mkws-moved-to-github.git

diff --git a/tools/htdocs/mkws.js b/tools/htdocs/mkws.js
index b7b9479..e90ff29 100644
--- a/tools/htdocs/mkws.js
+++ b/tools/htdocs/mkws.js
@@ -201,9 +201,10 @@ function my_onterm(data) {
 }
 
 function add_single_facet(acc, caption, data, max, cclIndex) {
-    acc.push('<div class="facet">');
+    acc.push('<div class="facet" id="mkwsFacet' + caption + '">');
     acc.push('<div class="termtitle">' + M(caption) + '</div>');
     for (var i = 0; i < data.length && i < max; i++ ) {
+	acc.push('<div class="term">');
         acc.push('<a href="#" ');
 	var action;
 	if (!cclIndex) {
@@ -214,7 +215,8 @@ function add_single_facet(acc, caption, data, max, cclIndex) {
 	    action = 'limitQuery(\'' + cclIndex + '\', this.firstChild.nodeValue)';
 	}
 	acc.push('onclick="' + action + ';return false;">' + data[i].name + '</a>'
-		 + '<span> (' + data[i].freq + ')</span><br/>');
+		 + ' <span>' + data[i].freq + '</span>');
+	acc.push('</div>');
     }
     acc.push('</div>');
 }
@@ -308,7 +310,7 @@ function loadSelect ()
 // limit the query after clicking the facet
 function limitQuery (field, value)
 {
-    document.mkwsSearchForm.query.value += ' and ' + field + '="' + value + '"';
+    document.mkwsSearchForm.mkwsQuery.value += ' and ' + field + '="' + value + '"';
     onFormSubmitEventHandler();
 }
 
@@ -638,7 +640,7 @@ function mkws_html_all(config) {
 }
 
 function mkws_set_lang(mkws_config)  {
-    var lang = jQuery.parseQuerystring().lang || mkws_config.lang || "";
+    var lang = $.parseQuerystring().lang || mkws_config.lang || "";
     if (!lang || !mkws_locale_lang[lang]) {
 	mkws_config.lang = ""
     } else {
@@ -727,7 +729,7 @@ function mkws_service_proxy_auth(auth_url) {
 
     var request = new pzHttpRequest(auth_url);
     request.get(null, function(data) {
-	if (!jQuery.isXMLDoc(data)) {
+	if (!$.isXMLDoc(data)) {
 	    alert("service proxy auth response document is not valid XML document, give up!");
 	    return;
 	}
@@ -818,88 +820,138 @@ function M(word) {
     return mkws_locale_lang[lang][word] ? mkws_locale_lang[lang][word] : word;
 }
 
-/* implement jQuery.parseQuerystring() for parsing URL parameters */
-jQuery.extend({
-  parseQuerystring: function() {
-    var nvpair = {};
-    var qs = window.location.search.replace('?', '');
-    var pairs = qs.split('&');
-    $.each(pairs, function(i, v){
-	var pair = v.split('=');
-	nvpair[pair[0]] = pair[1];
-    });
-    return nvpair;
-  },
-  pazpar2: function(config) {
-
-    // 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="mkwsFooter">\
-      <div id="mkwsStat"></div>\
-      <span>Powered by MKWS &copy; 2013 <a target="_new" href="http://www.indexdata.com">Index Data</a></span>\
-    </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>';
-
-    if (config && config.layout == 'table') {
-	debug("jquery plugin layout: table");
-        document.write(table);
-    } else {
-	debug("jquery plugin layout: div");
-        document.write(div);
-    }
+/*
+ * implement jQuery plugins
+ */
+$.extend({
+    // implement $.parseQuerystring() for parsing URL parameters
+    parseQuerystring: function() {
+	var nvpair = {};
+	var qs = window.location.search.replace('?', '');
+	var pairs = qs.split('&');
+	$.each(pairs, function(i, v){
+	    var pair = v.split('=');
+	    nvpair[pair[0]] = pair[1];
+	});
+	return nvpair;
+    },
 
-  }
+    debug2: function(string) { // delayed debug, internal variables are set after dom ready
+	setTimeout(function() { debug(string); }, 500);
+    },
+
+    // service-proxy or pazpar2
+    pazpar2: function(config) {
+	// 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="mkwsPopup">\
+	    <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') {
+	    this.debug2("jquery plugin layout: div");
+	    document.write(div);
+	} else if (config && config.layout == 'popup') {
+	    this.debug2("jquery plugin layout: popup");
+	    document.write(popup);
+	    $(document).ready( function() { init_popup(config); } );
+	} else {
+	    this.debug2("jquery plugin layout: table");
+	    document.write(table);
+	}
+    }
 });
 
+function init_popup(obj) {
+    var config = obj ? obj : {};
+
+    var height = config.height || 760;
+    var width = config.width || 880;
+    var id_button = config.button || "input#mkwsButton";
+    var id_popup = config.popup || "#mkwsPopup";
+
+    debug("popup height: " + height + ", width: " + width);
+
+    $(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");
+      });
+};
+
 function debug(string) {
     if (!mkws_debug)
 	return;
@@ -917,5 +969,6 @@ function debug(string) {
     console.log(string);
 }
 
+
 /* magic */
 $(document).ready(function() { mkws_html_all(mkws_config) });