From: Wolfram Schneider Date: Mon, 1 Jul 2013 14:26:30 +0000 (+0000) Subject: Merge branch 'wosch' X-Git-Tag: 0.9.1~396 X-Git-Url: http://sru.miketaylor.org.uk/?a=commitdiff_plain;h=3f7149be26baf7bc0fa52e0bb810c72ffb428532;hp=8c10eed89e419a000dd3c467006fb89cfc8e33ee;p=mkws-moved-to-github.git Merge branch 'wosch' Conflicts: experiments/spclient/index-mobile.html experiments/spclient/mkws.js --- diff --git a/experiments/spclient/index-full.html b/experiments/spclient/index-full.html index 6704694..6c43b20 100644 --- 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 --- a/experiments/spclient/index-mobile.html +++ b/experiments/spclient/index-mobile.html @@ -7,62 +7,25 @@ MKWS demo client - - @@ -76,7 +39,7 @@ diff --git a/experiments/spclient/index-popup.html b/experiments/spclient/index-popup.html index 5c84690..a523fb6 100644 --- a/experiments/spclient/index-popup.html +++ b/experiments/spclient/index-popup.html @@ -8,7 +8,11 @@ - + + + + +