Bugzilla – Attachment 146213 Details for
Bug 32769
Standardize structure around action fieldsets in administration
Home
|
New
|
Browse
|
Search
|
[?]
|
Reports
|
Help
|
New Account
|
Log In
[x]
|
Forgot Password
Login:
[x]
[patch]
Bug 32769: Standardize structure around action fieldsets in administration
Bug-32769-Standardize-structure-around-action-fiel.patch (text/plain), 9.51 KB, created by
Katrin Fischer
on 2023-02-05 13:32:01 UTC
(
hide
)
Description:
Bug 32769: Standardize structure around action fieldsets in administration
Filename:
MIME Type:
Creator:
Katrin Fischer
Created:
2023-02-05 13:32:01 UTC
Size:
9.51 KB
patch
obsolete
>From 75c4aa0e18d03e37b44bc79d57464962e6ca9fff Mon Sep 17 00:00:00 2001 >From: Owen Leonard <oleonard@myacpl.org> >Date: Tue, 31 Jan 2023 18:29:01 +0000 >Subject: [PATCH] Bug 32769: Standardize structure around action fieldsets in > administration > >This patch updates administration templates so that fieldsets with the >"action" class are placed outside the form's main fieldset. > >To test, apply the patch and check the following pages to confirm that >the forms look correct: > >- Administration > -> Keyboard shortcuts > -> Audio alerts > -> Share content with Mana KB > - When the ManaToken system preference is empty, the page should > have two forms with updated fieldsets: the form with the "Use > Mana KB..." field and a "Configure Mana KB" form. > - With a ManaToken defined the second form should be one labeled > "Mana KB token." > -> Budgets > - Click on a budget which has existing funds. > - In the page toolbar click Planning -> Plan by libraries. > - Check the forms in the sidebar. > -> System preferences -> OverDriveAuthName > - Follow the link to "OverDrive library authnames table" and check > the form on that page. > >Signed-off-by: Matt Blenkinsop <matt.blenkinsop@ptfs-europe.com> >Signed-off-by: Katrin Fischer <katrin.fischer.83@web.de> >--- > .../en/modules/admin/adveditorshortcuts.tt | 2 +- > .../prog/en/modules/admin/aqplan.tt | 14 +++++------ > .../prog/en/modules/admin/audio_alerts.tt | 4 ++-- > .../prog/en/modules/admin/overdrive.tt | 17 +++++++------ > .../prog/en/modules/admin/share_content.tt | 24 +++++++++---------- > 5 files changed, 30 insertions(+), 31 deletions(-) > >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/adveditorshortcuts.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/adveditorshortcuts.tt >index 9af7128fa4..3b27d3c017 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/adveditorshortcuts.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/adveditorshortcuts.tt >@@ -64,7 +64,7 @@ > [% END %] > </table> > </fieldset> >- </fieldset class="action"><input type="submit" class="btn btn-primary" value="Save shortcuts"></fieldset> >+ <fieldset class="action"><input type="submit" class="btn btn-primary" value="Save shortcuts"></fieldset> > </form> > [% ELSE %] > <p>Enable the advanced cataloging editor ( EnableAdvancedCatalogingEditor system preference) to define keyboard shortcuts</p> >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/aqplan.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/aqplan.tt >index a89abe7c61..29992d1436 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/aqplan.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/aqplan.tt >@@ -252,10 +252,10 @@ > <label for="show_actual">Show actual/estimated values</label> > </li> > </ol> >- <fieldset class="action"> >- <input type="submit" name="option_submit" class="btn btn-primary" value="Submit" /> >- <input type="hidden" name="budget_period_id" value="[% budget_period_id | html %]" /> >- </fieldset> >+</fieldset> >+<fieldset class="action"> >+ <input type="submit" name="option_submit" class="btn btn-primary" value="Submit" /> >+ <input type="hidden" name="budget_period_id" value="[% budget_period_id | html %]" /> > </fieldset> > </form> > [% IF ( budget_lines ) %] >@@ -277,13 +277,13 @@ > </select> > </li> > </ol> >+ <input type="hidden" name="budget_period_id" value="[% budget_period_id | html %]" /> >+ <input type="hidden" name="authcat" value="[% authcat | html %]" /> >+ </fieldset> > <fieldset class="action"> <input type="submit" class="btn btn-primary" value="Submit" /> > <input type="hidden" name="budget_period_id" value="[% budget_period_id | html %]" /> > <input type="hidden" name="report_name" value="[% report_name | html %]" /> > <input type="hidden" name="output" value="file" /></fieldset> >- <input type="hidden" name="budget_period_id" value="[% budget_period_id | html %]" /> >- <input type="hidden" name="authcat" value="[% authcat | html %]" /> >- </fieldset> > </form> > [% END %] > >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/audio_alerts.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/audio_alerts.tt >index dc1ef0a9fc..2019ff2830 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/audio_alerts.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/audio_alerts.tt >@@ -145,9 +145,9 @@ > </table> > </div> <!-- /.page-section --> > >- <p> >+ <fieldset class="action"> > <button id="delete-alerts" type="submit" class="btn btn-default disabled"><i class="fa fa-trash"></i> Delete selected alerts</button> >- </p> >+ </fieldset> > </form> > </main> > </div> <!-- /.col-sm-10.col-sm-push-2 --> >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/overdrive.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/overdrive.tt >index dd9b47907e..c0f495ade5 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/overdrive.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/overdrive.tt >@@ -37,10 +37,9 @@ > > <h1>OverDrive library authnames</h1> > >- <div class="page-section"> >- <form action="/cgi-bin/koha/admin/overdrive.pl" name="overdrive_form" method="post" class="validated"> >- <input type="hidden" name="op" value="update" /> >- >+ <form action="/cgi-bin/koha/admin/overdrive.pl" name="overdrive_form" method="post" class="validated"> >+ <input type="hidden" name="op" value="update" /> >+ <fieldset> > <table id="od_info"> > <thead> > <tr> >@@ -62,11 +61,11 @@ > [% END %] > </tbody> > </table> >- <div class="action"> >- <input type="submit" class="btn btn-primary" value="Submit" /> >- </div> >- </form> >- </div> <!-- /.page-section --> >+ </fieldset> >+ <div class="action"> >+ <input type="submit" class="btn btn-primary" value="Submit" /> >+ </div> >+ </form> > </main> > </div> <!-- /.col-sm-10.col-sm-push-2 --> > >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/share_content.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/share_content.tt >index 29f03081cd..48060ea7e5 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/share_content.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/share_content.tt >@@ -103,10 +103,10 @@ > <span class="hint">If checked, new subscriptions you create will be automatically shared with Mana KB.</span> > </li> > </ol> >- <fieldset class="action"> >- <input type="hidden" name="op" value="save" /> >- <input type="submit" class="btn btn-primary" value="Save" /> >- </fieldset> >+ </fieldset> >+ <fieldset class="action"> >+ <input type="hidden" name="op" value="save" /> >+ <input type="submit" class="btn btn-primary" value="Save" /> > </fieldset> > </form> > >@@ -127,10 +127,10 @@ > <div class="hint">Your unique security token used for authentication on Mana KB service (anti spam).</div> > </li> > </ol> >- <fieldset class="action"> >- <input type="hidden" name="op" value="reset" /> >- <input type="submit" class="btn btn-primary" value="Reset your token" /> >- </fieldset> >+ </fieldset> >+ <fieldset class="action"> >+ <input type="hidden" name="op" value="reset" /> >+ <input type="submit" class="btn btn-primary" value="Reset your token" /> > </fieldset> > </form> > [% ELSE %] >@@ -147,10 +147,10 @@ > <input id="email" type="text" name="email" size="45" required="required" /> > </li> > </ol> >- <fieldset class="action"> >- <input type="hidden" name="op" value="send" /> >- <input type="submit" class="btn btn-primary" value="Send to Mana KB" /> >- </fieldset> >+ </fieldset> >+ <fieldset class="action"> >+ <input type="hidden" name="op" value="send" /> >+ <input type="submit" class="btn btn-primary" value="Send to Mana KB" /> > </fieldset> > </form> > [% END %] >-- >2.30.2
You cannot view the attachment while viewing its details because your browser does not support IFRAMEs.
View the attachment on a separate page
.
View Attachment As Diff
View Attachment As Raw
Actions:
View
|
Diff
|
Splinter Review
Attachments on
bug 32769
:
145904
|
145956
| 146213