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 99-105 Link Here
99
                    </div>
100
                    </div>
100
                </li>
101
                </li>
101
                <li><span class="label">Staff note</span> [% course.staff_note | html %]</li>
102
                <li><span class="label">Staff note</span> [% course.staff_note | html %]</li>
102
                <li><span class="label">Public note</span> [% course.public_note | $raw %]</li>
103
                <li><span class="label">Public note</span> [% course.public_note | scrub_html type => 'note' | $raw %]</li>
103
                <li><span class="label">Student count</span> [% course.students_count | html %]</li>
104
                <li><span class="label">Student count</span> [% course.students_count | html %]</li>
104
                <li><span class="label">Status</span> [% IF course.enabled == 'yes' %]Active[% ELSE %]Inactive[% END %]</li>
105
                <li><span class="label">Status</span> [% IF course.enabled == 'yes' %]Active[% ELSE %]Inactive[% END %]</li>
105
            </ol>
106
            </ol>
Lines 265-273 Link Here
265
                            </td>
266
                            </td>
266
                            <td
267
                            <td
267
                                >[% IF (cr.public_note) %]
268
                                >[% IF (cr.public_note) %]
268
                                    [% cr.public_note | $raw %]
269
                                    [% cr.public_note | scrub_html type => 'note' | $raw %]
269
                                [% ELSIF (cr.item.itemnotes) %]
270
                                [% ELSIF (cr.item.itemnotes) %]
270
                                    [% cr.item.itemnotes | $raw %]
271
                                    [% cr.item.itemnotes | scrub_html type => 'note' | $raw %]
271
                                [% END %]
272
                                [% END %]
272
                            </td>
273
                            </td>
273
274
(-)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 74-80 Link Here
74
                            [% END %]
75
                            [% END %]
75
                        </td>
76
                        </td>
76
                        <td>[% c.staff_note | html %]</td>
77
                        <td>[% c.staff_note | html %]</td>
77
                        <td>[% c.public_note | $raw %]</td>
78
                        <td>[% c.public_note | scrub_html type => 'note' | $raw %]</td>
78
                        <td>[% c.students_count | html %]</td>
79
                        <td>[% c.students_count | html %]</td>
79
                        <td>
80
                        <td>
80
                            [% IF c.enabled == 'yes' %]
81
                            [% 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 54-60 Link Here
54
                                    </ul>
55
                                    </ul>
55
                                </li>
56
                                </li>
56
                            [% END %]
57
                            [% END %]
57
                            [% IF ( course.public_note ) %]<li><span class="label">Notes:</span> [% course.public_note | $raw %]</li>[% END %]
58
                            [% IF ( course.public_note ) %]<li><span class="label">Notes:</span> [% course.public_note | scrub_html type => 'note' | $raw %]</li>[% END %]
58
                        </ol>
59
                        </ol>
59
                    </div>
60
                    </div>
60
61
Lines 99-105 Link Here
99
                                        <td data-order="[% cr.issue.date_due | html %]">[% cr.issue.date_due | $KohaDates  as_due_date => 1 %]</td>
100
                                        <td data-order="[% cr.issue.date_due | html %]">[% cr.issue.date_due | $KohaDates  as_due_date => 1 %]</td>
100
                                        <td
101
                                        <td
101
                                            >[% IF ( cr.public_note ) %]
102
                                            >[% IF ( cr.public_note ) %]
102
                                                [% cr.public_note | $raw %]
103
                                                [% cr.public_note | scrub_html type => 'note' | $raw %]
103
                                            [% ELSIF ( cr.item.itemnotes ) %]
104
                                            [% ELSIF ( cr.item.itemnotes ) %]
104
                                                [% cr.item.itemnotes | $raw %]
105
                                                [% cr.item.itemnotes | $raw %]
105
                                            [% END %]
106
                                            [% 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
10
<title
10
    >[% FILTER collapse %]
11
    >[% FILTER collapse %]
11
        [% t("Course reserves") | html %]
12
        [% t("Course reserves") | html %]
Lines 63-69 Link Here
63
                                            >
64
                                            >
64
                                        [% END %]
65
                                        [% END %]
65
                                    </td>
66
                                    </td>
66
                                    <td>[% c.public_note | $raw %]</td>
67
                                    <td>[% c.public_note | scrub_html type => 'note' | $raw %]</td>
67
                                    <td></td>
68
                                    <td></td>
68
                                </tr>
69
                                </tr>
69
                            [% END %]
70
                            [% END %]
70
- 

Return to bug 31165