Attachment 29130 Details for Bug 12458 – [PASSED QA] Bug 12458 - Holidays calendar has wrong colors for weekly and yearly repeatable

[patch] [PASSED QA] Bug 12458 - Holidays calendar has wrong colors for weekly and yearly repeatable

PASSED-QA-Bug-12458---Holidays-calendar-has-wrong-.patch (text/plain), 3.40 KB, created by Katrin Fischer on 2014-06-21 15:39:05 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Katrin Fischer

Created: 2014-06-21 15:39:05 UTC

Size: 3.40 KB

patch

obsolete

>From fc11aab71a6acfd7bf9ada4945757949d8e46485 Mon Sep 17 00:00:00 2001
>From: Fridolin Somers <fridolin.somers@biblibre.com>
>Date: Fri, 20 Jun 2014 14:54:07 +0200
>Subject: [PATCH] [PASSED QA] Bug 12458 - Holidays calendar has wrong colors
> for weekly and yearly repeatable
>
>In Tools / Calendar, the colors in the calendar for weekly and yearly repeatable are different from the color of the "Key" legend.
>
>This patch sets the colors used in the "Key" legend to the cells if calendar.
>
>Test plan :
>- Go to Tools/Calendar
>- Add a weekly repeatable holiday
>- Check its color in calendar is the same as the text "Holiday repeating weekly"
>=> Without this patch, it's green instead of yellow
>- Add a yearly repeatable holiday
>- Check its color in calendar is the same as the text "Holiday repeating yearly"
>=> Without this patch, it's yellow instead of orange
>- Check the color of others holydays types are OK
>
>Signed-off-by: Nicole C. Engard <nengard@bywatersolutions.com>
>I'd like to see today's date a clearly different color from the
>weekly repeated holiday, because now they're close in color.
>But this patch does exactly what it says and should so I'm signing
>off.
>
>Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
>Legend, headings and calendar colors now match.
>No problems found.
>---
> koha-tmpl/intranet-tmpl/prog/en/modules/tools/holidays.tt | 4 ++--
> 1 file changed, 2 insertions(+), 2 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 bfc4d7e..f29944d 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/holidays.tt
>+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/holidays.tt
>@@ -204,8 +204,8 @@
> .repeatableyearly {  background-color :  #FFCC66; color :  Black;  border : 1px solid #BCBCBC; }
> td.exception a.ui-state-default { background:  #b3d4ff none; color :  Black; border : 1px solid #BCBCBC; }
> td.holiday a.ui-state-default {  background:  #ffaeae none; color :  Black;  border : 1px solid #BCBCBC; }
>-td.repeatableweekly a.ui-state-default {  background:  #D8EFB3 none; color :  Black;  border : 1px solid #BCBCBC; }
>-td.repeatableyearly a.ui-state-default {  background:  #FFFF99 none; color :  Black;  border : 1px solid #BCBCBC; }
>+td.repeatableweekly a.ui-state-default {  background:  #FFFF99 none; color :  Black;  border : 1px solid #BCBCBC; }
>+td.repeatableyearly a.ui-state-default {  background:  #FFCC66 none; color :  Black;  border : 1px solid #BCBCBC; }
> .information { z-index : 1; background-color :  #DCD2F1; width : 300px; display : none; border : 1px solid #000000; color :  #000000; font-size :  8pt; font-weight :  bold; background-color :  #FFD700; cursor :  pointer; padding : 2px; }
> .panel { z-index : 1; display : none; border : 3px solid #CCC; padding : 3px; margin-top: .3em;  background-color: #FEFEFE; } fieldset.brief { border : 0; margin-top: 0; }
> #showHoliday { margin : .5em 0; } h1 select { width: 20em; } div.yui-b fieldset.brief ol { font-size:100%; } div.yui-b fieldset.brief li, div.yui-b fieldset.brief li.radio  { padding:0.2em 0; } .help { margin:.3em 0;border:1px solid #EEE;padding:.3em .7em; font-size : 90%; } #holidayweeklyrepeatable, #holidaysyearlyrepeatable, #holidaysunique, #holidayexceptions { font-size : 90%; margin-bottom : 1em;} .calendar td, .calendar th, .calendar .button, .calendar tbody .day { padding : .7em; font-size: 110%; } .calendar { width: auto; border : 0; }
>-- 
>1.8.3.2

Actions: View | Diff | Splinter Review

Attachments on bug 12458: 29096 | 29097 | 29122 | 29130