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

(-)a/koha-tmpl/intranet-tmpl/prog/css/calendar.css (+160 lines)
Line 0 Link Here
1
.controls {
2
    display: block;
3
    padding: 3px 0;
4
}
5
6
.key {
7
     padding: 3px;
8
     white-space: nowrap;
9
     line-height: 230%;
10
 }
11
12
 .ui-datepicker {
13
     font-size: 150%;
14
 }
15
16
 .ui-datepicker th,
17
 .ui-datepicker .ui-datepicker-title select {
18
     font-size: 80%;
19
 }
20
21
 .ui-datepicker td a {
22
     padding: .5em;
23
 }
24
25
 .ui-datepicker .ui-datepicker-buttonpane button.ui-datepicker-current {
26
     font-size: 80%;
27
 }
28
29
 .key {
30
     padding: 3px;
31
     white-space: nowrap;
32
     line-height: 230%;
33
 }
34
35
 .normalday {
36
     background-color: #EDEDED;
37
     color: Black;
38
     border: 1px solid #BCBCBC;
39
 }
40
41
 .exception {
42
     background-color: #b3d4ff;
43
     color: Black;
44
     border: 1px solid #BCBCBC;
45
 }
46
47
 .holiday {
48
     background-color: #ffaeae;
49
     color: Black;
50
     border: 1px solid #BCBCBC;
51
 }
52
53
 .repeatableweekly {
54
     background-color: #FFFF99;
55
     color: Black;
56
     border: 1px solid #BCBCBC;
57
 }
58
59
 .repeatableyearly {
60
     background-color: #FFCC66;
61
     color: Black;
62
     border: 1px solid #BCBCBC;
63
 }
64
65
 td.exception a.ui-state-default {
66
     background: #b3d4ff none;
67
     color: Black;
68
     border: 1px solid #BCBCBC;
69
 }
70
71
 td.holiday a.ui-state-default {
72
     background: #ffaeae none;
73
     color: Black;
74
     border: 1px solid #BCBCBC;
75
 }
76
77
 td.repeatableweekly a.ui-state-default {
78
     background: #FFFF99 none;
79
     color: Black;
80
     border: 1px solid #BCBCBC;
81
 }
82
83
 td.repeatableyearly a.ui-state-default {
84
     background: #FFCC66 none;
85
     color: Black;
86
     border: 1px solid #BCBCBC;
87
 }
88
89
 .information {
90
     z-index: 1;
91
     background-color: #DCD2F1;
92
     width: 300px;
93
     display: none;
94
     border: 1px solid #000000;
95
     color: #000000;
96
     font-size: 8pt;
97
     font-weight: bold;
98
     background-color: #FFD700;
99
     cursor: pointer;
100
     padding: 2px;
101
 }
102
103
 .panel {
104
     z-index: 1;
105
     display: none;
106
     border: 3px solid #CCC;
107
     padding: 3px;
108
     margin-top: .3em;
109
     background-color: #FEFEFE;
110
 }
111
112
 fieldset.brief {
113
     border: 0;
114
     margin-top: 0;
115
 }
116
117
 #showHoliday {
118
     margin: .5em 0;
119
 }
120
121
 h1 select {
122
     width: 20em;
123
 }
124
125
 fieldset.brief ol {
126
     font-size: 100%;
127
 }
128
129
 fieldset.brief li,
130
 fieldset.brief li.radio {
131
     padding: 0.2em 0;
132
 }
133
134
 .help {
135
     margin: .3em 0;
136
     border: 1px solid #EEE;
137
     padding: .3em .7em;
138
     font-size: 90%;
139
 }
140
141
 #holidayweeklyrepeatable,
142
 #holidaysyearlyrepeatable,
143
 #holidaysunique,
144
 #holidayexceptions {
145
     font-size: 90%;
146
     margin-bottom: 1em;
147
 }
148
149
 .calendar td,
150
 .calendar th,
151
 .calendar .button,
152
 .calendar tbody .day {
153
     padding: .7em;
154
     font-size: 110%;
155
 }
156
157
 .calendar {
158
     width: auto;
159
     border: 0;
160
 }
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/holidays.tt (-3 / +16 lines)
Lines 228-233 Link Here
228
<!--   this will probably always have the least amount of data -->
228
<!--   this will probably always have the least amount of data -->
229
[% IF ( EXCEPTION_HOLIDAYS_LOOP ) %]
229
[% IF ( EXCEPTION_HOLIDAYS_LOOP ) %]
230
<h3>Exceptions</h3>
230
<h3>Exceptions</h3>
231
    <label class="controls">
232
        <input type="checkbox" name="show_past" id="show_past_holidayexceptions" class="show_past" />
233
        Show past entries
234
    </label>
231
  <table id="holidayexceptions">
235
  <table id="holidayexceptions">
232
<thead><tr>
236
<thead><tr>
233
  <th class="exception title-string">Date</th>
237
  <th class="exception title-string">Date</th>
Lines 298-303 Link Here
298
302
299
[% IF ( HOLIDAYS_LOOP ) %]
303
[% IF ( HOLIDAYS_LOOP ) %]
300
<h3>Unique holidays</h3>
304
<h3>Unique holidays</h3>
305
<label class="controls">
306
    <input type="checkbox" name="show_past" id="show_past_holidaysunique" class="show_past" />
307
    Show past entries
308
</label>
301
<table id="holidaysunique">
309
<table id="holidaysunique">
302
<thead>
310
<thead>
303
<tr>
311
<tr>
Lines 485-492 Link Here
485
               show_expired checkbox is checked */
493
               show_expired checkbox is checked */
486
            $.fn.dataTable.ext.search.push(
494
            $.fn.dataTable.ext.search.push(
487
                function( settings, searchData, index, rowData, counter ) {
495
                function( settings, searchData, index, rowData, counter ) {
496
                    var table = settings.nTable.id;
488
                    var row = $(settings.aoData[index].nTr);
497
                    var row = $(settings.aoData[index].nTr);
489
                    if( row.hasClass("date_past") && !$("#show_expired").prop("checked") ){
498
                    if( row.hasClass("date_past") && !$("#show_past_" + table ).prop("checked") ){
490
                        return false;
499
                        return false;
491
                    } else {
500
                    } else {
492
                        return true;
501
                        return true;
Lines 512-518 Link Here
512
                "sDom": 't',
521
                "sDom": 't',
513
                "bPaginate": false
522
                "bPaginate": false
514
            }));
523
            }));
515
            $("#holidayexceptions,#holidaysyearlyrepeatable,#holidaysunique").dataTable($.extend(true, {}, dataTablesDefaults, {
524
            var tables = $("#holidayexceptions,#holidaysyearlyrepeatable,#holidaysunique").DataTable($.extend(true, {}, dataTablesDefaults, {
516
                "sDom": 't',
525
                "sDom": 't',
517
                "aoColumnDefs": [
526
                "aoColumnDefs": [
518
                    { "type": "title-string", "targets" : [ "title-string" ] },
527
                    { "type": "title-string", "targets" : [ "title-string" ] },
Lines 525-530 Link Here
525
                    }
534
                    }
526
                }
535
                }
527
            }));
536
            }));
537
538
            $(".show_past").on("change", function(){
539
                tables.draw();
540
            });
541
528
            $("a.helptext").click(function(){
542
            $("a.helptext").click(function(){
529
                $(this).parent().find(".hint").toggle(); return false;
543
                $(this).parent().find(".hint").toggle(); return false;
530
            });
544
            });
531
- 

Return to bug 27773