From 246746759afd39a4bf67aca9fc944b4659fb740d 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. Signed-off-by: Claire Gravely Signed-off-by: Katrin Fischer Signed-off-by: Jonathan Druart --- .../en/modules/course_reserves/course-details.tt | 14 +++++++++----- .../en/modules/course_reserves/course-reserves.tt | 8 +++----- .../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 8052ff0d73..dec2c5d24e 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 %] -
+ [% 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 f46ea909f1..1308d582ba 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 %] -
+ [% 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 7e6c45d0ec..b3958f2638 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.39.5