@@ -, +, @@ --- .../en/modules/tools/discrete_calendar.tt | 27 +++++++++++++------ 1 file changed, 19 insertions(+), 8 deletions(-) --- a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/discrete_calendar.tt +++ a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/discrete_calendar.tt @@ -3,7 +3,7 @@ [% USE Branches %] [% SET footerjs = 1 %] [% INCLUDE 'doc-head-open.inc' %] -[% Branches.GetName( branch ) | html %] calendar; Tools › Koha &rsaquo +[% Branches.GetName( branch ) | html %] calendar › Tools › Koha [% INCLUDE 'doc-head-close.inc' %] [% Asset.css("css/calendar.css") | $raw %] @@ -56,7 +56,7 @@ [% END %] -

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

+

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

@@ -131,6 +131,17 @@ + [?] +
+
    +
  1. Working day: the library is open on that day.
  2. +
  3. Unique holiday: make a single holiday. For example, selecting August 1, 2012 will make it a holiday, but will not affect August 1 in other years.
  4. +
  5. Weekly holiday: 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.
  6. +
  7. Repeatable holiday: 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.
  8. +
  9. Floating holiday: this will take this day and month as a reference to make it a floating holiday. Through this option, you can add a holiday that repeats every year but not necessarily on the exact same day. On subsequent years the date will need validation.
  10. +
  11. Need validation: this holiday has been added automatically, but needs to be validated.
  12. +
+
  • @@ -468,6 +479,12 @@ var today = new Date(); today.setHours(0, 0, 0, 0); + if (date.date_obj < today) { + formatDay( [ "past-date", _("Past day")], dayElem ); + } else { + formatDay( [ "normalday", _("Normal day")], dayElem ); + } + if (datesInfos[dateString] && datesInfos[dateString].holiday_type =='W') { formatDay( [ "repeatableweekly", _("Weekly holiday: %s").format(datesInfos[dateString].title)], dayElem ); } else if (datesInfos[dateString] && datesInfos[dateString].holiday_type == 'R') { @@ -478,12 +495,6 @@ formatDay( [ "float", _("Floating holiday: %s").format(datesInfos[dateString].title)], dayElem ); } else if (datesInfos[dateString] && datesInfos[dateString].holiday_type == 'E') { formatDay( [ "holiday", _("Single holiday: %s").format(datesInfos[dateString].title)], dayElem ); - } else { - if (date.date_obj < today) { - formatDay( [ "past-date", _("Past day")], dayElem ); - }else { - formatDay( [ "normalday", _("Normal day")], dayElem ); - } } } --