projects / mkws-moved-to-github.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw (from parent 1: 8c10eed)
Merge branch 'wosch'
authorWolfram Schneider <wosch@indexdata.dk>
Mon, 1 Jul 2013 14:26:30 +0000 (14:26 +0000)
committerWolfram Schneider <wosch@indexdata.dk>
Mon, 1 Jul 2013 14:26:30 +0000 (14:26 +0000)
Conflicts:
experiments/spclient/index-mobile.html
experiments/spclient/mkws.js

experiments/spclient/index-full.html patch | blob | history
experiments/spclient/index-mobile.html patch | blob | history
experiments/spclient/index-popup.html patch | blob | history
experiments/spclient/mkws.js patch | blob | history

diff --git a/experiments/spclient/index-full.html b/experiments/spclient/index-full.html
index 6704694..6c43b20 100644 (file)
--- a/experiments/spclient/index-full.html
+++ b/experiments/spclient/index-full.html
@@ -14,7 +14,6 @@
                switch_menu: true, 
                lang_menu: true, 
                lang_display: ["da", "en"], 
-               termlist_menu: true, 
                sort_default: "relevance",
                query_width: 50,
                perpage_default: 20
diff --git a/experiments/spclient/index-mobile.html b/experiments/spclient/index-mobile.html
index 7fc9924..b1821b7 100644 (file)
--- a/experiments/spclient/index-mobile.html
+++ b/experiments/spclient/index-mobile.html
@@ -7,62 +7,25 @@
     <title>MKWS demo client</title>
 
     <script type="text/javascript">
-       var mkws_config = { 
+       var mkws_config = {
                lang: "da",
                debug: 1,
                use_service_proxy: true,
-               switch_menu: false, 
-               lang_menu: true, 
-               lang_display: ["da", "en"], 
-               termlist_menu: true, 
+               switch_menu: false,
+               lang_menu: true,
+               lang_display: ["da", "en"],
                sort_default: "relevance",
                query_width: 50,
                responsive_design: true,
-               facets: ["sources", "subjects", "authors"],
+               facets: ["authors", "sources", "subjects"],
                perpage_default: 20
-        }; 
+        };
     </script>
 
     <script type="text/javascript" src="http://code.jquery.com/jquery-1.10.0.min.js"></script>
     <script type="text/javascript" src="http://mkws.indexdata.com/libjs-pz2/pz2api.1.js"></script>
     <script type="text/javascript" src="mkws.js"></script>
     <link rel="stylesheet" href="mkwsStyle.css" />
-
-    <script type="text/javascript">
-       var timeout;
-
-       if (mkws_config.responsive_design) {
-           $(window).resize( function(e) { 
-               if (timeout)
-                   clearTimeout(timeout);
-               timeout = setTimeout(function () { mobile_resize() }, 100);
-            });
-           $(document).ready(function() { mobile_resize() });
-       }
-
-       function mobile_resize () {
-          debug("resize width: " + $(window).height() + ", width: " + $(window).width()); 
-          var list = ["mkwsSwitch"];
-          var obj;
-          // alert($(window).width());
- 
-          if ($(window).width() <= 980) {
-               for(var i = 0; i < list.length; i++) {
-                   $("#" + list[i]).hide();
-               }
-               
-               $("#termlist").parent().hide(); 
-               obj = $("#termlist").parent().html();
-               $("#mkwsTermlist").html(obj);
-          } else {
-               for(var i = 0; i < list.length; i++) {
-                   $("#" + list[i]).show();
-               }
-               $("#termlist").parent().show(); 
-               $("#mkwsTermlist").html("");
-          }
-       };
-    </script>
   </head>
   <body>
     <!-- These six mkws <div>s are provided by MKWS -->
@@ -76,7 +39,7 @@
 
     <div id="footer">
       <div id="mkwsStat"></div>
-      <span>Powered by MKWS &copy; 2013 <a href="http://www.indexdata.com">Index Data</a></span> 
+      <span>Powered by MKWS &copy; 2013 <a href="http://www.indexdata.com">Index Data</a></span>
     </div>
   </body>
 </html>
diff --git a/experiments/spclient/index-popup.html b/experiments/spclient/index-popup.html
index 5c84690..a523fb6 100644 (file)
--- a/experiments/spclient/index-popup.html
+++ b/experiments/spclient/index-popup.html
@@ -8,7 +8,11 @@
     <script type="text/javascript">
       mkws_config = { switch_menu: false, lang_menu: false, query_width: 40 };
     </script>
-    <script type="text/javascript" src="http://mkws.indexdata.com/mkws-complete.js"></script>
+    <!-- <script type="text/javascript" src="http://mkws.indexdata.com/mkws-complete.js"></script> -->
+    <script type="text/javascript" src="http://code.jquery.com/jquery-1.10.0.min.js"></script>
+    <script type="text/javascript" src="http://mkws.indexdata.com/libjs-pz2/pz2api.1.js"></script>
+    <script type="text/javascript" src="mkws.js"></script>
+
     <script src="http://code.jquery.com/ui/1.10.3/jquery-ui.js"></script>
 
     <style>
diff --git a/experiments/spclient/mkws.js b/experiments/spclient/mkws.js
index ae807e1..5dfe32e 100644 (file)
--- a/experiments/spclient/mkws.js
+++ b/experiments/spclient/mkws.js
@@ -158,8 +158,14 @@ function my_onstat(data) {
 }
 
 function my_onterm(data) {
-    if (!mkws_config.facets || mkws_config.facets.length == 0)
+    // no facets
+    if (!mkws_config.facets || mkws_config.facets.length == 0) {
+       $("#termlist").parent().hide();
        return;
+    }
+
+    // display if we first got results
+    $("#termlist").parent().show();
 
     var termlists = [];
     termlists.push('<div class="title">' + M('Termlists') + '</div>');
@@ -554,10 +560,33 @@ function mkws_html_all(config) {
       </table>');
 
     mkws_html_switch(config);
+
     if (mkws_config.use_service_proxy)
        mkws_service_proxy_auth(config.service_proxy_auth);
 
+    if (mkws_config.responsive_design)
+       mkws_responsive_design();
+
     domReady();
+
+    // on first page, hide the termlist
+    $(document).ready(function() { $("#termlist").parent().hide(); } );
+}
+
+/* Responsive web design - change layout on the fly depending on
+ * the current screen size width/height. Required for mobile devices.
+ */
+function mkws_responsive_design () {
+    var timeout = null;
+
+    $(window).resize( function(e) {
+       if (timeout)
+           clearTimeout(timeout);
+       timeout = setTimeout(function () { mkws_mobile_resize() }, 100);
+    });
+
+    // initial check after page load
+    $(document).ready(function() { mkws_mobile_resize() });
 }
 
 function mkws_set_lang(mkws_config)  {
@@ -704,6 +733,29 @@ function mkws_html_lang(mkws_config) {
     $("#mkwsLang").html(data);
 }
 
+function mkws_mobile_resize () {
+   debug("resize width: " + $(window).height() + ", width: " + $(window).width());
+   var list = ["mkwsSwitch"];
+   var obj;
+   // alert($(window).width());
+
+   if ($(window).width() <= 980) {
+       for(var i = 0; i < list.length; i++) {
+           $("#" + list[i]).hide();
+       }
+
+       $("#termlist").parent().hide();
+       obj = $("#termlist").parent().html();
+       $("#mkwsTermlist").html("<hr/>" + obj);
+   } else {
+       for(var i = 0; i < list.length; i++) {
+           $("#" + list[i]).show();
+       }
+       $("#termlist").parent().show();
+       $("#mkwsTermlist").html("");
+   }
+};
+
 /* locale */
 function M(word) {
     var lang = mkws_config.lang;
MasterKey Widget Set