From 9f5d5001e6d1a96297a2781de6df2399bc0e5f7d Mon Sep 17 00:00:00 2001 From: Jesse Weaver Date: Mon, 2 Nov 2009 20:10:24 -0700 Subject: [PATCH] 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. --- .../en/modules/admin/preferences/admin.pref | 5 +++++ .../admin/preferences/cataloguing.pref | 12 +++++++++++ .../admin/preferences/circulation.pref | 12 +++++++++-- .../en/modules/admin/preferences/opac.pref | 20 ++++++++++++++++++- .../admin/preferences/staff-client.pref | 13 ++++++++++++ 5 files changed, 59 insertions(+), 3 deletions(-) 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 2309006780..c57e4c9716 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/admin.pref +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/admin.pref @@ -49,6 +49,11 @@ Administration: yes: Allow 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 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 387b43359e..a4b2fd8522 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/cataloguing.pref +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/cataloguing.pref @@ -72,6 +72,11 @@ Cataloging: hbyymmincr: generated in the form <branchcode>yymm0001. OFF: not generated automatically. Display: + - + - 'Separate multiple displayed authors, series or subjects with ' + - pref: authoritysep + class: short + - '.' - - Show - pref: URLLinkText @@ -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 9b43e87c31..8e20b2b811 100644 --- 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 misc/cronjobs/fines.pl 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 4b7043f782..49ce31a0e2 100644 --- 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):' + - '
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 b8a8267f8e..60607a35dd 100644 --- 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 @@ -25,6 +26,11 @@ Staff Client: - pref: intranetcolorstylesheet 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 includes/. (Leave blank to disable) - - "Show the following HTML in its own column on the main page of the staff client:" - pref: IntranetmainUserblock @@ -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. -- 2.20.1