Rename all menu_* configuration options show_*. Part of MKWS-41

[mkws-moved-to-github.git] / tools / htdocs / mkws.js

diff --git a/tools/htdocs/mkws.js b/tools/htdocs/mkws.js
index 144d2de..0e0dfa1 100644 (file)
--- a/tools/htdocs/mkws.js
+++ b/tools/htdocs/mkws.js
@@ -49,6 +49,7 @@ mkws.locale_lang = {
        "Date": "Datum",
        "Subject": "Schlagwort",
        "Location": "Ort",
+       // ### to add: Records, Targets
 
        "dummy": "dummy"
     },
@@ -73,11 +74,17 @@ mkws.locale_lang = {
        "Date": "Dato",
        "Subject": "Emneord",
        "Location": "Lokation",
+       // ### to add: Records, Targets
 
        "dummy": "dummy"
     }
 };
 
+// keep time state for debugging
+mkws.debug_time = {
+    "start": $.now(),
+    "last": $.now()
+};
 mkws.debug = function (string) {
     if (!mkws.debug)
        return;
@@ -86,13 +93,17 @@ mkws.debug = function (string) {
        return;
     }
 
+    var now = $.now();
+    var timestamp = (now - mkws.debug_time.start)/1000 + " (+" + (now - mkws.debug_time.last)/1000 + ") "
+    mkws.debug_time.last = now;
+
     // you need to disable use strict at the top of the file!!!
     if (mkws.debug >= 3) {
-       console.log(arguments.callee.caller);
+       console.log(timestamp + arguments.callee.caller);
     } else if (mkws.debug >= 2) {
-       console.log(">>> called from function " + arguments.callee.caller.name + ' <<<');
+       console.log(timestamp + ">>> called from function " + arguments.callee.caller.name + ' <<<');
     }
-    console.log(string);
+    console.log(timestamp + string);
 }
 var debug = mkws.debug; // local alias
 
@@ -382,7 +393,7 @@ function drawPager (pagerDiv)
 
     var prev = '<span id="mkwsPrev">&#60;&#60; ' + M('Prev') + '</span><b> | </b>';
     if (curPage > 1)
-        prev = '<a href="#" id="mkwsPrev" onclick="pagerPrev();">'
+        prev = '<a href="#" id="mkwsPrev" onclick="mkws.pagerPrev();">'
         +'&#60;&#60; ' + M('Prev') + '</a><b> | </b>';
 
     var middle = '';
@@ -427,7 +438,7 @@ mkws.pagerNext = function () {
     }
 }
 
-function pagerPrev() {
+mkws.pagerPrev = function () {
     if ( my_paz.showPrev() != false )
         curPage--;
 }
@@ -435,6 +446,8 @@ function pagerPrev() {
 // switching view between targets and records
 
 mkws.switchView = function(view) {
+    debug("switchView: " + view);
+
     var targets = document.getElementById('mkwsTargets');
     var results = document.getElementById('mkwsResults') ||
                  document.getElementById('mkwsRecords');
@@ -545,15 +558,19 @@ function renderField(caption, data, data2, data3) {
 function mkws_html_all(config) {
 
     /* default mkws config */
+    /* ### No defaults given for:
+     * lang, responsive_design, service_proxy_auth, use_service_proxy
+     * and of course the optional language_* entries.
+     */
     var mkws_config_default = {
        sort: [["relevance"], ["title:1", "title"], ["date:0", "newest"], ["date:1", "oldest"]],
        perpage: [10, 20, 30, 50],
        sort_default: "relevance",
        perpage_default: 20,
        query_width: 50,
-       lang_menu: true,        /* show/hide language menu */
-       sort_menu: true,        /* show/hide sort menu */
-       perpage_menu: true,     /* show/hide perpage menu */
+       show_lang: true,        /* show/hide language menu */
+       show_sort: true,        /* show/hide sort menu */
+       show_perpage: true,     /* show/hide perpage menu */
        lang_display: [],       /* display languages links for given languages, [] for all */
        facets: ["sources", "subjects", "authors"], /* display facets, in this order, [] for none */
        responsive_design_width: 980, /* a page with less pixel width considered as narrow */
@@ -582,7 +599,7 @@ function mkws_html_all(config) {
     }
 
     mkws_set_lang(mkws_config);
-    if (mkws_config.lang_menu)
+    if (mkws_config.show_lang)
        mkws_html_lang(mkws_config);
 
     // For some reason, doing this programmatically results in
@@ -628,10 +645,10 @@ function mkws_html_all(config) {
     if ($("#mkwsRanking").length) {
        var ranking_data = '';
        ranking_data += '<form name="mkwsSelect" id="mkwsSelect" action="" >';
-       if (config.sort_menu) {
+       if (config.show_sort) {
            ranking_data +=  M('Sort by') + ' ' + mkws_html_sort(config) + ' ';
        }
-       if (config.perpage_menu) {
+       if (config.show_perpage) {
            ranking_data += M('and show') + ' ' + mkws_html_perpage(config) + ' ' + M('per page') + '.';
        }
         ranking_data += '</form>';
@@ -680,17 +697,9 @@ function mkws_set_lang(mkws_config)  {
 function mkws_html_switch(config) {
     debug("HTML switch");
 
-    $("#mkwsSwitch").html($("<a/>", {
-       href: '#',
-       onclick: "mkws.switchView(\'records\')",
-       text: M("Records")
-    }));
+    $("#mkwsSwitch").append($('<a href="#" id="mkwsSwitch_records" onclick="mkws.switchView(\'records\')">' + M('Records') + '</a>'));
     $("#mkwsSwitch").append($("<span/>", { text: " | " }));
-    $("#mkwsSwitch").append($("<a/>", {
-       href: '#',
-       onclick: "mkws.switchView(\'targets\')",
-       text: M("Targets")
-    }));
+    $("#mkwsSwitch").append($('<a href="#" id="mkwsSwitch_targets" onclick="mkws.switchView(\'targets\')">' + M('Targets') + '</a>'));
 
     debug("HTML targets");
     $("#mkwsTargets").html('\