From 65e2b3225ee3639a578fd3cfc13a541964f093e8 Mon Sep 17 00:00:00 2001 From: Kyle M Hall Date: Thu, 20 Sep 2012 14:24:06 -0400 Subject: [PATCH] Bug 8215 - Add Course Reserves - QA Followup Content-Type: text/plain; charset="utf-8" --- admin/authorised_values.pl | 2 +- course_reserves/course.pl | 6 ++---- .../en/modules/course_reserves/add_items-step1.tt | 6 +++--- .../en/modules/course_reserves/course-details.tt | 10 +++++----- .../en/modules/course_reserves/course-reserves.tt | 8 ++++---- .../prog/en/modules/course_reserves/course.tt | 2 +- koha-tmpl/opac-tmpl/ccsr/en/includes/masthead.inc | 1 + 7 files changed, 17 insertions(+), 18 deletions(-) diff --git a/admin/authorised_values.pl b/admin/authorised_values.pl index 17917ce..0dafe4c 100755 --- a/admin/authorised_values.pl +++ b/admin/authorised_values.pl @@ -199,7 +199,7 @@ sub default_form { } # push koha system categories - foreach (qw(Asort1 Asort2 Bsort1 Bsort2 SUGGEST DAMAGED LOST REPORT_GROUP REPORT_SUBGROUP)) { + foreach (qw(Asort1 Asort2 Bsort1 Bsort2 SUGGEST DAMAGED LOST REPORT_GROUP REPORT_SUBGROUP DEPARTMENT TERM)) { push @category_list, $_ unless $categories{$_}; } diff --git a/course_reserves/course.pl b/course_reserves/course.pl index 2df178e..e2af77f 100755 --- a/course_reserves/course.pl +++ b/course_reserves/course.pl @@ -48,10 +48,8 @@ if ($course_id) { } $template->param( - departments => GetAuthorisedValues('DEPARTMENT') - , ## TODO: use syspref instead of hard coded value. - terms => GetAuthorisedValues('TERM') - , ## TODO: use syspref instead of hard coded value. + departments => GetAuthorisedValues('DEPARTMENT'), + terms => GetAuthorisedValues('TERM'), ); output_html_with_http_headers $cgi, $cookie, $template->output; diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/course_reserves/add_items-step1.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/course_reserves/add_items-step1.tt index a3afafa..ab1b6ce 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/course_reserves/add_items-step1.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/course_reserves/add_items-step1.tt @@ -18,7 +18,7 @@ $(document).ready(function() { [% INCLUDE 'header.inc' %] [% INCLUDE 'cat-search.inc' %] - +
@@ -35,12 +35,12 @@ $(document).ready(function() {
- Add items: Scan barcode + Add items: scan barcode

  • - +
    • diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/course_reserves/course-details.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/course_reserves/course-details.tt index 060ea62..4dd9eb1 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/course_reserves/course-details.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/course_reserves/course-details.tt @@ -22,7 +22,7 @@ [% INCLUDE 'header.inc' %] [% INCLUDE 'cat-search.inc' %] - +
    @@ -47,16 +47,16 @@ //]]>
      - [% IF CAN_user_coursereserves_add_reserves %]
    • Add Reserves
      • [% END %] - [% IF ( CAN_user_coursereserves_manage_courses ) %]
    • Edit Course
      • [% END %] - [% IF ( CAN_user_coursereserves_manage_courses ) %]
    • Delete Course
      • [% END %] + [% IF CAN_user_coursereserves_add_reserves %]
    • Add reserves
      • [% END %] + [% IF ( CAN_user_coursereserves_manage_courses ) %]
    • Edit course
      • [% END %] + [% IF ( CAN_user_coursereserves_manage_courses ) %]
    • Delete course
      • [% END %]
    - + diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/course_reserves/course-reserves.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/course_reserves/course-reserves.tt index f3016bc..dfae703 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/course_reserves/course-reserves.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/course_reserves/course-reserves.tt @@ -40,7 +40,7 @@ @@ -61,7 +61,7 @@ --> @@ -76,8 +76,8 @@ - - + + diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/course_reserves/course.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/course_reserves/course.tt index a6928b2..14498fa 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/course_reserves/course.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/course_reserves/course.tt @@ -158,7 +158,7 @@ function RemoveInstructor( cardnumber ) {
    - +
    diff --git a/koha-tmpl/opac-tmpl/ccsr/en/includes/masthead.inc b/koha-tmpl/opac-tmpl/ccsr/en/includes/masthead.inc index d666113..254dcd4 100644 --- a/koha-tmpl/opac-tmpl/ccsr/en/includes/masthead.inc +++ b/koha-tmpl/opac-tmpl/ccsr/en/includes/masthead.inc @@ -235,6 +235,7 @@
    Advanced search +[% IF ( UseCourseReserves ) %] | Course Reserves[% END %] [% IF ( OpacBrowser ) %] | Browse by hierarchy[% END %] [% IF ( OpacAuthorities ) %] | Browse by author or subject[% END %] [% IF ( opacuserlogin && reviewson && OpacShowRecentComments ) %] | Recent comments[% END %] -- 1.7.2.5
    Course name[% course.course_name %]
    Term[% AuthorisedValues.GetByCode( 'TERM', course.term ) %]
    Department[% AuthorisedValues.GetByCode( 'DEPARTMENT', course.department ) %]
    Department_[% AuthorisedValues.GetByCode( 'DEPARTMENT', course.department ) %]
    Course number[% course.course_number %]
    Section[% course.section %]
    Instructors[% FOREACH i IN course.instructors %]
    [% i.firstname %] [% i.surname %]
    [% END %]
    Section Term InstructorsStaff NotePublic NoteStaff notePublic note # of Students Enabled