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

(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/calendar.tt (-20 / +22 lines)
Lines 1-4 Link Here
1
[% USE 'JavaScript' %]
1
[% USE 'JavaScript' %]
2
[% USE 'Koha' %]
2
[% USE 'KohaDates' %]
3
[% USE 'KohaDates' %]
3
[% INCLUDE 'doc-head-open.inc' %]
4
[% INCLUDE 'doc-head-open.inc' %]
4
<title>Koha &rsaquo; Tools &rsaquo; [% branchname %] Calendar</title>
5
<title>Koha &rsaquo; Tools &rsaquo; [% branchname %] Calendar</title>
Lines 147-155 Link Here
147
        if ( single_events[dateString] != null) {
148
        if ( single_events[dateString] != null) {
148
            return [true, "event", "Single event: "+single_events[dateString].title];
149
            return [true, "event", "Single event: "+single_events[dateString].title];
149
        } else if ( yearly_events[dayMonth] != null ) {
150
        } else if ( yearly_events[dayMonth] != null ) {
150
            return [true, "repeatableyearly", "Yearly event: "+yearly_events[dayMonth].title];
151
            return [true, "repeatableyearly", "Event repeating yearly: "+yearly_events[dayMonth].title];
151
        } else if ( weekly_events[weekDay] != null ){
152
        } else if ( weekly_events[weekDay] != null ){
152
            return [true, "repeatableweekly", "Weekly event: "+weekly_events[weekDay].title];
153
            return [true, "repeatableweekly", "Event repeating weekly: "+weekly_events[weekDay].title];
153
        } else {
154
        } else {
154
            return [true, "normalday", "Normal day"];
155
            return [true, "normalday", "Normal day"];
155
        }
156
        }
Lines 182-192 Link Here
182
        $("#branch").change(function(){
183
        $("#branch").change(function(){
183
            changeBranch();
184
            changeBranch();
184
        });
185
        });
185
        $("#weekly-events,#single-events").dataTable($.extend(true, {}, dataTablesDefaults, {
186
        // Replace week number with week name
186
            "sDom": 't',
187
        $("#weekly-events>tbody>tr").each(function(){
187
            "bPaginate": false
188
            var first_td_span = $(this).find('td').first().find('span');
188
        }));
189
            first_td_span.html(weekdays[first_td_span.html()]);
189
        $("#yearly-events").dataTable($.extend(true, {}, dataTablesDefaults, {
190
        });
191
        $("#yearly-events,#weekly-events,#single-events").dataTable($.extend(true, {}, dataTablesDefaults, {
190
            "sDom": 't',
192
            "sDom": 't',
191
            "aoColumns": [
193
            "aoColumns": [
192
                { "sType": "title-string" },null,null,null
194
                { "sType": "title-string" },null,null,null
Lines 459-481 li.hoursentry input { Link Here
459
<div class="help">
461
<div class="help">
460
<h4>Hints</h4>
462
<h4>Hints</h4>
461
    <ul>
463
    <ul>
462
        <li>Search in the calendar the day you want to set as event.</li>
464
        <li>Search for the day you want to set as an event in the calendar.</li>
463
        <li>Click the date to add or edit a event.</li>
465
        <li>Click the date to add or edit an event.</li>
464
        <li>Enter a title and description for the event.</li>
466
        <li>Enter a title and description for the event.</li>
465
        <li>Specify how the event should repeat.</li>
467
        <li>Specify how the event should repeat.</li>
466
        <li>Click Save to finish.</li>
468
        <li>Click "Save" to finish.</li>
467
    </ul>
469
    </ul>
468
<h4>Key</h4>
470
<h4>Key</h4>
469
    <p>
471
    <p>
470
        <span class="key normalday">Working day</span>
472
        <span class="key normalday">Working day</span>
471
        <span class="key event">Unique event</span>
473
        <span class="key event">Single event</span>
472
        <span class="key repeatableweekly">Event repeating weekly</span>
474
        <span class="key repeatableweekly">Event repeating weekly</span>
473
        <span class="key repeatableyearly">Event repeating yearly</span>
475
        <span class="key repeatableyearly">Event repeating yearly</span>
474
    </p>
476
    </p>
475
</div>
477
</div>
476
<div id="event-list">
478
<div id="event-list">
477
[% IF ( weekly_events ) %]
479
[% IF ( weekly_events ) %]
478
<h3>Weekly - Repeatable Events</h3>
480
<h3>Events repeating weekly</h3>
479
<table id="weekly-events">
481
<table id="weekly-events">
480
<thead>
482
<thead>
481
<tr>
483
<tr>
Lines 488-498 li.hoursentry input { Link Here
488
<tbody>
490
<tbody>
489
  [% FOREACH event IN weekly_events %]
491
  [% FOREACH event IN weekly_events %]
490
  <tr>
492
  <tr>
491
  <td>
493
  [%# Make sure Sundays are sorted last, if Monday should be considered the first day of the week %]
492
<script type="text/javascript">
494
  [% IF Koha.Preference( 'CalendarFirstDayOfWeek' ) == 'Monday' && event.weekday == 0 %]
493
  document.write(weekdays[ [% event.weekday %]]);
495
      <td><span title="7">[% event.weekday %]</span></td>
494
</script>
496
  [% ELSE %]
495
  </td>
497
      <td><span title="[% event.weekday %]">[% event.weekday %]</span></td>
498
  [% END %]
496
  <td>[% event.title %]</td>
499
  <td>[% event.title %]</td>
497
  <td>[% event.description %]</td>
500
  <td>[% event.description %]</td>
498
  <td>
501
  <td>
Lines 512-518 li.hoursentry input { Link Here
512
[% END %]
515
[% END %]
513
516
514
[% IF ( yearly_events ) %]
517
[% IF ( yearly_events ) %]
515
<h3>Yearly - Repeatable Events</h3>
518
<h3>Events repeating yearly</h3>
516
<table id="yearly-events">
519
<table id="yearly-events">
517
<thead>
520
<thead>
518
<tr>
521
<tr>
Lines 549-555 li.hoursentry input { Link Here
549
[% END %]
552
[% END %]
550
553
551
[% IF ( single_events ) %]
554
[% IF ( single_events ) %]
552
<h3>Single Events</h3>
555
<h3>Single events</h3>
553
<table id="single-events">
556
<table id="single-events">
554
<thead>
557
<thead>
555
<tr>
558
<tr>
556
- 

Return to bug 11211