Adding templates for the note in right_main.php, MOTD, and empty folder notification.

git-svn-id: https://svn.code.sf.net/p/squirrelmail/code/trunk/squirrelmail@10905 7612ce4b-ef26-0410-bec9-ea0150e637f0

diff --git a/src/right_main.php b/src/right_main.php
index 1ad78c92968bf7ca2326f2582ec65e5463312488..9135c31342a323980fceadd69bca56c83fc7b212 100644 (file)
--- a/src/right_main.php
+++ b/src/right_main.php
@@ -288,7 +288,8 @@ if (isset($mail_sent) && $mail_sent == 'yes') {
     $note = _("Your Message has been sent.");
 }
 if (isset($note)) {
-    echo html_tag( 'div', '<b>' . htmlspecialchars($note) .'</b>', 'center' ) . "<br />\n";
+    $oTemplate->assign('note', htmlspecialchars($note));
+    $oTemplate->display('note.tpl');
 }
 
 if ( sqgetGlobalVar('just_logged_in', $just_logged_in, SQ_SESSION) ) {
@@ -296,18 +297,10 @@ if ( sqgetGlobalVar('just_logged_in', $just_logged_in, SQ_SESSION) ) {
         $just_logged_in = false;
         sqsession_register($just_logged_in, 'just_logged_in');
 
-        if (strlen(trim($motd)) > 0) {
-            echo html_tag( 'table',
-                        html_tag( 'tr',
-                            html_tag( 'td',
-                                html_tag( 'table',
-                                    html_tag( 'tr',
-                                        html_tag( 'td', $motd, 'center' )
-                                    ) ,
-                                '', $color[4], 'width="100%" cellpadding="5" cellspacing="1" border="0"' )
-                             )
-                        ) ,
-                    'center', $color[9], 'width="70%" cellpadding="0" cellspacing="3" border="0"' );
+        $motd = trim($motd);
+        if (strlen($motd) > 0) {
+            $oTemplate->assign('motd', $motd);
+            $oTemplate->display('motd.tpl');
         }
     }
 }
@@ -340,18 +333,7 @@ if ($aMailbox['EXISTS'] > 0) {
     $oTemplate->display('message_list.tpl');
 
 } else {
-    $string = '<b>' . _("THIS FOLDER IS EMPTY") . '</b>';
-    echo '    <table width="100%" cellpadding="1" cellspacing="0" align="center" border="0" bgcolor="'.$color[9].'">';
-    echo '     <tr><td>';
-    echo '       <table width="100%" cellpadding="0" cellspacing="0" align="center" border="0" bgcolor="'.$color[4].'">';
-    echo '        <tr><td><br />';
-    echo '            <table cellpadding="1" cellspacing="5" align="center" border="0">';
-    echo '              <tr>' . html_tag( 'td', $string."\n", 'left')
-                        . '</tr>';
-    echo '            </table>';
-    echo '        <br /></td></tr>';
-    echo '       </table></td></tr>';
-    echo '    </table>';
+    $oTemplate->display('empty_folder.tpl');
 }
 
 do_hook('right_main_bottom');

diff --git a/templates/default/empty_folder.tpl b/templates/default/empty_folder.tpl
new file mode 100644 (file)
index 0000000..cfac719
--- /dev/null
+++ b/templates/default/empty_folder.tpl
@@ -0,0 +1,27 @@
+<?php
+/**
+ * empty_foler.tpl
+ *
+ * Message displayed when the folder is empty
+ * 
+ * There are no variables available to this template.
+ *
+ * @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
+ */
+ 
+// Get template variables
+extract($t);
+?>
+<div class="sqm_emptyFolderWrapper">
+ <table class="sqm_emptyFolder" cellspacing="1">
+  <tr>
+   <td>
+    <em><?php echo _("THIS FOLDER IS EMPTY"); ?></em>
+   </td>
+  </tr>
+ </table>
+</div>
\ No newline at end of file

diff --git a/templates/default/motd.tpl b/templates/default/motd.tpl
new file mode 100644 (file)
index 0000000..19fcaf9
--- /dev/null
+++ b/templates/default/motd.tpl
@@ -0,0 +1,30 @@
+<?php
+/**
+ * motd.tpl
+ *
+ * Tempalte for display Message of the day
+ * 
+ * Variables available in this template:
+ *      $motd - string containing the MOTD to be displayed
+ *
+ * @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
+ */
+ 
+// Get variables from template
+extract($t);
+?>
+<!-- Begin MOTD -->
+<div class="sqm_motdWrapper">
+ <table class="sqm_motd" cellspacing="3">
+  <tr>
+   <td>
+    <?php echo $motd; ?>
+   </td>
+  </tr>
+ </table>
+</div>
+<!-- End MOTD -->

diff --git a/templates/default/note.tpl b/templates/default/note.tpl
new file mode 100644 (file)
index 0000000..4780abd
--- /dev/null
+++ b/templates/default/note.tpl
@@ -0,0 +1,25 @@
+<?php
+/**
+ * note.tpl
+ *
+ * Template for displaying notes as needed.
+ * 
+ * Variables available in this template:
+ *      $note   = Sanitized string containing not to be displayed.
+ *
+ * @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
+ */
+
+// Get the variables from the template
+extract($t) 
+?>
+<div class="sqm_noteWrapper">
+ <div class="sqm_note">
+  <?php echo $note."\n"; ?>
+ </div>
+</div>
+<br />

diff --git a/templates/default/stylesheet.tpl b/templates/default/stylesheet.tpl
index a0722897272ae93880f8e242ee5d8437ef21a1ef..83ec53cc7a2e9085be2810cddb40f54f3e96f1d2 100644 (file)
--- a/templates/default/stylesheet.tpl
+++ b/templates/default/stylesheet.tpl
@@ -248,6 +248,58 @@ img   {
     text-align:center;
 }
 
+/* note.tpl defs */
+.sqm_noteWrapper {
+    text-align:center;
+    width:100%;
+}
+.sqm_note {
+    margin-left:auto;
+    margin-right:auto;
+    font-weight:bold;
+    text-align:center;
+}
+
+/* motd.tpl defs */
+.sqm_motdWrapper {
+    text-align:center;
+    width:100%;
+    margin:1px;
+}
+.sqm_motd {
+    margin-left:auto;
+    margin-right:auto;
+    text-align:center;
+    background: <?php echo $color[9]; ?>;
+    width:70%;
+    padding:0;
+}
+.sqm_motd td {
+    text-align:center;
+    background: <?php echo $color[4]; ?>;
+    padding:5px;
+}
+
+/* empty_folder.tpl defs */
+.sqm_emptyFolderWrapper {
+    text-align:center;
+    width:100%;
+}
+.sqm_emptyFolder {
+    margin-left:auto;
+    margin-right:auto;
+    text-align:center;
+    background: <?php echo $color[9]; ?>;
+    padding:1;
+    width:100%;
+}
+.sqm_emptyFolder td {
+    text-align:center;
+    background: <?php echo $color[4]; ?>;
+    padding-top:15px;
+    padding-bottom:15px;
+}
+
 /* page_header.tpl definitions */
 .sqm_currentFolder     {
     background: <?php echo $color[9]; ?>;

diff --git a/templates/default/template.php b/templates/default/template.php
index 12a204a51061378422cd84668542e33dd3ee67e2..2219709d65ec5391999a40d09b2f56cae29973a7 100644 (file)
--- a/templates/default/template.php
+++ b/templates/default/template.php
@@ -16,6 +16,7 @@
  * this file, e.g. the template root directory.
  */
 $templates_provided = array (
+                                'empty_folder.tpl',
                                 'error_message.tpl',
                                 'footer.tpl',
                                 'left_main.tpl',
@@ -23,6 +24,8 @@ $templates_provided = array (
                                 'message_list.tpl',
                                 'page_header.tpl',
                                 'paginator.tpl',
+                                'note.tpl',
+                                'motd.tpl',
                                 'stylesheet.tpl'
                             );
 

diff --git a/templates/default_advanced/stylesheet.tpl b/templates/default_advanced/stylesheet.tpl
index 263fc3164966c17a0577e24752b7343584195564..5ee1559e80c6aad8250f3cd2411f7ec387bf036f 100644 (file)
--- a/templates/default_advanced/stylesheet.tpl
+++ b/templates/default_advanced/stylesheet.tpl
@@ -286,6 +286,58 @@ img   {
     text-align:center;
 }
 
+/* note.tpl defs */
+.sqm_noteWrapper {
+    text-align:center;
+    width:100%;
+}
+.sqm_note {
+    margin-left:auto;
+    margin-right:auto;
+    font-weight:bold;
+    text-align:center;
+}
+
+/* motd.tpl defs */
+.sqm_motdWrapper {
+    text-align:center;
+    width:100%;
+    margin:1px;
+}
+.sqm_motd {
+    margin-left:auto;
+    margin-right:auto;
+    text-align:center;
+    background: <?php echo $color[9]; ?>;
+    width:70%;
+    padding:0;
+}
+.sqm_motd td {
+    text-align:center;
+    background: <?php echo $color[4]; ?>;
+    padding:5px;
+}
+
+/* empty_folder.tpl defs */
+.sqm_emptyFolderWrapper {
+    text-align:center;
+    width:100%;
+}
+.sqm_emptyFolder {
+    margin-left:auto;
+    margin-right:auto;
+    text-align:center;
+    background: <?php echo $color[9]; ?>;
+    padding:1;
+    width:100%;
+}
+.sqm_emptyFolder td {
+    text-align:center;
+    background: <?php echo $color[4]; ?>;
+    padding-top:15px;
+    padding-bottom:15px;
+}
+
 /* page_header.tpl definitions */
 .sqm_currentFolder     {
     background: <?php echo $color[9]; ?>;