View | Details | Raw Unified | Return to bug 6586
Collapse All | Expand All

(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/holidays.tt (-13 / +19 lines)
Lines 38-44 Link Here
38
			$("#holtype").attr("class","key exception").html(_("Holiday exception"));
38
			$("#holtype").attr("class","key exception").html(_("Holiday exception"));
39
		} else if(holidayType == 'weekday') {
39
		} else if(holidayType == 'weekday') {
40
			$("#showOperationDelLabel").html(_('Delete this holiday.'));
40
			$("#showOperationDelLabel").html(_('Delete this holiday.'));
41
			$("#holtype").attr("class","key repeatableday").html(_("Repeatable holiday"));
41
			$("#holtype").attr("class","key repeatableweekly").html(_("Holiday repeating weekly"));
42
		} else if(holidayType == 'daymonth') {
43
			$("#showOperationDelLabel").html(_('Delete this holiday.'));
44
			$("#holtype").attr("class","key repeatableyearly").html(_("Holiday repeating yearly"));
42
		} else {
45
		} else {
43
			$("#showOperationDelLabel").html(_('Delete this holiday.'));
46
			$("#showOperationDelLabel").html(_('Delete this holiday.'));
44
			$("#holtype").attr("class","key holiday").html(_("Unique holiday"));
47
			$("#holtype").attr("class","key holiday").html(_("Unique holiday"));
Lines 107-113 Link Here
107
.normalday { background-color :  #EDEDED; color :  Black; border : 1px solid #BCBCBC; }
110
.normalday { background-color :  #EDEDED; color :  Black; border : 1px solid #BCBCBC; }
108
.exception { background-color :  #b3d4ff; color :  Black; border : 1px solid #BCBCBC; }
111
.exception { background-color :  #b3d4ff; color :  Black; border : 1px solid #BCBCBC; }
109
.holiday {  background-color :  #ffaeae; color :  Black;  border : 1px solid #BCBCBC; }
112
.holiday {  background-color :  #ffaeae; color :  Black;  border : 1px solid #BCBCBC; }
110
.repeatableday {  background-color :  #FFFF99; color :  Black;  border : 1px solid #BCBCBC; }
113
.repeatableweekly {  background-color :  #FFFF99; color :  Black;  border : 1px solid #BCBCBC; }
114
.repeatableyearly {  background-color :  #FFCC66; color :  Black;  border : 1px solid #BCBCBC; }
111
.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; }
115
.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; }
112
.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; }
116
.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; }
113
#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; }
117
#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; }
Lines 288-295 Link Here
288
		var dateString = year + '/' + month + '/' + day;
292
		var dateString = year + '/' + month + '/' + day;
289
		if (exception_holidays[dateString] != null) {
293
		if (exception_holidays[dateString] != null) {
290
			return 'exception';
294
			return 'exception';
291
		} else if ((week_days[weekDay] != null) || (day_month_holidays[dayMonth] != null)) {
295
		} else if ( week_days[weekDay] != null ){
292
			return 'repeatableday';
296
			return 'repeatableweekly';
297
		} else if ( day_month_holidays[dayMonth] != null ) {
298
			return 'repeatableyearly';
293
		} else if (holidays[dateString] != null) {
299
		} else if (holidays[dateString] != null) {
294
			return 'holiday';
300
			return 'holiday';
295
		} else {
301
		} else {
Lines 347-353 Link Here
347
	<p>
353
	<p>
348
		<span class="key normalday">Working day</span>
354
		<span class="key normalday">Working day</span>
349
		<span class="key holiday">Unique holiday</span>
355
		<span class="key holiday">Unique holiday</span>
350
		<span class="key repeatableday">Repeatable holiday</span>
356
		<span class="key repeatableweekly">Holiday repeating weekly</span>
357
		<span class="key repeatableyearly">Holiday repeating yearly</span>
351
		<span class="key exception">Holiday exception</span>
358
		<span class="key exception">Holiday exception</span>
352
	</p>
359
	</p>
353
</div>
360
</div>
Lines 380-388 Link Here
380
<table id="holidayweeklyrepeatable">
387
<table id="holidayweeklyrepeatable">
381
<thead>
388
<thead>
382
<tr>
389
<tr>
383
  <th class="repeatableday">Day of Week</th>
390
  <th class="repeatableweekly">Day of Week</th>
384
  <th class="repeatableday">Title</th>
391
  <th class="repeatableweekly">Title</th>
385
  <th class="repeatableday">Description</th>
392
  <th class="repeatableweekly">Description</th>
386
</tr>
393
</tr>
387
</thead>
394
</thead>
388
<tbody>
395
<tbody>
Lines 407-418 Link Here
407
<thead>
414
<thead>
408
<tr>
415
<tr>
409
  [% IF ( dateformat == 'metric' ) %]
416
  [% IF ( dateformat == 'metric' ) %]
410
  <th class="repeatableday">Day/Month</th>
417
  <th class="repeatableyearly">Day/Month</th>
411
  [% ELSE %]
418
  [% ELSE %]
412
  <th class="repeatableday">Month/Day</th>
419
  <th class="repeatableyearly">Month/Day</th>
413
  [% END %]
420
  [% END %]
414
  <th class="repeatableday">Title</th>
421
  <th class="repeatableyearly">Title</th>
415
  <th class="repeatableday">Description</th>
422
  <th class="repeatableyearly">Description</th>
416
</tr>
423
</tr>
417
</thead>
424
</thead>
418
<tbody>
425
<tbody>
419
- 

Return to bug 6586