Bugzilla – Attachment 145874 Details for
Bug 32633
Add 'page-section' to cataloging and authority pages
Home
|
New
|
Browse
|
Search
|
[?]
|
Reports
|
Help
|
New Account
|
Log In
[x]
|
Forgot Password
Login:
[x]
[patch]
Bug 32633: (QA follow-up) Add handling for authorities merge
Bug-32633-QA-follow-up-Add-handling-for-authoritie.patch (text/plain), 3.63 KB, created by
Martin Renvoize (ashimema)
on 2023-01-31 14:19:14 UTC
(
hide
)
Description:
Bug 32633: (QA follow-up) Add handling for authorities merge
Filename:
MIME Type:
Creator:
Martin Renvoize (ashimema)
Created:
2023-01-31 14:19:14 UTC
Size:
3.63 KB
patch
obsolete
>From e4717279ec8a880ccb8c2454b4c90bc808912133 Mon Sep 17 00:00:00 2001 >From: Martin Renvoize <martin.renvoize@ptfs-europe.com> >Date: Tue, 31 Jan 2023 14:15:53 +0000 >Subject: [PATCH] Bug 32633: (QA follow-up) Add handling for authorities merge > >When you first click 'actions -> merge' from a result in the authories >search page you will see a new 'Merging with authority: ' text appear at >the top of the search results. > >Prior to this patch, the text appears outside of the white page-section >and is almost un-noticable. > >After this patch, we add a page-section with bg-info (blue backround) >around the merge message which makes it stand up more clearly. > >Signed-off-by: Martin Renvoize <martin.renvoize@ptfs-europe.com> >--- > koha-tmpl/intranet-tmpl/prog/en/includes/authorities_js.inc | 6 +++--- > .../prog/en/modules/authorities/authorities-home.tt | 2 +- > .../prog/en/modules/authorities/searchresultlist.tt | 2 +- > 3 files changed, 5 insertions(+), 5 deletions(-) > >diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/authorities_js.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/authorities_js.inc >index 6666c5b03d7..4c82cd05a11 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/includes/authorities_js.inc >+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/authorities_js.inc >@@ -21,14 +21,14 @@ function showMergingInProgress() { > var alreadySelected = Cookies.get('auth_to_merge'); > if (alreadySelected !== undefined) { > alreadySelected = JSON.parse(alreadySelected); >- $('#merge_in_progress').html(_("Merging with authority: ") + "<a href='detail.pl?authid=" + alreadySelected.authid + "'><span class='authorizedheading'>" + alreadySelected.summary + "</span> (" + alreadySelected.authid + ")</a> <a href='#' id='cancel_merge'>" + _("Cancel merge") + "</a>"); >+ $('#merge_in_progress').show().html(_("Merging with authority: ") + "<a href='detail.pl?authid=" + alreadySelected.authid + "'><span class='authorizedheading'>" + alreadySelected.summary + "</span> (" + alreadySelected.authid + ")</a> <a href='#' id='cancel_merge'>" + _("Cancel merge") + "</a>"); > $('#cancel_merge').click(function(event) { > event.preventDefault(); > Cookies.remove('auth_to_merge'); >- $('#merge_in_progress').empty(); >+ $('#merge_in_progress').hide().empty(); > }); > } else { >- $('#merge_in_progress').empty(); >+ $('#merge_in_progress').hide().empty(); > } > } > >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/authorities/authorities-home.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/authorities/authorities-home.tt >index 59733487c73..0898c002992 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/authorities/authorities-home.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/authorities/authorities-home.tt >@@ -32,7 +32,7 @@ > > <h1>Authorities</h1> > >- <div id="merge_in_progress"></div> >+ <div id="merge_in_progress" class="page-section bg-info" style="display:none;"></div> > > </div> > </div> >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/authorities/searchresultlist.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/authorities/searchresultlist.tt >index aca1a9e9343..be85ed01655 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/authorities/searchresultlist.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/authorities/searchresultlist.tt >@@ -48,7 +48,7 @@ > [% INCLUDE 'authorities-toolbar.inc' %] > <h1>Authority search results</h1> > >-<div id="merge_in_progress"></div> >+<div id="merge_in_progress" class="page-section bg-info" style="display:none;"></div> > <div class="page-section"> > [% IF ( total ) %] > <div class="pages">[% pagination_bar | $raw %]</div> >-- >2.39.1
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 32633
:
145302
|
145340
|
145872
|
145873
| 145874