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

(-)a/Koha/Template/Plugin/AuthorisedValues.pm (-1 / +3 lines)
Lines 22-32 use Modern::Perl; Link Here
22
use Template::Plugin;
22
use Template::Plugin;
23
use base qw( Template::Plugin );
23
use base qw( Template::Plugin );
24
24
25
use Encode qw{encode decode};
26
25
use C4::Koha;
27
use C4::Koha;
26
28
27
sub GetByCode {
29
sub GetByCode {
28
    my ( $self, $category, $code, $opac ) = @_;
30
    my ( $self, $category, $code, $opac ) = @_;
29
    return GetAuthorisedValueByCode( $category, $code, $opac );
31
    return encode('UTF-8', GetAuthorisedValueByCode( $category, $code, $opac ) );
30
}
32
}
31
33
32
1;
34
1;
(-)a/admin/authorised_values.pl (-1 / +1 lines)
Lines 199-205 sub default_form { Link Here
199
    }
199
    }
200
200
201
    # push koha system categories
201
    # push koha system categories
202
    foreach (qw(Asort1 Asort2 Bsort1 Bsort2 SUGGEST DAMAGED LOST REPORT_GROUP REPORT_SUBGROUP)) {
202
    foreach (qw(Asort1 Asort2 Bsort1 Bsort2 SUGGEST DAMAGED LOST REPORT_GROUP REPORT_SUBGROUP DEPARTMENT TERM)) {
203
        push @category_list, $_ unless $categories{$_};
203
        push @category_list, $_ unless $categories{$_};
204
    }
204
    }
205
205
(-)a/course_reserves/course.pl (-4 / +2 lines)
Lines 48-57 if ($course_id) { Link Here
48
}
48
}
49
49
50
$template->param(
50
$template->param(
51
    departments => GetAuthorisedValues('DEPARTMENT')
51
    departments => GetAuthorisedValues('DEPARTMENT'),
52
    ,    ## TODO: use syspref instead of hard coded value.
52
    terms => GetAuthorisedValues('TERM'),
53
    terms => GetAuthorisedValues('TERM')
54
    ,    ## TODO: use syspref instead of hard coded value.
55
);
53
);
56
54
57
output_html_with_http_headers $cgi, $cookie, $template->output;
55
output_html_with_http_headers $cgi, $cookie, $template->output;
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/course_reserves/add_items-step1.tt (-3 / +3 lines)
Lines 18-24 $(document).ready(function() { Link Here
18
[% INCLUDE 'header.inc' %]
18
[% INCLUDE 'header.inc' %]
19
[% INCLUDE 'cat-search.inc' %]
19
[% INCLUDE 'cat-search.inc' %]
20
20
21
<div id="breadcrumbs"><a href="/cgi-bin/koha/mainpage.pl">Home</a> &rsaquo; <a href="/cgi-bin/koha/course_reserves/course-reserves.pl">Course reserves</a> &rsaquo; Add Reserves for <i><a href="/cgi-bin/koha/course_reserves/course-details.pl?course_id=[% course.course_id %]">[% course.course_name %]</a></i></div>
21
<div id="breadcrumbs"><a href="/cgi-bin/koha/mainpage.pl">Home</a> &rsaquo; <a href="/cgi-bin/koha/course_reserves/course-reserves.pl">Course reserves</a> &rsaquo; Add reserves for <i><a href="/cgi-bin/koha/course_reserves/course-details.pl?course_id=[% course.course_id %]">[% course.course_name %]</a></i></div>
22
22
23
<div id="doc2" class="yui-t7">
23
<div id="doc2" class="yui-t7">
24
    <div id="bd">
24
    <div id="bd">
Lines 35-46 $(document).ready(function() { Link Here
35
                            <input type="hidden" name="action" value="lookup" />
35
                            <input type="hidden" name="action" value="lookup" />
36
36
37
                            <fieldset class="rows">
37
                            <fieldset class="rows">
38
                                <legend>Add items: Scan barcode</legend>
38
                                <legend>Add items: scan barcode</legend>
39
39
40
                                    <p>
40
                                    <p>
41
41
42
                                    <li>
42
                                    <li>
43
                                        <label class="required" for="barcode">Item Barcode:</label>
43
                                        <label class="required" for="barcode">Item barcode:</label>
44
                                        <input id="barcode" name="barcode" type="text" />
44
                                        <input id="barcode" name="barcode" type="text" />
45
                                    </li>
45
                                    </li>
46
                                </ol>
46
                                </ol>
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/course_reserves/course-details.tt (-5 / +5 lines)
Lines 22-28 Link Here
22
[% INCLUDE 'header.inc' %]
22
[% INCLUDE 'header.inc' %]
23
[% INCLUDE 'cat-search.inc' %]
23
[% INCLUDE 'cat-search.inc' %]
24
24
25
<div id="breadcrumbs"><a href="/cgi-bin/koha/mainpage.pl">Home</a> &rsaquo; <a href="/cgi-bin/koha/course_reserves/course-reserves.pl">Course reserves</a> &rsaquo; Course Details for <i>[% course.course_name %]</i></div>
25
<div id="breadcrumbs"><a href="/cgi-bin/koha/mainpage.pl">Home</a> &rsaquo; <a href="/cgi-bin/koha/course_reserves/course-reserves.pl">Course reserves</a> &rsaquo; Course details for <i>[% course.course_name %]</i></div>
26
26
27
<div id="doc2" class="yui-t7">
27
<div id="doc2" class="yui-t7">
28
    <div id="bd">
28
    <div id="bd">
Lines 47-62 Link Here
47
                //]]>
47
                //]]>
48
                </script>
48
                </script>
49
                <ul class="toolbar">
49
                <ul class="toolbar">
50
                    [% IF CAN_user_coursereserves_add_reserves %]<li><a id="add_items" href="/cgi-bin/koha/course_reserves/add_items.pl?course_id=[% course.course_id %]">Add Reserves</a></li>[% END %]
50
                    [% IF CAN_user_coursereserves_add_reserves %]<li><a id="add_items" href="/cgi-bin/koha/course_reserves/add_items.pl?course_id=[% course.course_id %]">Add reserves</a></li>[% END %]
51
                    [% IF ( CAN_user_coursereserves_manage_courses ) %]<li><a id="edit_course" href="/cgi-bin/koha/course_reserves/course.pl?course_id=[% course.course_id %]">Edit Course</a></li>[% END %]
51
                    [% IF ( CAN_user_coursereserves_manage_courses ) %]<li><a id="edit_course" href="/cgi-bin/koha/course_reserves/course.pl?course_id=[% course.course_id %]">Edit course</a></li>[% END %]
52
                    [% IF ( CAN_user_coursereserves_manage_courses ) %]<li><a id="delete_course" href="/cgi-bin/koha/course_reserves/mod_course.pl?course_id=[% course.course_id %]&action=del">Delete Course</a></li>[% END %]
52
                    [% IF ( CAN_user_coursereserves_manage_courses ) %]<li><a id="delete_course" href="/cgi-bin/koha/course_reserves/mod_course.pl?course_id=[% course.course_id %]&action=del">Delete course</a></li>[% END %]
53
                </ul>
53
                </ul>
54
            </div><!-- /toolbar -->
54
            </div><!-- /toolbar -->
55
55
56
            <table>
56
            <table>
57
                <tr><th>Course name</th><td>[% course.course_name %]</td></tr>
57
                <tr><th>Course name</th><td>[% course.course_name %]</td></tr>
58
                <tr><th>Term</th><td>[% AuthorisedValues.GetByCode( 'TERM', course.term ) %]</td></tr>
58
                <tr><th>Term</th><td>[% AuthorisedValues.GetByCode( 'TERM', course.term ) %]</td></tr>
59
                <tr><th>Department</th><td>[% AuthorisedValues.GetByCode( 'DEPARTMENT', course.department ) %]</td></tr>
59
                <tr><th>Department</th><td>_[% AuthorisedValues.GetByCode( 'DEPARTMENT', course.department ) %]</td></tr>
60
                <tr><th>Course number</th><td>[% course.course_number %]</td></tr>
60
                <tr><th>Course number</th><td>[% course.course_number %]</td></tr>
61
                <tr><th>Section</th><td>[% course.section %]</td></tr>
61
                <tr><th>Section</th><td>[% course.section %]</td></tr>
62
                <tr><th>Instructors</th><td>[% FOREACH i IN course.instructors %]<div class="instructor"><a href="/cgi-bin/koha/members/moremember.pl?borrowernumber=[% i.borrowernumber %]">[% i.firstname %] [% i.surname %]</a></div>[% END %]</td></tr>
62
                <tr><th>Instructors</th><td>[% FOREACH i IN course.instructors %]<div class="instructor"><a href="/cgi-bin/koha/members/moremember.pl?borrowernumber=[% i.borrowernumber %]">[% i.firstname %] [% i.surname %]</a></div>[% END %]</td></tr>
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/course_reserves/course-reserves.tt (-4 / +4 lines)
Lines 40-46 Link Here
40
                        </script>
40
                        </script>
41
                        <ul class="toolbar">
41
                        <ul class="toolbar">
42
                            [% IF ( CAN_user_coursereserves_manage_courses ) %]
42
                            [% IF ( CAN_user_coursereserves_manage_courses ) %]
43
                            <li><a id="new_course" href="/cgi-bin/koha/course_reserves/course.pl">New Course</a></li>
43
                            <li><a id="new_course" href="/cgi-bin/koha/course_reserves/course.pl">New course</a></li>
44
                            [% END %]
44
                            [% END %]
45
                        </ul>
45
                        </ul>
46
                    </div><!-- /toolbar -->
46
                    </div><!-- /toolbar -->
Lines 61-67 Link Here
61
                        </script>
61
                        </script>
62
                        <ul class="toolbar">
62
                        <ul class="toolbar">
63
                            <li><form id="search_courses_form"><input type="text" name="search_on" id="search_on"></form></li>
63
                            <li><form id="search_courses_form"><input type="text" name="search_on" id="search_on"></form></li>
64
                            <li><a id="search_courses">Search Courses</a></li>
64
                            <li><a id="search_courses">Search courses</a></li>
65
                        </ul>
65
                        </ul>
66
                    </div>
66
                    </div>
67
                    -->
67
                    -->
Lines 76-83 Link Here
76
                                <th>Section</th>
76
                                <th>Section</th>
77
                                <th>Term</th>
77
                                <th>Term</th>
78
                                <th>Instructors</th>
78
                                <th>Instructors</th>
79
                                <th>Staff Note</th>
79
                                <th>Staff note</th>
80
                                <th>Public Note</th>
80
                                <th>Public note</th>
81
                                <th># of Students</th>
81
                                <th># of Students</th>
82
                                <th>Enabled</th>
82
                                <th>Enabled</th>
83
                            </tr>
83
                            </tr>
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/course_reserves/course.tt (-1 / +1 lines)
Lines 158-164 function RemoveInstructor( cardnumber ) { Link Here
158
                                        </fieldset>
158
                                        </fieldset>
159
159
160
                                        <fieldset>
160
                                        <fieldset>
161
                                            <label for="find_instructor">Instructor Search:</label>
161
                                            <label for="find_instructor">Instructor search:</label>
162
                                            <input autocomplete="off" id="find_instructor" type="text" style="width:150px" class="noEnterSubmit"/>
162
                                            <input autocomplete="off" id="find_instructor" type="text" style="width:150px" class="noEnterSubmit"/>
163
                                            <div id="find_instructor_container"></div>
163
                                            <div id="find_instructor_container"></div>
164
                                        </fieldset>
164
                                        </fieldset>
(-)a/koha-tmpl/opac-tmpl/ccsr/en/includes/masthead.inc (-1 / +1 lines)
Lines 235-240 Link Here
235
235
236
<div id="moresearches">
236
<div id="moresearches">
237
<a href="/cgi-bin/koha/opac-search.pl">Advanced search</a>
237
<a href="/cgi-bin/koha/opac-search.pl">Advanced search</a>
238
[% IF ( UseCourseReserves ) %]<span class="pipe"> | </span><a href="/cgi-bin/koha/opac-course-reserves.pl">Course Reserves</a>[% END %]
238
[% IF ( OpacBrowser ) %]<span class="pipe"> | </span><a href="/cgi-bin/koha/opac-browser.pl">Browse by hierarchy</a>[% END %]
239
[% IF ( OpacBrowser ) %]<span class="pipe"> | </span><a href="/cgi-bin/koha/opac-browser.pl">Browse by hierarchy</a>[% END %]
239
[% IF ( OpacAuthorities ) %]<span class="pipe"> | </span><a href="/cgi-bin/koha/opac-authorities-home.pl">Browse by author or subject</a>[% END %]
240
[% IF ( OpacAuthorities ) %]<span class="pipe"> | </span><a href="/cgi-bin/koha/opac-authorities-home.pl">Browse by author or subject</a>[% END %]
240
[% IF ( opacuserlogin && reviewson && OpacShowRecentComments ) %]<span class="pipe"> | </span><a href="/cgi-bin/koha/opac-showreviews.pl">Recent comments</a>[% END %]
241
[% IF ( opacuserlogin && reviewson && OpacShowRecentComments ) %]<span class="pipe"> | </span><a href="/cgi-bin/koha/opac-showreviews.pl">Recent comments</a>[% END %]
241
- 

Return to bug 8215