From 4b294e374dde15f22e6944f858b4479d079cb9f0 Mon Sep 17 00:00:00 2001 From: Owen Leonard Date: Thu, 9 Sep 2021 18:32:20 +0000 Subject: [PATCH] Bug 28988: Reindent calendar template This patch performs general template cleanup to the calendar template: Make indentation consistent and trim trailing whitespace. To test, apply the patch and go to Tools -> Calendar. The page should look correct and work correctly. If you view the diff while ignoring whitespace the only changes should be where line breaks were introduced. Signed-off-by: David Nind Signed-off-by: Katrin Fischer Signed-off-by: Jonathan Druart --- .../prog/en/modules/tools/holidays.tt | 734 +++++++++--------- 1 file changed, 384 insertions(+), 350 deletions(-) diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/holidays.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/holidays.tt index a25c35501d..a8bdc947d1 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/holidays.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/holidays.tt @@ -32,327 +32,361 @@
-

[% Branches.GetName( branch ) | html %] calendar

- -
-
- - - - - - - - -
-
- -
-

Edit this holiday

- -
    -
  1. - Library: - -
    2. -
  2. - From date: - , - - [% IF ( dateformat == "us" ) %]//[% ELSIF ( dateformat == "metric") %]//[% ELSIF ( dateformat == "dmydot") %]..[% ELSE %]//[% END %] - - - - - - -
    3. -
  3. - To date: - -
    4. -
    5. - -
  5. - - -
    6. -
  6. - - [?] -
    You can make an exception for this holiday rule. This means that you will be able to say that for a repeatable holiday there is one day which is going to be an exception.
    -
    7. -
  7. - - - [?] -
    You can make an exception on a range of dates repeated yearly.
    -
    8. -
  8. - [?] -
    This will delete this holiday rule. If it is a repeatable holiday, this option checks for possible exceptions. If an exception exists, this option will remove the exception and set the date to a regular holiday.
    9. -
  9. . - [?] -
    This will delete the single holidays rules only. The repeatable holidays and exceptions will not be deleted.
    -
    10. -
  10. . - [?] -
    This will delete the repeated holidays rules only. The repeatable holidays will be deleted but not the exceptions.
    -
    11. -
  11. . - [?] -
    This will delete the exceptions inside a given range. Be careful about your scope range; if it is oversized you could slow down Koha.
    -
    12. -
  12. - [?] -
    This will save changes to the holiday's title and description. If the information for a repeatable holiday is modified, it affects all of the dates on which the holiday is repeated.
    13. -
  13. - - . - [?] -
    If checked, changes for this holiday will be copied to all libraries. If the holiday doesn't exists for a library, no change is made.
    -
    14. -
-
- - Cancel -
-
-
-
- - -
-
-
-

Add new holiday

-
    -
  1. - Library: - - -
    2. -
  2. - From date: - , - - [% IF ( dateformat == "us" ) %]//[% ELSIF ( dateformat == "metric" ) %]//[% ELSIF ( dateformat == "dmydot" ) %]..[% ELSE %]//[% END %] - - - - - - -
    3. -
  3. - To date: - -
    4. -
    5. -
  5. - -
    6. -
  6. - . - [?] -
    Make a single holiday. For example, selecting August 1, 2012 will make it a holiday, but will not affect August 1 in other years.
    -
    7. -
  7. - . - [?] -
    Make this weekday a holiday, every week. For example, if your library is closed on Saturdays, use this option to make every Saturday a holiday.
    -
    8. -
  8. - . - [?] -
    This will take this day and month as a reference to make it a holiday. Through this option, you can repeat this rule for every year. For example, selecting August 1 will make August 1 a holiday every year.
    -
    9. -
  9. - . - [?] -
    Make a single holiday on a range. For example, selecting August 1, 2012 and August 10, 2012 will make all days between August 1 and 10 a holiday, but will not affect August 1-10 in other years.
    -
    10. -
  10. - . - [?] -
    Make a single holiday on a range repeated yearly. For example, selecting August 1, 2012 and August 10, 2012 will make all days between August 1 and 10 a holiday, and will affect August 1-10 in other years.
    -
    11. -
  11. - - . - [?] -
    If checked, this holiday will be copied to all libraries. If the holiday already exists for a library, no change is made.
    -
-
- - Cancel -
-
-
-
- - - - - - - - -

Calendar information

-
- -
-
- - - - -
-
- -
-
-
-

Hints

-
    -
  • Search in the calendar the day you want to set as holiday.
    • -
  • Click the date to add or edit a holiday.
    • -
  • Enter a title and description for the holiday.
    • -
  • Specify how the holiday should repeat.
    • -
  • Click Save to finish.
    • -
-

Key

-

- Working day - Unique holiday - Holiday repeating weekly - Holiday repeating yearly - Holiday exception -

-
-
- - -[% IF ( EXCEPTION_HOLIDAYS_LOOP ) %] -

Exceptions

- - - - - - - - - - [% FOREACH EXCEPTION_HOLIDAYS_LOO IN EXCEPTION_HOLIDAYS_LOOP %] - - - - - - [% END %] - -
DateTitleDescription
- - [% EXCEPTION_HOLIDAYS_LOO.DATE | html %] - - [% EXCEPTION_HOLIDAYS_LOO.TITLE | html %][% EXCEPTION_HOLIDAYS_LOO.DESCRIPTION | html %]
-[% END %] - -[% IF ( WEEK_DAYS_LOOP ) %] -

Weekly - Repeatable holidays

- - - - - - - - - - [% FOREACH WEEK_DAYS_LOO IN WEEK_DAYS_LOOP %] - - - - - - - [% END %] - -
Day of weekTitleDescription
[% WEEK_DAYS_LOO.KEY | html %][% WEEK_DAYS_LOO.TITLE | html %][% WEEK_DAYS_LOO.DESCRIPTION | html %]
-[% END %] - -[% IF ( DAY_MONTH_HOLIDAYS_LOOP ) %] -

Yearly - Repeatable holidays

- - - - [% IF ( dateformat == "metric" ) %] - - [% ELSE %] - - [% END %] - - - - - - [% FOREACH DAY_MONTH_HOLIDAYS_LOO IN DAY_MONTH_HOLIDAYS_LOOP %] - - - - - - [% END %] - -
Day/monthMonth/dayTitleDescription
- [% DAY_MONTH_HOLIDAYS_LOO.DATE | html %] - [% DAY_MONTH_HOLIDAYS_LOO.TITLE | html %][% DAY_MONTH_HOLIDAYS_LOO.DESCRIPTION | html %]
-[% END %] - -[% IF ( HOLIDAYS_LOOP ) %] -

Unique holidays

- - - - - - - - - - - [% FOREACH HOLIDAYS_LOO IN HOLIDAYS_LOOP %] - - - - - - [% END %] - -
DateTitleDescription
- - [% HOLIDAYS_LOO.DATE | html %] - - [% HOLIDAYS_LOO.TITLE | html %][% HOLIDAYS_LOO.DESCRIPTION.replace('\\\r\\\n', '
') | html %]
-[% END %] -
-
-
- +

[% Branches.GetName( branch ) | html %] calendar

+ +
+
+ + + + + + + + +
+
+ +
+

Edit this holiday

+ +
    +
  1. + Library: + +
    2. +
  2. + From date: + , + [% IF ( dateformat == "us" ) %] + // + [% ELSIF ( dateformat == "metric") %] + // + [% ELSIF ( dateformat == "dmydot") %] + ..[% ELSE %]// + [% END %] + + + + + + +
    3. +
  3. + To date: + +
    4. +
  4. + +
    5. + +
  5. + + +
    6. +
  6. +
    + + [?] +
    You can make an exception for this holiday rule. This means that you will be able to say that for a repeatable holiday there is one day which is going to be an exception.
    +
    +
    7. +
  7. +
    + + + [?] +
    You can make an exception on a range of dates repeated yearly.
    +
    +
    8. +
  8. + + + [?] +
    This will delete this holiday rule. If it is a repeatable holiday, this option checks for possible exceptions. If an exception exists, this option will remove the exception and set the date to a regular holiday.
    +
    9. +
  9. + . + [?] +
    This will delete the single holidays rules only. The repeatable holidays and exceptions will not be deleted.
    +
    10. +
  10. + . + [?] +
    This will delete the repeated holidays rules only. The repeatable holidays will be deleted but not the exceptions.
    +
    11. +
  11. + . + [?] +
    This will delete the exceptions inside a given range. Be careful about your scope range; if it is oversized you could slow down Koha.
    +
    12. +
  12. + + [?] +
    This will save changes to the holiday's title and description. If the information for a repeatable holiday is modified, it affects all of the dates on which the holiday is repeated.
    13. +
  13. + + . + [?] +
    If checked, changes for this holiday will be copied to all libraries. If the holiday doesn't exists for a library, no change is made.
    +
    14. +
+
+ + Cancel +
+
+
+
+ + +
+
+
+

Add new holiday

+
    +
  1. + Library: + + +
    2. +
  2. + From date: + , + + [% IF ( dateformat == "us" ) %] + // + [% ELSIF ( dateformat == "metric" ) %] + // + [% ELSIF ( dateformat == "dmydot" ) %] + .. + [% ELSE %] + // + [% END %] + + + + + + +
    3. +
  3. + To date: + +
    4. +
  4. + +
    5. +
  5. + + +
    6. +
  6. + + . + [?] +
    Make a single holiday. For example, selecting August 1, 2012 will make it a holiday, but will not affect August 1 in other years.
    +
    7. +
  7. + + . + [?] +
    Make this weekday a holiday, every week. For example, if your library is closed on Saturdays, use this option to make every Saturday a holiday.
    +
    8. +
  8. + + . + [?] +
    This will take this day and month as a reference to make it a holiday. Through this option, you can repeat this rule for every year. For example, selecting August 1 will make August 1 a holiday every year.
    +
    9. +
  9. + + . + [?] +
    Make a single holiday on a range. For example, selecting August 1, 2012 and August 10, 2012 will make all days between August 1 and 10 a holiday, but will not affect August 1-10 in other years.
    +
    10. +
  10. + + . + [?] +
    Make a single holiday on a range repeated yearly. For example, selecting August 1, 2012 and August 10, 2012 will make all days between August 1 and 10 a holiday, and will affect August 1-10 in other years.
    +
    11. +
  11. + + . + [?] +
    If checked, this holiday will be copied to all libraries. If the holiday already exists for a library, no change is made.
    +
    12. +
+
+ + Cancel +
+
+
+
+ + + + + + + + +

Calendar information

+
+
+
+ + + + +
+
+
+ +
+
+

Hints

+
    +
  • Search in the calendar the day you want to set as holiday.
    • +
  • Click the date to add or edit a holiday.
    • +
  • Enter a title and description for the holiday.
    • +
  • Specify how the holiday should repeat.
    • +
  • Click Save to finish.
    • +
+

Key

+

+ Working day + Unique holiday + Holiday repeating weekly + Holiday repeating yearly + Holiday exception +

+
+ +
+ + + [% IF ( EXCEPTION_HOLIDAYS_LOOP ) %] +

Exceptions

+ + + + + + + + + + + [% FOREACH EXCEPTION_HOLIDAYS_LOO IN EXCEPTION_HOLIDAYS_LOOP %] + + + + + + [% END %] + +
DateTitleDescription
+ + [% EXCEPTION_HOLIDAYS_LOO.DATE | html %] + + [% EXCEPTION_HOLIDAYS_LOO.TITLE | html %][% EXCEPTION_HOLIDAYS_LOO.DESCRIPTION | html %]
+ [% END %] + + [% IF ( WEEK_DAYS_LOOP ) %] +

Weekly - Repeatable holidays

+ + + + + + + + + + [% FOREACH WEEK_DAYS_LOO IN WEEK_DAYS_LOOP %] + + + + + + [% END %] + +
Day of weekTitleDescription
[% WEEK_DAYS_LOO.KEY | html %][% WEEK_DAYS_LOO.TITLE | html %][% WEEK_DAYS_LOO.DESCRIPTION | html %]
+ [% END %] + + [% IF ( DAY_MONTH_HOLIDAYS_LOOP ) %] +

Yearly - Repeatable holidays

+ + + + [% IF ( dateformat == "metric" ) %] + + [% ELSE %] + + [% END %] + + + + + + [% FOREACH DAY_MONTH_HOLIDAYS_LOO IN DAY_MONTH_HOLIDAYS_LOOP %] + + + + + + [% END %] + +
Day/monthMonth/dayTitleDescription
+ [% DAY_MONTH_HOLIDAYS_LOO.DATE | html %] + [% DAY_MONTH_HOLIDAYS_LOO.TITLE | html %][% DAY_MONTH_HOLIDAYS_LOO.DESCRIPTION | html %]
+ [% END %] + + [% IF ( HOLIDAYS_LOOP ) %] +

Unique holidays

+ + + + + + + + + + + [% FOREACH HOLIDAYS_LOO IN HOLIDAYS_LOOP %] + + + + + + [% END %] + +
DateTitleDescription
+ + [% HOLIDAYS_LOO.DATE | html %] + + [% HOLIDAYS_LOO.TITLE | html %][% HOLIDAYS_LOO.DESCRIPTION.replace('\\\r\\\n', '
') | html %]
+ [% END %] +
+
+
@@ -378,17 +412,17 @@ var day_month_holidays = new Array(); var hola= "[% code | html %]"; [% FOREACH WEEK_DAYS_LOO IN WEEK_DAYS_LOOP %] - week_days["[% WEEK_DAYS_LOO.KEY | html %]"] = {title:"[% WEEK_DAYS_LOO.TITLE | replace('"','\"') | html %]", description:"[% WEEK_DAYS_LOO.DESCRIPTION | replace('"','\"') | html %]"}; + week_days["[% WEEK_DAYS_LOO.KEY | html %]"] = {title:"[% WEEK_DAYS_LOO.TITLE | replace('"','\"') | html %]", description:"[% WEEK_DAYS_LOO.DESCRIPTION | replace('"','\"') | html %]"}; [% END %] [% FOREACH HOLIDAYS_LOO IN HOLIDAYS_LOOP %] - holidates.push("[% HOLIDAYS_LOO.KEY | html %]"); - holidays["[% HOLIDAYS_LOO.KEY | html %]"] = {title:"[% HOLIDAYS_LOO.TITLE | replace('"','\"') | html %]", description:"[% HOLIDAYS_LOO.DESCRIPTION | replace('"','\"') | html %]"}; + holidates.push("[% HOLIDAYS_LOO.KEY | html %]"); + holidays["[% HOLIDAYS_LOO.KEY | html %]"] = {title:"[% HOLIDAYS_LOO.TITLE | replace('"','\"') | html %]", description:"[% HOLIDAYS_LOO.DESCRIPTION | replace('"','\"') | html %]"}; [% END %] [% FOREACH EXCEPTION_HOLIDAYS_LOO IN EXCEPTION_HOLIDAYS_LOOP %] - exception_holidays["[% EXCEPTION_HOLIDAYS_LOO.KEY | html %]"] = {title:"[% EXCEPTION_HOLIDAYS_LOO.TITLE | replace('"','\"') | html %]", description:"[% EXCEPTION_HOLIDAYS_LOO.DESCRIPTION | replace('"','\"') | html %]"}; + exception_holidays["[% EXCEPTION_HOLIDAYS_LOO.KEY | html %]"] = {title:"[% EXCEPTION_HOLIDAYS_LOO.TITLE | replace('"','\"') | html %]", description:"[% EXCEPTION_HOLIDAYS_LOO.DESCRIPTION | replace('"','\"') | html %]"}; [% END %] [% FOREACH DAY_MONTH_HOLIDAYS_LOO IN DAY_MONTH_HOLIDAYS_LOOP %] - day_month_holidays["[% DAY_MONTH_HOLIDAYS_LOO.KEY | html %]"] = {title:"[% DAY_MONTH_HOLIDAYS_LOO.TITLE | replace('"','\"') | html %]", description:"[% DAY_MONTH_HOLIDAYS_LOO.DESCRIPTION | replace('"','\"') | html %]"}; + day_month_holidays["[% DAY_MONTH_HOLIDAYS_LOO.KEY | html %]"] = {title:"[% DAY_MONTH_HOLIDAYS_LOO.TITLE | replace('"','\"') | html %]", description:"[% DAY_MONTH_HOLIDAYS_LOO.DESCRIPTION | replace('"','\"') | html %]"}; [% END %] function holidayOperation(formObject, opType) { @@ -499,33 +533,33 @@ var dayName = weekdays[weekDay]; var dayMonth = month + '/' + day; var dateString = year + '/' + month + '/' + day; - if (holidays[dateString] != null) { - showHoliday(0, dayName, day, month, year, weekDay, holidays[dateString].title, holidays[dateString].description, 'ymd'); - } else if (exception_holidays[dateString] != null) { - showHoliday(0, dayName, day, month, year, weekDay, exception_holidays[dateString].title, exception_holidays[dateString].description, 'exception'); - } else if (week_days[weekDay] != null) { - showHoliday(1, dayName, day, month, year, weekDay, week_days[weekDay].title, week_days[weekDay].description, 'weekday'); - } else if (day_month_holidays[dayMonth] != null) { - showHoliday(1, dayName, day, month, year, weekDay, day_month_holidays[dayMonth].title, day_month_holidays[dayMonth].description, 'daymonth'); - } else { - newHoliday(dayName, day, month, year, weekDay); - } + if (holidays[dateString] != null) { + showHoliday(0, dayName, day, month, year, weekDay, holidays[dateString].title, holidays[dateString].description, 'ymd'); + } else if (exception_holidays[dateString] != null) { + showHoliday(0, dayName, day, month, year, weekDay, exception_holidays[dateString].title, exception_holidays[dateString].description, 'exception'); + } else if (week_days[weekDay] != null) { + showHoliday(1, dayName, day, month, year, weekDay, week_days[weekDay].title, week_days[weekDay].description, 'weekday'); + } else if (day_month_holidays[dayMonth] != null) { + showHoliday(1, dayName, day, month, year, weekDay, day_month_holidays[dayMonth].title, day_month_holidays[dayMonth].description, 'daymonth'); + } else { + newHoliday(dayName, day, month, year, weekDay); + } }; - /* Custom table search configuration: If a table row - has an "expired" class, hide it UNLESS the - show_expired checkbox is checked */ - $.fn.dataTable.ext.search.push( - function( settings, searchData, index, rowData, counter ) { - var table = settings.nTable.id; - var row = $(settings.aoData[index].nTr); - if( row.hasClass("date_past") && !$("#show_past_" + table ).prop("checked") ){ - return false; - } else { - return true; - } + /* Custom table search configuration: If a table row + has an "expired" class, hide it UNLESS the + show_expired checkbox is checked */ + $.fn.dataTable.ext.search.push( + function( settings, searchData, index, rowData, counter ) { + var table = settings.nTable.id; + var row = $(settings.aoData[index].nTr); + if( row.hasClass("date_past") && !$("#show_past_" + table ).prop("checked") ){ + return false; + } else { + return true; } - ); + } + ); // Create current date variable var date = new Date(); -- 2.39.5