Bugzilla – Attachment 53291 Details for
Bug 3311
Statistical reports should error if row and column aren't selected
Home
|
New
|
Browse
|
Search
|
[?]
|
Reports
|
Help
|
New Account
|
Log In
[x]
|
Forgot Password
Login:
[x]
[patch]
Bug 3311: Follow-up to add alerts and colour corrections
Bug-3311-Follow-up-to-add-alerts-and-colour-correc.patch (text/plain), 3.06 KB, created by
Mark Tompsett
on 2016-07-11 23:50:44 UTC
(
hide
)
Description:
Bug 3311: Follow-up to add alerts and colour corrections
Filename:
MIME Type:
Creator:
Mark Tompsett
Created:
2016-07-11 23:50:44 UTC
Size:
3.06 KB
patch
obsolete
>From f14774383b913e8012bf21552daad945d77c188a Mon Sep 17 00:00:00 2001 >From: Mark Tompsett <mtompset@hotmail.com> >Date: Mon, 11 Jul 2016 18:59:43 -0400 >Subject: [PATCH] Bug 3311: Follow-up to add alerts and colour corrections > >This should deal with comment #12. > >I agree the coloring was poor. Used 'message' instead >of 'alert' for information one. The whole width thing >is a CSS thing that I'd rather not touch. > >And having tested on my phone, I totally understand >the request for alerts. Those have been added. >--- > .../prog/en/modules/reports/catalogue_stats.tt | 22 ++++++++++++++++++---- > 1 file changed, 18 insertions(+), 4 deletions(-) > >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/reports/catalogue_stats.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/reports/catalogue_stats.tt >index 0ef130a..75158e6 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/reports/catalogue_stats.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/reports/catalogue_stats.tt >@@ -12,13 +12,23 @@ > return; > } else if (Line) { > <!-- Column is not defined --> >- divParameterWarning.html('<p><strong><i class="fa fa-exclamation-triangle"> </i> ' + _("Warning:") + '</strong> ' + _("A column value must be selected.") + '</p>'); >+ var message = _("A column value must be selected."); >+ alert(message); >+ divParameterWarning.html('<p><strong><i class="fa fa-exclamation-triangle"> </i> ' + _("Warning:") + '</strong> ' + message + '</p>'); > } else if (Column) { > <!-- Line is not defined --> >- divParameterWarning.html('<p><strong><i class="fa fa-exclamation-triangle"> </i> ' + _("Warning:") + '</strong> ' + _("A row value must be selected.") + '</p>'); >+ var message = _("A row value must be selected."); >+ alert(message); >+ divParameterWarning.html('<p><strong><i class="fa fa-exclamation-triangle"> </i> ' + _("Warning:") + '</strong> ' + message + '</p>'); > } else { > <!-- Neither are defined --> >- divParameterWarning.html('<p><strong><i class="fa fa-exclamation-triangle"> </i> ' + _("Warning:") + '</strong> ' + _("Both row and column values must be selected.") + '</p>'); >+ var message = _("Both row and column values must be selected."); >+ alert(message); >+ divParameterWarning.html('<p><strong><i class="fa fa-exclamation-triangle"> </i> ' + _("Warning:") + '</strong> ' + message + '</p>'); >+ } >+ if (divParameterWarning.hasClass('message')) { >+ divParameterWarning.removeClass('message'); >+ divParameterWarning.addClass('alert'); > } > return false; > } >@@ -117,7 +127,11 @@ > [% END %] > [% ELSE %] > >- <div id="parameter_warning" class="dialog alert"> >+ [% IF invalid_parameters %] >+ <div id="parameter_warning" class="dialog alert"> >+ [% ELSE %] >+ <div id="parameter_warning" class="dialog message"> >+ [% END %] > [% SWITCH invalid_parameters %] > [% CASE 'line+column' %] > <p> >-- >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 3311
:
52775
|
52776
|
52777
|
52778
|
52779
|
53194
|
53195
|
53291
|
62533
|
62541
|
62623
|
62624
|
62630
|
62658
|
62659
|
62776
|
62777
|
62793
|
62794
|
62795
|
62796
|
62797
|
62798
|
62799
|
62800
|
62801
|
62802