projects / squirrelmail.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 3cecf1c)
Adding template for error box.
authorstevetruckstuff <stevetruckstuff@7612ce4b-ef26-0410-bec9-ea0150e637f0>
Tue, 28 Mar 2006 22:39:52 +0000 (22:39 +0000)
committerstevetruckstuff <stevetruckstuff@7612ce4b-ef26-0410-bec9-ea0150e637f0>
Tue, 28 Mar 2006 22:39:52 +0000 (22:39 +0000)
git-svn-id: https://svn.code.sf.net/p/squirrelmail/code/trunk/squirrelmail@11005 7612ce4b-ef26-0410-bec9-ea0150e637f0

functions/display_messages.php patch | blob | blame | history
templates/default/error_box.tpl [new file with mode: 0644] patch | blob
templates/default/stylesheet.tpl patch | blob | blame | history

diff --git a/functions/display_messages.php b/functions/display_messages.php
index 22abf4fcf93567831a7dfd859e25adc87756a34e..7f94acd560e52a09a9668f20d5aa8374c59994ee 100644 (file)
--- a/functions/display_messages.php
+++ b/functions/display_messages.php
@@ -142,21 +142,9 @@ function logout_error( $errString, $errTitle = '' ) {
  * @since 1.3.2
  */
 function error_box($string, $color) {
-    global $pageheader_sent;
-
-    if ( !isset( $color ) ) {
-        $color = array();
-        $color[0]  = '#dcdcdc';  /* light gray    TitleBar               */
-        $color[1]  = '#800000';  /* red                                  */
-        $color[2]  = '#cc0000';  /* light red     Warning/Error Messages */
-        $color[4]  = '#ffffff';  /* white         Normal Background      */
-        $color[7]  = '#0000cc';  /* blue          Links                  */
-        $color[8]  = '#000000';  /* black         Normal text            */
-        $color[9]  = '#ababab';  /* mid-gray      Darker version of #0   */
-    }
+    global $pageheader_sent, $oTemplate;
 
     $err = _("ERROR");
-
     $ret = concat_hook_function('error_box', $string);
     if($ret != '') {
         $string = $ret;
@@ -168,18 +156,13 @@ function error_box($string, $color) {
         include_once( SM_PATH . 'functions/page_header.php' );
         displayHtmlHeader('SquirrelMail: '.$err);
         $pageheader_sent = TRUE;
-        echo "<body text=\"$color[8]\" bgcolor=\"$color[4]\" link=\"$color[7]\" vlink=\"$color[7]\" alink=\"$color[7]\">\n\n";
+        echo "<body>\n\n";
     }
 
-    echo '<table width="100%" cellpadding="1" cellspacing="0" align="center" border="0" bgcolor="'.$color[9].'">'.
-         '<tr><td>'.
-         '<table width="100%" cellpadding="0" cellspacing="0" align="center" border="0" bgcolor="'.$color[4].'">'.
-         '<tr><td align="center" bgcolor="'.$color[0].'">'.
-         '<font color="'.$color[2].'"><b>' . $err . ':</b></font>'.
-         '</td></tr><tr><td>'.
-         '<table cellpadding="1" cellspacing="5" align="center" border="0">'.
-         '<tr>' . html_tag( 'td', $string."\n", 'left') . '</tr></table>'.
-         '</td></tr></table></td></tr></table>';
+    /** ERROR is pre-translated to avoid multiple translation calls. **/
+    $oTemplate->assign('error', $err);
+    $oTemplate->assign('errorMessage', $string);
+    $oTemplate->display('error_box.tpl');
 }
 
 /**
@@ -195,5 +178,4 @@ function error_option_save($message) {
 
     $optpage_save_error=array_merge($optpage_save_error,array($message));
 }
-// vim: et ts=4
 ?>
diff --git a/templates/default/error_box.tpl b/templates/default/error_box.tpl
new file mode 100644 (file)
index 0000000..b0ebd9c
--- /dev/null
+++ b/templates/default/error_box.tpl
@@ -0,0 +1,45 @@
+<?php
+/**
+ * error_box.tpl
+ *
+ * Displays the simple error box.  This is different than the error list 
+ * template that is displayed in footer.tpl.
+ *
+ * Variables available to this template:
+ *      $errorMessage - Translated string containing error message to be
+ *                      displayed.
+ *      $error        - Translation of string "ERROR".  This string is
+ *                      translated in functions that call this template to
+ *                      avoid making multiple translations on this string
+ * 
+ * @copyright &copy; 1999-2006 The SquirrelMail Project Team
+ * @license http://opensource.org/licenses/gpl-license.php GNU Public License
+ * @version $Id$
+ * @package squirrelmail
+ * @subpackage templates
+ */
+
+// Extract template variables
+extract($t);
+?>
+<div style="text-align:center; width:100%">
+<table class="table_errorBoxWrapper" cellspacing="0">
+ <tr>
+  <td>
+   <table class="table_errorBox" cellspacing="0">
+    <tr>
+     <td class="error_header">
+      <?php echo $error; ?>
+     </td>
+    </tr>
+    <tr>
+     <td class="error_message">
+      <?php echo $errorMessage."\n"; ?>
+     </td>
+    </tr>
+   </table>
+  </td>
+ </tr>
+</table>
+</div>
+<br>
\ No newline at end of file
diff --git a/templates/default/stylesheet.tpl b/templates/default/stylesheet.tpl
index 5a2b9936e34d1e9fbfaf9b0a0cdeb4ca504bd54e..f8af6a7d3a8611bb873d8c73e03b7d369268a6f3 100644 (file)
--- a/templates/default/stylesheet.tpl
+++ b/templates/default/stylesheet.tpl
@@ -36,7 +36,6 @@
 
 /* retrieve the template vars */
 extract($t);
-
 ?>
 /* older css template */
 body, td, th, dd, dt, h1, h2, h3, h4, h5, h6, p, ol, ul, li {
@@ -320,7 +319,16 @@ img   {
     text-align:center;
     margin-left:auto;
     margin-right:auto;
-    background: <?php echo $color[5]; ?>;
+    background: <?php echo $color[0]; ?>;
+}
+.error_header {
+    color: red;
+    font-weight:bold;
+    font-weight:bold;
+    font-style:normal;
+}
+.error_message {
+    background: <?php echo $color[4]; ?>;
 }
 
 /* page_header.tpl definitions */
Unnamed repository; edit this file 'description' to name the repository.