From 65e2b3225ee3639a578fd3cfc13a541964f093e8 Mon Sep 17 00:00:00 2001
From: Kyle M Hall <kyle@bywatersolutions.com>
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' %]
 
-<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>
+<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>
 
 <div id="doc2" class="yui-t7">
     <div id="bd">
@@ -35,12 +35,12 @@ $(document).ready(function() {
                             <input type="hidden" name="action" value="lookup" />
 
                             <fieldset class="rows">
-                                <legend>Add items: Scan barcode</legend>
+                                <legend>Add items: scan barcode</legend>
 
                                     <p>
 
                                     <li>
-                                        <label class="required" for="barcode">Item Barcode:</label>
+                                        <label class="required" for="barcode">Item barcode:</label>
                                         <input id="barcode" name="barcode" type="text" />
                                     </li>
                                 </ol>
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' %]
 
-<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>
+<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>
 
 <div id="doc2" class="yui-t7">
     <div id="bd">
@@ -47,16 +47,16 @@
                 //]]>
                 </script>
                 <ul class="toolbar">
-                    [% 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 %]
-                    [% 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 %]
-                    [% 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 %]
+                    [% 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 %]
+                    [% 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 %]
+                    [% 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 %]
                 </ul>
             </div><!-- /toolbar -->
 
             <table>
                 <tr><th>Course name</th><td>[% course.course_name %]</td></tr>
                 <tr><th>Term</th><td>[% AuthorisedValues.GetByCode( 'TERM', course.term ) %]</td></tr>
-                <tr><th>Department</th><td>[% AuthorisedValues.GetByCode( 'DEPARTMENT', course.department ) %]</td></tr>
+                <tr><th>Department</th><td>_[% AuthorisedValues.GetByCode( 'DEPARTMENT', course.department ) %]</td></tr>
                 <tr><th>Course number</th><td>[% course.course_number %]</td></tr>
                 <tr><th>Section</th><td>[% course.section %]</td></tr>
                 <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>
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 @@
                         </script>
                         <ul class="toolbar">
                             [% IF ( CAN_user_coursereserves_manage_courses ) %]
-                            <li><a id="new_course" href="/cgi-bin/koha/course_reserves/course.pl">New Course</a></li>
+                            <li><a id="new_course" href="/cgi-bin/koha/course_reserves/course.pl">New course</a></li>
                             [% END %]
                         </ul>
                     </div><!-- /toolbar -->
@@ -61,7 +61,7 @@
                         </script>
                         <ul class="toolbar">
                             <li><form id="search_courses_form"><input type="text" name="search_on" id="search_on"></form></li>
-                            <li><a id="search_courses">Search Courses</a></li>
+                            <li><a id="search_courses">Search courses</a></li>
                         </ul>
                     </div>
                     -->
@@ -76,8 +76,8 @@
                                 <th>Section</th>
                                 <th>Term</th>
                                 <th>Instructors</th>
-                                <th>Staff Note</th>
-                                <th>Public Note</th>
+                                <th>Staff note</th>
+                                <th>Public note</th>
                                 <th># of Students</th>
                                 <th>Enabled</th>
                             </tr>
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 ) {
                                         </fieldset>
 
                                         <fieldset>
-                                            <label for="find_instructor">Instructor Search:</label>
+                                            <label for="find_instructor">Instructor search:</label>
                                             <input autocomplete="off" id="find_instructor" type="text" style="width:150px" class="noEnterSubmit"/>
                                             <div id="find_instructor_container"></div>
                                         </fieldset>
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 @@
 
 <div id="moresearches">
 <a href="/cgi-bin/koha/opac-search.pl">Advanced search</a>
+[% IF ( UseCourseReserves ) %]<span class="pipe"> | </span><a href="/cgi-bin/koha/opac-course-reserves.pl">Course Reserves</a>[% END %]
 [% IF ( OpacBrowser ) %]<span class="pipe"> | </span><a href="/cgi-bin/koha/opac-browser.pl">Browse by hierarchy</a>[% END %]
 [% IF ( OpacAuthorities ) %]<span class="pipe"> | </span><a href="/cgi-bin/koha/opac-authorities-home.pl">Browse by author or subject</a>[% END %]
 [% IF ( opacuserlogin && reviewson && OpacShowRecentComments ) %]<span class="pipe"> | </span><a href="/cgi-bin/koha/opac-showreviews.pl">Recent comments</a>[% END %]
-- 
1.7.2.5