Bugzilla – Attachment 155035 Details for
Bug 34400
Inconsistencies in OAI sets page titles, breadcrumbs, and header
Home
|
New
|
Browse
|
Search
|
[?]
|
Reports
|
Help
|
New Account
|
Log In
[x]
|
Forgot Password
Login:
[x]
[patch]
Bug 34400: Inconsistencies in OAI sets page titles, breadcrumbs, and header
Bug-34400-Inconsistencies-in-OAI-sets-page-titles-.patch (text/plain), 6.07 KB, created by
Owen Leonard
on 2023-08-31 18:41:43 UTC
(
hide
)
Description:
Bug 34400: Inconsistencies in OAI sets page titles, breadcrumbs, and header
Filename:
MIME Type:
Creator:
Owen Leonard
Created:
2023-08-31 18:41:43 UTC
Size:
6.07 KB
patch
obsolete
>From a16d72bff2cfca4c7c87671386ac71758184a148 Mon Sep 17 00:00:00 2001 >From: Owen Leonard <oleonard@myacpl.org> >Date: Fri, 25 Aug 2023 16:35:18 +0000 >Subject: [PATCH] Bug 34400: Inconsistencies in OAI sets page titles, > breadcrumbs, and header > >This patch fixes a couple of inconsistencies in the style of the >OIA sets administration screen, making sure the page title, breadcrumb >navigation, and page headers are consistent with each other. > >The patch also corrects the structure of the form on the OAI set >mappings page so that the submit button is outside the "page-section" >area. > >To test, apply the patch and go to Administration -> OAI sets. Test each >variation of the page: > >- Main page >- New OAI set >- Edit OAI set >- OAI set mappings >--- > .../prog/en/modules/admin/oai_set_mappings.tt | 20 +++++++++---------- > .../prog/en/modules/admin/oai_sets.tt | 18 +++++++++-------- > 2 files changed, 20 insertions(+), 18 deletions(-) > >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/oai_set_mappings.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/oai_set_mappings.tt >index fe64fd4b8c..ce6e837231 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/oai_set_mappings.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/oai_set_mappings.tt >@@ -4,7 +4,7 @@ > [% SET footerjs = 1 %] > [% INCLUDE 'doc-head-open.inc' %] > <title>[% FILTER collapse %] >- [% t("OAI set mappings") | html %] › >+ [% tx("Mappings for set '{oai_set}'", { oai_set = setSpec }) | html %] › > [% t("OAI sets") | html %] › > [% t("Administration") | html %] › > [% t("Koha") | html %] >@@ -26,7 +26,7 @@ > <a href="/cgi-bin/koha/admin/oai_sets.pl">OAI sets configuration</a> > [% END %] > [% WRAPPER breadcrumb_item bc_active= 1 %] >- <span>OAI set mappings</span> >+ [% tx("Mappings for set '{oai_set}'", { oai_set = setSpec }) | html %] > [% END %] > [% END #/ WRAPPER breadcrumbs %] > [% END #/ WRAPPER sub-header.inc %] >@@ -42,13 +42,13 @@ > <p><a href="/cgi-bin/koha/admin/oai_sets.pl">Return to sets management</a></p> > </div> > [% END %] >- <h1>Mappings for set '[% setName | html %]' ([% setSpec | html %])</h1> >+ <h1>[% tx("Mappings for set '{oai_set}'", { oai_set = setSpec }) | html %]</h1> > [% UNLESS ( mappings ) %] > <div class="dialog alert"><p><strong>Warning:</strong> No mappings have been defined for this set</p></div> > [% END %] > >- <div class="page-section"> >- <form action="/cgi-bin/koha/admin/oai_set_mappings.pl" method="post" id="mappingform"> >+ <form action="/cgi-bin/koha/admin/oai_set_mappings.pl" method="post" id="mappingform"> >+ <div class="page-section"> > <table id="mappings"> > <thead> > <tr> >@@ -132,11 +132,11 @@ > </table> > <input type="hidden" name="id" value="[% id | html %]" /> > <input type="hidden" name="op" value="save" /> >- <fieldset class="action"> >- <input type="submit" class="btn btn-primary" value="Save" /> <a class="cancel" href="/cgi-bin/koha/admin/oai_sets.pl">Cancel</a> >- </fieldset> >- </form> >- </div> <!-- /.page-section --> >+ </div> <!-- /.page-section --> >+ <fieldset class="action"> >+ <input type="submit" class="btn btn-primary" value="Save" /> <a class="cancel" href="/cgi-bin/koha/admin/oai_sets.pl">Cancel</a> >+ </fieldset> >+ </form> > > </main> > </div> <!-- /.col-sm-10.col-sm-push-2 --> >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/oai_sets.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/oai_sets.tt >index 928cff31ec..8a82e5f44d 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/oai_sets.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/oai_sets.tt >@@ -5,9 +5,11 @@ > [% INCLUDE 'doc-head-open.inc' %] > <title>[% FILTER collapse %] > [% IF ( op_new ) %] >- [% t("Add a new OAI set") | html %] › >+ [% t("New OAI set") | html %] › >+ [% ELSIF ( op_mod ) %] >+ [% tx("Modify OAI set '{oai_set}'", { oai_set = spec }) | html %] › > [% END %] >- [% t("OAI sets configuration") | html %] › >+ [% t("OAI sets") | html %] › > [% t("Administration") | html %] › > [% t("Koha") | html %] > [% END %]</title> >@@ -27,23 +29,23 @@ > > [% IF ( op_new || op_mod ) %] > [% WRAPPER breadcrumb_item %] >- <a href="/cgi-bin/koha/admin/oai_sets.pl">OAI sets configuration</a> >+ <a href="/cgi-bin/koha/admin/oai_sets.pl">OAI sets</a> > [% END %] > [% END %] > > [% IF ( op_new ) %] > [% WRAPPER breadcrumb_item bc_active= 1 %] >- <span>Add a new OAI set</span> >+ <span>New OAI set</span> > [% END %] > > [% ELSIF ( op_mod ) %] > [% WRAPPER breadcrumb_item bc_active= 1 %] >- <span>Edit OAI set '[% spec | html %]'</span> >+ [% tx("Modify OAI set '{oai_set}'", { oai_set = spec }) | html %] > [% END %] > > [% ELSE %] > [% WRAPPER breadcrumb_item bc_active= 1 %] >- <span>OAI sets configuration</span> >+ <span>OAI sets</span> > [% END %] > [% END %] > [% END #/ WRAPPER breadcrumbs %] >@@ -57,10 +59,10 @@ > [% IF ( op_new || op_mod ) %] > <form method="post" action="/cgi-bin/koha/admin/oai_sets.pl" class="validated"> > [% IF ( op_new ) %] >- <h1>Add a new OAI set</h1> >+ <h1>New OAI set</h1> > <input type="hidden" name="op" value="savenew" /> > [% ELSIF ( op_mod ) %] >- <h1>Edit OAI set '[% spec | html %]'</h1> >+ <h1>[% tx("Modify OAI set '{oai_set}'", { oai_set = spec }) | html %]</h1> > <input type="hidden" name="op" value="savemod" /> > <input type="hidden" name="id" value="[% id | html %]" /> > [% 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 34400
:
155035
|
155261
|
155495
|
155755