Bug 32028: Add page-section to smart-rules.tt and fix markup errors

To test:
1. Apply patch
2. Go to Adminstration > Circulation and fine rules
3. Look at the page-section added and make sure each looks good.
4. Use an HTML validator to check and make sure the HTML looks good.

Note: There are indentation changes and some fixes to bad markup ( stray tags, etc ).

Signed-off-by: David Nind <david@davidnind.com>

Signed-off-by: Katrin Fischer <katrin.fischer.83@web.de>

https://bugs.koha-community.org/show_bug.cgi?id=32082
Signed-off-by: Tomas Cohen Arazi <tomascohen@theke.io>
This commit is contained in:
Lucas Gass 2022-11-04 14:52:23 +00:00 committed by Tomas Cohen Arazi
parent fb6f107b39
commit 517726d69a
Signed by: tomascohen
GPG key ID: 0A272EA1B2F3C15F

View file

@ -63,6 +63,7 @@
Defining circulation and fine rules for all libraries
[% END %]
</h1>
<div class="page-section">
<div class="help">
<p>The rules are applied from most specific to less specific, using the first found in this order:</p>
<ul>
@ -544,6 +545,7 @@
<button name="cancel" class="clear_edit btn btn-default btn-xs"><i class="fa fa-undo"></i> Clear</button>
</td>
</tr>
</tbody>
<tfoot>
<tr>
<th>&nbsp;</th>
@ -597,12 +599,13 @@
<th>&nbsp;</th>
</tr>
</tfoot>
</tbody>
</table>
</form>
</div><!-- ./page-section -->
</div>
<div id="defaults-for-this-library" class="container">
<h3>Default checkout, hold and return policy[% IF humanbranch %] for [% Branches.GetName( humanbranch ) | html %][% END %]</h3>
<div class="page-section">
<p>You can set a default maximum number of checkouts, hold policy and return policy that will be used if none is defined below for a particular item type or category.</p>
<form method="post" action="/cgi-bin/koha/admin/smart-rules.pl">
<input type="hidden" name="op" value="set-branch-defaults" />
@ -780,10 +783,12 @@
</tr>
</table>
</form>
</div><!-- /.page-section -->
</div>
[% IF ( show_branch_cat_rule_form ) %]
<div id="holds-policy-by-patron-category" class="container">
<h3>[% IF humanbranch %]Checkout, hold policy by patron category for [% Branches.GetName( humanbranch ) | html %][% ELSE %]Default checkout, hold policy by patron category[% END %]</h3>
<div class="page-section">
<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>
@ -855,10 +860,11 @@
<td><input name="patron_maxissueqty" size="3" type="text" /></td>
<td><input name="patron_maxonsiteissueqty" size="3" type="text" /></td>
<td><input name="max_holds" size="3" type="text" /></td>
<td class="actions"><button type="submit" class="btn btn-default btn-xs"><i class="fa fa-plus"></i> Add</td>
<td class="actions"><button type="submit" class="btn btn-default btn-xs"><i class="fa fa-plus"></i> Add</button></td>
</tr>
</table>
</form>
</div><!-- ./page-section -->
</div>
[% END %]
@ -868,6 +874,7 @@
[% ELSE %]
<h3>Default waiting hold cancellation policy</h3>
[% END %]
<div class="page-section">
<p>Specify if waiting holds can be cancelled for a given patron category.</p>
<form id="set-waiting-hold-cancellation" method="post" action="/cgi-bin/koha/admin/smart-rules.pl">
<input type="hidden" name="op" value="set-waiting-hold-cancellation" />
@ -939,10 +946,11 @@
<option value="1">Yes</option>
</select>
</td>
<td class="actions"><button type="submit" class="btn btn-default btn-xs"><i class="fa fa-plus"></i> Add</td>
<td class="actions"><button type="submit" class="btn btn-default btn-xs"><i class="fa fa-plus"></i> Add</button></td>
</tr>
</table>
</form>
</div><!-- /.page-section -->
</div>
[% IF Koha.Preference('ArticleRequests') %]
@ -994,7 +1002,7 @@
</select>
</td>
<td><input name="open_article_requests_limit" size="3" type="text" /></td>
<td class="actions"><button type="submit" class="btn btn-default btn-xs"><i class="fa fa-plus"></i> Add</td>
<td class="actions"><button type="submit" class="btn btn-default btn-xs"><i class="fa fa-plus"></i> Add</button></td>
</tr>
</table>
</form>
@ -1052,7 +1060,7 @@
</select>
</td>
<td><input name="article_request_fee" size="3" type="text" /></td>
<td class="actions"><button type="submit" class="btn btn-default btn-xs"><i class="fa fa-plus"></i> Add</td>
<td class="actions"><button type="submit" class="btn btn-default btn-xs"><i class="fa fa-plus"></i> Add</button></td>
</tr>
</table>
</form>
@ -1066,8 +1074,8 @@
[% ELSE %]
<h3>Lost item fee refund on return policy for [% Branches.GetName(current_branch) | html %]</h3>
[% END %]
<p>Specify the default policy for lost item fees on return.
</p>
<div class="page-section">
<p>Specify the default policy for lost item fees on return.</p>
<form method="post" action="/cgi-bin/koha/admin/smart-rules.pl">
<input type="hidden" name="op" value="mod-refund-lost-item-fee-rule" />
<input type="hidden" name="branch" value="[% current_branch | html %]" />
@ -1241,21 +1249,20 @@
<td class="actions">
<button type="submit" class="btn btn-default btn-xs"><i class="fa fa-save"></i> Save</button>
</td>
</td>
</tr>
</table>
</form>
</div><!-- /.page-section -->
</div>
<div id="holds-policy-by-item-type" class="container">
<h3>[% IF humanbranch %]Holds policy by item type for [% Branches.GetName( humanbranch ) | html %][% ELSE %]Default holds policy by item type[% END %]</h3>
<div class="page-section">
<p>
For this library, you can edit rules for given itemtypes, regardless
of the patron's category.
For this library, you can edit rules for given itemtypes, regardless of the patron's category.
</p>
<p>
Currently, this means hold policies.
The various policies have the following effects:
Currently, this means hold policies. The various policies have the following effects:
</p>
<ul>
<li><strong>From any library:</strong> Patrons from any library may put this item on hold. <cite>(default if none is defined)</cite></li>
@ -1263,13 +1270,14 @@
<li><strong>From home library:</strong> Only patrons from the item's home library may put this book on hold.</li>
<li><strong>No holds allowed:</strong> No patron may put this book on hold.</li>
</ul>
<p><strong>Note: </strong>If the system preference 'AllowHoldPolicyOverride' is enabled, these policies can be overridden by your circulation staff.</br />
<strong>Important:</strong>
<p><strong>Note: </strong>If the system preference 'AllowHoldPolicyOverride' is enabled, these policies can be overridden by your circulation staff.</p>
<p><strong>Important:</strong></p>
<ul>
<li>The hold policies are applied based on the ReservesControlBranch system preference which is set to <a href="/cgi-bin/koha/admin/preferences.pl?op=search&searchfield=ReservesControlBranch">[% Koha.Preference('ReservesControlBranch') | html %]</a>.</li>
<li>The return policy is applied based on the CircControlReturnsBranch system preference which is set to <a href=""/cgi-bin/koha/admin/preferences.pl?op=search&searchfield=CircControlReturnsBranch">[% Koha.Preference('CircControlReturnsBranch') | html %]</a>.</li>
<li>The return policy is applied based on the CircControlReturnsBranch system preference which is set to <a href="/cgi-bin/koha/admin/preferences.pl?op=search&searchfield=CircControlReturnsBranch">[% Koha.Preference('CircControlReturnsBranch') | html %]</a>.</li>
</ul>
</p>
<form method="post" action="/cgi-bin/koha/admin/smart-rules.pl">
<input type="hidden" name="op" value="add-branch-item" />
@ -1381,6 +1389,7 @@
</tr>
</table>
</form>
</div><!-- /.page-section -->
</div>
</main>
</div> <!-- /.col-sm-10.col-sm-push-2 -->