From 5817a7bd5e52acb938173d5c44e33edcce4816f1 Mon Sep 17 00:00:00 2001 From: Owen Leonard 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 --- .../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 @@
-
-
    - [% 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 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() {
-
-
    - [% IF ( CAN_user_coursereserves_manage_courses ) %] -
  • New course
  • - [% END %] -
+
+ [% IF ( CAN_user_coursereserves_manage_courses ) %] + New course + [% END %]
- -

Courses

@@ -72,7 +49,7 @@ $(document).ready(function() { - + @@ -107,7 +84,5 @@ $(document).ready(function() { - - [% INCLUDE 'intranet-bottom.inc' %] -- 1.7.2.5
Instructors Staff note Public note# of Students# of students Enabled