Rename all menu_* configuration options show_*. Part of MKWS-41

diff --git a/examples/htdocs/index-full.html b/examples/htdocs/index-full.html
index 45d6b7d..3c60694 100644 (file)
--- a/examples/htdocs/index-full.html
+++ b/examples/htdocs/index-full.html
@@ -11,7 +11,7 @@
                lang: "da",
                debug: 1,
                use_service_proxy: true,
-               lang_menu: true,
+               show_lang: true,
                sort_default: "relevance",
                query_width: 50,
                perpage_default: 20,

diff --git a/examples/htdocs/index-mobile.html b/examples/htdocs/index-mobile.html
index 45a735d..79a6b39 100644 (file)
--- a/examples/htdocs/index-mobile.html
+++ b/examples/htdocs/index-mobile.html
@@ -11,7 +11,7 @@
                lang: "da",
                debug: 1,
                use_service_proxy: true,
-               lang_menu: true,
+               show_lang: true,
                lang_display: ["da", "en"],
                sort_default: "relevance",
                query_width: 50,

diff --git a/examples/htdocs/index-popup.html b/examples/htdocs/index-popup.html
index e363b7e..2d1ba09 100644 (file)
--- a/examples/htdocs/index-popup.html
+++ b/examples/htdocs/index-popup.html
@@ -8,7 +8,7 @@
 
     <script type="text/javascript">
       mkws_config = {
-       lang_menu: false,
+       show_lang: false,
        perpage_default: 10,
        query_width: 50,
         service_proxy_auth: "http://mkws.indexdata.com/service-proxy-auth"

diff --git a/tools/htdocs/README.markdown b/tools/htdocs/README.markdown
index 70467c2..b349bf5 100644 (file)
--- a/tools/htdocs/README.markdown
+++ b/tools/htdocs/README.markdown
@@ -61,9 +61,9 @@ possible options:
        <script type="text/javascript">
            var mkws_config = {
                use_service_proxy: true,    /* true, flase: use service proxy instead pazpar2 */
-               lang_menu: true,            /* true, false: show/hide language menu */
-               sort_menu: true,            /* true, false: show/hide sort menu */
-               perpage_menu: true,         /* true, false: show/hide perpage menu */
+               show_lang: true,            /* true, false: show/hide language menu */
+               show_sort: true,            /* true, false: show/hide sort menu */
+               show_perpage: true,         /* true, false: show/hide perpage menu */
                lang_display: ["en", "de", "da"], /* display languages links for given
                                                     languages, [] for all */
                facets: ["sources", "subjects", "authors"], /* display facets, in this order, [] for none */

diff --git a/tools/htdocs/mkws.js b/tools/htdocs/mkws.js
index ed81bcb..0e0dfa1 100644 (file)
--- a/tools/htdocs/mkws.js
+++ b/tools/htdocs/mkws.js
@@ -568,9 +568,9 @@ function mkws_html_all(config) {
        sort_default: "relevance",
        perpage_default: 20,
        query_width: 50,
-       lang_menu: true,        /* show/hide language menu */
-       sort_menu: true,        /* show/hide sort menu */
-       perpage_menu: true,     /* show/hide perpage menu */
+       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 */
        facets: ["sources", "subjects", "authors"], /* display facets, in this order, [] for none */
        responsive_design_width: 980, /* a page with less pixel width considered as narrow */
@@ -599,7 +599,7 @@ function mkws_html_all(config) {
     }
 
     mkws_set_lang(mkws_config);
-    if (mkws_config.lang_menu)
+    if (mkws_config.show_lang)
        mkws_html_lang(mkws_config);
 
     // For some reason, doing this programmatically results in
@@ -645,10 +645,10 @@ function mkws_html_all(config) {
     if ($("#mkwsRanking").length) {
        var ranking_data = '';
        ranking_data += '<form name="mkwsSelect" id="mkwsSelect" action="" >';
-       if (config.sort_menu) {
+       if (config.show_sort) {
            ranking_data +=  M('Sort by') + ' ' + mkws_html_sort(config) + ' ';
        }
-       if (config.perpage_menu) {
+       if (config.show_perpage) {
            ranking_data += M('and show') + ' ' + mkws_html_perpage(config) + ' ' + M('per page') + '.';
        }
         ranking_data += '</form>';

diff --git a/tools/htdocs/whitepaper.markdown b/tools/htdocs/whitepaper.markdown
index 9345cba..7185310 100644 (file)
--- a/tools/htdocs/whitepaper.markdown
+++ b/tools/htdocs/whitepaper.markdown
@@ -292,7 +292,7 @@ lang                     string  en        Code of the default language to displ
 lang_display             array   []        A list of the languages to offer as options. If empty (the default), then all
                                            configured languages are listed.
 
-lang_menu                bool    true      Indicates whether or not to display the language menu. ### We should get rid of this
+show_lang                bool    true      Indicates whether or not to display the language menu. ### We should get rid of this
                                            setting, and simply display the menu if there's an `mkwsLang` element.
 
 language_*               hash              Support for any number of languages can be added by providing entries whose name is
@@ -310,7 +310,7 @@ perpage_default          string  20        The initial value for the number of r
                                            `perpage_default` entries should be renamed `perpage_display` and `perpage`
                                            respectively for consistency with the language-related settings.
 
-perpage_menu             bool    true      Indicates whether or not to display the perpage menu. ### We should get rid of this
+show_perpage             bool    true      Indicates whether or not to display the perpage menu. ### We should get rid of this
                                            setting, and simply display the menu if an appropriate container is provided.
 
 query_width              int     50        The width of the query box, in characters.
@@ -336,7 +336,7 @@ sort                     array   *Note 6*  List of supported sort criteria. Each
 sort_default             string  relevance The label of the default sort criterion to use. Must be one of those in the `sort`
                                            array.
 
-sort_menu                bool    true      Indicates whether or not to display the sort menu. ### We should get rid of this
+show_sort                bool    true      Indicates whether or not to display the sort menu. ### We should get rid of this
                                            setting, and simply display the menu if an appropriate container is provided.
 
 use_service_proxy        bool    true      If true, then a Service Proxy is used to deliver searching services rather than raw