Attachment 157028 Details for Bug 33537 – Bug 33537: (QA follow-up) Modal UI fixes:

[patch] Bug 33537: (QA follow-up) Modal UI fixes:

Bug-33537-QA-follow-up-Modal-UI-fixes.patch (text/plain), 5.57 KB, created by Marcel de Rooy on 2023-10-13 07:31:06 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Marcel de Rooy

Created: 2023-10-13 07:31:06 UTC

Size: 5.57 KB

patch

obsolete

>From 23f9e0c6cdda1d215d7e5ae2999ce894cd833f9f Mon Sep 17 00:00:00 2001
>From: Pedro Amorim <pedro.amorim@ptfs-europe.com>
>Date: Fri, 25 Aug 2023 11:27:25 +0000
>Subject: [PATCH] Bug 33537: (QA follow-up) Modal UI fixes:
>Content-Type: text/plain; charset=utf-8
>
>Use ol instead of ul in modal fieldset inputs:
>This ol->ul change makes the UI inputs more spaced
>and overall more in line with other modals in Koha.
>
>Use 'btn-primary' on 'Save' button to have it be shown
>yellow as other confirmation buttons in Koha.
>
>Add a11y attributes to modal form
>
>Also prettied HTML code:
>git show --ignore-all-space <commit_hash>
>
>Signed-off-by: Pedro Amorim <pedro.amorim@ptfs-europe.com>
>
>Signed-off-by: Marcel de Rooy <m.de.rooy@rijksmuseum.nl>
>---
> .../prog/en/modules/admin/domain_limits.tt    | 75 ++++++++++---------
> 1 file changed, 40 insertions(+), 35 deletions(-)
>
>diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/domain_limits.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/domain_limits.tt
>index a830de71a7..5081b001ec 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/domain_limits.tt
>+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/domain_limits.tt
>@@ -12,42 +12,47 @@
> [% INCLUDE 'prefs-admin-search.inc' %]
> 
> [% BLOCK modal_form %]
>-<div id="domain_limits_modal" class="modal" role="dialog" aria-hidden="true">
>-<div class="modal-dialog">
>-<div class="modal-content">
>-<form class="modal-form">
>-    <div class="modal-header">
>-        <h3 class="modal-title add">Add domain limit</h4>
>-        <h3 class="modal-title add_member">Add member</h4>
>-        <h3 class="modal-title edit edit_member">Edit domain limit</h4>
>+<div id="domain_limits_modal" class="modal" tabindex="-1" role="dialog" aria-labelledby="domain_limits_modal" aria-hidden="true">
>+    <div class="modal-dialog">
>+        <div class="modal-content">
>+            <form class="modal-form">
>+                <div class="modal-header">
>+                    <h3 class="modal-title add">Add domain limit</h4>
>+                    <h3 class="modal-title add_member">Add member</h4>
>+                    <h3 class="modal-title edit edit_member">Edit domain limit</h4>
>+                </div>
>+                <div class="modal-body">
>+                    <fieldset class="rows">
>+                        <ol>
>+                            <li class="add edit add_member edit_member"><label for="domain_name" class="">Domain name</label>
>+                                <input type="text" name="domain_name" class="" required/>
>+                            </li>
>+                            <li class="add edit"><label for="domain_limit">Message limit</label>
>+                                <input type="text" name="domain_limit" class="toggle_validation" required inputmode="numeric" pattern="[0-9]*"/>
>+                            </li>
>+                            <li class="add edit"><label for="units">Units</label></td>
>+                                <input type="text" name="units" class="toggle_validation" required inputmode="numeric" pattern="[0-9]*"/>
>+                            </li>
>+                            <li class="add edit"><label for="unit_type">Unit type</label>
>+                                <select name="unit_type" class="toggle_validation" required>
>+                                    <option value="days"   >days   </option>
>+                                    <option value="hours"  >hours  </option>
>+                                    <option value="minutes">minutes</option>
>+                                </select>
>+                            </li>
>+                            <li class="add_member edit_member"><label for="group_domain">Group domain</label>
>+                                <input type="text" name="group_domain" class="" disabled/>
>+                            </li>
>+                        </ol>
>+                    </fieldset>
>+                </div>
>+                <div class="modal-footer">
>+                    <button class="btn btn-primary save" data-dismiss="modal" role="button">Save</button>
>+                    <button class="btn btn-default cancel" data-dismiss="modal" role="button">Cancel</button>
>+                </div>
>+            </form>
>+        </div>
>     </div>
>-    <div class="modal-body"><fieldset class="rows"><ul>
>-        <li class="add edit add_member edit_member"><label for="domain_name" class="">Domain name</label>
>-        <input type="text" name="domain_name" class="" required/></li>
>-
>-        <li class="add edit"><label for="domain_limit">Message limit</label>
>-        <input type="text" name="domain_limit" class="toggle_validation" required inputmode="numeric" pattern="[0-9]*"/></li>
>-
>-        <li class="add edit"><label for="units">Units</label></td>
>-        <input type="text" name="units" class="toggle_validation" required inputmode="numeric" pattern="[0-9]*"/></li>
>-
>-        <li class="add edit"><label for="unit_type">Unit type</label>
>-        <select name="unit_type" class="toggle_validation" required>
>-            <option value="days"   >days   </option>
>-            <option value="hours"  >hours  </option>
>-            <option value="minutes">minutes</option>
>-        </select></li>
>-
>-        <li class="add_member edit_member"><label for="group_domain">Group domain</label>
>-        <input type="text" name="group_domain" class="" disabled/></li>
>-    </ul></fieldset></div>
>-    <div class="modal-footer">
>-        <button class="btn btn-default save" data-dismiss="modal" role="button">Save</button>
>-        <button class="btn btn-default cancel" data-dismiss="modal" role="button">Cancel</button>
>-    </div>
>-</form>
>-</div>
>-</div>
> </div>
> [% END %]
> 
>-- 
>2.30.2

Actions: View | Diff | Splinter Review

Attachments on bug 33537: 153351 | 153352 | 153353 | 153354 | 153355 | 153356 | 153357 | 153358 | 153359 | 153361 | 153362 | 153363 | 153364 | 154769 | 154770 | 154771 | 154772 | 154773 | 154774 | 154775 | 154776 | 154777 | 154778 | 154779 | 154818 | 154819 | 154820 | 154821 | 154822 | 154823 | 154824 | 154825 | 154826 | 154827 | 154828 | 154829 | 154830 | 154831 | 154832 | 154833 | 154869 | 154870 | 154871 | 154872 | 154873 | 157017 | 157018 | 157019 | 157020 | 157021 | 157022 | 157023 | 157024 | 157025 | 157026 | 157027 | 157028 | 157029 | 157030 | 157031 | 157032 | 157038 | 157039 | 157040 | 157041 | 157042 | 157043 | 157044 | 157045 | 157046 | 157047 | 157048