[Koha-patches] [PATCH] Fix for Bug 4820, Alter layout of Circulation and fines rules page for clarity

[Owen Leonard]

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.
---
 .../intranet-tmpl/prog/en/css/staff-global.css     |    5 +++++
 .../prog/en/modules/admin/smart-rules.tmpl         |   20 ++++++++------------
 2 files changed, 13 insertions(+), 12 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 e63fa3a..9cc5ba0 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 4576e26..6502e47 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
@@ -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" -->"/>
-- 
1.7.3