Attachment 166778 Details for Bug 36864 – Bug 36864: Add classes/CSS/fix markup on request.tt

[patch] Bug 36864: Add classes/CSS/fix markup on request.tt

Bug-36864-Add-classesCSSfix-markup-on-requesttt.patch (text/plain), 8.31 KB, created by Martin Renvoize (ashimema) on 2024-05-15 13:51:14 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Martin Renvoize (ashimema)

Created: 2024-05-15 13:51:14 UTC

Size: 8.31 KB

patch

obsolete

>From 396e273bba7504a7746bd9f8154e699766be71ca Mon Sep 17 00:00:00 2001
>From: Lucas Gass <lucas@bywatersolutions.com>
>Date: Tue, 14 May 2024 21:06:52 +0000
>Subject: [PATCH] Bug 36864: Add classes/CSS/fix markup on request.tt
>
>To test:
>1. APPLY PATCH
>2. Regenerate CSS ( https://wiki.koha-community.org/wiki/Working_with_SCSS_in_the_OPAC_and_staff_interface )
>3. Place a hold
>4. On reserve/request.pl the 'Hold a specific item' fieldset should be
>   disabled by default.
>5. While disabled try clicking on the Allowed pickup locations
>   dropdowns, you should not be able to.
>6. In the 'Hold next available item', while enabled, you should be able
>   to interact with the dropdowns.
>7. Use the radio buttons to enable the 'Hold a specific item' fieldset.
>   You should now be able to interact with the dropdowns.
>
>Signed-off-by: Owen Leonard <oleonard@myacpl.org>
>Signed-off-by: Martin Renvoize <martin.renvoize@ptfs-europe.com>
>---
> .../prog/css/src/staff-global.scss            | 12 ++++
> .../prog/en/modules/reserve/request.tt        | 62 +++++++++----------
> 2 files changed, 41 insertions(+), 33 deletions(-)
>
>diff --git a/koha-tmpl/intranet-tmpl/prog/css/src/staff-global.scss b/koha-tmpl/intranet-tmpl/prog/css/src/staff-global.scss
>index f048744e8f2..334cd1e80c7 100644
>--- a/koha-tmpl/intranet-tmpl/prog/css/src/staff-global.scss
>+++ b/koha-tmpl/intranet-tmpl/prog/css/src/staff-global.scss
>@@ -4801,6 +4801,18 @@ div .suggestion_note {
>     }
> }
> 
>+#circ_request {
>+    fieldset {
>+        &.disabled {
>+            pointer-events: none;
>+        }
>+        &.rows:has(fieldset.enabled) {
>+            border: 1px solid #408540;
>+        }
>+    }
>+
>+}
>+
> @import "header";
> @import "toolbar";
> @import "forms";
>diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/reserve/request.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/reserve/request.tt
>index 7dca1e83ba2..f8e506abaa3 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/modules/reserve/request.tt
>+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/reserve/request.tt
>@@ -613,20 +613,18 @@
>                             </fieldset>
>                             <fieldset class="rows">
>                                 <legend>
>-                                    <button type="button">
>-                                        [% IF force_hold_level == 'item' || force_hold_level == 'item_group' %]
>-                                            <input type="radio" id="requestany" name="request" disabled="true" />
>-                                        [% ELSIF force_hold_level == 'record' %]
>-                                            <input type="radio" id="requestany" checked="checked" value="Any" disabled="true"/>
>-                                            <input type="hidden" name="request" value="Any"/>
>-                                            <span class="error"><i>(Required)</i></span>
>-                                        [% ELSE %]
>-                                            <input type="radio" id="requestany" name="request" checked="checked" value="Any" />
>-                                        [% END %]
>-                                        <label for="requestany" class="inline">
>-                                            Hold next available item
>-                                        </label>
>-                                    </button>
>+                                    [% IF force_hold_level == 'item' || force_hold_level == 'item_group' %]
>+                                        <input type="radio" id="requestany" name="request" disabled="true" />
>+                                    [% ELSIF force_hold_level == 'record' %]
>+                                        <input type="radio" id="requestany" checked="checked" value="Any" disabled="true"/>
>+                                        <input type="hidden" name="request" value="Any"/>
>+                                        <span class="error"><i>(Required)</i></span>
>+                                    [% ELSE %]
>+                                        <input type="radio" id="requestany" name="request" checked="checked" value="Any" />
>+                                    [% END %]
>+                                    <label for="requestany" class="inline">
>+                                        Hold next available item
>+                                    </label>
>                                 </legend>
>                                 <input type="hidden" name="alreadyreserved" value="[% alreadyreserved | html %]" />
>                                 <fieldset class="enable_request_any disable_request_group disable_request_specific">
>@@ -796,19 +794,17 @@
> 
>                         <fieldset class="rows">
>                             <legend>
>-                                <button type="button">
>-                                    [% IF force_hold_level == 'item' %]
>-                                         <input type="radio" id="requestspecificitem" name="request" class="requestspecific" checked="checked" disabled='disabled'/>
>-                                         <span class="error"><em>(Required)</em></span>
>-                                    [% ELSIF force_hold_level == 'record' || force_hold_level == 'item_group' %]
>-                                         <input type="radio" id="requestspecificitem" name="request" class="requestspecific" disabled='disabled'/>
>-                                    [% ELSE %]
>-                                         <input type="radio" id="requestspecificitem" name="request" class="requestspecific"/>
>-                                    [% END %]
>-                                    <label for="requestspecificitem" class="inline">
>-                                        Hold a specific item
>-                                    </label>
>-                                </button>
>+                                [% IF force_hold_level == 'item' %]
>+                                     <input type="radio" id="requestspecificitem" name="request" class="requestspecific" checked="checked" disabled='disabled'/>
>+                                     <span class="error"><em>(Required)</em></span>
>+                                [% ELSIF force_hold_level == 'record' || force_hold_level == 'item_group' %]
>+                                     <input type="radio" id="requestspecificitem" name="request" class="requestspecific" disabled='disabled'/>
>+                                [% ELSE %]
>+                                     <input type="radio" id="requestspecificitem" name="request" class="requestspecific"/>
>+                                [% END %]
>+                                <label for="requestspecificitem" class="inline">
>+                                    Hold a specific item
>+                                </label>
>                             </legend>
> 
>                             <fieldset class="enable_request_specific disable_request_any disable_request_group">
>@@ -1681,16 +1677,16 @@
> 
>         function ToggleHoldsToPlace() {
>             if ( $("#requestany").prop('checked') ) {
>-                $(".disable_request_any").prop('disabled',true);
>-                $(".enable_request_any").prop('disabled',false);
>+                $(".disable_request_any").prop('disabled',true).addClass('disabled').removeClass('enabled');
>+                $(".enable_request_any").prop('disabled',false).removeClass('disabled').addClass('enabled');
>                 $(".requestspecific,.requestgrp").prop('checked', false);
>             } else if( $(".requestspecific").prop('checked') ) {
>-                $(".disable_request_specific").prop('disabled',true);
>-                $(".enable_request_specific").prop('disabled',false);
>+                $(".disable_request_specific").prop('disabled',true).addClass('disabled').removeClass('enabled');
>+                $(".enable_request_specific").prop('disabled',false).removeClass('disabled').addClass('enabled');
>                 $("#requestany,.requestgrp").prop('checked', false);
>             } else {
>-                $(".disable_request_group").prop('disabled',true);
>-                $(".enable_request_group").prop('disabled',false);
>+                $(".disable_request_group").prop('disabled',true).addClass('disabled').removeClass('enabled');
>+                $(".enable_request_group").prop('disabled',false).removeClass('disabled').addClass('enabled');
>                 $("#requestany,.requestspecific").prop('checked', false);
>             }
>         }
>-- 
>2.45.0

Actions: View | Diff | Splinter Review

Attachments on bug 36864: 166743 | 166744 | 166768 | 166769 | 166778 | 166779