From 2c757f86006c6f6174b8a26c2efbf028c3738cef Mon Sep 17 00:00:00 2001 From: Owen Leonard Date: Fri, 18 May 2012 08:57:15 -0400 Subject: [PATCH] Bug 7889 - Use standard style for errors and messages Content-Type: text/plain; charset="utf-8" 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) { [% ELSE %] [% IF ( errors ) %] +
[% FOREACH error IN errors %] -
[% error.error %]
+

[% error.error %]

[% END %] +
[% ELSE %]
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) {
[% IF ( success || error ) %] [% IF ( success ) %] - [% IF ( action == 'create' ) %]

The new CSV profile "[% profile_name %]" has been successfully created.

[% END %] - [% IF ( action == 'edit' ) %]

The CSV profile has been successfully modified.

[% END %] - [% IF ( action == 'delete' ) %]

The CSV profile has been successfully deleted.

[% END %] - [% ELSE %] - [% IF ( action == 'create' ) %]

The new CSV profile "[% profile_name %]" has not been created.

[% END %] - [% IF ( action == 'edit' ) %]

The CSV profile has not been modified.

[% END %] - [% IF ( action == 'delete' ) %]

The CSV profile has not been deleted.

[% END %] + [% IF ( action == 'create' ) %]
The new CSV profile "[% profile_name %]" has been successfully created.
[% END %] + [% IF ( action == 'edit' ) %]
The CSV profile has been successfully modified.
[% END %] + [% IF ( action == 'delete' ) %]
The CSV profile has been successfully deleted.
[% END %] + [% ELSE %] + [% IF ( action == 'create' ) %]
The new CSV profile "[% profile_name %]" has not been created.
[% END %] + [% IF ( action == 'edit' ) %]
The CSV profile has not been modified.
[% END %] + [% IF ( action == 'delete' ) %]
The CSV profile has not been deleted.
[% END %] [% END %] [% END %]
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 @@
[% IF ( cgi_debug ) %]
CGI debug is on.
[% END %] [% IF ( ERRORS ) %] -
+
[% FOREACH ERROR IN ERRORS %]

[% IF ( ERROR.scrubbed ) %]Note: your comment contained illegal markup code. -- 1.7.9.5