diff --git a/C4/Calendar.pm b/C4/Calendar.pm index b5a3436f50..dc9037b9c8 100644 --- a/C4/Calendar.pm +++ b/C4/Calendar.pm @@ -37,7 +37,7 @@ BEGIN { &insert_day_month_holiday &insert_single_holiday &insert_exception_holiday - &ModWeekdayholiday + &ModWeekdayholiday &ModDaymonthholiday &ModSingleholiday &ModExceptionholiday diff --git a/koha-tmpl/intranet-tmpl/prog/en/css/staff-global.css b/koha-tmpl/intranet-tmpl/prog/en/css/staff-global.css index 13ac2c7752..7803604c10 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/css/staff-global.css +++ b/koha-tmpl/intranet-tmpl/prog/en/css/staff-global.css @@ -499,7 +499,8 @@ fieldset.brief { border : 1px solid #E8E8E8; } -fieldset.brief label { +fieldset.brief label, +fieldset.brief span.label { display : block; font-weight : bold; padding : .3em 0; @@ -535,7 +536,8 @@ div.yui-b fieldset.brief select { div.yui-b fieldset.brief li.radio { padding : .7em 0; } -div.yui-b fieldset.brief li.radio label { +div.yui-b fieldset.brief li.radio label, +div.yui-b fieldset.brief li.radio span.label { display : inline; } diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/holidays.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/holidays.tmpl index 01f718c7e6..423c7da37e 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/holidays.tmpl +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/holidays.tmpl @@ -1,46 +1,14 @@ -
| - - | -
- Working day - Unique holiday - Repeatable holiday - Holiday exception -
@@ -206,39 +147,49 @@ h1 select { width: 20em; }+ Working day + Unique holiday + Repeatable holiday + Holiday exception +
+