Attachment 174082 Details for Bug 38380 – Bug 38380: Fix other instances of obsolete col-*-offset classes from templates

[patch] Bug 38380: Fix other instances of obsolete col-*-offset classes from templates

Bug-38380-Fix-other-instances-of-obsolete-col--off.patch (text/plain), 11.50 KB, created by Owen Leonard on 2024-11-06 16:47:54 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Owen Leonard

Created: 2024-11-06 16:47:54 UTC

Size: 11.50 KB

patch

obsolete

>From 16a00e32962779c1bfc57ac625775a9be2d66d99 Mon Sep 17 00:00:00 2001
>From: Owen Leonard <oleonard@myacpl.org>
>Date: Wed, 6 Nov 2024 16:32:33 +0000
>Subject: [PATCH] Bug 38380: Fix other instances of obsolete col-*-offset
> classes from templates
>
>This patch corrects a few remaining instances of obsolete col-*-offset
>classes from a few different templates.
>
>To test, apply the patch and make sure you have the system preferences
>AllowCheckoutNotes and ArticleRequests.
>
>- Go to Circulation -> Article requests. If necessary, create an article
>  request.
>  - From the list of requests, click Actions -> Cancel request. The
>    "Confirm deletion" modal form should be well-formatted.
>  - From the list of requests, under the "New" tab, click a record
>    title to view the details for that article request.
>    - In the list of patron requests, click the "X" to delete the
>      request. The "Confirm deletion" modal form should be
>      well-formatted.
>- Log into the OPAC as a user with checkouts. On your summary page,
>  under the "Checked out" tab, click the "Add note" button and save a
>  new note.
>- Go to Circulation -> Checkout notes. The layout should look correct.
>  Toggle the CircSidebar system preference and reload the checkout notes
>  page. It should still look correct.
>- The last change, to the patron clubs template page, only modifies a
>  comment.
>---
> .../prog/en/modules/circ/article-requests.tt  | 52 ++++++++++---------
> .../prog/en/modules/circ/checkout-notes.tt    |  4 +-
> .../prog/en/modules/circ/request-article.tt   |  8 +--
> .../en/modules/clubs/templates-add-modify.tt  |  2 +-
> 4 files changed, 35 insertions(+), 31 deletions(-)
>
>diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/article-requests.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/article-requests.tt
>index 9cd79ee409..1453e7c327 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/article-requests.tt
>+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/article-requests.tt
>@@ -24,7 +24,7 @@
>             Actions
>         </a>
> 
>-        <ul class="dropdown-menu [% pull_right | html %]" role="menu" aria-labelledby="[% aria_menu | html %]">
>+        <ul class="dropdown-menu" role="menu" aria-labelledby="[% aria_menu | html %]">
>             <li>
>                 <a class="ar-set-pending-request dropdown-item" data-ar-id="[% id_arg | uri %]" href="#">
>                     <i class="fa fa-bars"></i>
>@@ -37,7 +37,7 @@
>                 </a>
> 
>                 [% IF id_arg && format=='SCAN' %]
>-                <a class="ar-edit-urls" href="#" data-ar-id="[% id_arg | uri %]" href="#">
>+                <a class="ar-edit-urls dropdown-item" href="#" data-ar-id="[% id_arg | uri %]" href="#">
>                     <i class="fa-solid fa-pencil" aria-hidden="true"></i>
>                     Edit URLs
>                 </a>
>@@ -106,21 +106,25 @@
>                 <div class="modal-body">
>                     <p>Are you sure you want to cancel this article request?</p>
> 
>-                    <fieldset class="action">
>+                    <fieldset class="brief">
>                         [% SET ar_cancellation = AuthorisedValues.GetAuthValueDropbox('AR_CANCELLATION') %]
>-                        [% IF ar_cancellation.count %]
>-                            <label for="cancellation-reason" class="col-sm-4">Cancellation reason: </label>
>-                            <select class="cancellation-reason col-sm-8" name="cancellation-reason" id="modal-cancellation-reason">
>-                                <option value="" selected>Other reasons</option>
>-                                [% FOREACH reason IN ar_cancellation %]
>-                                    <option value="[% reason.authorised_value | html %]">[% reason.lib | html %]</option>
>-                                [% END %]
>-                            </select>
>-                        [% END %]
>-                    </fieldset>
>-                    <fieldset class="action">
>-                        <div class="hint col-sm-offset-4">Enter reason</div>
>-                        <input type="text" class="notes col-sm-offset-4 col-sm-8" name="notes" id="modal-notes"/>
>+                        <ol>
>+                            [% IF ar_cancellation.count %]
>+                                <li>
>+                                    <label for="cancellation-reason">Cancellation reason: </label>
>+                                    <select class="cancellation-reason" name="cancellation-reason" id="modal-cancellation-reason">
>+                                        <option value="" selected>Other reasons</option>
>+                                        [% FOREACH reason IN ar_cancellation %]
>+                                            <option value="[% reason.authorised_value | html %]">[% reason.lib | html %]</option>
>+                                        [% END %]
>+                                    </select>
>+                                </li>
>+                            [% END %]
>+                            <li>
>+                                <label for="modal-notes">Enter reason:</label>
>+                                <input type="text" class="notes" name="notes" id="modal-notes"/>
>+                            </li>
>+                        </ol>
>                     </fieldset>
>                 </div>
> 
>@@ -153,11 +157,11 @@
>         <div class="row">
> 
>                 [% INCLUDE 'messages.inc' %]
>-            [% IF Koha.Preference('CircSidebar') %]
>-            <div class="col-md-10 order-md-2 order-sm-1">
>-            [% ELSE %]
>-            <div class="col-md-12 col-lg-10 col-lg-offset-1">
>-            [% END %]
>+                [% IF Koha.Preference('CircSidebar') %]
>+                    <div class="col-md-10 order-md-2 order-sm-1">
>+                [% ELSE %]
>+                    <div class="col-md-10 offset-md-1 col-lg-8 offset-lg-2">
>+                [% END %]
> 
>                 <h1>Article requests</h1>
>                 [% PROCESS urls_modal %]
>@@ -291,7 +295,7 @@
>                                             </td>
>                                             <td class="ar-date"><span title="[% ar.created_on | html %]">[% ar.created_on | $KohaDates %]</span></td>
>                                             <td class="ar-actions">
>-                                                [% PROCESS actions menuid = "row" _ ar.id id_arg=ar.id format=ar.format pull_right='pull-right' aria_menu='ar-actions' %]
>+                                                [% PROCESS actions menuid = "row" _ ar.id id_arg=ar.id format=ar.format aria_menu='ar-actions' %]
>                                             </td>
>                                         </tr>
>                                     [% END %]
>@@ -398,7 +402,7 @@
>                                             </td>
>                                             <td class="ar-date" data-order="[% ar.created_on | html %]">[% ar.created_on | $KohaDates %]</td>
>                                             <td class="ar-actions">
>-                                                [% PROCESS actions menuid = "row" _ ar.id id_arg=ar.id format=ar.format pull_right='pull-right' aria_menu='ar-actions' %]
>+                                                [% PROCESS actions menuid = "row" _ ar.id id_arg=ar.id format=ar.format aria_menu='ar-actions' %]
>                                             </td>
>                                         </tr>
>                                     [% END %]
>@@ -502,7 +506,7 @@
>                                             </td>
>                                             <td class="ar-date" data-order="[% ar.created_on | html %]">[% ar.created_on | $KohaDates %]</td>
>                                             <td class="ar-actions">
>-                                                [% PROCESS actions menuid="table_" _ ar.id id_arg=ar.id format=ar.format pull_right='pull-right' aria_menu='ar-actions' %]
>+                                                [% PROCESS actions menuid="table_" _ ar.id id_arg=ar.id format=ar.format aria_menu='ar-actions' %]
>                                             </td>
>                                         </tr>
>                                     [% END %]
>diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/checkout-notes.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/checkout-notes.tt
>index 0f8e0528fd..96e7527fc7 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/checkout-notes.tt
>+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/checkout-notes.tt
>@@ -40,7 +40,7 @@
>                 [% IF Koha.Preference('CircSidebar') %]
>                     <div class="col-md-10 order-md-2 order-sm-1">
>                 [% ELSE %]
>-                    <div class="col-md-12 col-lg-10 col-lg-offset-1">
>+                    <div class="col-md-10 offset-md-1 col-lg-8 offset-lg-2">
>                 [% END %]
>                 [% INCLUDE 'messages.inc' %]
> 
>@@ -129,7 +129,7 @@
>                             </aside>
>                         </div> 
>                     [% ELSE %]
>-                        </div> 
>+                        </div> 
>                     [% END %]
> 
>                 </div> 
>diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/request-article.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/request-article.tt
>index eda9b013b2..7a00c9de14 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/request-article.tt
>+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/request-article.tt
>@@ -41,8 +41,8 @@
>                         [% IF ar_cancellation.count %]
>                             <ol>
>                                 <li>
>-                                    <label for="cancellation-reason" class="col-sm-4">Cancellation reason: </label>
>-                                    <select class="cancellation-reason col-sm-8" name="cancellation-reason" id="modal-cancellation-reason">
>+                                    <label for="cancellation-reason">Cancellation reason: </label>
>+                                    <select class="cancellation-reason" name="cancellation-reason" id="modal-cancellation-reason">
>                                         <option value="" selected>Other reasons</option>
>                                         [% FOREACH reason IN ar_cancellation %]
>                                             <option value="[% reason.authorised_value | html %]">[% reason.lib | html %]</option>
>@@ -50,8 +50,8 @@
>                                     </select>
>                                 </li>
>                                 <li>
>-                                    <div class="hint col-sm-offset-4">Enter reason</div>
>-                                    <input type="text" class="notes col-sm-offset-4 col-sm-8" name="notes" id="modal-notes"/>
>+                                    <label for="modal-notes">Enter reason</label>
>+                                    <input type="text" class="notes" name="notes" id="modal-notes" />
>                                 </li>
>                             </ol>
>                         [% END %]
>diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/clubs/templates-add-modify.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/clubs/templates-add-modify.tt
>index 8195f33ef9..be0ae811ca 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/modules/clubs/templates-add-modify.tt
>+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/clubs/templates-add-modify.tt
>@@ -203,7 +203,7 @@
>                 </fieldset>
>             </form>
> 
>-        </div> 
>+        </div> 
>     </div> 
> 
> 
>-- 
>2.39.5

Actions: View | Diff | Splinter Review

Attachments on bug 38380: 174082 | 174289 | 174655