Merge remote-tracking branch 'origin/new/bug_8525'

diff --combined koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/opac.pref
index 6858a58,e0c798b..1a9fa09
--- 1/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/opac.pref
--- 2/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/opac.pref
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/opac.pref
@@@ -125,7 -125,7 +125,7 @@@ OPAC
                choices:
                    yes: Highlight
                    no: "Don't highlight"
-             - words the patron searched for in their search results.
+             - words the patron searched for in their search results and detail pages.
          -
              - pref: AuthorisedValueImages
                choices:
@@@ -163,33 -163,11 +163,33 @@@
                type: textarea
                class: code
          -
 +            - "Include the following CSS for the mobile view on all pages in the OPAC:"
 +            - pref: OPACMobileUserCSS
 +              type: textarea
 +              class: code
 +        -
              - "Show the following HTML in its own column on the main page of the OPAC:"
              - pref: OpacMainUserBlock
                type: textarea
                class: code
          -
 +            - "Show the following HTML in its own column on the main page of the OPAC (mobile version):"
 +            - pref: OpacMainUserBlockMobile
 +              type: textarea
 +              class: code
 +        -
 +            - pref: OpacShowLibrariesPulldownMobile
 +              choices:
 +                  yes: Show
 +                  no: "Don't show"
 +            - the libraries pulldown on the mobile version of the OPAC.
 +        -
 +            - pref: OpacShowFiltersPulldownMobile
 +              choices:
 +                  yes: Show
 +                  no: "Don't show"
 +            - the search filters pulldown on the mobile version of the OPAC.
 +        -
              - "Show the following HTML on the left hand column of the main page and patron account on the OPAC (generally navigation links):"
              - pref: OpacNav
                type: textarea
@@@ -221,7 -199,7 +221,7 @@@
                type: textarea
                class: code
          -
 -            - 'Include a "Links" column on the "my summary" tab when a user is logged in to the OPAC, with the following HTML (leave blank to disable):'
 +            - 'Include a "Links" column on the "my summary" and "my reading history" tabs when a user is logged in to the OPAC, with the following HTML (leave blank to disable):'
              - '<br />Note: The placeholders {BIBLIONUMBER}, {TITLE}, {ISBN} and {AUTHOR} will be replaced with information from the displayed record.'
              - pref: OPACMySummaryHTML
                type: textarea
@@@ -296,12 -274,6 +296,12 @@@
                    no: "Don't allow"
              - patrons to browse subject authorities on OPAC (run misc/cronjobs/build_browser_and_cloud.pl to create the browser list)
          -
 +            - pref: OpacCloud
 +              choices:
 +                  yes: Show
 +                  no: "Don't show"
 +            - a subject cloud on OPAC (run misc/cronjobs/build_browser_and_cloud.pl to build)
 +        -
              - pref: OpacAuthorities
                choices:
                    yes: Allow
@@@ -387,7 -359,7 +387,7 @@@
                choices:
                    yes: "Don't allow"
                    no: Allow
 -            - patrons to select their library on the OPAC.
 +            - patrons to select their branch on the OPAC or show branch names with callnumbers.
          -
              - pref: SearchMyLibraryFirst
                choices: