gitea
/
Koha-clms
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/new/bug_7889'

This commit is contained in:
Paul Poulain 2012-07-25 15:08:50 +02:00
parent 5e10c0ad87 ba2f90dc77
commit 5432bd488f
3 changed files with 11 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/merge.tt
View File

@ -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()">

14
koha-tmpl/intranet-tmpl/prog/en/modules/tools/csv-profiles.tt
View File

@ -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">

2
koha-tmpl/opac-tmpl/prog/en/modules/opac-review.tt
View File

@ -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.