Bug 3585 - sys prefs missing and in wrong tabs

Note that most of the prefs that have been moved between tabs were
moved intentionally, because the old tab no longer made sense. If one
in particular seems wrong, please let me know.

diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/admin.pref b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/admin.pref
index 2309006..c57e4c9 100644 (file)
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/admin.pref
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/admin.pref
@@ -50,6 +50,11 @@ Administration:
                   no: "Don't allow"
             - staff to access the staff client without logging in. Enabling this is dangerous, and should not be done in production environments.
         -
+            - Automatically log out users after
+            - pref: timeout
+              class: integer
+            - seconds of inactivity.
+        -
             - pref: AutoLocation
               default: 0
               choices:

diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/cataloguing.pref b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/cataloguing.pref
index 387b433..a4b2fd8 100644 (file)
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/cataloguing.pref
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/cataloguing.pref
@@ -73,6 +73,11 @@ Cataloging:
                   OFF: not generated automatically.
     Display:
         -
+            - 'Separate multiple displayed authors, series or subjects with '
+            - pref: authoritysep
+              class: short
+            - '.'
+        -
             - Show
             - pref: URLLinkText
             - as the text of links embedded in MARC records.
@@ -116,4 +121,11 @@ Cataloging:
             - pref: OPACSerialIssueDisplayCount
               class: integer
             - previous issues of a serial on the OPAC.
+        -
+            - When showing the subscription information for a biblio, show
+            - pref: SubscriptionHistory
+              choices:
+                  simplified: a summary
+                  full: a full list
+            - of the serial issues.
 

diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/circulation.pref b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/circulation.pref
index 9b43e87..8e20b2b 100644 (file)
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/circulation.pref
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/circulation.pref
@@ -81,7 +81,7 @@ Circulation:
             - When items are created, give them the temporary location of
             - pref: NewItemsDefaultLocation
               class: short
-            - (should be a location code or blank).
+            - (should be a location code, or blank to disable).
         -
             - pref: InProcessingToShelvingCart
               choices:
@@ -89,7 +89,7 @@ Circulation:
                   no: "Don't move"
             - items that have the location PROC to the location CART when they are checked in.
         -
-            - pref: InProcessingToShelvingCart
+            - pref: ReturnToShelvingCart
               choices:
                   yes: Move
                   no: "Don't move"
@@ -239,3 +239,11 @@ Circulation:
                   test: Calculate (but only for mailing to the admin)
                   production: Calculate and charge
             - fines (when <code>misc/cronjobs/fines.pl</code> is being run).
+    Self Checkout:
+        -
+            - pref: ShowPatronImageInWebBasedSelfCheck
+              choices:
+                  yes: Show
+                  no: "Don't show"
+            - "the patron's picture (if one has been added) when they use the web-based self checkout."
+

diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/opac.pref b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/opac.pref
index 4b7043f..49ce31a 100644 (file)
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/opac.pref
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/opac.pref
@@ -142,6 +142,12 @@ OPAC:
             - pref: opaccredits
               type: textarea
               class: code
+        -
+            - 'Include a "More Searches" box on the detail pages of items on the OPAC, with the following HTML (leave blank to disable):'
+            - '<br />Note: The placeholders {TITLE}, {ISBN} and {AUTHOR} will be replaced with information from the displayed record.'
+            - pref: OPACSearchForTitleIn
+              type: textarea
+              class: code
     Features:
         -
             - pref: opacuserlogin
@@ -154,7 +160,19 @@ OPAC:
               choices:
                   yes: Allow
                   no: "Don't allow"
-            - patrons to change their own password on the OPAC. Note that enabling this will break LDAP authentication.
+            - patrons to change their own password on the OPAC. Note that this must be off to use LDAP authentication.
+        -
+            - pref: OPACPatronDetails
+              choices:
+                  yes: Allow
+                  no: "Don't allow"
+            - patrons to notify the library of changes to their contact information from the OPAC.
+        -
+            - pref: OPACFinesTab
+              choices:
+                  yes: Allow
+                  no: "Don't allow"
+            - patrons to access the Fines tab on the My Account page on the OPAC.
         -
             - pref: OpacAuthorities
               choices:

diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/staff-client.pref b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/staff-client.pref
index b8a8267..60607a3 100644 (file)
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/staff-client.pref
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/staff-client.pref
@@ -1,6 +1,7 @@
 # Broken, omitted: IntranetNav, TemplateEncoding
 
 Staff Client:
+    Appearance:
         -
             - Use the
             - pref: template
@@ -26,6 +27,11 @@ Staff Client:
               class: file
             - on all pages in the staff interface. (Leave blank to disable.)
         -
+            - Use include files from the
+            - pref: intranet_includes
+              class: file
+            - directory in the template directory, instead of <code>includes/</code>. (Leave blank to disable)
+        -
             - "Show the following HTML in its own column on the main page of the staff client:"
             - pref: IntranetmainUserblock
               type: textarea
@@ -41,6 +47,7 @@ Staff Client:
               choices:
                   local: "included with Koha (faster, will work if internet goes down)."
                   "http://yui.yahooapis.com/2.5.1/build": "from Yahoo's own servers (less demand on your servers)."
+    Options:
         -
             - pref: viewMARC
               choices:
@@ -59,3 +66,9 @@ Staff Client:
                   yes: Allow
                   no: "Don't allow"
             - staff to view records in ISBD form on the staff client.
+        -
+            - pref: HidePatronName
+              choices:
+                  yes: Show
+                  no: "Don't show"
+            - the names of patrons that have items checked out or on hold on detail pages or the "Place Hold" screen.