Bug 38285: Replace instances of obsolete Bootstrap class "pull-right"

This patch fixes instances where the pre-Bootstrap-5 class "pull-right"
was missed during the upgrade. Most cases were on dropdown menus, and
in all of these cases the class can be removed because Bootstrap 5 menus
have better responsive behavior.

Other changes: Added "dropdown-item" classes to some menu items which
lacked it; Added some custom style for the "Filter" form in the patron
permissions toolbar.

To test, apply the patch and rebuild the staff interface CSS. Test that
the following menus look correct and work correctly:

- Catalog -> Bibliographic details page -> Holdings table: The "Edit"
  secondary menu shown for each item (requires that the LocalCoverImages
  system preference be enabled.
- Administration -> Z39.50 servers: The "Actions" menu for each server
  in the list of servers.
- Circulation -> Article requests: The "Actions" menu for each title and
  under each tab (New, Pending, and Processing).
- Tools -> Patron lists: "Actions" menu.
- Administration -> Plugins: "Actions" menu (requires that you have at
  least one plugin installed).
- Reports -> Saved SQL reports: The secondary menu on each saved
  report's "Run" button .
- Cataloging -> Rotating collections: "Actions" menu.
- Serials -> Subscription search results: In the "Open" tab, the
  secondary menu on the "Serial receive" button on each subscription. In
  the "Closed" tab, the "Actions" menu.
- Acquistions -> Suggestions: The secondary menu on each title's
  "Edit" button.
- Tools -> HTML customizations: The secondary menu on the "New
  entry" button; The secondary menu on each entry's
  "Edit" button; Edit entry -> The secondary menu on the "Save" button.
- Cataloging -> Stock rotation: The "Manage" menu on each rota.

A non-menu change:
- Patrons -> Patron details -> More -> Set permissions: CSS has been
  added to correctly align the "Filter" menu.

Sponsored-by: Athens County Public Libraries
Signed-off-by: David Nind <david@davidnind.com>
Signed-off-by: Katrin Fischer <katrin.fischer@bsz-bw.de>
This commit is contained in:
Owen Leonard 2024-10-29 11:00:06 +00:00 committed by Katrin Fischer
parent 4fb4b7527e
commit b6c04435c5
No known key found for this signature in database
GPG Key ID: 0EF6E2C03357A834
18 changed files with 33 additions and 29 deletions

View File

@ -97,4 +97,8 @@
padding: 0 .5em;
}
}
.toolbar-filter-form {
padding: $input-btn-padding-y $input-btn-padding-x;
}
}

View File

@ -788,9 +788,9 @@
let nodes = '';
if ( can_edit_items_from.includes(row.home_library_id) || !can_edit_items_from.length ){
[% IF Koha.Preference('LocalCoverImages') OR Koha.Preference('OPACLocalCoverImages') %]
nodes += '<div class="btn-group">';
nodes += '<div class="btn-group dropup">';
nodes += ' <a class="btn btn-default btn-xs" href="/cgi-bin/koha/cataloguing/additem.pl?op=edititem&biblionumber=%s&itemnumber=%s#edititem"><i class="fa-solid fa-pencil"></i> %s</a><a class="btn btn-default btn-xs dropdown-toggle" data-bs-toggle="dropdown"><span class="caret"></span></a>'.format(row.biblio_id, row.item_id, _("Edit"));
nodes += ' <ul class="dropdown-menu pull-right">';
nodes += ' <ul class="dropdown-menu">';
nodes += ' <li><a class="dropdown-item" href="/cgi-bin/koha/tools/upload-cover-image.pl?itemnumber=%s&amp;filetype=image"><i class="fa fa-upload"></i> %s</a></li>'.format(row.item_id, _("Upload image"));
nodes += ' </ul>';
nodes += '</div>';

View File

@ -243,7 +243,7 @@
<a class="btn btn-default btn-xs dropdown-toggle" id="reportactions[% savedreport.id | html %]" role="button" data-bs-toggle="dropdown" href="#">
Actions
</a>
<ul class="dropdown-menu pull-right" role="menu" aria-labelledby="reportactions[% savedreport.id | html %]">
<ul class="dropdown-menu" role="menu" aria-labelledby="reportactions[% savedreport.id | html %]">
<li><a class="dropdown-item" href="/cgi-bin/koha/admin/z3950servers.pl?op=edit&amp;id=[% loo.id | uri %]"><i class="fa-solid fa-pencil" aria-hidden="true"></i> Edit</a></li>
<li><a class="dropdown-item" href="/cgi-bin/koha/admin/z3950servers.pl?op=add&amp;id=[% loo.id | uri %]"><i class="fa fa-copy"></i> Copy</a></li>
<li>

View File

@ -499,7 +499,7 @@
</table>
<div class="form-group">
<label for="verify-items-bundle-contents-barcodes">Barcodes <span id="verify-progress" class="pull-right" style="display: none"><span id="verified">0</span> of <span id="expected"></span> verified</span></label>
<label for="verify-items-bundle-contents-barcodes">Barcodes <span id="verify-progress" style="display: none"><span id="verified">0</span> of <span id="expected"></span> verified</span></label>
<textarea autocomplete="off" id="verify-items-bundle-contents-barcodes" name="verify-items-bundle-contents-barcodes" class="form-control"></textarea>
[% IF item.onloan %]
<div class="help-block">Scan all barcodes of items found in the items bundle. If any items are missing, they will be marked as lost</div>

View File

@ -633,11 +633,11 @@
[% END %]
</ul>
</div>
<a title="Display supplier metadata" id="ill-request-display-metadata" class="btn btn-default pull-right" href="#">
<a title="Display supplier metadata" id="ill-request-display-metadata" class="btn btn-default" href="#">
<span class="fa-solid fa-eye"></span>
Display supplier metadata
</a>
<a title="ILL request log" id="ill-request-display-log" class="btn btn-default pull-right" href="#">
<a title="ILL request log" id="ill-request-display-log" class="btn btn-default" href="#">
<span class="fa-solid fa-calendar-days"></span>
ILL request log
</a>

View File

@ -70,8 +70,8 @@
</div>
<a href="#" id="pastePermissions" class="btn btn-link disabled"><i class="fa fa-paste"></i> Paste permissions</a>
<div class="btn-group pull-right">
Filter: <input type="text" name="permissions_filter" id="permissions_filter" size="20" />
<div class="toolbar-filter-form">
<label for="permissions_filter">Filter:</label> <input type="text" name="permissions_filter" id="permissions_filter" size="20" />
<a href="#" id="clear_filter" style="display:none"><i class="fa fa-times"></i></a>
</div>
</div>

View File

@ -81,7 +81,7 @@
<a class="btn btn-default btn-xs dropdown-toggle" id="listactions[% l.patron_list_id | html %]" role="button" data-bs-toggle="dropdown" href="#">
Actions
</a>
<ul class="dropdown-menu pull-right" role="menu" aria-labelledby="listactions[% l.patron_list_id | html %]">
<ul class="dropdown-menu" role="menu" aria-labelledby="listactions[% l.patron_list_id | html %]">
<li><a class="dropdown-item" href="/cgi-bin/koha/patron_lists/list.pl?patron_list_id=[% l.patron_list_id | uri %]"><i class="fa fa-user"></i> Add patrons</a></li>
[% UNLESS shared_by_other %]
<li><a class="dropdown-item" href="/cgi-bin/koha/patron_lists/add-modify.pl?patron_list_id=[% l.patron_list_id | uri %]"><i class="fa-solid fa-pencil" aria-hidden="true"></i> Edit list</a></li>

View File

@ -47,7 +47,7 @@
<a class="btn btn-default btn-xs dropdown-toggle" id="listactions[% l.patron_list_id | html %]" role="button" data-bs-toggle="dropdown" href="#">
Actions
</a>
<ul class="dropdown-menu pull-right" role="menu" aria-labelledby="listactions[% l.patron_list_id | html %]">
<ul class="dropdown-menu" role="menu" aria-labelledby="listactions[% l.patron_list_id | html %]">
<li><a class="dropdown-item" onclick="removeFromList('[% l.patron_list_id | html %]','[% list_id_lookup.${l.patron_list_id} | html %]')"><i class="fa fa-remove"></i> Remove patron from list</a></li>
<li><hr class="dropdown-divider" /></li>
<li><a class="dropdown-item" href="/cgi-bin/koha/patron_lists/list.pl?patron_list_id=[% l.patron_list_id | uri %]"><i class="fa fa-user"></i> Add patrons</a></li>

View File

@ -210,7 +210,7 @@
<a class="btn btn-default btn-xs dropdown-toggle" id="pluginactions[% plugin.class | html %]" role="button" data-bs-toggle="dropdown" href="#">
Actions
</a>
<ul class="dropdown-menu pull-right" role="menu" aria-labelledby="pluginactions[% plugin.class | html %]">
<ul class="dropdown-menu" role="menu" aria-labelledby="pluginactions[% plugin.class | html %]">
[% IF ( CAN_user_plugins_report ) %]
[% IF plugin.can('report') %]
<li><a class="dropdown-item" href="/cgi-bin/koha/plugins/run.pl?class=[% plugin.class | uri %]&method=report"><i class="fa fa-table fa-fw"></i> Run report</a></li>

View File

@ -375,7 +375,7 @@
class="fa fa-play"></i> Run</a><a
class="btn btn-default btn-xs dropdown-toggle" id="reportactions[% savedreport.id | html %]" role="button" data-bs-toggle="dropdown"
href="#"></a>
<ul class="dropdown-menu pull-right" role="menu" aria-labelledby="reportactions[% savedreport.id | html %]">
<ul class="dropdown-menu" role="menu" aria-labelledby="reportactions[% savedreport.id | html %]">
<li><a class="dropdown-item" href="/cgi-bin/koha/reports/guided_reports.pl?id=[% savedreport.id | uri %]&amp;op=show"><i class="fa fa-search" aria-hidden="true"></i> View</a></li>
<li>
<a href="/cgi-bin/koha/reports/guided_reports.pl?id=[% savedreport.id | uri %]&op=show" class="dropdown-item preview_sql" data-reportid="[% savedreport.id | html %]">
@ -1189,7 +1189,7 @@
<td class="batch-op itemnumber" data-number="itemnumber">
<span class="data-plain">[% cells.cell | $raw %]</span>
<div id="itemnumber_autolink" class="btn-group dropup autolink"><a class="btn btn-link dropdown-toggle" role="button" data-bs-toggle="dropdown" href="#">[% cells.cell | $raw %] </a>
<ul class="dropdown-menu pull-right" role="menu">
<ul class="dropdown-menu" role="menu">
<li><a class="dropdown-item" target="_blank" href="/cgi-bin/koha/cataloguing/additem.pl?op=edititem&itemnumber=[% cells.cell | $raw %]"><i class="fa-fw fa-solid fa-pencil" aria-hidden="true"></i> Edit item</a></li>
<li><a class="dropdown-item" target="_blank" href="/cgi-bin/koha/catalogue/moredetail.pl?itemnumber=[% cells.cell | $raw %]"><i class="fa fa-fw fa-eye" aria-hidden="true"></i> View item</a></li>
</ul>
@ -1199,7 +1199,7 @@
<td class="batch-op biblionumber" data-number="biblionumber">
<span class="data-plain">[% cells.cell | $raw %]</span>
<div id="biblionumber_autolink" class="btn-group dropup autolink"><a class="btn btn-link dropdown-toggle" role="button" data-bs-toggle="dropdown" href="#">[% cells.cell | $raw %] </a>
<ul class="dropdown-menu pull-right" role="menu">
<ul class="dropdown-menu" role="menu">
<li><a class="dropdown-item" target="_blank" href="/cgi-bin/koha/cataloguing/addbiblio.pl?biblionumber=[% cells.cell | $raw %]"><i class="fa-solid fa-pencil" aria-hidden="true"></i> Edit record</a></li>
<li><a class="dropdown-item" target="_blank" href="/cgi-bin/koha/catalogue/detail.pl?biblionumber=[% cells.cell | $raw %]"><i class="fa-solid fa-eye" aria-hidden="true"></i> View record</a></li>
</ul>
@ -1209,7 +1209,7 @@
<td class="batch-op borrowernumber" data-number="borrowernumber">
<span class="data-plain">[% cells.cell | $raw %]</span>
<div id="borrowernumber_autolink" class="btn-group dropup autolink"><a class="btn btn-link dropdown-toggle" role="button" data-bs-toggle="dropdown" href="#">[% cells.cell | $raw %] </a>
<ul class="dropdown-menu pull-right" role="menu">
<ul class="dropdown-menu" role="menu">
<li><a class="dropdown-item" target="_blank" href="/cgi-bin/koha/members/moremember.pl?borrowernumber=[% cells.cell | $raw %]"><i class="fa-solid fa-eye" aria-hidden="true"></i> View patron</a></li>
<li><a class="dropdown-item" target="_blank" href="/cgi-bin/koha/members/memberentry.pl?op=edit_form&amp;borrowernumber=[% cells.cell | $raw %]"><i class="fa-solid fa-pencil" aria-hidden="true"></i> Edit patron</a></li>
<li><a class="dropdown-item" target="_blank" href="/cgi-bin/koha/circ/circulation.pl?borrowernumber=[% cells.cell | $raw %]"><i class="fa fa-barcode" aria-hidden="true"></i> Check out</a></li>
@ -1220,7 +1220,7 @@
<td class="batch-op cardnumber" data-number="cardnumber">
<span class="data-plain">[% cells.cell | $raw %]</span>
<div id="cardnumber_autolink" class="btn-group dropup autolink"><a class="btn btn-link dropdown-toggle" role="button" data-bs-toggle="dropdown" href="#">[% cells.cell | $raw %] </a>
<ul class="dropdown-menu pull-right" role="menu">
<ul class="dropdown-menu" role="menu">
<li><a target="_blank" href="/cgi-bin/koha/circ/circulation.pl?findborrower=[% cells.cell | $raw %]"><i class="fa fa-barcode" aria-hidden="true"></i> Check out</a></li>
</ul>
</div>

View File

@ -59,7 +59,7 @@
<td>
<div class="btn-group dropup">
<a class="btn btn-default btn-xs dropdown-toggle" id="collectionsactions[% collectionsLoo.colId | html %]" role="button" data-bs-toggle="dropdown" href="#">Actions</a>
<ul class="dropdown-menu pull-right" role="menu" aria-labelledby="collectionsactions[% collectionsLoo.colId | html %]">
<ul class="dropdown-menu" role="menu" aria-labelledby="collectionsactions[% collectionsLoo.colId | html %]">
<li><a class="dropdown-item" href="/cgi-bin/koha/rotating_collections/addItems.pl?colId=[% collectionsLoo.colId | uri %]"><i class="fa fa-plus"></i> Manage items</a></li>
<li><a class="dropdown-item" href="/cgi-bin/koha/rotating_collections/transferCollection.pl?colId=[% collectionsLoo.colId | uri %]"><i class="fa-solid fa-right-left"></i> Transfer</a></li>
<li><a class="dropdown-item" href="/cgi-bin/koha/rotating_collections/editCollections.pl?op=edit&amp;colId=[% collectionsLoo.colId | uri %]"><i class="fa-solid fa-pencil" aria-hidden="true"></i> Edit</a></li>

View File

@ -135,18 +135,18 @@
<a class="btn btn-default btn-xs dropdown-toggle" id="closedsubactions[% subscription.subscriptionid | html %]" role="button" data-bs-toggle="dropdown" href="#">
Actions
</a>
<ul class="dropdown-menu pull-right" role="menu" aria-labelledby="closedsubactions[% subscription.subscriptionid | html %]">
<ul class="dropdown-menu" role="menu" aria-labelledby="closedsubactions[% subscription.subscriptionid | html %]">
[% IF ( routing && CAN_user_serials_routing ) %]
[% UNLESS ( subscription.cannotedit ) %]
<li>
<a href="/cgi-bin/koha/serials/serials-search.pl?subscriptionid=[% subscription.subscriptionid | uri %]&amp;op=reopen&amp;routing=[% subscription.routing | uri %]&amp;searched=1&amp;title_filter=[% title_filter | uri %]&amp;ISSN_filter=[% ISSN_filter | uri %]&amp;EAN_filter=[% EAN_filter | uri %]&amp;published_filter=[% publisher_filter | uri %]&amp;bookseller_filter=[% bookseller_filter | uri %]&amp;branch_filter=[% branch_filter | uri %]" id="reopensub"> <i class="fa-solid fa-arrow-rotate-right"></i> Reopen</a>
<a class="dropdown-item" href="/cgi-bin/koha/serials/serials-search.pl?subscriptionid=[% subscription.subscriptionid | uri %]&amp;op=reopen&amp;routing=[% subscription.routing | uri %]&amp;searched=1&amp;title_filter=[% title_filter | uri %]&amp;ISSN_filter=[% ISSN_filter | uri %]&amp;EAN_filter=[% EAN_filter | uri %]&amp;published_filter=[% publisher_filter | uri %]&amp;bookseller_filter=[% bookseller_filter | uri %]&amp;branch_filter=[% branch_filter | uri %]" id="reopensub"> <i class="fa-solid fa-arrow-rotate-right"></i> Reopen</a>
</li>
[% END %]
[% END # IF ( routing && CAN_user_serials_routing ) %]
<li>
<a href="/cgi-bin/koha/serials/serials-collection.pl?subscriptionid=[% subscription.subscriptionid | uri %]"><i class="fa-solid fa-rectangle-list"></i> Issue history</a>
<a class="dropdown-item" href="/cgi-bin/koha/serials/serials-collection.pl?subscriptionid=[% subscription.subscriptionid | uri %]"><i class="fa-solid fa-rectangle-list"></i> Issue history</a>
</li>
</ul>
@ -162,7 +162,7 @@
[% ELSE %]
<a class="btn btn-default btn-xs dropdown-toggle" id="subactions[% subscription.subscriptionid | html %]" role="button" data-bs-toggle="dropdown" href="#">Actions </a>
[% END %]
<ul class="dropdown-menu pull-right" role="menu" aria-labelledby="subactions[% subscription.subscriptionid | html %]">
<ul class="dropdown-menu" role="menu" aria-labelledby="subactions[% subscription.subscriptionid | html %]">
[% IF ( routing && CAN_user_serials_routing ) %]
[% IF ( subscription.cannotedit ) %]

View File

@ -864,7 +864,7 @@
[% IF CAN_user_suggestions_suggestions_manage %]
<div class="btn-group dropup">
<a class="btn btn-default btn-xs" role="button" href="suggestion.pl?suggestionid=[% s.suggestionid | html %]&amp;op=edit_form"><i class="fa-solid fa-pencil" aria-hidden="true"></i> Edit</a><a class="btn btn-default btn-xs dropdown-toggle" id="more_actions_[% s.suggestionid | html %]" role="button" data-bs-toggle="dropdown" href="#"><b class="caret"></b></a>
<ul class="dropdown-menu pull-right" role="menu" aria-labelledby="more_actions_[% s.suggestionid | html %]">
<ul class="dropdown-menu" role="menu" aria-labelledby="more_actions_[% s.suggestionid | html %]">
[% IF CAN_user_suggestions_suggestions_delete %]
<li>
<a href="#" data-op="cud-delete" data-suggestionid="[% s.suggestionid | html %]" class="dropdown-item trigger_action">Delete</a>

View File

@ -207,7 +207,7 @@
<div class="btn-group">
<button class="btn btn-primary" id="submit_form"><i class="fa fa-save"></i> Save</button>
<button class="btn btn-primary dropdown-toggle" data-bs-toggle="dropdown" aria-expanded="false"></button>
<ul class="dropdown-menu dropdown-menu-end">
<ul class="dropdown-menu">
<li><a class="dropdown-item" id="saveandcontinue" href="#">Save and continue editing</a></li>
</ul>
</div>
@ -341,7 +341,7 @@
<a href="/cgi-bin/koha/tools/additional-contents.pl?op=add_form&category=[% category | uri %]&editmode=[% editmode | uri %]" class="btn btn-default" id="newentry"> <i class="fa fa-plus"></i> New entry</a><button class="btn btn-default dropdown-toggle" data-bs-toggle="dropdown" aria-expanded="false">
</button>
<ul class="dropdown-menu dropdown-menu-end">
<ul class="dropdown-menu">
<li>
[% IF ( wysiwyg ) %]
<a class="dropdown-item" href="/cgi-bin/koha/tools/additional-contents.pl?op=add_form&category=[% category | uri %]&editmode=text">New entry using text editor</a>
@ -466,7 +466,7 @@
<a href="/cgi-bin/koha/tools/additional-contents.pl?op=add_form&amp;id=[% c.id | uri %]&editmode=[% editmode | uri %]" class="btn btn-default btn-xs"> <i class="fa-solid fa-pencil"></i> Edit</a><button class="btn btn-default btn-xs dropdown-toggle" data-bs-toggle="dropdown" aria-expanded="false">
</button>
<ul class="dropdown-menu pull-right">
<ul class="dropdown-menu">
<li>
[% IF ( wysiwyg ) %]
<a class="dropdown-item" href="/cgi-bin/koha/tools/additional-contents.pl?op=add_form&amp;id=[% c.id | uri %]&editmode=text"><i class="fa-solid fa-pencil"></i> Edit with text editor</a>

View File

@ -139,7 +139,7 @@
<button type="button" class="btn btn-default btn-xs dropdown-toggle" data-bs-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
Manage
</button>
<ul class="dropdown-menu pull-right">
<ul class="dropdown-menu">
<li><a class="dropdown-item" href="?op=manage_stages&amp;rota_id=[% rota.rota_id | uri %]">Stages</a></li>
[% IF CAN_user_stockrotation_manage_rota_items && rota.stockrotationstages.count > 0 %]
<li><a class="dropdown-item" href="?op=manage_items&amp;rota_id=[% rota.rota_id | uri %]">Items</a></li>

View File

@ -49,5 +49,5 @@
</div> <!-- /# .dropdown-menu -->
</li> <!-- / .dropdown -->
<li class="divider-vertical" aria-hidden="false"></li>
</ul> <!-- /.nav.pull-right -->
</ul> <!-- /.navbar-nav -->
</div> <!-- /#header_langmenu -->

View File

@ -171,7 +171,7 @@
<td data-order="[% request.placed | html %]">[% request.placed | $KohaDates %]</td>
<td data-order="[% request.updated | html %]">[% request.updated | $KohaDates %]</td>
<td>
<a href="/cgi-bin/koha/opac-illrequests.pl?op=view&amp;illrequest_id=[% request.id | uri %]" class="btn btn-primary btn-sm pull-right">View</a>
<a href="/cgi-bin/koha/opac-illrequests.pl?op=view&amp;illrequest_id=[% request.id | uri %]" class="btn btn-primary btn-sm">View</a>
</td>
</tr>
[% END %]

View File

@ -283,7 +283,7 @@
[% END # /IF can_manage_shelf %]
</div> <!-- /.list-actions -->
<form method="get" action="/cgi-bin/koha/opac-shelves.pl" id="sorting-form" class="d-inline sort_by pull-right">
<form method="get" action="/cgi-bin/koha/opac-shelves.pl" id="sorting-form" class="d-inline sort_by">
<input type="hidden" name="op" value="view" />
<input type="hidden" name="shelfnumber" value="[% shelf.shelfnumber | html %]" />