projects / mkws-moved-to-github.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw (from parent 2: fb0d7cd)
Merge branch 'master' of ssh://git.indexdata.com/home/git/private/mkws
authorMike Taylor <mike@indexdata.com>
Wed, 5 Feb 2014 00:28:53 +0000 (00:28 +0000)
committerMike Taylor <mike@indexdata.com>
Wed, 5 Feb 2014 00:28:53 +0000 (00:28 +0000)
examples/htdocs/mike2.html patch | blob | history
tools/htdocs/mkws.css patch | blob | history
tools/htdocs/mkws.js patch | blob | history

diff --git a/examples/htdocs/mike2.html b/examples/htdocs/mike2.html
index 9dc7d88..cddc36e 100644 (file)
--- a/examples/htdocs/mike2.html
+++ b/examples/htdocs/mike2.html
@@ -20,10 +20,10 @@
   </head>
   <body>
     <div class="mkwsSwitch"></div>
-    <div id="mkwsLang"></div>
+    <div class="mkwsLang"></div>
     <div class="mkwsSearch"></div>
     <div class="mkwsResults"></div>
-    <div id="mkwsTargets"></div>
-    <div id="mkwsStat"></div>
+    <div class="mkwsTargets"></div>
+    <div class="mkwsStat"></div>
   </body>
 </html>
diff --git a/tools/htdocs/mkws.css b/tools/htdocs/mkws.css
index ef5c1c8..b39c8b1 100644 (file)
--- a/tools/htdocs/mkws.css
+++ b/tools/htdocs/mkws.css
@@ -1,4 +1,4 @@
-#mkwsLang,
+#mkwsLang, .mkwsLang,
 #mkwsSwitch, .mkwsSwitch,
 #mkwsSearch, .mkwsSearch,
 #mkwsTermlists,
@@ -7,23 +7,23 @@
 #mkwsNavi,
 #mkwsRecords,
 #mkwsTargets, .mkwsTargets,
-#mkwsStat,
+#mkwsStat, .mkwsStat,
 #mkwsMOTD {
     font-family: Gill Sans, "Gillius ADF", Gillius, GilliusADF, Verdana, Sans-Serif;
 }
 
-#mkwsLang {
+#mkwsLang, .mkwsLang {
     float: left;
     padding-left: 1em;
     padding-top: 0.4em;
 }
 
-#mkwsLang a {
+#mkwsLang a, .mkwsLang a {
     background: #d0e0ff;
     padding: 1px 4px;
 }
 
-#mkwsLang span {
+#mkwsLang span, .mkwsLang span {
     border: solid 1px #d0e0ff;
     padding: 0px 3px;
 }
@@ -42,19 +42,19 @@
     background-color: #fafafa;
 }
 
-#mkwsStat {
+#mkwsStat, .mkwsStat {
     margin-top: 10px;
     border-top: 1px solid  #156a16;
     padding-top: 5px;
     font-size: small;
 }
 
-#mkwsStat span.head {
+#mkwsStat span.head, .mkwsStat span.head {
     font-weight: bold;
 }
 
 #mkwsSwitch a, .mkwsSwitch a,
-#mkwsLang a,
+#mkwsLang a, .mkwsLang a,
 #mkwsTermlists a,
 #mkwsRanking a,
 #mkwsPager a,
@@ -65,7 +65,7 @@
 }
 
 #mkwsSwitch a:hover, .mkwsSwitch a:hover,
-#mkwsLang a:hover,
+#mkwsLang a:hover, .mkwsLang a:hover,
 #mkwsTermlists a:hover,
 #mkwsPager a:hover,
 #mkwsRecords a:hover {
diff --git a/tools/htdocs/mkws.js b/tools/htdocs/mkws.js
index 45564dd..5548cef 100644 (file)
--- a/tools/htdocs/mkws.js
+++ b/tools/htdocs/mkws.js
@@ -290,15 +290,15 @@ function team($, teamName) {
 
     function my_onstat(data, teamName) {
        debug("stat for " + teamName);
-       var stat = document.getElementById("mkwsStat");
-       if (stat == null)
+       var stat = $('.mkwsStat.mkwsTeam_' + teamName);
+       if (stat.length === 0)
            return;
 
-       stat.innerHTML = '<span class="head">' + M('Status info') + '</span>' +
+       stat.html('<span class="head">' + M('Status info') + '</span>' +
            ' -- ' +
            '<span class="clients">' + M('Active clients') + ': ' + data.activeclients + '/' + data.clients + '</span>' +
            ' -- ' +
-            '<span class="records">' + M('Retrieved records') + ': ' + data.records + '/' + data.hits + '</span>';
+           '<span class="records">' + M('Retrieved records') + ': ' + data.records + '/' + data.hits + '</span>');
     }
 
 
@@ -375,7 +375,6 @@ function team($, teamName) {
        debug("target for " + teamName);
        var targetDiv = $('.mkwsBytarget.mkwsTeam_' + teamName);
        if (!targetDiv) {
-           // No mkwsTargets div.
            return;
        }
 
@@ -704,7 +703,6 @@ function team($, teamName) {
     mkws.switchView = function(tname, view) {
        debug("switchView(" + tname + ", " + view + ")");
 
-       //var targets = document.getElementById('mkwsTargets');
        var targets = $('.mkwsTargets.mkwsTeam_' + tname);
        var results = $('.mkwsResults.mkwsTeam_' + tname + ',.mkwsRecords.mkwsTeam_' + tname);
        var blanket = $('#mkwsBlanket');
@@ -1052,18 +1050,18 @@ function team($, teamName) {
 
        /* display a list of configured languages, or all */
        var lang_options = mkws_config.lang_options || [];
-       var hash = {};
+       var toBeIncluded = {};
        for (var i = 0; i < lang_options.length; i++) {
-           hash[lang_options[i]] = 1;
+           toBeIncluded[lang_options[i]] = true;
        }
 
        for (var k in mkws.locale_lang) {
-           if (hash[k] == 1 || lang_options.length == 0)
+           if (toBeIncluded[k] || lang_options.length == 0)
                list.push(k);
        }
 
        // add english link
-       if (lang_options.length == 0 || hash[lang_default] == 1)
+       if (lang_options.length == 0 || toBeIncluded[lang_default])
             list.push(lang_default);
 
        debug("Language menu for: " + list.join(", "));
@@ -1083,7 +1081,7 @@ function team($, teamName) {
            }
        }
 
-       $("#mkwsLang").html(data);
+       $(".mkwsLang.mkwsTeam_" + m_teamName).html(data);
     }
 
 
@@ -1423,11 +1421,11 @@ function _mkws_jquery_plugin ($) {
      * for the site.
      */
     function authenticate_session(auth_url, auth_domain, pp2_url) {
-       console.log("Run service proxy auth URL: " + auth_url);
+       log("Run service proxy auth URL: " + auth_url);
 
        if (!auth_domain) {
            auth_domain = pp2_url.replace(/^(https?:)?\/\/(.*?)\/.*/, '$2');
-           console.log("guessed auth_domain '" + auth_domain + "' from pp2_url '" + pp2_url + "'");
+           log("guessed auth_domain '" + auth_domain + "' from pp2_url '" + pp2_url + "'");
        }
 
        var request = new pzHttpRequest(auth_url, function(err) {
@@ -1446,7 +1444,7 @@ function _mkws_jquery_plugin ($) {
                return;
            }
 
-           console.log("Service proxy auth successfully done");
+           log("Service proxy auth successfully done");
            mkws.authenticated = true;
            run_auto_searches();
        });
@@ -1454,13 +1452,13 @@ function _mkws_jquery_plugin ($) {
 
 
     function run_auto_searches() {
-       console.log("running auto searches");
+       log("running auto searches");
 
        for (var teamName in mkws.teams) {
            // ### should check mkwsTermlist as well, for facet-only teams
            var node = $('.mkwsRecords.mkwsTeam_' + teamName);
            var query = node.attr('autosearch');
-           console.log("teamName '" + teamName + "', node=" + node + ", class='" + node.className + "', query=" + query);
+           log("teamName '" + teamName + "', node=" + node + ", class='" + node.className + "', query=" + query);
 
            if (query) {
                var sort = node.attr('sort');
@@ -1469,9 +1467,9 @@ function _mkws_jquery_plugin ($) {
                if (teamName) s += " [teamName '" + teamName + "']";
                if (sort) s += " sorted by '" + sort + "'";
                if (targets) s += " in targets '" + targets + "'";
-               console.log(s);
+               log(s);
                var team = mkws.teams[teamName];
-               console.log($.toJSON(team));
+               log($.toJSON(team));
                team.newSearch(query, sort, targets, teamName);
            }
        }
MasterKey Widget Set