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

(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/course_reserves/course-details.tt (-3 / +4 lines)
Lines 6-11 Link Here
6
[% USE ItemTypes %]
6
[% USE ItemTypes %]
7
[% USE Branches %]
7
[% USE Branches %]
8
[% USE TablesSettings %]
8
[% USE TablesSettings %]
9
[% USE HtmlScrubber %]
9
[% PROCESS 'i18n.inc' %]
10
[% PROCESS 'i18n.inc' %]
10
[% SET footerjs = 1 %]
11
[% SET footerjs = 1 %]
11
[% INCLUDE 'doc-head-open.inc' %]
12
[% INCLUDE 'doc-head-open.inc' %]
Lines 102-108 Link Here
102
                        </div>
103
                        </div>
103
                    </li>
104
                    </li>
104
                    <li><span class="label">Staff note</span> [% course.staff_note | html %]</li>
105
                    <li><span class="label">Staff note</span> [% course.staff_note | html %]</li>
105
                    <li><span class="label">Public note</span> [% course.public_note | $raw %]</li>
106
                    <li><span class="label">Public note</span> [% course.public_note | scrub_html type => 'note' | $raw %]</li>
106
                    <li><span class="label">Student count</span> [% course.students_count | html %]</li>
107
                    <li><span class="label">Student count</span> [% course.students_count | html %]</li>
107
                    <li><span class="label">Status</span> [% IF course.enabled == 'yes' %]Active[% ELSE %]Inactive[% END %]</li>
108
                    <li><span class="label">Status</span> [% IF course.enabled == 'yes' %]Active[% ELSE %]Inactive[% END %]</li>
108
                </ol>
109
                </ol>
Lines 263-271 Link Here
263
                                        [% END %]
264
                                        [% END %]
264
                                    </td>
265
                                    </td>
265
                                    <td>[% IF (cr.public_note) %]
266
                                    <td>[% IF (cr.public_note) %]
266
                                            [% cr.public_note | $raw %]
267
                                            [% cr.public_note | scrub_html type => 'note' | $raw %]
267
                                        [% ELSIF (cr.item.itemnotes) %]
268
                                        [% ELSIF (cr.item.itemnotes) %]
268
                                            [% cr.item.itemnotes | $raw %]
269
                                            [% cr.item.itemnotes | scrub_html type => 'note' | $raw %]
269
                                        [% END %]
270
                                        [% END %]
270
                                    </td>
271
                                    </td>
271
272
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/course_reserves/course-reserves.tt (-1 / +2 lines)
Lines 3-8 Link Here
3
[% USE Asset %]
3
[% USE Asset %]
4
[% USE AuthorisedValues %]
4
[% USE AuthorisedValues %]
5
[% USE TablesSettings %]
5
[% USE TablesSettings %]
6
[% USE HtmlScrubber %]
6
[% PROCESS 'i18n.inc' %]
7
[% PROCESS 'i18n.inc' %]
7
[% SET footerjs = 1 %]
8
[% SET footerjs = 1 %]
8
[% INCLUDE 'doc-head-open.inc' %]
9
[% INCLUDE 'doc-head-open.inc' %]
Lines 76-82 Link Here
76
                                            [% END %]
77
                                            [% END %]
77
                                        </td>
78
                                        </td>
78
                                        <td>[% c.staff_note | html %]</td>
79
                                        <td>[% c.staff_note | html %]</td>
79
                                        <td>[% c.public_note | $raw %]</td>
80
                                        <td>[% c.public_note | scrub_html type => 'note' | $raw %]</td>
80
                                        <td>[% c.students_count | html %]</td>
81
                                        <td>[% c.students_count | html %]</td>
81
                                        <td>
82
                                        <td>
82
                                            [% IF c.enabled == 'yes' %]
83
                                            [% IF c.enabled == 'yes' %]
(-)a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-course-details.tt (-2 / +3 lines)
Lines 6-11 Link Here
6
[% USE ItemTypes %]
6
[% USE ItemTypes %]
7
[% USE Branches %]
7
[% USE Branches %]
8
[% USE TablesSettings %]
8
[% USE TablesSettings %]
9
[% USE HtmlScrubber %]
9
[% PROCESS 'i18n.inc' %]
10
[% PROCESS 'i18n.inc' %]
10
[% PROCESS 'html_helpers.inc' %]
11
[% PROCESS 'html_helpers.inc' %]
11
[% INCLUDE 'doc-head-open.inc' %]
12
[% INCLUDE 'doc-head-open.inc' %]
Lines 51-57 Link Here
51
                                    </ul>
52
                                    </ul>
52
                                </li>
53
                                </li>
53
                            [% END %]
54
                            [% END %]
54
                            [% IF ( course.public_note ) %]<li><span class="label">Notes:</span> [% course.public_note | $raw %]</li>[% END %]
55
                            [% IF ( course.public_note ) %]<li><span class="label">Notes:</span> [% course.public_note | scrub_html type => 'note' | $raw %]</li>[% END %]
55
                        </ol>
56
                        </ol>
56
                    </div>
57
                    </div>
57
58
Lines 92-98 Link Here
92
                                        </td>
93
                                        </td>
93
                                        <td data-order="[% cr.issue.date_due | html %]">[% cr.issue.date_due | $KohaDates  as_due_date => 1 %]</td>
94
                                        <td data-order="[% cr.issue.date_due | html %]">[% cr.issue.date_due | $KohaDates  as_due_date => 1 %]</td>
94
                                        <td>[% IF ( cr.public_note ) %]
95
                                        <td>[% IF ( cr.public_note ) %]
95
                                                [% cr.public_note | $raw %]
96
                                                [% cr.public_note | scrub_html type => 'note' | $raw %]
96
                                            [% ELSIF ( cr.item.itemnotes ) %]
97
                                            [% ELSIF ( cr.item.itemnotes ) %]
97
                                                [% cr.item.itemnotes | $raw %]
98
                                                [% cr.item.itemnotes | $raw %]
98
                                            [% END %]
99
                                            [% END %]
(-)a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-course-reserves.tt (-2 / +2 lines)
Lines 6-11 Link Here
6
[% PROCESS 'i18n.inc' %]
6
[% PROCESS 'i18n.inc' %]
7
[% PROCESS 'html_helpers.inc' %]
7
[% PROCESS 'html_helpers.inc' %]
8
[% INCLUDE 'doc-head-open.inc' %]
8
[% INCLUDE 'doc-head-open.inc' %]
9
[% USE HtmlScrubber %]
9
<title>[% FILTER collapse %]
10
<title>[% FILTER collapse %]
10
    [% t("Course reserves") | html %] &rsaquo;
11
    [% t("Course reserves") | html %] &rsaquo;
11
    [% PROCESS 'library_name_title' %]
12
    [% PROCESS 'library_name_title' %]
Lines 58-64 Link Here
58
                                          <div class="instructor"><span class="inst_surname">[% i.surname | html %]</span>[% IF i.firstname %]<span class="instr_separator">, </span><span class="instr_firstname">[% i.firstname | html %]</span>[% END %]</div>
59
                                          <div class="instructor"><span class="inst_surname">[% i.surname | html %]</span>[% IF i.firstname %]<span class="instr_separator">, </span><span class="instr_firstname">[% i.firstname | html %]</span>[% END %]</div>
59
                                      [% END %]
60
                                      [% END %]
60
                                    </td>
61
                                    </td>
61
                                    <td>[% c.public_note | $raw %]</td>
62
                                    <td>[% c.public_note | scrub_html type => 'note' | $raw %]</td>
62
                                    <td></td>
63
                                    <td></td>
63
                            [% END %]
64
                            [% END %]
64
                        </tbody>
65
                        </tbody>
65
- 

Return to bug 31165