Attachment 101870 Details for Bug 24982 – Bug 24982: (follow-up) Give checkboxes more structured layout

[patch] Bug 24982: (follow-up) Give checkboxes more structured layout

Bug-24982-follow-up-Give-checkboxes-more-structure.patch (text/plain), 7.49 KB, created by Kyle M Hall (khall) on 2020-03-26 15:16:13 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Kyle M Hall (khall)

Created: 2020-03-26 15:16:13 UTC

Size: 7.49 KB

patch

obsolete

>From 4968854b3914742eb568043d58ff11d388063cd9 Mon Sep 17 00:00:00 2001
>From: Owen Leonard <oleonard@myacpl.org>
>Date: Thu, 26 Mar 2020 12:48:02 +0000
>Subject: [PATCH] Bug 24982: (follow-up) Give checkboxes more structured layout
>
>This patch makes minor markup changes and adds some CSS so that the
>module and actions checkboxes are laid out a little more clearly.
>
>The patch includes some whitespace changes, so diff accordingly.
>
>Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>
>---
> .../prog/en/modules/tools/viewlog.tt          | 57 ++++++++++++-------
> 1 file changed, 35 insertions(+), 22 deletions(-)
>
>diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/viewlog.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/viewlog.tt
>index e496ff7724..f167cfc4b4 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/viewlog.tt
>+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/viewlog.tt
>@@ -18,8 +18,17 @@
> <style>
> fieldset.rows label.viewlog {
>     float: none;
>-    padding-left: 15px;
>     font-weight: normal;
>+    margin: 0;
>+    min-width: 9em;
>+    padding: .5em;
>+    text-align: left;
>+    white-space: nowrap;
>+    width: auto;
>+}
>+.log_modules {
>+    display: flex;
>+    flex-wrap: wrap;
> }
> </style>
> </head>
>@@ -108,37 +117,41 @@ fieldset.rows label.viewlog {
>                             [% UNLESS src == "circ" %]
>                                 <li>
>                                     <label for="modules">Modules:</label>
>-                                    [% UNLESS modules %]
>-                                        <label for="moduleALL" class="viewlog">All <input type="checkbox" id="moduleALL" name="modules" value="" checked="checked"></label>
>-                                    [% ELSE %]
>-                                        <label for="moduleALL" class="viewlog">All <input type="checkbox" id="moduleALL" name="modules" value=""></label>
>-                                    [% END %]
>-                                    [% FOREACH modx IN [ 'CATALOGUING' 'AUTHORITIES' 'MEMBERS' 'ACQUISITIONS' 'SERIAL' 'HOLDS' 'ILL' 'CIRCULATION' 'LETTER' 'FINES' 'SYSTEMPREFERENCE' 'CRONJOBS', 'REPORTS' ] %]
>-                                        [% IF modules.grep(modx).size %]
>-                                            <label for="module[% modx | html %]" class="viewlog">[% PROCESS translate_log_module module=modx %] <input type="checkbox" id="module[% modx | html %]" name="modules" value="[% modx | html %]" checked="checked"></label>
>+                                    <div class="log_modules">
>+                                        [% UNLESS modules %]
>+                                            <label for="moduleALL" class="viewlog">All <input type="checkbox" id="moduleALL" name="modules" value="" checked="checked"></label>
>                                         [% ELSE %]
>-                                            <label for="module[% modx | html %]" class="viewlog">[% PROCESS translate_log_module module=modx %] <input type="checkbox" id="module[% modx | html %]" name="modules" value="[% modx | html %]"></label>
>+                                            <label for="moduleALL" class="viewlog">All <input type="checkbox" id="moduleALL" name="modules" value=""></label>
>                                         [% END %]
>-                                    [% END %]
>+                                        [% FOREACH modx IN [ 'CATALOGUING' 'AUTHORITIES' 'MEMBERS' 'ACQUISITIONS' 'SERIAL' 'HOLDS' 'ILL' 'CIRCULATION' 'LETTER' 'FINES' 'SYSTEMPREFERENCE' 'CRONJOBS', 'REPORTS' ] %]
>+                                            [% IF modules.grep(modx).size %]
>+                                                <label for="module[% modx | html %]" class="viewlog">[% PROCESS translate_log_module module=modx %] <input type="checkbox" id="module[% modx | html %]" name="modules" value="[% modx | html %]" checked="checked"></label>
>+                                            [% ELSE %]
>+                                                <label for="module[% modx | html %]" class="viewlog">[% PROCESS translate_log_module module=modx %] <input type="checkbox" id="module[% modx | html %]" name="modules" value="[% modx | html %]"></label>
>+                                            [% END %]
>+                                        [% END %]
>+                                    </div>
>                                 </li>
>                             [% ELSE %]
>                                 <input type="hidden" name="modules" value="MEMBERS" />
>                             [% END %]
>                             <li>
>                                 <label for="actions">Actions:</label>
>-                                [% UNLESS actions %]
>-                                    <label for="actionALL" class="viewlog">All <input type="checkbox" id="actionALL" name="actions" value="" checked="checked"></label>
>-                                [% ELSE %]
>-                                    <label for="actionALL" class="viewlog">All <input type="checkbox" id="actionALL" name="actions" value=""></label>
>-                                [% END %]
>-
>-                                [% FOREACH actx IN [ 'ADD' 'DELETE' 'MODIFY' 'ISSUE' 'RETURN' 'RENEW' 'CREATE' 'CANCEL' 'SUSPEND' 'RESUME' 'ADDCIRCMESSAGE' 'DELCIRCMESSAGE' 'STATUS_CHANGE' 'CHANGE PASS' 'Run' ] %]
>-                                    [% IF actions.grep(actx).size %]
>-                                        <label for="action[% actx | html %]" class="viewlog">[% PROCESS translate_log_action action=actx %] <input type="checkbox" id="action[% actx | html %]" name="actions" value="[% actx | html %]" checked="checked"></label>
>+                                <div class="log_modules">
>+                                    [% UNLESS actions %]
>+                                        <label for="actionALL" class="viewlog">All <input type="checkbox" id="actionALL" name="actions" value="" checked="checked"></label>
>                                     [% ELSE %]
>-                                        <label for="action[% actx | html %]" class="viewlog">[% PROCESS translate_log_action action=actx %] <input type="checkbox" id="action[% actx | html %]" name="actions" value="[% actx | html %]"></label>
>+                                        <label for="actionALL" class="viewlog">All <input type="checkbox" id="actionALL" name="actions" value=""></label>
>                                     [% END %]
>-                                [% END %]
>+
>+                                    [% FOREACH actx IN [ 'ADD' 'DELETE' 'MODIFY' 'ISSUE' 'RETURN' 'RENEW' 'CREATE' 'CANCEL' 'SUSPEND' 'RESUME' 'ADDCIRCMESSAGE' 'DELCIRCMESSAGE' 'STATUS_CHANGE' 'CHANGE PASS' 'Run' ] %]
>+                                        [% IF actions.grep(actx).size %]
>+                                            <label for="action[% actx | html %]" class="viewlog">[% PROCESS translate_log_action action=actx %] <input type="checkbox" id="action[% actx | html %]" name="actions" value="[% actx | html %]" checked="checked"></label>
>+                                        [% ELSE %]
>+                                            <label for="action[% actx | html %]" class="viewlog">[% PROCESS translate_log_action action=actx %] <input type="checkbox" id="action[% actx | html %]" name="actions" value="[% actx | html %]"></label>
>+                                        [% END %]
>+                                    [% END %]
>+                                </div>
>                             </li>
>                             <li>
>                                 [% IF src == 'circ' %]
>-- 
>2.21.1 (Apple Git-122.3)

Actions: View | Diff | Splinter Review

Attachments on bug 24982: 101781 | 101782 | 101799 | 101824 | 101845 | 101860 | 101861 | 101862 | 101869 | 101870 | 101871 | 101872