From ba2f90dc7765744b56510d4d7240a5eddbdacc3f Mon Sep 17 00:00:00 2001
From: Owen Leonard <oleonard@myacpl.org>
Date: Fri, 18 May 2012 08:57:15 -0400
Subject: [PATCH] Bug 7889 - Use standard style for errors and messages

Correcting the markup of error messages in three places:
catalogue merge, CSV profile editing, and opac comments.

Signed-off-by: Jonathan Druart <jonathan.druart@biblibre.com>
Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
---
 .../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 745680c4f3..07c223d393 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 242e7f9a7c..b0f5dc5bf9 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 d14028521d..2fd6338987 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.
-- 
2.39.5