[Koha-patches] [PATCH] Bug 7889 - Use standard style for errors and messages
Owen Leonard
oleonard at myacpl.org
Mon Jul 23 18:33:22 CEST 2012
Correcting the markup of error messages in three places:
catalogue merge, CSV profile editing, and opac comments.
---
.../prog/en/modules/cataloguing/merge.tt | 4 +++-
.../prog/en/modules/tools/csv-profiles.tt | 14 +++++++-------
koha-tmpl/opac-tmpl/prog/en/modules/opac-review.tt | 2 +-
3 files changed, 11 insertions(+), 9 deletions(-)
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/merge.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/merge.tt
index 9c910ec..911c2f0 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/merge.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/merge.tt
@@ -227,9 +227,11 @@ function changeFramework(fw) {
</form>
[% ELSE %]
[% IF ( errors ) %]
+ <div class="dialog alert">
[% FOREACH error IN errors %]
- <div class="error">[% error.error %]</div>
+ <p>[% error.error %]</p>
[% END %]
+ </div>
[% ELSE %]
<form id="mergeform" action="/cgi-bin/koha/cataloguing/merge.pl" method="post" onsubmit="return mergeformsubmit()">
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/csv-profiles.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/csv-profiles.tt
index 74624ea..2d98836 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/csv-profiles.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/csv-profiles.tt
@@ -28,13 +28,13 @@ function reloadPage(p) {
<div class="yui-b">
[% IF ( success || error ) %]
[% IF ( success ) %]
- [% IF ( action == 'create' ) %]<p>The new CSV profile "[% profile_name %]" has been successfully created.</p>[% END %]
- [% IF ( action == 'edit' ) %]<p>The CSV profile has been successfully modified.</p>[% END %]
- [% IF ( action == 'delete' ) %]<p>The CSV profile has been successfully deleted.</p>[% END %]
- [% ELSE %]
- [% IF ( action == 'create' ) %]<p class="error">The new CSV profile "[% profile_name %]" has not been created.</p>[% END %]
- [% IF ( action == 'edit' ) %]<p class="error">The CSV profile has not been modified.</p>[% END %]
- [% IF ( action == 'delete' ) %]<p class="error">The CSV profile has not been deleted.</p>[% END %]
+ [% IF ( action == 'create' ) %]<div class="dialog message">The new CSV profile "[% profile_name %]" has been successfully created.</div>[% END %]
+ [% IF ( action == 'edit' ) %]<div class="dialog message">The CSV profile has been successfully modified.</div>[% END %]
+ [% IF ( action == 'delete' ) %]<div class="dialog message">The CSV profile has been successfully deleted.</div>[% END %]
+ [% ELSE %]
+ [% IF ( action == 'create' ) %]<div class="dialog alert">The new CSV profile "[% profile_name %]" has not been created.</div>[% END %]
+ [% IF ( action == 'edit' ) %]<div class="dialog alert">The CSV profile has not been modified.</div>[% END %]
+ [% IF ( action == 'delete' ) %]<div class="dialog alert">The CSV profile has not been deleted.</div>[% END %]
[% END %]
[% END %]
<div id="csvexporttabs" class="toptabs">
diff --git a/koha-tmpl/opac-tmpl/prog/en/modules/opac-review.tt b/koha-tmpl/opac-tmpl/prog/en/modules/opac-review.tt
index 92bdc87..6e2b974 100644
--- a/koha-tmpl/opac-tmpl/prog/en/modules/opac-review.tt
+++ b/koha-tmpl/opac-tmpl/prog/en/modules/opac-review.tt
@@ -51,7 +51,7 @@
<div id="userreview" class="container">
[% IF ( cgi_debug ) %]<div class="debug">CGI debug is on.</div>[% END %]
[% IF ( ERRORS ) %]
- <div class="error">
+ <div class="dialog alert">
[% FOREACH ERROR IN ERRORS %]
<p>
[% IF ( ERROR.scrubbed ) %]Note: your comment contained illegal markup code.
--
1.7.9.5
More information about the Koha-patches
mailing list