From 5817a7bd5e52acb938173d5c44e33edcce4816f1 Mon Sep 17 00:00:00 2001
From: Owen Leonard <oleonard@myacpl.org>
Date: Thu, 20 Feb 2014 09:59:51 -0500
Subject: [PATCH] Bug 11800 - Correct toolbar markup on course reserve pages

This patch corrects some inconsistencies between the toolbars on some
course reserves pages and other toolbars in Koha.

Other changes: Removed obsolete commented markup and corrected some
invalid markup.

To test course reserves must be enabled. View the list of course
reserves (course_reserves/course-reserves.pl) and the detail view of a
course (course_reserves/course-details.pl?course_id=X). Toolbars on both
pages should look correct and work correctly.

Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>
---
 .../en/modules/course_reserves/course-details.tt   |   10 ++---
 .../en/modules/course_reserves/course-reserves.tt  |   35 +++-----------------
 2 files changed, 9 insertions(+), 36 deletions(-)

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 5e69702..f41b3cd 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
@@ -45,12 +45,10 @@
 <div id="doc2" class="yui-t7">
     <div id="bd">
         <div id="yui-main">
-            <div id="toolbar">
-                <ul class="toolbar">
-                    [% IF CAN_user_coursereserves_add_reserves %]<li><a class="btn" id="add_items" href="/cgi-bin/koha/course_reserves/add_items.pl?course_id=[% course.course_id %]"><i class="icon-plus"></i> Add reserves</a></li>[% END %]
-                    [% IF ( CAN_user_coursereserves_manage_courses ) %]<li><a class="btn" id="edit_course" href="/cgi-bin/koha/course_reserves/course.pl?course_id=[% course.course_id %]"><i class="icon-pencil"></i> Edit course</a></li>[% END %]
-                    [% IF ( CAN_user_coursereserves_manage_courses ) %]<li><a class="btn" id="delete_course" href="/cgi-bin/koha/course_reserves/mod_course.pl?course_id=[% course.course_id %]&amp;action=del"><i class="icon-remove"></i> Delete course</a></li>[% END %]
-                </ul>
+            <div id="toolbar" class="btn-toolbar">
+                [% IF CAN_user_coursereserves_add_reserves %]<a class="btn btn-small" id="add_items" href="/cgi-bin/koha/course_reserves/add_items.pl?course_id=[% course.course_id %]"><i class="icon-plus"></i> Add reserves</a>[% END %]
+                [% IF ( CAN_user_coursereserves_manage_courses ) %]<a class="btn btn-small" id="edit_course" href="/cgi-bin/koha/course_reserves/course.pl?course_id=[% course.course_id %]"><i class="icon-pencil"></i> Edit course</a>[% END %]
+                [% IF ( CAN_user_coursereserves_manage_courses ) %]<a class="btn btn-small" id="delete_course" href="/cgi-bin/koha/course_reserves/mod_course.pl?course_id=[% course.course_id %]&amp;action=del"><i class="icon-remove"></i> Delete course</a>[% END %]
             </div><!-- /toolbar -->
 
             <div class="rows">
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 820c1a2..3072e53 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
@@ -31,35 +31,12 @@ $(document).ready(function() {
             <div class="yui-b">
                 <div class="yui-g">
 
-                    <div id="toolbar">
-                        <ul class="toolbar">
-                            [% IF ( CAN_user_coursereserves_manage_courses ) %]
-                            <li><a class="btn" id="new_course" href="/cgi-bin/koha/course_reserves/course.pl">New course</a></li>
-                            [% END %]
-                        </ul>
+                    <div id="toolbar" class="btn-toolbar">
+                        [% IF ( CAN_user_coursereserves_manage_courses ) %]
+                            <a class="btn btn-small" id="new_course" href="/cgi-bin/koha/course_reserves/course.pl"><i class="icon-plus"></i> New course</a>
+                        [% END %]
                     </div><!-- /toolbar -->
 
-                    <!--
-                    <div id="search-toolbar">
-                        <script type="text/javascript">
-                        //<![CDATA[
-                            function submitSearchForm(p_oEvent){
-                                $('#search_courses_form').submit();
-                            }
-
-                            $(document).ready(function(){
-                                newCourseButton = new YAHOO.widget.Button("search_courses");
-                                newCourseButton.on("click", submitSearchForm );
-                            });
-                        //]]>
-                        </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>
-                        </ul>
-                    </div>
-                    -->
-
                     <h1>Courses</h1>
                     <table id="course_reserves_table">
                         <thead>
@@ -72,7 +49,7 @@ $(document).ready(function() {
                                 <th>Instructors</th>
                                 <th>Staff note</th>
                                 <th>Public note</th>
-                                <th># of Students</th>
+                                <th># of students</th>
                                 <th>Enabled</th>
                             </tr>
                         </thead>
@@ -107,7 +84,5 @@ $(document).ready(function() {
             </div>
         </div>
     </div>
-</div>
-
 
 [% INCLUDE 'intranet-bottom.inc' %]
-- 
1.7.2.5