X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=tools%2Fhtdocs%2Fmkws.js;h=2d9b452780e646dd9addabc6fa15b058e939b00a;hb=588ec81e46383127b62dc1e9d0b454dfe2637967;hp=0d5868eff1daf608cea30e2979119f66752568ce;hpb=1cf7757402c2edd03643afe3c379e222e2d960e7;p=mkws-moved-to-github.git

diff --git a/tools/htdocs/mkws.js b/tools/htdocs/mkws.js
index 0d5868e..2d9b452 100644
--- a/tools/htdocs/mkws.js
+++ b/tools/htdocs/mkws.js
@@ -1,5 +1,5 @@
-/*! MKWS, the MasterKey Widget Set. 
- *  Copyright (C) 2013-2014 Index Data 
+/*! MKWS, the MasterKey Widget Set.
+ *  Copyright (C) 2013-2014 Index Data
  *  See the file LICENSE for details
  */
 
@@ -86,6 +86,7 @@ var mkws = {
 	    "Authors": "Autoren",
 	    "Subjects": "Schlagwörter",
 	    "Sources": "Daten und Quellen",
+	    "source": "datenquelle",
 	    "Termlists": "Termlisten",
 	    "Next": "Weiter",
 	    "Prev": "Zurück",
@@ -99,8 +100,10 @@ var mkws = {
 	    "found": "gefunden",
 	    "Title": "Titel",
 	    "Author": "Autor",
+	    "author": "autor",
 	    "Date": "Datum",
 	    "Subject": "Schlagwort",
+	    "subject": "schlagwort",
 	    "Location": "Ort",
 	    "Records": "Datensätze",
 	    "Targets": "Datenbanken",
@@ -112,6 +115,7 @@ var mkws = {
 	    "Authors": "Forfattere",
 	    "Subjects": "Emner",
 	    "Sources": "Kilder",
+	    "source": "kilder",
 	    "Termlists": "Termlists",
 	    "Next": "Næste",
 	    "Prev": "Forrige",
@@ -125,8 +129,10 @@ var mkws = {
 	    "found": "fandt",
 	    "Title": "Title",
 	    "Author": "Forfatter",
+	    "author": "forfatter",
 	    "Date": "Dato",
 	    "Subject": "Emneord",
+	    "subject": "emneord",
 	    "Location": "Lokation",
 	    "Records": "Poster",
 	    "Targets": "Baser",
@@ -228,8 +234,8 @@ function team($, teamName) {
 		      "pazpar2path": mkws_config.pazpar2_url,
 		      "oninit": my_oninit,
 		      "onstat": my_onstat,
-		      "onterm": my_onterm,
-		      "termlist": "xtargets,subject,author",
+		      "onterm": (mkws_config.facets.length ? my_onterm : undefined),
+		      "termlist": mkws_config.facets.join(','),
 		      "onbytarget": my_onbytarget,
 		      "usesessions" : mkws_config.use_service_proxy ? false : true,
 		      "showResponseType": '', // or "json" (for debugging?)
@@ -307,34 +313,36 @@ function team($, teamName) {
 
     function my_onterm(data, teamName) {
 	debug("term for " + teamName);
-	// no facets
+	var node = $(".mkwsTermlists.mkwsTeam_" + teamName);
+	if (node.length == 0) return;
+
+	// no facets: this should never happen
 	if (!mkws_config.facets || mkws_config.facets.length == 0) {
-	    $(".mkwsTermlists.mkwsTeam_" + teamName).hide();
+	    alert("my_onterm called even though we have no facets: " + $.toJSON(data));
+	    node.hide();
 	    return;
 	}
 
 	// display if we first got results
-	$(".mkwsTermlists.mkwsTeam_" + teamName).show();
+	node.show();
 
 	var acc = [];
 	acc.push('<div class="title">' + M('Termlists') + '</div>');
 	var facets = mkws_config.facets;
 
 	for(var i = 0; i < facets.length; i++) {
-	    if (facets[i] == "sources") {
+	    if (facets[i] == "xtargets") {
 		add_single_facet(acc, "Sources",  data.xtargets, 16, null);
-	    } else if (facets[i] == "subjects") {
+	    } else if (facets[i] == "subject") {
 		add_single_facet(acc, "Subjects", data.subject,  10, "subject");
-	    } else if (facets[i] == "authors") {
+	    } else if (facets[i] == "author") {
 		add_single_facet(acc, "Authors",  data.author,   10, "author");
 	    } else {
 		alert("bad facet configuration: '" + facets[i] + "'");
 	    }
 	}
 
-	var termlist = $(".mkwsTermlists.mkwsTeam_" + teamName);
-	if (termlist)
-	    termlist.html(acc.join(''));
+	node.html(acc.join(''));
     }
 
 
@@ -417,8 +425,8 @@ function team($, teamName) {
 	    });
 	});
 
-	document.mkwsSearchForm.mkwsQuery.value = '';
 	if (document.mkwsSelect) {
+	    debug("messing with mkwsSelect");
 	    if (document.mkwsSelect.mkwsSort)
 		document.mkwsSelect.mkwsSort.onchange = onSelectDdChange;
 	    if (document.mkwsSelect.mkwsPerpage)
@@ -620,10 +628,10 @@ function team($, teamName) {
 	    }
 	    var filter = m_filters[i];
 	    if (filter.id) {
-		text += 'Source: <a class="crossout" href="#" onclick="mkws.delimitTarget(' +
+		text += M('source') + ': <a class="crossout" href="#" onclick="mkws.delimitTarget(' +
 		    "'" + filter.id + "'" + ');return false;">' + filter.name + '</a>';
 	    } else {
-		text += filter.field + ': <a class="crossout" href="#" onclick="mkws.delimitQuery(' +
+		text += M(filter.field) + ': <a class="crossout" href="#" onclick="mkws.delimitQuery(' +
 		    "'" + filter.field + "', '" + filter.value + "'" +
 		    ');return false;">' + filter.value + '</a>';
 	    }
@@ -708,8 +716,8 @@ function team($, teamName) {
 
 	var targets = $('.mkwsTargets.mkwsTeam_' + tname);
 	var results = $('.mkwsResults.mkwsTeam_' + tname + ',.mkwsRecords.mkwsTeam_' + tname);
-	var blanket = $('#mkwsBlanket');
-	var motd    = $('#mkwsMOTD');
+	var blanket = $('.mkwsBlanket.mkwsTeam_' + tname);
+	var motd    = $('.mkwsMOTD.mkwsTeam_' + tname);
 
 	switch(view) {
         case 'targets':
@@ -908,7 +916,7 @@ function team($, teamName) {
     <td class="mkwsTermlistContainer1 mkwsTeam_' + m_teamName + '" width="250" valign="top">\
       <div id="mkwsTermlists" class="mkwsTermlists mkwsTeam_' + m_teamName + '"></div>\
     </td>\
-    <td id="mkwsMOTDContainer" valign="top">\
+    <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>\
@@ -947,16 +955,18 @@ 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").hide(); });
-	var motd = document.getElementById("mkwsMOTD");
-	var container = document.getElementById("mkwsMOTDContainer");
-	if (motd && container) {
+	$(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.parentNode.removeChild(motd);
-	    container.appendChild(motd);
+	    motd.appendTo(container);
 	}
     }
 
@@ -1392,7 +1402,7 @@ function _mkws_jquery_plugin ($) {
 	    show_sort: true, 	/* show/hide sort menu */
 	    show_perpage: true, 	/* show/hide perpage menu */
 	    lang_options: [], 	/* display languages links for given languages, [] for all */
-	    facets: ["sources", "subjects", "authors"], /* display facets, in this order, [] for none */
+	    facets: ["xtargets", "subject", "author"], /* display facets, in this order, [] for none */
 	    responsive_design_width: undefined, /* a page with less pixel width considered as narrow */
 	    debug_level: 1,     /* debug level for development: 0..2 */