Add and change preferences, change tab names in sysprefs editor
authorJesse Weaver <pianohacker@gmail.com>
Tue, 13 Oct 2009 03:05:27 +0000 (21:05 -0600)
committerJesse Weaver <pianohacker@gmail.com>
Tue, 20 Oct 2009 03:25:46 +0000 (21:25 -0600)
This adds some missing preferences and changes others. It also moves
the OAI-PMH tab to Web Services, and fixes the alphabetization of the
others.

koha-tmpl/intranet-tmpl/prog/en/includes/prefs-menu.inc
koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/admin.pref
koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/cataloguing.pref
koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/circulation.pref
koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/oai-pmh.pref [deleted file]
koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/opac.pref
koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/searching.pref
koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/web-services.pref [new file with mode: 0644]

index 5c5e1cf..9569faa 100644 (file)
@@ -1,18 +1,18 @@
 <div id="menu">
 <ul>
-<!-- TMPL_IF NAME="admin" --><li class="active"><!-- TMPL_ELSE --><li><!-- /TMPL_IF --><a title="Administration" href="/cgi-bin/koha/admin/preferences.pl?tab=admin">Administration</a></li>
 <!-- TMPL_IF NAME="acquisitions" --><li class="active"><!-- TMPL_ELSE --><li><!-- /TMPL_IF --><a title="Acquisitions" href="/cgi-bin/koha/admin/preferences.pl?tab=acquisitions">Acquisitions</a></li>
+<!-- TMPL_IF NAME="admin" --><li class="active"><!-- TMPL_ELSE --><li><!-- /TMPL_IF --><a title="Administration" href="/cgi-bin/koha/admin/preferences.pl?tab=admin">Administration</a></li>
 <!-- TMPL_IF NAME="authorities" --><li class="active"><!-- TMPL_ELSE --><li><!-- /TMPL_IF --><a title="Authority Control" href="/cgi-bin/koha/admin/preferences.pl?tab=authorities">Authorities</a></li>
 <!-- TMPL_IF NAME="cataloguing" --><li class="active"><!-- TMPL_ELSE --><li><!-- /TMPL_IF --><a title="Cataloging" href="/cgi-bin/koha/admin/preferences.pl?tab=cataloguing">Cataloging</a></li>
 <!-- TMPL_IF NAME="circulation" --><li class="active"><!-- TMPL_ELSE --><li><!-- /TMPL_IF --><a title="Circulation" href="/cgi-bin/koha/admin/preferences.pl?tab=circulation">Circulation</a></li>
 <!-- TMPL_IF NAME="enhanced-content" --><li class="active"><!-- TMPL_ELSE --><li><!-- /TMPL_IF --><a title="Enhanced Content Settings" href="/cgi-bin/koha/admin/preferences.pl?tab=enhanced-content">Enhanced Content</a></li>
 <!-- TMPL_IF NAME="i18n/l10n" --><li class="active"><!-- TMPL_ELSE --><li><!-- /TMPL_IF --><a title="Internationalization and Localization" href="/cgi-bin/koha/admin/preferences.pl?tab=i18n-l10n">I18N/L10N</a></li>
+<!-- TMPL_IF NAME="" --><li class="active"><!-- TMPL_ELSE --><li><!-- /TMPL_IF --><a href="/cgi-bin/koha/admin/preferences.pl">Local Use</a></li>
 <!-- TMPL_IF NAME="logs" --><li class="active"><!-- TMPL_ELSE --><li><!-- /TMPL_IF --><a title="Transaction Logs" href="/cgi-bin/koha/admin/preferences.pl?tab=logs">Logs</a></li>
-<!-- TMPL_IF NAME="oai-pmh" --><li class="active"><!-- TMPL_ELSE --><li><!-- /TMPL_IF --><a title="OAI-PMH" href="/cgi-bin/koha/admin/preferences.pl?tab=oai-pmh">OAI-PMH</a></li>
 <!-- TMPL_IF NAME="opac" --><li class="active"><!-- TMPL_ELSE --><li><!-- /TMPL_IF --><a title="Online Public Access Catalog" href="/cgi-bin/koha/admin/preferences.pl?tab=opac">OPAC</a></li>
 <!-- TMPL_IF NAME="patrons" --><li class="active"><!-- TMPL_ELSE --><li><!-- /TMPL_IF --><a title="Patrons" href="/cgi-bin/koha/admin/preferences.pl?tab=patrons">Patrons</a></li>
 <!-- TMPL_IF NAME="searching" --><li class="active"><!-- TMPL_ELSE --><li><!-- /TMPL_IF --><a title="Searching" href="/cgi-bin/koha/admin/preferences.pl?tab=searching">Searching</a></li>
 <!-- TMPL_IF NAME="staff-client" --><li class="active"><!-- TMPL_ELSE --><li><!-- /TMPL_IF --><a title="Staff Client" href="/cgi-bin/koha/admin/preferences.pl?tab=staff-client">Staff Client</a></li>
-<!-- TMPL_IF NAME="" --><li class="active"><!-- TMPL_ELSE --><li><!-- /TMPL_IF --><a href="/cgi-bin/koha/admin/preferences.pl">Local Use</a></li>
+<!-- TMPL_IF NAME="web-services" --><li class="active"><!-- TMPL_ELSE --><li><!-- /TMPL_IF --><a title="Web Services" href="/cgi-bin/koha/admin/preferences.pl?tab=web-services">Web Services</a></li>
 </ul>
 </div>
index 4ca0269..2309006 100644 (file)
@@ -3,6 +3,11 @@ Administration:
 # Only used internally, omitted: FrameworksLoaded, Version
     Interface options:
         -
+            - Use
+            - pref: KohaAdminEmailAddress
+              class: email
+            - "as the email address for the administrator of Koha. (This is the default From: address for emails unless there is one for the particular branch, and is referred to when an internal error occurs.)"
+        -
             - Show
             - pref: DebugLevel
               default: 0
index 2ee1b86..6dc6fa2 100644 (file)
@@ -1,4 +1,4 @@
-Cataloguing:
+Cataloging:
 # broken, omitted: marc
     Interface:
         -
@@ -12,6 +12,19 @@ Cataloguing:
                   yes: Display
                   no: "Don't display"
             - descriptions of fields and subfields in the MARC editor.
+    Spine Labels:
+        -
+            - When using the quick spine label printer,
+            - pref: SpineLabelAutoPrint
+              choices:
+                  yes: do
+                  no: "don't"
+            - automatically pop up a print dialog.
+        -
+            - "Include the following fields on a quick-printed spine label:"
+            - (Enter in columns from the <code>biblio</code>, <code>biblioitems</code> or <code>items</code> tables, surrounded by &lt; and &gt;.)
+            - pref: SpineLabelFormat
+              type: textarea
     Record Structure:
         -
             - Interpret and store MARC records in the
@@ -36,18 +49,6 @@ Cataloguing:
             - pref: MARCOrgCode
             - by default in new MARC records (leave blank to disable).
         -
-            - pref: NoZebra
-              choices:
-                  yes: "Don't use"
-                  no: Use
-            - the Zebra search engine. Searches are very slow on even modest sized collections when Zebra is off.
-        -
-            - When Zebra is off, translate the following marc fields to the following indexes (each line should look something like <code>'indexname' =&gt; '100a,245a,500*',</code>):
-            - pref: NoZebraIndexes
-              type: textarea
-              class: list
-            -
-        -
             - pref: z3950NormalizeAuthor
               choices:
                   yes: Copy
@@ -86,7 +87,7 @@ Cataloguing:
               choices:
                   standard: "Don't"
                   economical: Do
-            - collapse repeated tags of the same type into one tag entry.
+            - collapse repeated tags of the same type into one tag entry on the display.
         -
             - By default, display biblio records in
             - pref: IntranetBiblioDefaultView
@@ -105,3 +106,14 @@ Cataloguing:
                   yes: Hide
                   no: "Don't hide"
             - items marked as suppressed from OPAC search results. Note that you must have the <code>Suppress</code> index set up in Zebra and at least one suppressed item, or your searches will be broken.
+        - 
+            - Show the
+            - pref: StaffSerialIssueDisplayCount
+              class: integer
+            - previous issues of a serial on the staff client.
+        - 
+            - Show the
+            - pref: OPACSerialIssueDisplayCount
+              class: integer
+            - previous issues of a serial on the OPAC.
+
index fb6fb6e..4c6f014 100644 (file)
@@ -7,10 +7,9 @@ Circulation:
               choices:
                   yes: Try
                   no: "Don't try"
-            - to automatically fill in the member when entering a patron search on the circulation screen.
+            - to guess the patron being entered while typing a patron search on the circulation screen.
         -
             - pref: itemBarcodeInputFilter
-              type: choice
               choices:
                   OFF: "Don't filter"
                   whitespace: Remove spaces from
@@ -20,7 +19,6 @@ Circulation:
         -
             - Sort previous checkouts on the circulation page from
             - pref: previousIssuesDefaultSortOrder
-              type: choice
               choices:
                   asc: earliest to latest
                   desc: latest to earliest
@@ -40,6 +38,12 @@ Circulation:
                   no: "Don't allow"
             - staff to specify a due date for a checkout.
         -
+            - pref: AllowAllMessageDeletion
+              choices:
+                  yes: Allow
+                  no: "Don't allow"
+            - staff to delete messages added from other libraries.
+        -
             - Mark a hold as problematic if it has been waiting for more than
             - pref: ReservesMaxPickUpDelay
               class: integer
@@ -55,6 +59,11 @@ Circulation:
                   yes: Require
                   no: "Don't require"
             - staff to choose which checkouts to show before running the overdues report.
+            - pref: DisplayClearScreenButton
+              choices:
+                  yes: Show
+                  no: "Don't show"
+            - a button to clear the current patron from the screen on the circulation screen.
     Checkout Policy:
         -
             - pref: AllowNotForLoanOverride
@@ -69,6 +78,23 @@ Circulation:
                   no: "Don't allow"
             - staff to manually override the renewal limit and renew a checkout when it would go over the renewal limit.
         -
+            - When items are created, give them the temporary location of
+            - pref: NewItemsDefaultLocation
+              class: short
+            - (should be a location code or blank).
+        -
+            - pref: InProcessingToShelvingCart
+              choices:
+                  yes: Move
+                  no: "Don't move"
+            - items that have the location PROC to the location CART when they are checked in.
+        -
+            - pref: InProcessingToShelvingCart
+              choices:
+                  yes: Move
+                  no: "Don't move"
+            - all items to the location CART when they are checked in.
+        -
             - pref: AutomaticItemReturn
               choices:
                   yes: Do
@@ -90,6 +116,9 @@ Circulation:
             - pref: CircControl
               type: choice
               choices:
+            - pref: CircControl
+              type: choice
+              choices:
                   PickupLibrary: the library you are logged in at.
                   PatronLibrary: the library the patron is from.
                   ItemHomeBranch: the library the item is from.
@@ -101,7 +130,7 @@ Circulation:
               choices:
                   homebranch: the library the item is from.
                   holdingbranch: the library the item was checked out from.
-            - <br />NOTE: This is deprecated in favor of <code>CircControl</code>, but used by some parts of Koha. It will be removed soon.
+            - "<br />NOTE: This is older than <code>CircControl</code>, but used by some parts of Koha. It will be removed soon."
         -
             - Make all checkouts have a due date of
             - pref: globalDueDate
@@ -181,9 +210,6 @@ Circulation:
                   no: in that order.
             -
         -
-            - pref: canreservefromotherbranches
-              choices:
-                  yes: Allow
                   no: "Don't allow (with independent branches)"
             - a user from one library to place a hold on an item from another library
         -
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/oai-pmh.pref b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/oai-pmh.pref
deleted file mode 100644 (file)
index 42d4497..0000000
+++ /dev/null
@@ -1,18 +0,0 @@
-# Broken, omitted: OAI-PMH:Set, OAI-PMH:Subset
-OAI-PMH:
-    -
-        - pref: OAI-PMH
-          choices:
-              yes: Enable
-              no: Disable
-        - "Koha's"
-        - '<a href="http://www.openarchives.org/pmh/">OAI-PMH</a> server.'
-    -
-        - Identify records at this site with the prefix
-        - pref: "OAI-PMH:archiveID"
-        - ": ."
-    -
-        - Only return
-        - pref: "OAI-PMH:MaxCount"
-          class: integer
-        - records at a time in response to a <code>ListRecords</code> or <code>ListIdentifiers</code> query.
index 0312dee..4b7043f 100644 (file)
@@ -29,6 +29,12 @@ OPAC:
               class: long
             - as the name of the library on the OPAC.
         -
+            - pref: OpacMaintenance
+              choices:
+                  yes: Show
+                  no: "Don't show"
+            - a warning that the OPAC is under maintenance, instead of the OPAC itself. Note: this shows the same warning as when the database needs upgraded, but unconditionally.
+        -
             - By default, show bib records
             - pref: BiblioDefaultView
               choices:
@@ -55,6 +61,13 @@ OPAC:
                   yes: using XSLT stylesheets.
                   no: normally.
         -
+            - On pages displayed with XSLT stylesheets on the OPAC,
+            - pref: DisplayOPACiconsXSLT
+              choices:
+                  yes: show
+                  no: "don't show"
+            - icons for itemtype and authorized values.
+        -
             - pref: OPACDisplayRequestPriority
               choices:
                   yes: Show
index dccb820..2a74746 100644 (file)
@@ -2,6 +2,18 @@ Searching:
 # omitted, broken: sortbynonfiling
     Features:
         -
+            - pref: NoZebra
+              choices:
+                  yes: "Don't use"
+                  no: Use
+            - the Zebra search engine. Searches are very slow on even modest sized collections when Zebra is off.
+        -
+            - When Zebra is not in use, translate the following MARC fields to the following indexes (each line should look something like <code>'indexname' =&gt; '100a,245a,500*',</code>):
+            - pref: NoZebraIndexes
+              type: textarea
+              class: list
+            -
+        -
             - pref: QueryAutoTruncate
               type: boolean
               choices:
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/web-services.pref b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/web-services.pref
new file mode 100644 (file)
index 0000000..7c5685b
--- /dev/null
@@ -0,0 +1,19 @@
+# Broken, omitted: OAI-PMH:Set, OAI-PMH:Subset
+Web Services:
+    OAI-PMH:
+        -
+            - pref: OAI-PMH
+              choices:
+                  yes: Enable
+                  no: Disable
+            - "Koha's"
+            - '<a href="http://www.openarchives.org/pmh/">OAI-PMH</a> server.'
+        -
+            - Identify records at this site with the prefix
+            - pref: "OAI-PMH:archiveID"
+            - ": ."
+        -
+            - Only return
+            - pref: "OAI-PMH:MaxCount"
+              class: integer
+            - records at a time in response to a <code>ListRecords</code> or <code>ListIdentifiers</code> query.