[open-ils-commits] [GIT] Evergreen ILS branch rel_2_8 updated. 395036d4a7086b1021ce444f52ef2725ac128a63
Evergreen Git
git at git.evergreen-ils.org
Tue Mar 17 11:09:23 EDT 2015
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "Evergreen ILS".
The branch, rel_2_8 has been updated
via 395036d4a7086b1021ce444f52ef2725ac128a63 (commit)
via 339634e66786983294522abd32fe1e9d8231276b (commit)
via 998871453a8df31bb03471580cb5b84b7dd7d9ca (commit)
via 056b3ebbf3e0824b4198fb1857806123497fea77 (commit)
via bb5e1261519c0551af1a490291848b020b69e558 (commit)
via a48d60408422cb6faf7c842f20ed6d861ec4b375 (commit)
via da9f138949ecdd250d287e6f9a4188a195fd1058 (commit)
via c01a9b0ca969ff99b60b41ecc08162f637effb6a (commit)
via 59cd2c03e7a260565d0df8353cc34de8103aac33 (commit)
from 6da9fdaab984845dbc5924de6047caa674ffe294 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
commit 395036d4a7086b1021ce444f52ef2725ac128a63
Author: Remington Steed <rjs7 at calvin.edu>
Date: Thu Mar 12 09:15:37 2015 -0400
Docs: Link optional docs from Apache config
This commit links to the new optional Apache config docs from the Apache
config step in the installation instructions.
Signed-off-by: Remington Steed <rjs7 at calvin.edu>
diff --git a/docs/installation/server_installation.txt b/docs/installation/server_installation.txt
index e99aa4f..4c32b15 100644
--- a/docs/installation/server_installation.txt
+++ b/docs/installation/server_installation.txt
@@ -344,6 +344,10 @@ a2ensite eg.conf
------------------------------------------------------------------------------
chown opensrf /var/lock/apache2
------------------------------------------------------------------------------
++
+9. Learn more about additional Apache options in the following sections:
+ * <<_apache_rewrite_tricks,Apache Rewrite Tricks>>
+ * <<_apache_access_handler_perl_module,Apache Access Handler Perl Module>>
Configure OpenSRF for the Evergreen application
-----------------------------------------------
commit 339634e66786983294522abd32fe1e9d8231276b
Author: Remington Steed <rjs7 at calvin.edu>
Date: Wed Mar 11 17:23:57 2015 -0400
LP#1413624 Docs: Move Access Handler docs to official docs
This commit moves the new Access Handler doc file to the official docs
folder, adds the file reference to the root.txt, changes the main header
text for easier linking, adds the missing block delimiter lines around a
code block, and adds a blank line at the end of another doc file to
prevent the docs from running together.
Signed-off-by: Remington Steed <rjs7 at calvin.edu>
diff --git a/docs/TechRef/Apache/apache_access_handler.txt b/docs/admin/apache_access_handler.txt
similarity index 91%
rename from docs/TechRef/Apache/apache_access_handler.txt
rename to docs/admin/apache_access_handler.txt
index 324f3bd..594393c 100644
--- a/docs/TechRef/Apache/apache_access_handler.txt
+++ b/docs/admin/apache_access_handler.txt
@@ -1,10 +1,10 @@
-Apache Access Handler: OpenILS::WWW::AccessHandler
---------------------------------------------------
-This Perl module is intended for limiting patron access to configured locations
-in Apache. These locations could be folder trees, static files, non-Evergreen
-dynamic content, or other Apache features/modules. It is intended as a more
-patron-oriented and transparent version of the OpenILS::WWW::Proxy and
-OpenILS::WWW:Proxy::Authen modules.
+Apache Access Handler Perl Module
+---------------------------------
+The OpenILS::WWW::AccessHandler Perl module is intended for limiting patron
+access to configured locations in Apache. These locations could be folder
+trees, static files, non-Evergreen dynamic content, or other Apache
+features/modules. It is intended as a more patron-oriented and transparent
+version of the OpenILS::WWW::Proxy and OpenILS::WWW:Proxy::Authen modules.
Instead of using Basic Authentication the AccessHandler module instead redirects
to the OPAC for login. Once logged in additional checks can be performed, based
@@ -17,11 +17,13 @@ on configured variables:
Use of the module is a simple addition to a Location block in Apache:
[source,conf]
+----
<Location /path/to/be/protected>
PerlAccessHandler OpenILS::WWW::AccessHandler
# For each option you wish to set:
PerlSetVar OPTION "VALUE"
</Location>
+----
The available options are:
diff --git a/docs/admin/apache_rewrite_tricks.txt b/docs/admin/apache_rewrite_tricks.txt
index 2b96797..5a0eea5 100644
--- a/docs/admin/apache_rewrite_tricks.txt
+++ b/docs/admin/apache_rewrite_tricks.txt
@@ -145,3 +145,4 @@ RewriteRule (.*) /%{ENG:eglibid}$1
----
Note that template files themselves cannot be replaced in that manner.
+
diff --git a/docs/root.txt b/docs/root.txt
index 1becdc5..b2698a3 100644
--- a/docs/root.txt
+++ b/docs/root.txt
@@ -159,6 +159,9 @@ include::admin/sip_server.txt[]
include::admin/apache_rewrite_tricks.txt[]
+include::admin/apache_access_handler.txt[]
+
+
Using the Staff Client
======================
commit 998871453a8df31bb03471580cb5b84b7dd7d9ca
Author: Remington Steed <rjs7 at calvin.edu>
Date: Wed Jan 21 14:14:00 2015 -0500
LP#1413621 Docs: Minor changes to Apache Rewrite Tricks
This commit moves this doc file from TechRef into the official docs
area, adds it to the root.txt file, and adds line breaks for easier
viewing and editing of the file.
Signed-off-by: Remington Steed <rjs7 at calvin.edu>
diff --git a/docs/TechRef/Apache/rewrite_tricks.txt b/docs/admin/apache_rewrite_tricks.txt
similarity index 71%
rename from docs/TechRef/Apache/rewrite_tricks.txt
rename to docs/admin/apache_rewrite_tricks.txt
index 28ed236..2b96797 100644
--- a/docs/TechRef/Apache/rewrite_tricks.txt
+++ b/docs/admin/apache_rewrite_tricks.txt
@@ -1,10 +1,14 @@
Apache Rewrite Tricks
---------------------
-It is possible to use Apache's Rewrite Module features to perform a number of useful tricks that can make people's lives much easier.
+It is possible to use Apache's Rewrite Module features to perform a number of
+useful tricks that can make people's lives much easier.
Short URLs
~~~~~~~~~~
-Making short URLs for common destinations can simplify making printed media as well as shortening or simplifying what people need to type. These are also easy to add and require minimal maintenance, and generally can be implemented with a single line addition to your eg_vhost.conf file.
+Making short URLs for common destinations can simplify making printed media as
+well as shortening or simplifying what people need to type. These are also easy
+to add and require minimal maintenance, and generally can be implemented with a
+single line addition to your eg_vhost.conf file.
[source,conf]
----
@@ -17,18 +21,27 @@ RewriteRule ^/search/isbn/(.*) /eg/opac/results?_special=1&qtype=identifier|isbn
Domain Based Content with RewriteMaps
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-One creative use of Rewrite features is domain-based configuration in a single eg_vhost.conf file. Regardless of how many VirtualHost blocks use the configuration you don't need to duplicate things for minor changes, and can in fact use wildcard VirtualHost blocks to serve multiple subdomains.
+One creative use of Rewrite features is domain-based configuration in a single
+eg_vhost.conf file. Regardless of how many VirtualHost blocks use the
+configuration you don't need to duplicate things for minor changes, and can in
+fact use wildcard VirtualHost blocks to serve multiple subdomains.
-For the wildcard blocks you will want to use a ServerAlias directive, and for SSL VirtualHost blocks ensure you have a wildcard SSL certificate.
+For the wildcard blocks you will want to use a ServerAlias directive, and for
+SSL VirtualHost blocks ensure you have a wildcard SSL certificate.
[source,conf]
----
ServerAlias *.example.com
----
-For actually changing things based on the domain, or subdomain, you can use RewriteMaps. Each RewriteMap is generally a lookup table of some kind. In the following examples we will generally use text files, though database lookups and external programs are also possible.
+For actually changing things based on the domain, or subdomain, you can use
+RewriteMaps. Each RewriteMap is generally a lookup table of some kind. In the
+following examples we will generally use text files, though database lookups
+and external programs are also possible.
-Note that in the examples below we generally store things in Environment Variables. From within Template Toolkit templates you can access environment variables with the ENV object.
+Note that in the examples below we generally store things in Environment
+Variables. From within Template Toolkit templates you can access environment
+variables with the ENV object.
.Template Toolkit ENV example, link library name/url if set
[source,html]
@@ -36,13 +49,15 @@ Note that in the examples below we generally store things in Environment Variabl
[% IF ENV.eglibname && ENV.egliburl %]<a href="[% ENV.egliburl %]">[% ENV.eglibname %]</a>[% END %]
----
-The first lookup to do is a domain to identifier, allowing us to re-use identifiers for multiple domains. In addition we can also supply a default identifier, for when the domain isn't present in the lookup table.
+The first lookup to do is a domain to identifier, allowing us to re-use
+identifiers for multiple domains. In addition we can also supply a default
+identifier, for when the domain isn't present in the lookup table.
.Apache Config
[source,conf]
----
# This internal map allows us to lowercase our hostname, removing case issues in our lookup table
-# If you preferr uppercase you can use "uppercase int:toupper" instead.
+# If you prefer uppercase you can use "uppercase int:toupper" instead.
RewriteMap lowercase int:tolower
# This provides a hostname lookup
RewriteMap eglibid txt:/openils/conf/libid.txt
@@ -63,7 +78,8 @@ branch2.example.com BRANCH2
branch3.example.com BRANCH3
----
-Once we have identifiers we can look other information up, when appropriate. For example, say we want to look up library names and URLs:
+Once we have identifiers we can look up other information, when appropriate.
+For example, say we want to look up library names and URLs:
.Apache Config
[source,conf]
@@ -115,12 +131,13 @@ BRANCH3 6
CONS 1
----
-Going further, you could also replace files to be downloaded, such as images or stylesheets, on the fly:
+Going further, you could also replace files to be downloaded, such as images or
+stylesheets, on the fly:
.Apache Config
[source,conf]
----
-# A file exists based on eglibid and the requested file
+# Check if a file exists based on eglibid and the requested file name
# Say, BRANCH1/opac/images/main_logo.png
RewriteCond %{DOCUMENT_ROOT}/%{ENV:eglibid}%{REQUEST_URI} -f
# Serve up the eglibid version of the file instead
diff --git a/docs/root.txt b/docs/root.txt
index b65180b..1becdc5 100644
--- a/docs/root.txt
+++ b/docs/root.txt
@@ -157,6 +157,8 @@ include::admin/phonelist.txt[]
include::admin/sip_server.txt[]
+include::admin/apache_rewrite_tricks.txt[]
+
Using the Staff Client
======================
commit 056b3ebbf3e0824b4198fb1857806123497fea77
Author: Thomas Berezansky <tsbere at mvlc.org>
Date: Wed Jan 21 14:14:00 2015 -0500
LP#1413621 Docs: Apache Rewrite Tricks
Because multiple sites have found this kind of thing useful in the past.
Signed-off-by: Thomas Berezansky <tsbere at mvlc.org>
Signed-off-by: Remington Steed <rjs7 at calvin.edu>
diff --git a/docs/TechRef/Apache/rewrite_tricks.txt b/docs/TechRef/Apache/rewrite_tricks.txt
new file mode 100644
index 0000000..28ed236
--- /dev/null
+++ b/docs/TechRef/Apache/rewrite_tricks.txt
@@ -0,0 +1,130 @@
+Apache Rewrite Tricks
+---------------------
+It is possible to use Apache's Rewrite Module features to perform a number of useful tricks that can make people's lives much easier.
+
+Short URLs
+~~~~~~~~~~
+Making short URLs for common destinations can simplify making printed media as well as shortening or simplifying what people need to type. These are also easy to add and require minimal maintenance, and generally can be implemented with a single line addition to your eg_vhost.conf file.
+
+[source,conf]
+----
+# My Account - http://host.ext/myaccount -> My Account Page
+RewriteRule ^/myaccount https://%{HTTP_HOST}/eg/opac/myopac/main [R]
+
+# ISBN Search - http://host.ext/search/isbn/<ISBN NUMBER> -> Search Page
+RewriteRule ^/search/isbn/(.*) /eg/opac/results?_special=1&qtype=identifier|isbn&query=$1 [R]
+----
+
+Domain Based Content with RewriteMaps
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+One creative use of Rewrite features is domain-based configuration in a single eg_vhost.conf file. Regardless of how many VirtualHost blocks use the configuration you don't need to duplicate things for minor changes, and can in fact use wildcard VirtualHost blocks to serve multiple subdomains.
+
+For the wildcard blocks you will want to use a ServerAlias directive, and for SSL VirtualHost blocks ensure you have a wildcard SSL certificate.
+
+[source,conf]
+----
+ServerAlias *.example.com
+----
+
+For actually changing things based on the domain, or subdomain, you can use RewriteMaps. Each RewriteMap is generally a lookup table of some kind. In the following examples we will generally use text files, though database lookups and external programs are also possible.
+
+Note that in the examples below we generally store things in Environment Variables. From within Template Toolkit templates you can access environment variables with the ENV object.
+
+.Template Toolkit ENV example, link library name/url if set
+[source,html]
+----
+[% IF ENV.eglibname && ENV.egliburl %]<a href="[% ENV.egliburl %]">[% ENV.eglibname %]</a>[% END %]
+----
+
+The first lookup to do is a domain to identifier, allowing us to re-use identifiers for multiple domains. In addition we can also supply a default identifier, for when the domain isn't present in the lookup table.
+
+.Apache Config
+[source,conf]
+----
+# This internal map allows us to lowercase our hostname, removing case issues in our lookup table
+# If you preferr uppercase you can use "uppercase int:toupper" instead.
+RewriteMap lowercase int:tolower
+# This provides a hostname lookup
+RewriteMap eglibid txt:/openils/conf/libid.txt
+# This stores the identifier in a variable (eglibid) for later use
+# In this case CONS is the default value for when the lookup table has no entry
+RewriteRule . - [E=eglibid:${eglibid:${lowercase:%{HTTP_HOST}}|CONS}]
+----
+
+.Contents of libid.txt File
+[source,txt]
+----
+# Comments can be included
+# Multiple TLDs for Branch 1
+branch1.example.com BRANCH1
+branch1.example.net BRANCH1
+# Branches 2 and 3 don't have alternate TLDs
+branch2.example.com BRANCH2
+branch3.example.com BRANCH3
+----
+
+Once we have identifiers we can look other information up, when appropriate. For example, say we want to look up library names and URLs:
+
+.Apache Config
+[source,conf]
+----
+# Library Name Lookup - Note we provide no default in this case.
+RewriteMap eglibname txt:/openils/conf/libname.txt
+RewriteRule . - [E=eglibname:${eglibname:%{ENV:eglibid}}]
+# Library URL Lookup - Also with no default.
+RewriteMap egliburl txt:/openils/conf/liburl.txt
+RewriteRule . - [E=egliburl:${egliburl:%{ENV:eglibid}}]
+----
+
+.Contents of libname.txt File
+[source,txt]
+----
+# Note that we cannot have spaces in the "value", so instead is used. is also an option.
+BRANCH1 Branch One
+BRANCH2 Branch Two
+BRANCH3 Branch Three
+CONS Example Consortium Name
+----
+
+.Contents of liburl.txt File
+[source,txt]
+----
+BRANCH1 http://branch1.example.org
+BRANCH2 http://branch2.example.org
+BRANCH3 http://branch3.example.org
+CONS http://example.org
+----
+
+Or, perhaps set the "physical location" variable for default search/display library:
+
+.Apache Config
+[source,conf]
+----
+# Lookup "physical location" IDs
+RewriteMap eglibphysloc txt:/openils/conf/libphysloc.txt
+# Note: physical_loc is a variable used in the TTOPAC and should not be re-named
+RewriteRule . - [E=physical_loc:${eglibphysloc:%{ENV:eglibid}}]
+----
+
+.Contents of libphysloc.txt File
+[source,txt]
+----
+BRANCH1 4
+BRANCH2 5
+BRANCH3 6
+CONS 1
+----
+
+Going further, you could also replace files to be downloaded, such as images or stylesheets, on the fly:
+
+.Apache Config
+[source,conf]
+----
+# A file exists based on eglibid and the requested file
+# Say, BRANCH1/opac/images/main_logo.png
+RewriteCond %{DOCUMENT_ROOT}/%{ENV:eglibid}%{REQUEST_URI} -f
+# Serve up the eglibid version of the file instead
+RewriteRule (.*) /%{ENG:eglibid}$1
+----
+
+Note that template files themselves cannot be replaced in that manner.
commit bb5e1261519c0551af1a490291848b020b69e558
Author: Remington Steed <rjs7 at calvin.edu>
Date: Tue Mar 10 09:00:06 2015 -0400
Docs: Fix AsciiDoc processing errors
This commit fixes an AsciiDoc link syntax error, and renames section ids
to prevent duplicate names in the preview version of the Web Client
docs.
Signed-off-by: Remington Steed <rjs7 at calvin.edu>
diff --git a/docs/TechRef/KidsOPAC.txt b/docs/TechRef/KidsOPAC.txt
index 70b0a57..832dd8e 100644
--- a/docs/TechRef/KidsOPAC.txt
+++ b/docs/TechRef/KidsOPAC.txt
@@ -83,7 +83,7 @@ Skin Configuration
The following example enables you to configure the alternate skin (Monster Skin, kpac2) for the Kids
Catalog.
-You should be familiar with how the <<_how_to_override_templates|Evergreen TPAC handles template folders>>
+You should be familiar with how the <<_how_to_override_templates,Evergreen TPAC handles template folders>>
before you make these changes.
If you already have a custom template directory setup you can copy the *Open-ILS/examples/web/templates/kpac*
diff --git a/docs/circulation/circulation_patron_records_web_client.txt b/docs/circulation/circulation_patron_records_web_client.txt
index 1e4e47f..c8132c5 100644
--- a/docs/circulation/circulation_patron_records_web_client.txt
+++ b/docs/circulation/circulation_patron_records_web_client.txt
@@ -1,7 +1,7 @@
Circulation - Patron Record
---------------------------
-[[circulation_searching_patrons]]
+[[searching_patrons_wc]]
Searching Patrons
~~~~~~~~~~~~~~~~~
@@ -128,14 +128,14 @@ image::media/patron_self_registration2.JPG[Patron Self-Registration form]
. Fill in the necessary patron information for your library, and click *Save* to create the permanent patron account.
-[[updating_patron_information]]
+[[updating_patron_information_wc]]
Updating Patron Information
~~~~~~~~~~~~~~~~~~~~~~~~~~~
indexterm:[patrons, updating]
Retrieve the patron record as described in the section
-<<circulation_searching_patrons,Searching Patrons>>.
+<<searching_patrons_wc,Searching Patrons>>.
Click on _Edit_ from the options that display at the top of the patron record.
@@ -165,7 +165,7 @@ stating that the ``Patron account is EXPIRED.''
image::media/circulation_patron_records-11_web_client.png[circulation_patron_records 11]
Open the patron record in edit mode as described in the section
-<<updating_patron_information,Updating Patron Information>>.
+<<updating_patron_information_wc,Updating Patron Information>>.
Navigate to the information field labeled _Privilege Expiration Date_. Enter a
new date in this box. When you place your cursor in the _Patron Expiration Date
@@ -185,10 +185,10 @@ Lost Library Cards
indexterm:[library cards, replacing]
Retrieve the patron record as described in the section
-<<circulation_searching_patrons,Searching Patrons>>.
+<<searching_patrons_wc,Searching Patrons>>.
Open the patron record in edit mode as described in the section
-<<updating_patron_information,Updating Patron Information>>.
+<<updating_patron_information_wc,Updating Patron Information>>.
Next to the _Barcode_ field, select the _Replace Barcode_ button.
@@ -200,8 +200,8 @@ pane.
If a patron’s barcode is mistakenly replaced, the old barcode may be reinstated.
Retrieve the patron record as described in the section
-<<circulation_searching_patrons,Searching Patrons>>. Open the patron record in
-edit mode as described in the section <<updating_patron_information,Updating
+<<searching_patrons_wc,Searching Patrons>>. Open the patron record in
+edit mode as described in the section <<updating_patron_information_wc,Updating
Patron Information>>.
Select the _See All_ button next to the _Replace Barcode_ button. This will
@@ -226,10 +226,10 @@ indexterm:[patrons, passwords]
A patron’s password may be reset from the OPAC or through the staff client. To
reset the password from the staff client, retrieve the patron record as
-described in the section <<circulation_searching_patrons,Searching Patrons>>.
+described in the section <<searching_patrons_wc,Searching Patrons>>.
Open the patron record in edit mode as described in the section
-<<updating_patron_information,Updating Patron Information>>.
+<<updating_patron_information_wc,Updating Patron Information>>.
Select the _Reset Password_ button next to the _Password_ field.
@@ -275,10 +275,10 @@ indexterm:[patrons, barring]
A patron may be barred from circulation activities. To bar a patron, retrieve
the patron record as described in the section
-<<circulation_searching_patrons,Searching Patrons>>.
+<<searching_patrons_wc,Searching Patrons>>.
Open the patron record in edit mode as described in the section
-<<updating_patron_information,Updating Patron Information>>.
+<<updating_patron_information_wc,Updating Patron Information>>.
Check the box for _Barred_ in the patron account.
@@ -320,21 +320,21 @@ patrons, but staff may be given permissions to override blocks.
Staff-Generated Messages
~~~~~~~~~~~~~~~~~~~~~~~~
-[[staff_generated_messages]]
+[[staff_generated_messages_wc]]
indexterm:[patrons, messages]
There are several types of messages available for staff to leave notes on patron records.
*Patron Notes*: These notes are added via _Other_ -> _Notes_ in the patron record. These notes can be viewable by staff only or shared with the patron. Staff initials can be required. (See the section <<circulation_patron_notes,Patron Notes>> for more.)
-*Patron Alerts*: This type of alert is added via _Edit_ button in the patron record. There is currently no way to require staff initials for this type of alert. (See the section <<circulation_patron_alerts,Patron Alerts>> for more.)
+*Patron Alerts*: This type of alert is added via _Edit_ button in the patron record. There is currently no way to require staff initials for this type of alert. (See the section <<circulation_patron_alerts_wc,Patron Alerts>> for more.)
*Staff-Generated Penalties/Messages*: These messages are added via the _Messages_ button in the patron record. They can be a note, alert or block. Staff initials can be required. (See the section <<staff_generated_penalties,Staff-Generated Penalties/Messages>> for more.)
Patron Alerts
~~~~~~~~~~~~~~
-[[circulation_patron_alerts]]
+[[circulation_patron_alerts_wc]]
indexterm:[patrons, Alerts]
When an account has an alert on it, a Stop sign is displayed when the record is
@@ -358,10 +358,10 @@ been renewed), the message will disappear automatically.
*Staff-generated alerts*: Must be added and removed manually.
To add an alert to a patron account, retrieve the patron record as described
-in the section <<circulation_searching_patrons,Searching Patrons>>.
+in the section <<searching_patrons_wc,Searching Patrons>>.
Open the patron record in edit mode as described in the section
-<<updating_patron_information,Updating Patron Information>>.
+<<updating_patron_information_wc,Updating Patron Information>>.
Enter the alert text in the Alert Message field.
@@ -370,10 +370,10 @@ image::media/circulation_patron_records-20.png[circulation_patron_records 20]
_Save_ the record. The screen will refresh and the alert will display.
To remove the alert, retrieve the patron record as described in the section
-<<circulation_searching_patrons,Searching Patrons>>.
+<<searching_patrons_wc,Searching Patrons>>.
Open the patron record in edit mode as described in the section
-<<updating_patron_information,Updating Patron Information>>.
+<<updating_patron_information_wc,Updating Patron Information>>.
Delete the alert text in the _Alert Message_ field.
@@ -392,10 +392,10 @@ screen in the OPAC.
image::media/circulation_patron_records-23_web_client.png[circulation_patron_records 23]
To insert or remove a note, retrieve the patron record as described in the
-section <<circulation_searching_patrons,Searching Patrons>>.
+section <<searching_patrons_wc,Searching Patrons>>.
Open the patron record in edit mode as described in the section
-<<updating_patron_information,Updating Patron Information>>.
+<<updating_patron_information_wc,Updating Patron Information>>.
Use the Other menu to navigate to _Notes_.
commit a48d60408422cb6faf7c842f20ed6d861ec4b375
Author: Yamil Suarez <yamil at yamil.com>
Date: Fri Mar 6 16:26:02 2015 -0500
Docs: Eliminate accidental invalid level 5 AsciiDoc headings
To properly integrate updated receipt template editor documentation
we origimally used invalid level 5 AsciiDoc headings. Asciidoc only
supports 4 levels of headings
Signed-off-by: Yamil Suarez <yamil at yamil.com>
diff --git a/docs/admin/workstation_admin_receipt_template_editor.txt b/docs/admin/workstation_admin_receipt_template_editor.txt
index 47482d3..2d5cf67 100644
--- a/docs/admin/workstation_admin_receipt_template_editor.txt
+++ b/docs/admin/workstation_admin_receipt_template_editor.txt
@@ -533,8 +533,7 @@ indexterm:[receipt template editor, includes]
Additional Macros for various slip types
^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-Holds
-+++++
+*Holds*
[horizontal]
%ROUTE_TO%:: It should say Hold Shelf if it is a hold being fulfilled
@@ -548,8 +547,7 @@ Holds
%formatted_note%:: Hold Notes (new to 2.1)
%notify_by_text%:: SMS contact number (new to 2.2)
-Check out
-+++++++++
+*Check out*
[horizontal]
%title%:: Title
@@ -557,8 +555,7 @@ Check out
%barcode%:: Item Barcode
%due_date%:: Due Date: formated by the date field in the library settings editor
-Payment
-+++++++
+*Payment*
[horizontal]
%original_balance%:: The original balance the patron owes
@@ -581,8 +578,7 @@ Payment
%barcode%:: Item barcode
%title%:: title of item
-Bills
-+++++
+*Bills*
[horizontal]
%mbts_id%:: The id for the bill in the bill database
@@ -597,8 +593,7 @@ Bills
%xact_type%:: Type of Biil
%title%:: title of item
-Transit
-+++++++
+*Transit*
Transit receipts come into two types, general Transit receipts and Transit slips. Transit receipts are listings of item that are in transits. Transit slips are Slips telling the staff that this item is in transit to another location.
commit da9f138949ecdd250d287e6f9a4188a195fd1058
Author: Yamil Suarez <yamil at yamil.com>
Date: Fri Mar 6 16:03:54 2015 -0500
Docs: Add authority section and Authority subject heading thesaurus
Signed-off-by: Yamil Suarez <yamil at yamil.com>
diff --git a/docs/cataloging/authorities.txt b/docs/cataloging/authorities.txt
new file mode 100644
index 0000000..ac1e05c
--- /dev/null
+++ b/docs/cataloging/authorities.txt
@@ -0,0 +1,42 @@
+Manage Authorities
+------------------
+
+In Evergreen to view, edit, merge, and delete authority records you would use the *Manage Authorities* interface
+through the *Cataloging* menu.
+
+[TIP]
+=================
+Currently in Evergreen to create a new authority record, as opposed to importing an authority record, you
+need to have a bib record open in the bib MARC editor.
+
+* For example, if you want to create a new author
+authority you need to have a bib record that has a bib 1xx or 7xx tag with the main entry filled out.
+* Then you need to right click on that 1xx or 7xx tag. In the context menu that shows up, select _Create
+New Authority from this field_, then select either _Create Immediately_ or _Create and Edit..._.
+* If you
+choose _Create and Edit..._, after the authority MARC editor opens you need to click on the _Save_ button
+to finally add the new authority record to your system.
+=================
+
+
+Searching for authorities
+~~~~~~~~~~~~~~~~~~~~~~~~~
+
+To search for authorities in your system, first select the *Cataloging* menu and then select *Manage Authorities*.
+Then proceed to fill out the search form.
+
+. Type in your _Search Term_
+. Select an _Authority type_, types currently include: Author, Subject, Title, Topic
+. Click on the _Submit_ button
+
+
+The authority search results will include the following elements from left to right:
+
+* _Actions_ menu, which can be used to select actions that affect the corresponding authority record. Actions include:
+_Edit_, _Mark for Merge_, _Delete_
+* Count of how many bibs are linked to the corresponding authority
+* Main entry of the authority, i.e the authority tag 1xx value
+* _Control set_ value, with LoC being the default, but others can be added
+* Authority Subject heading system/thesaurus, for example a value of "a" means authority originated from the Library of Congress
+ (http://www.loc.gov/marc/authority/ad008.html)
+
diff --git a/docs/root.txt b/docs/root.txt
index d6145f2..b65180b 100644
--- a/docs/root.txt
+++ b/docs/root.txt
@@ -324,6 +324,8 @@ include::cataloging/tpac_copy_edit_links.txt[]
include::cataloging/MARC_batch_edit.txt[]
+include::cataloging/authorities.txt[]
+
include::cataloging/link_checker.txt[]
commit c01a9b0ca969ff99b60b41ecc08162f637effb6a
Author: Remington Steed <rjs7 at calvin.edu>
Date: Fri Mar 6 12:22:51 2015 -0500
Docs: 2.8 feature correction
This commit corrects a mistake in the new feature documentation for
deleting copy locations.
Signed-off-by: Remington Steed <rjs7 at calvin.edu>
diff --git a/docs/admin_initial_setup/borrowing_items.txt b/docs/admin_initial_setup/borrowing_items.txt
index 7ed32bf..0084daf 100644
--- a/docs/admin_initial_setup/borrowing_items.txt
+++ b/docs/admin_initial_setup/borrowing_items.txt
@@ -37,7 +37,7 @@ Copy Locations
* To get to the Copy Locations Editor, navigate to *Admin > Local Administration
> Copy Locations Editor*.
* Set _OPAC Visible_ to "No" to hide all copies in a copy location from the
-public catalog. (This can also be managed at the _Shelving Location_ level.)
+public catalog. (You can also hide individual copies using the Copy Editor.)
* Set _Hold Verify_ to "Yes" if when a copy checks in you want to always ask for
staff confirmation before capturing a hold.
* Set _Checkin Alert_ to "Yes" to allow routing alerts to display when copies
commit 59cd2c03e7a260565d0df8353cc34de8103aac33
Author: Remington Steed <rjs7 at calvin.edu>
Date: Fri Mar 6 10:46:50 2015 -0500
Docs: 2.8 feature "Deleted flag for copy locations"
This commit documents the new 2.8 feature, the ability to delete copy
locations. It also updates the screenshot, and adds lines to document
other common features of the interface.
Signed-off-by: Remington Steed <rjs7 at calvin.edu>
diff --git a/docs/admin_initial_setup/borrowing_items.txt b/docs/admin_initial_setup/borrowing_items.txt
index 299cc6b..7ed32bf 100644
--- a/docs/admin_initial_setup/borrowing_items.txt
+++ b/docs/admin_initial_setup/borrowing_items.txt
@@ -36,10 +36,22 @@ Copy Locations
* To get to the Copy Locations Editor, navigate to *Admin > Local Administration
> Copy Locations Editor*.
-* When setting up copy locations for your library you can set an entire copy
-location to allow or disallow circulation.
-
-image::media/copy_locations_circulate.png[]
+* Set _OPAC Visible_ to "No" to hide all copies in a copy location from the
+public catalog. (This can also be managed at the _Shelving Location_ level.)
+* Set _Hold Verify_ to "Yes" if when a copy checks in you want to always ask for
+staff confirmation before capturing a hold.
+* Set _Checkin Alert_ to "Yes" to allow routing alerts to display when copies
+are checked in.
+* Set _Holdable_ to "No" to prevent copies in an entire copy location from
+being placed on hold.
+* Set _Circulate_ to "No" to disallow circulating copies in an entire copy
+location.
+* If you delete a copy location, it will be removed from display in the staff
+client and the catalog, but it will remain in the database. This allows you to
+treat a copy location as deleted without losing statistical information for
+circulations related to that copy location.
+
+image::media/copy_locations_editor.png[screenshot of Copy Location Editor]
* Copy locations can also be used as a data element in circulation policies.
diff --git a/docs/media/copy_locations_editor.png b/docs/media/copy_locations_editor.png
new file mode 100644
index 0000000..18b91ad
Binary files /dev/null and b/docs/media/copy_locations_editor.png differ
-----------------------------------------------------------------------
Summary of changes:
docs/TechRef/KidsOPAC.txt | 2 +-
.../Apache => admin}/apache_access_handler.txt | 16 ++-
docs/admin/apache_rewrite_tricks.txt | 148 ++++++++++++++++++++
.../workstation_admin_receipt_template_editor.txt | 15 +--
docs/admin_initial_setup/borrowing_items.txt | 20 ++-
docs/cataloging/authorities.txt | 42 ++++++
.../circulation_patron_records_web_client.txt | 42 +++---
docs/installation/server_installation.txt | 4 +
docs/media/copy_locations_editor.png | Bin 0 -> 31131 bytes
docs/root.txt | 7 +
10 files changed, 253 insertions(+), 43 deletions(-)
rename docs/{TechRef/Apache => admin}/apache_access_handler.txt (91%)
create mode 100644 docs/admin/apache_rewrite_tricks.txt
create mode 100644 docs/cataloging/authorities.txt
create mode 100644 docs/media/copy_locations_editor.png
hooks/post-receive
--
Evergreen ILS
More information about the open-ils-commits
mailing list