From 8db16e6e00d9f285ad3ce7a3ac8e5648b71e2ae3 Mon Sep 17 00:00:00 2001 From: Owen Leonard Date: Fri, 14 Oct 2022 11:00:07 +0000 Subject: [PATCH] Bug 32050: Add 'page-section' to calendar page This patch adds a "page-section" div to a couple of areas on the calendar page. To test, apply the patch and go to Tools -> Calendar. The content in the page's two columns should be wrapped in a white box. Signed-off-by: David Nind Signed-off-by: Katrin Fischer Signed-off-by: Tomas Cohen Arazi --- .../prog/en/modules/tools/holidays.tt | 658 +++++++++--------- 1 file changed, 331 insertions(+), 327 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 a0e1530596..aca3af467b 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/holidays.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/holidays.tt @@ -40,345 +40,349 @@
- - - -
-
- -
-

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. -
    - +
    + + + +
    + + +
    +

    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. + + [?] -
      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. -
    - - +
    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.
    +
    8. +
  8. + . [?] -
    You can make an exception on a range of dates repeated yearly.
    -
- -
  • - - - [?] -
    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.
    -
    • -
  • - . - [?] -
    This will delete the single holidays rules only. The repeatable holidays and exceptions will not be deleted.
    -
    • -
  • - . - [?] -
    This will delete the repeated holidays rules only. The repeatable holidays will be deleted but not the exceptions.
    -
    • -
  • - . - [?] -
    This will delete the exceptions inside a given range. Be careful about your scope range; if it is oversized you could slow down Koha.
    -
    • -
  • - - [?] -
    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.
    • -
  • - - . - [?] -
    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.
    -
    • - -
    - - 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

    - -
    -
    -
    - - - - -
    -
    +
    This will delete the single holidays rules only. The repeatable holidays and exceptions will not be deleted.
    + +
  • + . + [?] +
    This will delete the repeated holidays rules only. The repeatable holidays will be deleted but not the exceptions.
    +
    • +
  • + . + [?] +
    This will delete the exceptions inside a given range. Be careful about your scope range; if it is oversized you could slow down Koha.
    +
    • +
  • + + [?] +
    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.
    • +
  • + + . + [?] +
    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.
    +
    • + +
    + + 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 %] - - - - +
    +
    +

    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

    + +
    DateTitleDescription
    - - [% EXCEPTION_HOLIDAYS_LOO.DATE | html %] - - [% EXCEPTION_HOLIDAYS_LOO.TITLE | html %][% EXCEPTION_HOLIDAYS_LOO.DESCRIPTION | html %]
    + + + + + - [% END %] - -
    DateTitleDescription
    - [% END # /IF ( EXCEPTION_HOLIDAYS_LOOP ) %] - - [% IF ( WEEK_DAYS_LOOP ) %] -

    Weekly - Repeatable holidays

    - - - - - - - - - - [% FOREACH WEEK_DAYS_LOO IN WEEK_DAYS_LOOP %] + + + [% FOREACH EXCEPTION_HOLIDAYS_LOO IN EXCEPTION_HOLIDAYS_LOOP %] + + + + + + [% END %] + +
    Day of weekTitleDescription
    + + [% EXCEPTION_HOLIDAYS_LOO.DATE | html %] + + [% EXCEPTION_HOLIDAYS_LOO.TITLE | html %][% EXCEPTION_HOLIDAYS_LOO.DESCRIPTION | html %]
    + [% END # /IF ( EXCEPTION_HOLIDAYS_LOOP ) %] + + [% IF ( WEEK_DAYS_LOOP ) %] +

    Weekly - Repeatable holidays

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

    Yearly - Repeatable holidays

    - - - - [% IF ( dateformat == "metric" ) %] - - [% ELSE %] - + + + [% FOREACH WEEK_DAYS_LOO IN WEEK_DAYS_LOOP %] + + + + + [% END %] - - - - - - [% FOREACH DAY_MONTH_HOLIDAYS_LOO IN DAY_MONTH_HOLIDAYS_LOOP %] + +
    Day/monthMonth/day
    [% WEEK_DAYS_LOO.KEY | html %][% WEEK_DAYS_LOO.TITLE | html %][% WEEK_DAYS_LOO.DESCRIPTION | html %]
    TitleDescription
    + [% END # / IF ( WEEK_DAYS_LOOP ) %] + + [% IF ( DAY_MONTH_HOLIDAYS_LOOP ) %] +

    Yearly - Repeatable holidays

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

    Unique holidays

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

    Unique holidays

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