From 481672fedbe6d6a07ea04c870a04823310fcc115 Mon Sep 17 00:00:00 2001 From: Owen Leonard <oleonard@myacpl.org> 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 <div id="toolbar"></div> 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 <claire.gravely@bsz-bw.de> --- .../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 %] <div id="toolbar"> - <ul class="toolbar"> - [% IF CAN_user_coursereserves_add_reserves %]<li><a class="btn btn-default btn-sm" id="add_items" href="/cgi-bin/koha/course_reserves/add_items.pl?course_id=[% course.course_id %]"><i class="fa fa-plus"></i> Add reserves</a></li>[% END %] - [% IF ( CAN_user_coursereserves_manage_courses ) %]<li><a class="btn btn-default btn-sm" id="edit_course" href="/cgi-bin/koha/course_reserves/course.pl?course_id=[% course.course_id %]"><i class="fa fa-pencil"></i> Edit course</a></li>[% END %] - [% IF ( CAN_user_coursereserves_manage_courses ) %]<li><a class="btn btn-default btn-sm" id="delete_course" href="/cgi-bin/koha/course_reserves/mod_course.pl?course_id=[% course.course_id %]&action=del"><i class="fa fa-trash"></i> Delete course</a></li>[% END %] - </ul> + [% IF CAN_user_coursereserves_add_reserves %] + <a class="btn btn-default btn-sm" id="add_items" href="/cgi-bin/koha/course_reserves/add_items.pl?course_id=[% course.course_id %]"><i class="fa fa-plus"></i> Add reserves</a> + [% END %] + [% IF ( CAN_user_coursereserves_manage_courses ) %] + <a class="btn btn-default btn-sm" id="edit_course" href="/cgi-bin/koha/course_reserves/course.pl?course_id=[% course.course_id %]"><i class="fa fa-pencil"></i> Edit course</a> + [% END %] + [% IF ( CAN_user_coursereserves_manage_courses ) %] + <a class="btn btn-default btn-sm" id="delete_course" href="/cgi-bin/koha/course_reserves/mod_course.pl?course_id=[% course.course_id %]&action=del"><i class="fa fa-trash"></i> Delete course</a> + [% END %] </div><!-- /toolbar --> [% 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 %] <div id="toolbar"> - <ul class="toolbar"> - [% IF ( CAN_user_coursereserves_manage_courses ) %] - <li><a class="btn btn-default btn-sm" id="new_course" href="/cgi-bin/koha/course_reserves/course.pl"><i class="fa fa-plus"></i> New course</a></li> - [% END %] - </ul> + [% IF ( CAN_user_coursereserves_manage_courses ) %] + <a class="btn btn-default btn-sm" id="new_course" href="/cgi-bin/koha/course_reserves/course.pl"><i class="fa fa-plus"></i> New course</a> + [% END %] </div><!-- /toolbar --> [% 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 @@ <div class="yui-b"> [% IF ( start_dictionary ) %] <div id="toolbar"> - <ul class="toolbar"> - <li><a id="newdictionary" class="btn btn-default btn-sm" href="/cgi-bin/koha/reports/dictionary.pl?phase=Add%20New%20Definition"><i class="fa fa-plus"></i> New definition</a></li> - </ul> + <a id="newdictionary" class="btn btn-default btn-sm" href="/cgi-bin/koha/reports/dictionary.pl?phase=Add%20New%20Definition"><i class="fa fa-plus"></i> New definition</a> </div> [% END %] <h1>Dictionary</h1> -- 2.1.4