From 67855991d43b3be9f8abe240a00e237fc08307f0 Mon Sep 17 00:00:00 2001 From: Owen Leonard Date: Mon, 12 Mar 2018 12:56:08 +0000 Subject: [PATCH] Bug 20372: Correct toolbar markup on some pages Differences in markup around some toolbars has the potential to create CSS styling problems. This patch changes the markup to be consistent with other instances of
To test, apply the patch and view these pages: - Course reserves (main page) - Course reserves -> Course detail page - Reports -> Dictionary On each of these pages the toolbar should look correct. --- .../prog/en/modules/course_reserves/course-details.tt | 14 +++++++++----- .../prog/en/modules/course_reserves/course-reserves.tt | 8 +++----- .../intranet-tmpl/prog/en/modules/reports/dictionary.tt | 4 +--- 3 files changed, 13 insertions(+), 13 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 8052ff0..dec2c5d 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,11 +22,15 @@ [% IF CAN_user_coursereserves_add_reserves OR CAN_user_coursereserves_manage_courses OR CAN_user_coursereserves_manage_courses %]
- + [% 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 %]
[% 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 f46ea90..1308d58 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 @@ -20,11 +20,9 @@ [% IF CAN_user_coursereserves_add_reserves OR CAN_user_coursereserves_manage_courses OR CAN_user_coursereserves_manage_courses %]
- + [% IF ( CAN_user_coursereserves_manage_courses ) %] + New course + [% END %]
[% END %] diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/reports/dictionary.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/reports/dictionary.tt index 7e6c45d..b3958f2 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/reports/dictionary.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/reports/dictionary.tt @@ -34,9 +34,7 @@
[% IF ( start_dictionary ) %] [% END %]

Dictionary

-- 2.1.4