projects / koha.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 492759e)
Moving the text of an error message from the script to the template where it can...
authorOwen Leonard <oleonard@myacpl.org>
Mon, 6 Jul 2009 14:06:51 +0000 (09:06 -0500)
committerGalen Charlton <galen.charlton@liblime.com>
Mon, 13 Jul 2009 03:52:11 +0000 (23:52 -0400)
Signed-off-by: Galen Charlton <galen.charlton@liblime.com>
koha-tmpl/opac-tmpl/prog/en/modules/kohaerror.tmpl patch | blob | history
opac/opac-userupdate.pl patch | blob | history

diff --git a/koha-tmpl/opac-tmpl/prog/en/modules/kohaerror.tmpl b/koha-tmpl/opac-tmpl/prog/en/modules/kohaerror.tmpl
index 6a90fae..0fa7474 100644 (file)
--- a/koha-tmpl/opac-tmpl/prog/en/modules/kohaerror.tmpl
+++ b/koha-tmpl/opac-tmpl/prog/en/modules/kohaerror.tmpl
@@ -2,11 +2,25 @@
 <!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
 </head>
 <body>
-<!--TMPL_INCLUDE NAME="masthead.inc" -->
-<!--TMPL_INCLUDE NAME="navigation.inc" -->
+<div id="doc3" class="yui-t7">
+   <div id="bd">
+<!-- TMPL_INCLUDE name="masthead.inc" -->
 
+<div id="yui-g">
+<div class="container">
+<div id="kohaerror">
+<div class="dialog message">
+<h3>An Error has Occurred</h3>
+<!-- TMPL_IF NAME="noadminemail" -->
+<p>An error occurred when sending your message to the administrator. Please visit the library to update your personal details. </p>
+<p><a href="/cgi-bin/koha/opac-user.pl">Return to your summary.</a></p>
+<!-- TMPL_ELSE -->
+<p><!-- TMPL_VAR NAME="errormessage" --></p>
+<!-- /TMPL_IF -->
+</div>
+</div>
+</div>
+</div>
+</div>
 
-<div id="main">
-<h3>An Error has Occurred</h3><!-- TMPL_VAR NAME="errormessage" --></div>
-</body>
-</html>
\ No newline at end of file
+<!-- TMPL_INCLUDE NAME="opac-bottom.inc" -->
diff --git a/opac/opac-userupdate.pl b/opac/opac-userupdate.pl
index bbe02d7..43986b0 100755 (executable)
--- a/opac/opac-userupdate.pl
+++ b/opac/opac-userupdate.pl
@@ -73,8 +73,7 @@ if ( $updateemailaddress eq '' ) {
     );
 
     $template->param(
-        errormessage => 'KohaAdminEmailAddress system preference
-    is not set.  Please visit the library to update your user record'
+        noadminemail => 1,
     );
 
     output_html_with_http_headers $query, $cookie, $template->output;
Koha ILS @ FFZG - based on git://git.koha.org/pub/scm/koha.git