@@ -, +, @@ tools/discrete_calendar.tt --- .../prog/css/discretecalendar.css | 8 +- .../en/modules/tools/discrete_calendar.tt | 109 +++++++++--------- 2 files changed, 60 insertions(+), 57 deletions(-) --- a/koha-tmpl/intranet-tmpl/prog/css/discretecalendar.css +++ a/koha-tmpl/intranet-tmpl/prog/css/discretecalendar.css @@ -159,19 +159,19 @@ td.repeatableyearly a.ui-state-default { fieldset.brief { border:0; - margin-top:0; + margin:0; } h1 select { width:20em; } -div.yui-b fieldset.brief ol { +fieldset.brief ol { font-size:100%; } -div.yui-b fieldset.brief li, -div.yui-b fieldset.brief li.radio { +fieldset.brief li, +fieldset.brief li.radio { padding:.2em 0; } --- a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/discrete_calendar.tt +++ a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/discrete_calendar.tt @@ -1,27 +1,29 @@ +[% USE raw %] [% USE Asset %] [% USE Branches %] [% SET footerjs = 1 %] [% INCLUDE 'doc-head-open.inc' %] -Koha › Tools › [% Branches.GetName( branch ) %] calendar +Koha › Tools › [% Branches.GetName( branch ) | html %] calendar [% INCLUDE 'doc-head-close.inc' %] -[% Asset.css("css/datatables.css") %] -[% Asset.css("css/discretecalendar.css") %] +[% Asset.css("css/datatables.css") | $raw %] +[% Asset.css("css/discretecalendar.css") | $raw %] [% INCLUDE 'header.inc' %] [% INCLUDE 'cat-search.inc' %] - + -
+
+
+
+
-
-
-
-

[% Branches.GetName( branch ) %] calendar

-
-
+

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

+ +
+
@@ -77,7 +79,7 @@
  • - To date: + To date:
  • @@ -154,7 +156,7 @@
  • -
    +

    Hints

      @@ -171,7 +173,7 @@

    Key

    - Working day + Working day Unique holiday Holiday repeating weekly Holiday repeating yearly @@ -193,8 +195,8 @@ [% FOREACH need_validation_holiday IN NEED_VALIDATION_HOLIDAYS %] - [% need_validation_holiday.outputdate %] - [% need_validation_holiday.note %] + [% need_validation_holiday.outputdate | html %] + [% need_validation_holiday.note | html %] [% END %] @@ -213,14 +215,13 @@ [% FOREACH WEEK_DAYS_LOO IN WEEKLY_HOLIDAYS %] - [% WEEK_DAYS_LOO.weekday %] - - [% WEEK_DAYS_LOO.note %] - - [% END %] - - -[% END %] + [% WEEK_DAYS_LOO.weekday | html %] + [% WEEK_DAYS_LOO.note | html %] + + [% END %] + + + [% END %] [% IF ( REPEATABLE_HOLIDAYS ) %]

    Yearly - Repeatable holidays

    @@ -239,11 +240,11 @@ [% FOREACH DAY_MONTH_HOLIDAYS_LOO IN REPEATABLE_HOLIDAYS %] [% IF ( dateformat == "metric" ) %] - [% DAY_MONTH_HOLIDAYS_LOO.day %]/[% DAY_MONTH_HOLIDAYS_LOO.month %] + [% DAY_MONTH_HOLIDAYS_LOO.day | html %]/[% DAY_MONTH_HOLIDAYS_LOO.month | html %] [% ELSE %] - [% DAY_MONTH_HOLIDAYS_LOO.month %]/[% DAY_MONTH_HOLIDAYS_LOO.day %] + [% DAY_MONTH_HOLIDAYS_LOO.month | html %]/[% DAY_MONTH_HOLIDAYS_LOO.day | html %] [% END %] - [% DAY_MONTH_HOLIDAYS_LOO.note %] + [% DAY_MONTH_HOLIDAYS_LOO.note | html %] [% END %] @@ -262,8 +263,8 @@ [% FOREACH HOLIDAYS_LOO IN UNIQUE_HOLIDAYS %] - [% HOLIDAYS_LOO.outputdate %] - [% HOLIDAYS_LOO.note %] + [% HOLIDAYS_LOO.outputdate | html %] + [% HOLIDAYS_LOO.note | html %] [% END %] @@ -282,8 +283,8 @@ [% FOREACH float_holiday IN FLOAT_HOLIDAYS %] - [% float_holiday.outputdate %] - [% float_holiday.note %] + [% float_holiday.outputdate | html %] + [% float_holiday.note | html %] [% END %] @@ -292,29 +293,32 @@
    -
    -
    -
    -[% INCLUDE 'tools-menu.inc' %] -
    -
    +
    +
    + +
    + +
    +
    + [% MACRO jsinclude BLOCK %] -[% Asset.js("lib/jquery/plugins/jquery-ui-timepicker-addon.min.js") %] +[% Asset.js("lib/jquery/plugins/jquery-ui-timepicker-addon.min.js") | $raw %] [% INCLUDE 'calendar.inc' %] [% INCLUDE 'datatables.inc' %] - [% END %] [% INCLUDE 'intranet-bottom.inc' %] --