From 90beb9c383ad919acded370655f13ddb7f167a7b Mon Sep 17 00:00:00 2001 From: Jesse Weaver Date: Thu, 31 Dec 2015 12:48:01 -0700 Subject: [PATCH] Bug 15456: Fix tabs and inconsistent indentation in smart-rules.tt To verify patch, run `git diff -w HEAD^' and note that the only changes shown are where [% IF %] statements are expanded/unexpanded onto multiple lines to match the prevailing style. --- .../prog/en/modules/admin/smart-rules.tt | 188 +++++++++++---------- 1 file changed, 95 insertions(+), 93 deletions(-) diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/smart-rules.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/smart-rules.tt index e7cc158..18ec312 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/smart-rules.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/smart-rules.tt @@ -135,9 +135,9 @@ $(document).ready(function() { Select a library : [% IF ( definedbranch ) %]
- [% IF ( rule.default_humancategorycode ) %] - All - [% ELSE %] - [% rule.humancategorycode %] - [% END %] - - [% IF ( rule.default_humanitemtype ) %] - All - [% ELSE %] - [% rule.translated_description %] - [% END %] - - [% IF ( rule.unlimited_maxissueqty ) %] - Unlimited - [% ELSE %] - [% rule.maxissueqty %] - [% END %] - - [% IF rule.unlimited_maxonsiteissueqty %] - Unlimited - [% ELSE %] - [% rule.maxonsiteissueqty %] - [% END %] - - [% rule.issuelength %] - - [% rule.lengthunit %] - - - [% IF ( rule.hardduedate ) %] + [% FOREACH rule IN rules %] + + + [% IF ( rule.default_humancategorycode ) %] + All + [% ELSE %] + [% rule.humancategorycode %] + [% END %] + + + [% IF ( rule.default_humanitemtype ) %] + All + [% ELSE %] + [% rule.translated_description %] + [% END %] + + + [% IF ( rule.unlimited_maxissueqty ) %] + Unlimited + [% ELSE %] + [% rule.maxissueqty %] + [% END %] + + + [% IF rule.unlimited_maxonsiteissueqty %] + Unlimited + [% ELSE %] + [% rule.maxonsiteissueqty %] + [% END %] + + [% rule.issuelength %] + [% rule.lengthunit %] + + [% IF ( rule.hardduedate ) %] [% IF ( rule.hardduedatebefore ) %] - before [% rule.hardduedate %] - + before [% rule.hardduedate %] + [% ELSIF ( rule.hardduedateexact ) %] - on [% rule.hardduedate %] - + on [% rule.hardduedate %] + [% ELSIF ( rule.hardduedateafter ) %] - after [% rule.hardduedate %] - + after [% rule.hardduedate %] + [% END %] - [% ELSE %] + [% ELSE %] None defined - [% END %] - - [% rule.fine %] - [% rule.chargeperiod %] - [% IF rule.chargeperiod_charge_at %]Start of interval[% ELSE %]End of interval[% END %] - [% rule.firstremind %] - [% rule.overduefinescap FILTER format("%.2f") %] - - [% IF rule.cap_fine_to_replacement_price %] - - [% ELSE %] - - [% END %] - - [% rule.finedays %] - [% rule.maxsuspensiondays %] - [% rule.renewalsallowed %] - [% rule.renewalperiod %] - [% rule.norenewalbefore %] - - [% IF ( rule.auto_renew ) %] - Yes - [% ELSE %] - No - [% END %] - - [% rule.reservesallowed %] - [% IF rule.onshelfholds %]Yes[% ELSE %]No[% END %] - [% IF rule.opacitemholds == 'F'%]Force[% ELSIF rule.opacitemholds == 'Y'%]Allow[% ELSE %]Don't allow[% END %] - [% rule.rentaldiscount %] - Edit - - Delete - - - [% END %] + [% END %] + + [% rule.fine %] + [% rule.chargeperiod %] + [% IF rule.chargeperiod_charge_at %]Start of interval[% ELSE %]End of interval[% END %] + [% rule.firstremind %] + [% rule.overduefinescap FILTER format("%.2f") %] + + [% IF rule.cap_fine_to_replacement_price %] + + [% ELSE %] + + [% END %] + + [% rule.finedays %] + [% rule.maxsuspensiondays %] + [% rule.renewalsallowed %] + [% rule.renewalperiod %] + [% rule.norenewalbefore %] + [% IF ( rule.auto_renew ) %]Yes[% ELSE %]No[% END %] + [% rule.reservesallowed %] + [% IF rule.onshelfholds %]Yes[% ELSE %]No[% END %] + [% IF rule.opacitemholds == 'F'%]Force[% ELSIF rule.opacitemholds == 'Y'%]Allow[% ELSE %]Don't allow[% END %] + [% rule.rentaldiscount %] + Edit + + Delete + + + [% END %] @@ -470,19 +466,22 @@ for="tobranch">Clone these rules to: Clone these rules to: - [% FOREACH categoryloo IN categoryloop %] - - [% END %] + [% FOREACH categoryloo IN categoryloop %] + + [% END %] @@ -545,13 +544,15 @@ for="tobranch">Clone these rules to: Clone these rules to: