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

(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/holidays.tt (-2 / +2 lines)
Lines 438-444 Link Here
438
<tbody>
438
<tbody>
439
  [% FOREACH EXCEPTION_HOLIDAYS_LOO IN EXCEPTION_HOLIDAYS_LOOP %]
439
  [% FOREACH EXCEPTION_HOLIDAYS_LOO IN EXCEPTION_HOLIDAYS_LOOP %]
440
  <tr>
440
  <tr>
441
  <td><a href="/cgi-bin/koha/tools/holidays.pl?branch=[% EXCEPTION_HOLIDAYS_LOO.branch %]&amp;calendardate=[% EXCEPTION_HOLIDAYS_LOO.DATE %]">[% EXCEPTION_HOLIDAYS_LOO.DATE %]</a></td>
441
  <td><a href="/cgi-bin/koha/tools/holidays.pl?branch=[% branch %]&amp;calendardate=[% EXCEPTION_HOLIDAYS_LOO.DATE %]">[% EXCEPTION_HOLIDAYS_LOO.DATE %]</a></td>
442
  <td>[% EXCEPTION_HOLIDAYS_LOO.TITLE %]</td>
442
  <td>[% EXCEPTION_HOLIDAYS_LOO.TITLE %]</td>
443
  <td>[% EXCEPTION_HOLIDAYS_LOO.DESCRIPTION %]</td> 
443
  <td>[% EXCEPTION_HOLIDAYS_LOO.DESCRIPTION %]</td> 
444
  </tr>
444
  </tr>
Lines 512-518 Link Here
512
<tbody>
512
<tbody>
513
    [% FOREACH HOLIDAYS_LOO IN HOLIDAYS_LOOP %]
513
    [% FOREACH HOLIDAYS_LOO IN HOLIDAYS_LOOP %]
514
<tr>
514
<tr>
515
  <td><a href="/cgi-bin/koha/tools/holidays.pl?branch=[% HOLIDAYS_LOO.branch %]&amp;calendardate=[% HOLIDAYS_LOO.DATE %]">[% HOLIDAYS_LOO.DATE %]</a></td>
515
  <td><a href="/cgi-bin/koha/tools/holidays.pl?branch=[% branch %]&amp;calendardate=[% HOLIDAYS_LOO.DATE %]">[% HOLIDAYS_LOO.DATE %]</a></td>
516
  <td>[% HOLIDAYS_LOO.TITLE %]</td>
516
  <td>[% HOLIDAYS_LOO.TITLE %]</td>
517
  <td>[% HOLIDAYS_LOO.DESCRIPTION %]</td>
517
  <td>[% HOLIDAYS_LOO.DESCRIPTION %]</td>
518
</tr>
518
</tr>
(-)a/tools/holidays.pl (-13 / +14 lines)
Lines 138-155 foreach my $yearMonthDay (keys %$single_holidays) { Link Here
138
    push @holidays, \%holiday;
138
    push @holidays, \%holiday;
139
}
139
}
140
140
141
$template->param(WEEK_DAYS_LOOP => \@week_days,
141
$template->param(
142
        branchloop => \@branchloop, 
142
    WEEK_DAYS_LOOP           => \@week_days,
143
        HOLIDAYS_LOOP => \@holidays,
143
    branchloop               => \@branchloop,
144
        EXCEPTION_HOLIDAYS_LOOP => \@exception_holidays,
144
    HOLIDAYS_LOOP            => \@holidays,
145
        DAY_MONTH_HOLIDAYS_LOOP => \@day_month_holidays,
145
    EXCEPTION_HOLIDAYS_LOOP  => \@exception_holidays,
146
        calendardate => $calendardate,
146
    DAY_MONTH_HOLIDAYS_LOOP  => \@day_month_holidays,
147
        keydate => $keydate,
147
    calendardate             => $calendardate,
148
        branchcodes => $branchcodes,
148
    keydate                  => $keydate,
149
        branch => $branch,
149
    branchcodes              => $branchcodes,
150
        DHTMLcalendar_dateformat => C4::Dates->DHTMLcalendar(),
150
    branch                   => $branch,
151
        branchname => $branchname
151
    DHTMLcalendar_dateformat => C4::Dates->DHTMLcalendar(),
152
  );
152
    branchname               => $branchname,
153
    branch                   => $branch,
154
);
153
155
154
# Shows the template with the real values replaced
156
# Shows the template with the real values replaced
155
output_html_with_http_headers $input, $cookie, $template->output;
157
output_html_with_http_headers $input, $cookie, $template->output;
156
- 

Return to bug 7833