From 0185ea6e9a0a352d06e69e2141e0cb5d5ddb4e1e Mon Sep 17 00:00:00 2001
From: Owen Leonard <oleonard@myacpl.org>
Date: Thu, 30 Dec 2010 06:31:23 -0500
Subject: [PATCH] Fix for Bug 4820, Alter layout of Circulation and fines rules
 page for clarity

I propose some changes to the issuing rules interface to improve usability:

 - Better define and delineate the sub-sections on the page:
   - Default checkout and hold policy
   - Checkout limit by patron category
   - Holds policy by item type

 - Repeat the current library name, when selected, for clarity: "Default
   checkout and hold policy for Athens" rather than "Default checkout and
   hold policy for this library"

 - Use the phrase "all libraries" when no library is selected. "Default
   library" seems ambiguous. "All libraries" better defines how the rule
   will be applied: to all libraries in the absence of a more specific rule.

 - Use the term "all" instead of "default" in cases where a rule will apply
   to all categories or item types.

Signed-off-by: Nicole Engard <nengard@bywatersolutions.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
---
 .../prog/en/css/staff-global.css              |  5 ++
 .../prog/en/modules/admin/smart-rules.tmpl    | 46 +++++++++----------
 2 files changed, 26 insertions(+), 25 deletions(-)

diff --git a/koha-tmpl/intranet-tmpl/prog/en/css/staff-global.css b/koha-tmpl/intranet-tmpl/prog/en/css/staff-global.css
index e63fa3ae92..9cc5ba0d10 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/css/staff-global.css
+++ b/koha-tmpl/intranet-tmpl/prog/en/css/staff-global.css
@@ -1914,3 +1914,8 @@ ul.budget_hierarchy li:first-child:after {
 .holdcount { font-size : 105%; line-height : 200%; }
 .holdcount a { border : 1px solid #a4bedd; background-color : #e4ecf5; font-weight : bold; -moz-border-radius: 4px; padding : .1em .4em; text-decoration : none; }
 .holdcount a:hover { background-color : #ebeff7; }
+.container {
+	border : 1px solid #EEE;
+	padding : 1em;
+	margin : 1em 0;
+}
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/smart-rules.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/smart-rules.tmpl
index 4576e26bc8..43ad6534e7 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/smart-rules.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/smart-rules.tmpl
@@ -29,20 +29,20 @@ $(document).ready(function() {
         <!-- TMPL_IF NAME="humanbranch" -->
             Defining circulation and fine rules for "<!-- TMPL_VAR NAME="humanbranch" -->"
         <!-- TMPL_ELSE -->
-            Defining default circulation and fine rules
+            Defining circulation and fine rules for all libraries
         <!-- /TMPL_IF -->
     </h1>
     <div class="help">
         <p>The rules are applied from most specific to less specific, using the first found in this order:</p>
         <ul>
             <li>same library, same patron type, same item type</li>
-            <li>same library, same patron type, default item type</li>
-            <li>same library, default patron type, same item type</li>
-            <li>same library, default patron type, default item type</li>
-            <li>default library, same patron type, same item type</li>
-            <li>default library, same patron type, default item type</li>
-            <li>default library, default patron type, same item type</li>
-            <li>default library, default patron type, default item type</li>
+            <li>same library, same patron type, all item types</li>
+            <li>same library, all patron types, same item type</li>
+            <li>same library, all patron types, default item type</li>
+            <li>all libraries, same patron type, same item type</li>
+            <li>all libraries, same patron type, all item types</li>
+            <li>all libraries, all patron types, same item type</li>
+            <li>all libraries, all patron types, all item types</li>
         </ul>
         <p>To modify a rule, create a new one with the same patron type and item type.</p>
     </div>
@@ -50,7 +50,7 @@ $(document).ready(function() {
         <form method="get" action="/cgi-bin/koha/admin/smart-rules.pl" id="selectlibrary">
         Select a library :
             <select name="branch" id="branch" style="width:20em;">
-                <option value="*">Default</option>
+                <option value="*">All libraries</option>
             <!-- TMPL_LOOP NAME="branchloop" -->
 				<!-- TMPL_IF NAME="selected" --><option value="<!-- TMPL_VAR NAME="value" -->" selected="selected"><!-- TMPL_VAR NAME="branchname" --></option><!-- TMPL_ELSE --><option value="<!-- TMPL_VAR NAME="value" -->"><!-- TMPL_VAR NAME="branchname" --></option><!-- /TMPL_IF -->
             <!-- /TMPL_LOOP -->
@@ -83,13 +83,13 @@ $(document).ready(function() {
 					<tr>
 					<!-- /TMPL_UNLESS -->
 							<td><!-- TMPL_IF NAME="default_humancategorycode" -->
-									<em>Default</em>
+									<em>All</em>
 								<!-- TMPL_ELSE -->
 									<!-- TMPL_VAR NAME="humancategorycode" -->
 								<!-- /TMPL_IF -->
 							</td>
 							<td><!-- TMPL_IF NAME="default_humanitemtype" -->
-									<em>Default</em>
+									<em>All</em>
 								<!-- TMPL_ELSE -->
 									<!-- TMPL_VAR NAME="humanitemtype" -->
 								<!-- /TMPL_IF -->
@@ -116,7 +116,7 @@ $(document).ready(function() {
                 <tr>
                     <td>
                         <select name="categorycode">
-                            <option value="*">Default</option>
+                            <option value="*">All</option>
                         <!-- TMPL_LOOP NAME="categoryloop" -->
                             <option value="<!-- TMPL_VAR NAME="categorycode" -->"><!-- TMPL_VAR NAME="description" --></option>
                         <!-- /TMPL_LOOP -->
@@ -124,7 +124,7 @@ $(document).ready(function() {
                     </td>
                     <td>
                         <select name="itemtype" style="width:13em;">
-                            <option value="*">Default</option>
+                            <option value="*">All</option>
                         <!-- TMPL_LOOP NAME="itemtypeloop" -->
                             <option value="<!-- TMPL_VAR NAME="itemtype" -->"><!-- TMPL_VAR NAME="description" --></option>
                         <!-- /TMPL_LOOP -->
@@ -144,11 +144,9 @@ $(document).ready(function() {
             </table>
         </form>
     </div>
-    <div class="help">
-        <h4>Defaults for this library</h4>
+    <div id="defaults-for-this-library" class="container">
+    <h3>Default checkout and hold policy for <!-- TMPL_IF NAME="humanbranch" --><!-- TMPL_VAR NAME="humanbranch" --><!-- TMPL_ELSE -->all libraries<!-- /TMPL_IF --></h3>
         <p>You can set a default maximum number of checkouts and hold policy that will be used if none is defined below for a particular item type or category.</p>
-    </div>
-    <div>
         <form method="post" action="/cgi-bin/koha/admin/smart-rules.pl">
             <input type="hidden" name="op" value="set-branch-defaults" />
             <input type="hidden" name="branch" value="<!-- TMPL_VAR NAME="branch" -->"/>
@@ -197,15 +195,14 @@ $(document).ready(function() {
         </form>
     </div>
     <!-- TMPL_IF NAME="show_branch_cat_rule_form" -->
-    <div class="help">
+    <div id="holds-policy-by-patron-category" class="container">
+    <h3>Checkout limit by patron category for <!-- TMPL_IF NAME="humanbranch" --><!-- TMPL_VAR NAME="humanbranch" --><!-- TMPL_ELSE -->all libraries<!-- /TMPL_IF --></h3>
         <p>For this library, you can specify the maximum number of loans that
             a patron of a given category can make, regardless of the item type.
         </p>
         <p>If the total amount loanable for a given patron category is left blank,
            no limit applies, except possibly for a limit you define for a specific item type.
         </p>
-    </div>
-    <div>
         <form method="post" action="/cgi-bin/koha/admin/smart-rules.pl">
             <input type="hidden" name="op" value="add-branch-cat" />
             <input type="hidden" name="branch" value="<!-- TMPL_VAR NAME="branch" -->"/>
@@ -253,7 +250,8 @@ $(document).ready(function() {
         </form>
     </div>
     <!-- /TMPL_IF -->
-    <div class="help">
+    <div id="holds-policy-by-item-type" class="container">
+    <h3>Holds policy by item type for <!-- TMPL_IF NAME="humanbranch" --><!-- TMPL_VAR NAME="humanbranch" --><!-- TMPL_ELSE -->all libraries<!-- /TMPL_IF --></h3>
         <p>
             For this library, you can edit rules for given itemtypes, regardless
             of the patron's category.
@@ -271,11 +269,9 @@ $(document).ready(function() {
             Note that if the system preference
             <code>AllowHoldPolicyOverride</code> is enabled, these policies can
             be overridden by your circulation staff. Also, these policies are
-            based on the patron's home branch, <em>not</em> the branch that
-            the reserving staff member is from.
+            based on the patron's home library, <em>not</em> the library where the hold is being placed..
         </p>
-    </div>
-    <div>
+
         <form method="post" action="/cgi-bin/koha/admin/smart-rules.pl">
             <input type="hidden" name="op" value="add-branch-item" />
             <input type="hidden" name="branch" value="<!-- TMPL_VAR NAME="branch" -->"/>
-- 
2.39.5