Attachment 173098 Details for Bug 35659 – Bug 35659: (follow-up) Adjust TT code for Bootstrap 5

[patch] Bug 35659: (follow-up) Adjust TT code for Bootstrap 5

Bug-35659-follow-up-Adjust-TT-code-for-Bootstrap-5.patch (text/plain), 4.75 KB, created by David Cook on 2024-10-22 01:36:50 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: David Cook

Created: 2024-10-22 01:36:50 UTC

Size: 4.75 KB

patch

obsolete

>From 35430ace26f5a545c5f77023c7ae2855e39b00b8 Mon Sep 17 00:00:00 2001
>From: Andreas Roussos <a.roussos@dataly.gr>
>Date: Wed, 18 Sep 2024 14:18:23 +0000
>Subject: [PATCH] Bug 35659: (follow-up) Adjust TT code for Bootstrap 5
>
>In Bug 35402 the Bootstrap CSS framework was upgraded
>to version 5.
>
>This patch adjusts the relevant TT code for the OAI
>repositories administration page, and also adds a
>missing [% USE %] directive.
>
>Signed-off-by: Victor Grousset/tuxayo <victor@tuxayo.net>
>Signed-off-by: David Cook <dcook@prosentient.com.au>
>Sponsored-by: Association KohaLa - https://koha-fr.org/
>---
> .../prog/en/modules/admin/oai_servers.tt      | 27 ++++++++++---------
> 1 file changed, 14 insertions(+), 13 deletions(-)
>
>diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/oai_servers.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/oai_servers.tt
>index 8603e83ccc..04eeaca2f1 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/oai_servers.tt
>+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/oai_servers.tt
>@@ -1,5 +1,6 @@
> [% USE raw %]
> [% USE Asset %]
>+[% USE I18N %]
> [% SET footerjs = 1 %]
> [% INCLUDE 'doc-head-open.inc' %]
> 
>@@ -52,17 +53,17 @@
> 
> <div class="main container-fluid">
>     <div class="row">
>-        <div class="col-sm-10 col-sm-push-2">
>+        <div class="col-md-10 order-md-2 order-sm-1">
>             <main>
> 
> [% IF msg_deleted %]
>-    <div class="dialog alert">OAI repository deleted ([% msg_add | html %])</div>
>+    <div class="alert alert-warning">OAI repository deleted ([% msg_add | html %])</div>
> [% ELSIF msg_updated %]
>-    <div class="dialog message">OAI repository updated ([% msg_add | html %])</div>
>+    <div class="alert alert-info">OAI repository updated ([% msg_add | html %])</div>
> [% ELSIF msg_added %]
>-    <div class="dialog message">OAI repository added ([% msg_add | html %])</div>
>+    <div class="alert alert-info">OAI repository added ([% msg_add | html %])</div>
> [% ELSIF msg_notfound %]
>-    <div class="dialog alert">Error: Server with ID [% msg_add | html %] not found</div>
>+    <div class="alert alert-warning">Error: Server with ID [% msg_add | html %] not found</div>
> [% END %]
> 
> [% IF ( add_form ) %]
>@@ -149,14 +150,14 @@
>             </td>
>             <td>
>                 <div class="btn-group dropup">
>-                    <a class="btn btn-default btn-xs dropdown-toggle" id="reportactions[% savedreport.id | html %]" role="button" data-toggle="dropdown" href="#">
>-                        Actions <b class="caret"></b>
>+                    <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 %]">
>-                        <li><a href="/cgi-bin/koha/admin/oai_servers.pl?op=edit&amp;id=[% loo.oai_server_id | uri %]"><i class="fa-solid fa-pencil" aria-hidden="true"></i> Edit</a></li>
>-                        <li><a href="/cgi-bin/koha/admin/oai_servers.pl?op=add&amp;id=[% loo.oai_server_id | uri %]"><i class="fa fa-copy"></i> Copy</a></li>
>+                        <li><a class="dropdown-item" href="/cgi-bin/koha/admin/oai_servers.pl?op=edit&amp;id=[% loo.oai_server_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/oai_servers.pl?op=add&amp;id=[% loo.oai_server_id | uri %]"><i class="fa fa-copy"></i> Copy</a></li>
>                         <li>
>-                            <a href="#" class="delete" data-formid="server_row_[% loo.oai_server_id | uri %]" data-servername="[% loo.servername | html %]"><i class="fa fa-trash-can"></i> Delete</a>
>+                            <a href="#" class="dropdown-item delete" data-formid="server_row_[% loo.oai_server_id | uri %]" data-servername="[% loo.servername | html %]"><i class="fa fa-trash-can"></i> Delete</a>
>                             <form id="server_row_[% loo.oai_server_id | uri %]" action="/cgi-bin/koha/admin/oai_servers.pl" method="post">
>                                 [% INCLUDE 'csrf-token.inc' %]
>                                 <input type="hidden" name="op" value="cud-delete_confirmed">
>@@ -175,13 +176,13 @@
> [% END %]
> 
>             </main>
>-        </div> 
>+        </div> 
> 
>-        <div class="col-sm-2 col-sm-pull-10">
>+        <div class="col-md-2 order-sm-2 order-md-1">
>             <aside>
>                 [% INCLUDE 'admin-menu.inc' %]
>             </aside>
>-        </div> 
>+        </div> 
>      </div> 
> 
> [% MACRO jsinclude BLOCK %]
>-- 
>2.39.2

Actions: View | Diff | Splinter Review

Attachments on bug 35659: 160356 | 160357 | 160744 | 161813 | 161960 | 162004 | 162005 | 162006 | 162007 | 162008 | 162009 | 162010 | 162011 | 162527 | 162528 | 162692 | 162693 | 162694 | 163527 | 164586 | 164590 | 164602 | 164603 | 164604 | 164605 | 164606 | 164618 | 164619 | 164620 | 164621 | 164622 | 165199 | 165594 | 165595 | 165596 | 165597 | 165598 | 167106 | 167107 | 167171 | 167172 | 167173 | 167174 | 167175 | 167176 | 168982 | 168983 | 169941 | 171255 | 171258 | 171260 | 171264 | 171265 | 171267 | 171675 | 171676 | 171678 | 171679 | 172072 | 172073 | 172074 | 172075 | 172076 | 172077 | 172078 | 172079 | 172080 | 172081 | 172082 | 172083 | 172202 | 172203 | 172204 | 172205 | 172206 | 172207 | 172208 | 172209 | 172210 | 172211 | 172212 | 172213 | 173088 | 173089 | 173090 | 173091 | 173092 | 173093 | 173094 | 173095 | 173096 | 173097 | 173098 | 173099 | 173100 | 173101 | 173561 | 173599 | 173600 | 173601 | 173614 | 174790