Bugzilla – Attachment 155233 Details for
Bug 34412
Inconsistencies in system preferences page titles, breadcrumbs, and header
Home
|
New
|
Browse
|
Search
|
[?]
|
Reports
|
Help
|
New Account
|
Log In
[x]
|
Forgot Password
Login:
[x]
[patch]
Bug 34412: Inconsistencies in System preferences page titles, breadcrumbs, and header
Bug-34412-Inconsistencies-in-System-preferences-pa.patch (text/plain), 11.14 KB, created by
Owen Leonard
on 2023-09-05 18:25:06 UTC
(
hide
)
Description:
Bug 34412: Inconsistencies in System preferences page titles, breadcrumbs, and header
Filename:
MIME Type:
Creator:
Owen Leonard
Created:
2023-09-05 18:25:06 UTC
Size:
11.14 KB
patch
obsolete
>From 71e3fff6ce21b95b5db603ce0e92097968203f92 Mon Sep 17 00:00:00 2001 >From: Owen Leonard <oleonard@myacpl.org> >Date: Tue, 5 Sep 2023 17:58:58 +0000 >Subject: [PATCH] Bug 34412: Inconsistencies in System preferences page titles, > breadcrumbs, and header > >This patch makes changes to the markup of various areas of the local use >system preferences template in order to make it more consistent with >other pages in Koha. > >To test, apply the patch and go to Administration -> System >preferences -> Local use. View each variation of the page to confirm >that breadcrumb navigation, page title, and page headings are consistent >with each other. > >- On the main page confirm that the heading is "Local use system > preferences" > - New preference: > - The form on this page has been updated to make the markup > structure more consistent with other pages, with the heading > outside the white box of the form. > - The two portions of the form have been combined into one so that > the layout of the form is more consistent with similar forms. > - Edit preference > - Delete: > - The deletion confirmation page has been reformatted to use an > "alert" style dialog with styled confirmation buttons. > - The "Data deleted" view has been reformatted to use a "message" > style dialog. >--- > .../en/modules/admin/systempreferences.tt | 124 ++++++++++-------- > 1 file changed, 68 insertions(+), 56 deletions(-) > >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/systempreferences.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/systempreferences.tt >index 0da7d14c82..8d2deedd0c 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/systempreferences.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/systempreferences.tt >@@ -7,21 +7,21 @@ > <title>[% FILTER collapse %] > [% IF ( add_form ) %] > [% IF ( modify ) %] >- [% tx("Modify system preference '{searchfield}'", { searchfield = searchfield }) | html %] >+ [% tx("Modify preference '{searchfield}'", { searchfield = searchfield }) | html %] > [% ELSE %] >- [% t("Add a system preference") | html %] >+ [% t("New preference") | html %] > [% END %] › > [% END %] > [% IF ( add_validate ) %] >- [% t("Data added") | html %] › >+ [% t("Preference added") | html %] › > [% END %] > [% IF ( delete_confirm ) %] >- [% tx("Confirm deletion of parameter '{searchfield}'", { searchfield = searchfield }) | html %] › >+ [% tx("Confirm deletion of preference '{searchfield}'", { searchfield = searchfield }) | html %] › > [% END %] > [% IF ( delete_confirmed ) %] >- [% t("Parameter deleted") | html %] › >+ [% t("Preference deleted") | html %] › > [% END %] >- [% t("System preferences") | html %] › >+ [% t("Local use system preferences") | html %] › > [% t("Administration") | html %] › > [% t("Koha") | html %] > [% END %]</title> >@@ -41,16 +41,16 @@ > > [% IF ( add_form || add_validate || delete_confirm || delete_confirmed ) %] > [% WRAPPER breadcrumb_item %] >- <a href="/cgi-bin/koha/admin/systempreferences.pl">System preferences</a> >+ <a href="/cgi-bin/koha/admin/systempreferences.pl">Local use system preferences</a> > [% END %] > [% END %] > > [% IF ( add_form ) %] > [% WRAPPER breadcrumb_item bc_active= 1 %] > [% IF ( modify ) %] >- <span>Modify system preference '[% searchfield | html %]'</span> >+ <span>Modify preference '[% searchfield | html %]'</span> > [% ELSE %] >- <span>Add a system preference</span> >+ <span>New preference</span> > [% END %] > [% END %] > [% END %] >@@ -66,19 +66,19 @@ > <a href="/cgi-bin/koha/admin/systempreferences.pl?op=add_form&searchfield=[% searchfield | uri %]">[% searchfield | html %]</a> > [% END %] > [% WRAPPER breadcrumb_item bc_active= 1 %] >- <span>Confirm deletion of parameter '[% searchfield | html %]'</span> >+ <span>Confirm deletion of preference '[% searchfield | html %]'</span> > [% END %] > [% END %] > > [% IF ( delete_confirmed ) %] > [% WRAPPER breadcrumb_item bc_active= 1 %] >- <span>Parameter deleted</span> >+ <span>Preference deleted</span> > [% END %] > [% END %] > > [% IF ( else ) %] > [% WRAPPER breadcrumb_item bc_active= 1 %] >- <span>System preferences</span> >+ <span>Local use system preferences</span> > [% END %] > [% END %] > [% END #/ WRAPPER breadcrumbs %] >@@ -90,18 +90,22 @@ > <main> > > [% IF ( add_form ) %] >+ <h1> >+ [% IF ( modify ) %] >+ Modify a local use system preference >+ [% ELSE %] >+ New local use system preference >+ [% END %] >+ </h1> >+ > [% IF ( type_upload ) %] > <form action="[% script_name | html %]" name="Aform" method="post" enctype="multipart/form-data"> > [% ELSE %] > <form action="[% script_name | html %]" name="Aform" method="post"> > [% END %] >- <fieldset class="rows"><legend> >- <h1> >- [% IF ( modify ) %]Modify >- [% ELSE %]Add >- [% END %] a system preference >- </h1> >- </legend><ol> >+ <fieldset class="rows"> >+ <legend class="sr-only">Preference details</legend> >+ <ol> > <li><label for="explanation">Explanation: </label><input type="text" name="explanation" id="explanation" size="60" value="[% explanation | html %]" /><input type="hidden" name="op" value="add_validate" /></li> > <li>[% IF ( searchfield ) %]<span class="label">Variable: </span>[% searchfield | html %]<input type="hidden" name="variable" value="[% searchfield | html %]" /> > [% ELSE %]<label for="variable">Variable: </label><input type="text" name="variable" id="variable" size="60" />[% END %]</li> >@@ -192,19 +196,7 @@ > <label for="value-no" class="yesno">OFF</label> > [% END %] > </li> >- </ol></fieldset> >- <fieldset class="action"><input type="submit" class="btn btn-primary" value="Save" /> >- [% IF ( return_tab ) %] >- <a class="cancel" href="/cgi-bin/koha/admin/systempreferences.pl?tab=[% return_tab | html %]">Cancel</a> >- [% ELSE %] >- <a class="cancel" href="/cgi-bin/koha/admin/systempreferences.pl">Cancel</a> >- [% END %] >- </fieldset> >- >- <fieldset class="brief"> >- <legend>Koha internal</legend> >- <div class="hint">Note: change the variable type to one of the dropdown values as needed</div> >- <ol> >+ > <li><label for="preftype">Variable type:</label> > <select name="preftype" id="preftype"> > [%- IF (preftype && preftype == 'Free') || !preftype -%] >@@ -263,11 +255,22 @@ > <option value="ClassSources">ClassSources</option> > [% END %] > </select> >+ <div class="hint">Note: change the variable type to one of the dropdown values as needed</div> > <li><label for="prefoptions">Variable options:</label> >- <div class="hint">(a choice list for choice (separated by |) or cols|rows for texarea)</div> >- <input type="text" name="prefoptions" id="prefoptions" value="[% prefoptions | html %]" size="60" maxlength="80" /></li> >+ <input type="text" name="prefoptions" id="prefoptions" value="[% prefoptions | html %]" size="60" maxlength="80" /> >+ <div class="hint">(a choice list for choice (separated by |) or cols|rows for texarea)</div> >+ </li> > </ol> > </fieldset> >+ >+ <fieldset class="action"><input type="submit" class="btn btn-primary" value="Save" /> >+ [% IF ( return_tab ) %] >+ <a class="cancel" href="/cgi-bin/koha/admin/systempreferences.pl?tab=[% return_tab | html %]">Cancel</a> >+ [% ELSE %] >+ <a class="cancel" href="/cgi-bin/koha/admin/systempreferences.pl">Cancel</a> >+ [% END %] >+ </fieldset> >+ > </form> > [% END %] > >@@ -280,30 +283,39 @@ > [% END %] > > [% IF ( delete_confirm ) %] >- <table> >- <caption><h1>Confirm deletion of [% searchfield | html %]?</h1></caption> >- <tr> >- <th>Variable name:</th> >- <td>[% searchfield | html %]</td> >- </tr> >- <tr><th>Value: </th><td> >- [% Tvalue | html %] >- </td></tr></table> >- <form class="inline" action="[% script_name | html %]" method="post"> >- <input type="hidden" name="op" value="delete_confirmed" /> >- <input type="hidden" name="searchfield" value="[% searchfield | html %]" /> >- <input type="hidden" name="Tvalue" value="[% Tvalue | html %]" /> >- <input type="submit" value="Yes, delete" /></form> >- <form class="inline" action="[% script_name | html %]" method="post"><input type="submit" value="No, do not delete" /></form> >+ <div class="dialog alert"> >+ <h1>Confirm deletion of [% searchfield | html %]?</h1> >+ <table> >+ <tr> >+ <th>Variable name:</th> >+ <td>[% searchfield | html %]</td> >+ </tr> >+ <tr> >+ <th>Value: </th> >+ <td>[% Tvalue | html %]</td> >+ </tr> >+ </table> >+ <form class="inline" action="[% script_name | html %]" method="post"> >+ <input type="hidden" name="op" value="delete_confirmed" /> >+ <input type="hidden" name="searchfield" value="[% searchfield | html %]" /> >+ <input type="hidden" name="Tvalue" value="[% Tvalue | html %]" /> >+ <button type="submit" class="approve"><i class="fa fa-check" aria-hidden="true"></i> Yes, delete</button> >+ </form> >+ <form class="inline" action="[% script_name | html %]" method="post"> >+ <button type="submit" class="deny"><i class="fa fa-remove" aria-hidden="true"></i> No, do not delete</button> >+ </form> >+ </div> > [% END %] >- >+ > [% IF ( delete_confirmed ) %] >- <h1>Data deleted</h1> >- <form action="[% script_name | html %]" method="post"> >- <input type="submit" class="btn btn-primary" value="Back to system preferences" /> >- </form> >+ <div class="dialog message"> >+ <h1>Data deleted</h1> >+ <form action="[% script_name | html %]" method="post"> >+ <button type="submit">Back to system preferences</button> >+ </form> >+ </div> > [% END %] >- >+ > [% IF ( else ) %] > > <div id="toolbar" class="btn-toolbar"> >@@ -314,7 +326,7 @@ > <p>Please click on one of the tabs at the left side of this form.</p> > <table> > [% ELSE %] >- <h1>Local use preferences</h1> >+ <h1>Local use system preferences</h1> > <div class="page-section"> > <table id="sysprefst"> > <thead><tr> >-- >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 34412
:
155233
|
155250
|
155262
|
155393
|
155401
|
155402
|
155403