X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=tools%2Fhtdocs%2Fmkws.js;h=41d34a34a303b8531d1959211d72c263e31e0a57;hb=287904816476333f1b699d3ce612418059cf51d3;hp=0e0dfa14de74251a5d456bd4a29794d1858be564;hpb=1e449acba57c1146e146225f7f47e5cd412e07e2;p=mkws-moved-to-github.git

diff --git a/tools/htdocs/mkws.js b/tools/htdocs/mkws.js
index 0e0dfa1..41d34a3 100644
--- a/tools/htdocs/mkws.js
+++ b/tools/htdocs/mkws.js
@@ -22,10 +22,9 @@ if (!mkws_config)
 if (typeof mkws_config.use_service_proxy === 'undefined')
     mkws_config.use_service_proxy = true;
 
-var pazpar2_url = mkws_config.pazpar2_url ? mkws_config.pazpar2_url : "/pazpar2/search.pz2";
-var service_proxy_url = mkws_config.service_proxy_url ? mkws_config.service_proxy_url : "http://mkws.indexdata.com/service-proxy/";
+var pazpar2_url = mkws_config.pazpar2_url ? mkws_config.pazpar2_url : "http://mkws.indexdata.com/service-proxy/";
 
-mkws.pazpar2path = mkws_config.use_service_proxy ? service_proxy_url : pazpar2_url;
+mkws.pazpar2path = pazpar2_url;
 mkws.usesessions = mkws_config.use_service_proxy ? false : true;
 
 mkws.locale_lang = {
@@ -559,21 +558,21 @@ function mkws_html_all(config) {
 
     /* default mkws config */
     /* ### No defaults given for:
-     * lang, responsive_design, service_proxy_auth, use_service_proxy
+     * lang, 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_options: [["relevance"], ["title:1", "title"], ["date:0", "newest"], ["date:1", "oldest"]],
+	perpage_options: [10, 20, 30, 50],
 	sort_default: "relevance",
 	perpage_default: 20,
 	query_width: 50,
 	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 */
+	lang_options: [], 	/* 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 */
+	responsive_design_width: undefined, /* a page with less pixel width considered as narrow */
 	debug: 1,     /* debug level for development: 0..2 */
 
 	dummy: "dummy"
@@ -661,7 +660,7 @@ function mkws_html_all(config) {
     if (mkws_config.use_service_proxy)
 	mkws_service_proxy_auth(config.service_proxy_auth);
 
-    if (mkws_config.responsive_design) {
+    if (mkws_config.responsive_design_width) {
 	// Responsive web design - change layout on the fly based on
 	// current screen width. Required for mobile devices.
 	$(window).resize( function(e) { mkws_resize_page() });
@@ -713,9 +712,9 @@ function mkws_html_sort(config) {
     debug("HTML sort");
     var sort_html = '<select name="mkwsSort" id="mkwsSort">';
 
-    for(var i = 0; i < config.sort.length; i++) {
-	var key = config.sort[i][0];
-	var val = config.sort[i].length == 1 ? config.sort[i][0] : config.sort[i][1];
+    for(var i = 0; i < config.sort_options.length; i++) {
+	var key = config.sort_options[i][0];
+	var val = config.sort_options[i].length == 1 ? config.sort_options[i][0] : config.sort_options[i][1];
 
 	sort_html += '<option value="' + key + '"';
 	if (key == config.sort_default) {
@@ -732,8 +731,8 @@ function mkws_html_perpage(config) {
     debug("HTML perpage");
     var perpage_html = '<select name="mkwsPerpage" id="mkwsPerpage">';
 
-    for(var i = 0; i < config.perpage.length; i++) {
-	var key = config.perpage[i];
+    for(var i = 0; i < config.perpage_options.length; i++) {
+	var key = config.perpage_options[i];
 
 	perpage_html += '<option value="' + key + '"';
 	if (key == config.perpage_default) {
@@ -785,19 +784,19 @@ function mkws_html_lang(mkws_config) {
     var list = [];
 
     /* display a list of configured languages, or all */
-    var lang_display = mkws_config.lang_display || [];
+    var lang_options = mkws_config.lang_options || [];
     var hash = {};
-    for (var i = 0; i < lang_display.length; i++) {
-	hash[lang_display[i]] = 1;
+    for (var i = 0; i < lang_options.length; i++) {
+	hash[lang_options[i]] = 1;
     }
 
     for (var k in mkws.locale_lang) {
-	if (hash[k] == 1 || lang_display.length == 0)
+	if (hash[k] == 1 || lang_options.length == 0)
 	    list.push(k);
     }
 
     // add english link
-    if (lang_display.length == 0 || hash[lang_default] == 1)
+    if (lang_options.length == 0 || hash[lang_default] == 1)
         list.push(lang_default);
 
     debug("Language menu for: " + list.join(", "));
@@ -823,7 +822,7 @@ function mkws_html_lang(mkws_config) {
 function mkws_resize_page () {
     var list = ["mkwsSwitch"];
 
-    var width = mkws_config.responsive_design_width || 980;
+    var width = mkws_config.responsive_design_width;
     var parentId = $("#mkwsTermlists").parent().attr('id');
 
     if ($(window).width() <= width &&