From: Wolfram Schneider <wosch@indexdata.dk>
Date: Wed, 10 Jul 2013 12:16:30 +0000 (+0000)
Subject: Merge remote branch 'origin/master' into wosch
X-Git-Tag: 0.9.1~297
X-Git-Url: http://sru.miketaylor.org.uk/?a=commitdiff_plain;h=86bf6d896e3e172c9fe5fa5095776e9ee249cfbb;hp=9a7b5cacc188da91322bf8dde2522419481f378d;p=mkws-moved-to-github.git

Merge remote branch 'origin/master' into wosch
---

diff --git a/tools/htdocs/mkws.js b/tools/htdocs/mkws.js
index f4124b4..fc79eb9 100644
--- a/tools/htdocs/mkws.js
+++ b/tools/htdocs/mkws.js
@@ -830,8 +830,10 @@ jQuery.extend({
     });
     return nvpair;
   },
-  pazpar2: function(data) {
-	document.write('<div id="mkwsSwitch"></div>\
+  pazpar2: function(config) {
+
+    // simple layout
+    var div = '<div id="mkwsSwitch"></div>\
     <div id="mkwsLang"></div>\
     <div id="mkwsSearch"></div>\
     <div id="mkwsResults"></div>\
@@ -839,7 +841,59 @@ jQuery.extend({
     <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>');
+    </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') {
+       document.write(table);
+    } else {
+       document.write(div);
+    }
 
     mkws_html_all(mkws_config);
   }