Bugzilla – Attachment 55345 Details for
Bug 17147
Streamline messages following batch record modification
Home
|
New
|
Browse
|
Search
|
[?]
|
Reports
|
Help
|
New Account
|
Log In
[x]
|
Forgot Password
Login:
[x]
[patch]
[SIGNED-OFF] Bug 17147 [Revised] Streamline messages following batch record modification
SIGNED-OFF-Bug-17147-Revised-Streamline-messages-f.patch (text/plain), 9.00 KB, created by
Owen Leonard
on 2016-09-08 14:43:56 UTC
(
hide
)
Description:
[SIGNED-OFF] Bug 17147 [Revised] Streamline messages following batch record modification
Filename:
MIME Type:
Creator:
Owen Leonard
Created:
2016-09-08 14:43:56 UTC
Size:
9.00 KB
patch
obsolete
>From 47ec306c3b16796f90f633c16af4661184712e51 Mon Sep 17 00:00:00 2001 >From: Owen Leonard <oleonard@myacpl.org> >Date: Thu, 18 Aug 2016 11:04:38 -0400 >Subject: [PATCH] [SIGNED-OFF] Bug 17147 [Revised] Streamline messages > following batch record modification >Content-Type: text/plain; charset="utf-8" > >This patch changes the display of informational messages during and >after the batch record modification process. Instead of showing a >separate dialog for each record modified, messages are now grouped into >one dialog. > >To test, apply the patch and clear your browser cache if necessary. You >must have at least one MARC modification template defined. > >- Go to Tools -> Batch record modification. >- Submit a list of biblionumbers which contains at least one number > which doesn't exist in your database. >- Confirm that warning and success messages are grouped instead of > showing in separate dialogs. >- Submit a list of biblionumbers using a MARC modification template > which contains no actions. Confirm that the resulting error message is > correctly formatted. > >Revision formats the error messages without the unordered list, which >was giving them padding which didn't look correct inside a dialog. > >Signed-off-by: Aleisha Amohia <aleishaamohia@hotmail.com> > >Edit for QA: Removed obsolete changes to CSS. >--- > koha-tmpl/intranet-tmpl/prog/css/staff-global.css | 12 ++- > .../en/modules/tools/batch_record_modification.tt | 85 +++++++++++++--------- > 2 files changed, 59 insertions(+), 38 deletions(-) > >diff --git a/koha-tmpl/intranet-tmpl/prog/css/staff-global.css b/koha-tmpl/intranet-tmpl/prog/css/staff-global.css >index 525cd0e..6e17ec9 100644 >--- a/koha-tmpl/intranet-tmpl/prog/css/staff-global.css >+++ b/koha-tmpl/intranet-tmpl/prog/css/staff-global.css >@@ -808,12 +808,17 @@ fieldset.rows .inputnote { > } > > /* Font Awesome icon */ >-.error i { >+i.success { >+ color: green; >+} >+ >+/* Font Awesome icon */ >+i.error { > color: #CC0000; > } > > /* Font Awesome icon */ >-.warn i { >+i.warn { > color: orange; > } > >@@ -1067,7 +1072,8 @@ div.alert strong { > border : 1px inset #999999; > } > >-.approve i.fa { >+.approve i.fa, >+.success i.fa { > color: green; > } > >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/batch_record_modification.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/batch_record_modification.tt >index 2d7d534..6a176d6 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/batch_record_modification.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/batch_record_modification.tt >@@ -91,35 +91,42 @@ $(document).ready(function() { > <div id="yui-main"> > <div class="yui-b"> > <h1>Batch record modification</h1> >- [% FOREACH message IN messages %] >- [% IF message.type == 'success' %] >- <div class="dialog message"> >- [% ELSIF message.type == 'warning' %] >- <div class="dialog alert"> >- [% ELSIF message.type == 'error' %] >- <div class="dialog error" style="margin:auto;"> >- [% END %] >- <td><a href="/cgi-bin/koha/catalogue/detail.pl?biblionumber=[% biblio.biblionumber %]">[% biblio.title %]</a></td> >- [% IF message.code == 'no_action_defined_for_the_template' %] >- The selected template (id=[% message.mmtid%]) does not exist or no action is defined. >- [% ELSIF message.code == 'biblio_not_exists' %] >- The biblionumber [% message.biblionumber %] does not exist in the database. >- [% ELSIF message.code == 'authority_not_exists' %] >- The authority id [% message.authid %] does not exist in the database. >- [% ELSIF message.code == 'biblio_not_modified' %] >- The biblio <a href="/cgi-bin/koha/catalogue/detail.pl?biblionumber=[% message.biblionumber %]">[% message.biblionumber %]</a> has not been modified. An error occurred on modifying it. >- [% ELSIF message.code == 'authority_not_modified' %] >- The authority <a href="/cgi-bin/koha/authorities/detail.pl?authid=[% message.authid %]">[% message.authid %]</a> has not been modified. An error occurred on modifying it. >- [% ELSIF message.code == 'biblio_modified' %] >- The biblio <a href="/cgi-bin/koha/catalogue/detail.pl?biblionumber=[% message.biblionumber %]">[% message.biblionumber %]</a> has successfully been modified. >- [% ELSIF message.code == 'authority_modified' %] >- The authority <a href="/cgi-bin/koha/authorities/detail.pl?authid=[% message.authid %]">[% message.authid %]</a> has successfully been modified. >- [% END %] >- [% IF message.error %] >- (The error was: [% message.error%], see the Koha logfile for more information). >+ >+ [% IF ( messages ) %] >+ <div class="dialog message"> >+ >+ [% FOREACH message IN messages %] >+ [% IF message.type == 'success' %] >+ <div><i class="fa fa-check success"></i> >+ [% ELSIF message.type == 'warning' %] >+ <div><i class="fa fa-warning warn"></i> >+ [% ELSIF message.type == 'error' %] >+ <div><i class="fa fa-exclamation error"></i> >+ [% END %] >+ [% IF message.code == 'no_action_defined_for_the_template' %] >+ The selected template (id=[% message.mmtid%]) does not exist or no action is defined. >+ [% ELSIF message.code == 'biblio_not_exists' %] >+ Bibliographic record [% message.biblionumber %] does not exist in the database. >+ [% ELSIF message.code == 'authority_not_exists' %] >+ Authority record [% message.authid %] does not exist in the database. >+ [% ELSIF message.code == 'biblio_not_modified' %] >+ Bibliographic record <a href="/cgi-bin/koha/catalogue/detail.pl?biblionumber=[% message.biblionumber %]">[% message.biblionumber %]</a> has not been modified. An error occurred on modifying it. >+ [% ELSIF message.code == 'authority_not_modified' %] >+ Authority record <a href="/cgi-bin/koha/authorities/detail.pl?authid=[% message.authid %]">[% message.authid %]</a> has not been modified. An error occurred on modifying it. >+ [% ELSIF message.code == 'biblio_modified' %] >+ Bibliographic record <a href="/cgi-bin/koha/catalogue/detail.pl?biblionumber=[% message.biblionumber %]">[% message.biblionumber %]</a> has successfully been modified. >+ [% ELSIF message.code == 'authority_modified' %] >+ Bibliographic record <a href="/cgi-bin/koha/authorities/detail.pl?authid=[% message.authid %]">[% message.authid %]</a> has successfully been modified. >+ [% END %] >+ [% IF message.error %] >+ (The error was: [% message.error%]. See the Koha logfile for more information). >+ [% END %] >+ </div> >+ [% END %] >+ >+ </div> > [% END %] >- </div> >- [% END %] >+ > [% IF view == 'form' %] > <form method="post" enctype="multipart/form-data" action="/cgi-bin/koha/tools/batch_record_modification.pl"> > <fieldset class="rows"> >@@ -257,24 +264,32 @@ $(document).ready(function() { > </div> > </form> > [% ELSE %] >- There is no record ids defined. >+ <div class="dialog message"> >+ No records were modified. <a href="/cgi-bin/koha/tools/batch_record_modification.pl" title="New batch record modification">New batch record modification</a> >+ </div> > [% END %] > [% ELSIF view == 'report' %] > [% IF report.total_records == report.total_success %] >- All records have successfully been modified! >+ <div class="dialog message"> >+ All records have successfully been modified! <a href="/cgi-bin/koha/tools/batch_record_modification.pl" title="New batch record modification">New batch record modification</a> >+ </div> > [% ELSE %] >- [% report.total_success %] / [% report.total_records %] records have successfully been modified. >- Some errors occurred. >+ <div class="dialog message"> >+ [% report.total_success %] / [% report.total_records %] records have successfully been modified. Some errors occurred. <a href="/cgi-bin/koha/tools/batch_record_modification.pl" title="New batch record modification">New batch record modification</a> >+ </div> > [% END %] >- <p><a href="/cgi-bin/koha/tools/batch_record_modification.pl" title="New batch record modification">New batch record modification</a></p> > [% ELSIF view == 'errors' %] > [% FOR error IN errors %] > [% IF error == 'no_template_defined' %] >- No MARC modification template is defined. You have <a href="/cgi-bin/koha/tools/marc_modification_templates.pl">to create</a> at least one template for using this tool. >+ <div class="dialog alert"> >+ No MARC modification template is defined. You have <a href="/cgi-bin/koha/tools/marc_modification_templates.pl">to create</a> at least one template for using this tool. >+ </div> > [% END %] > [% END %] > [% ELSE %] >- No action defined for the template. >+ <div class="dialog alert"> >+ No action defined for the template. >+ </div> > [% END %] > </div> > </div> >-- >2.1.4
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 17147
:
54572
|
54725
|
54932
|
54963
|
55345
|
55524