From 875e98f607fdfee4caea6240c3dbdba5a5b964df Mon Sep 17 00:00:00 2001 From: Tomas Cohen Arazi Date: Fri, 27 Oct 2017 11:40:48 -0300 Subject: [PATCH] Bug 15486: (followup) Tidy table code for readability Signed-off-by: Tomas Cohen Arazi --- .../prog/en/modules/admin/smart-rules.tt | 219 ++++++++++----------- 1 file changed, 106 insertions(+), 113 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 e7d10f6..faab711 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 @@ -202,119 +202,112 @@ $(document).ready(function() { - [% FOREACH rule IN rules %] - - [% IF ( rule.default_humancategorycode ) %] - All - [% ELSE %] - [% rule.humancategorycode %] - [% END %] - - [% IF rule.default_translated_description %] - All - [% ELSE %] - [% rule.translated_description %] - [% END %] - - - Edit - Delete - - - [% 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 %] - - [% ELSIF ( rule.hardduedateexact ) %] - on [% rule.hardduedate %] - - [% ELSIF ( rule.hardduedateafter ) %] - after [% rule.hardduedate %] - - [% END %] - [% 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.no_auto_renewal_after %] - [% rule.no_auto_renewal_after_hard_limit %] - [% rule.reservesallowed %] - [% IF rule.unlimited_holds_per_day %] - Unlimited - [% ELSE %] - [% rule.holds_per_day %] - [% END %] - - [% rule.holds_per_record %] - - [% IF rule.onshelfholds == 1 %] - Yes - [% ELSIF rule.onshelfholds == 2 %] - If all unavailable - [% ELSE %] - If any unavailable - [% END %] - [% IF rule.opacitemholds == 'F'%]Force[% ELSIF rule.opacitemholds == 'Y'%]Allow[% ELSE %]Don't allow[% END %] - - [% IF rule.article_requests == 'no' %] - No - [% ELSIF rule.article_requests == 'yes' %] - Yes - [% ELSIF rule.article_requests == 'bib_only' %] - Record only - [% ELSIF rule.article_requests == 'item_only' %] - Item only - [% END %] - - [% rule.rentaldiscount %] - - Edit - Delete - - - - [% END %] + [% FOREACH rule IN rules %] + + [% IF ( rule.default_humancategorycode ) %] + All + [% ELSE %] + [% rule.humancategorycode %] + [% END %] + [% IF rule.default_translated_description %] + All + [% ELSE %] + [% rule.translated_description %] + [% END %] + + Edit + + Delete + [% 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 %] + + [% ELSIF ( rule.hardduedateexact ) %] + on [% rule.hardduedate %] + + [% ELSIF ( rule.hardduedateafter ) %] + after [% rule.hardduedate %] + + [% END %] + [% 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.no_auto_renewal_after %] + [% rule.no_auto_renewal_after_hard_limit %] + [% rule.reservesallowed %] + [% IF rule.unlimited_holds_per_day %] + Unlimited + [% ELSE %] + [% rule.holds_per_day %] + [% END %] + [% rule.holds_per_record %] + [% IF rule.onshelfholds == 1 %] + Yes + [% ELSIF rule.onshelfholds == 2 %] + If all unavailable + [% ELSE %] + If any unavailable + [% END %] + [% IF rule.opacitemholds == 'F'%] + Force + [% ELSIF rule.opacitemholds == 'Y'%] + Allow + [% ELSE %] + Don't allow + [% END %] + [% IF rule.article_requests == 'no' %] + No + [% ELSIF rule.article_requests == 'yes' %] + Yes + [% ELSIF rule.article_requests == 'bib_only' %] + Record only + [% ELSIF rule.article_requests == 'item_only' %] + Item only + [% END %] + [% rule.rentaldiscount %] + + + Edit + + Delete + + [% END %]