From: Steve B. <ste...@us...> - 2006-03-06 20:58:09
|
Update of /cvsroot/squirrelmail/squirrelmail/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv4719/src Modified Files: right_main.php Log Message: Adding templates for the note in right_main.php, MOTD, and empty folder notification. Index: right_main.php =================================================================== RCS file: /cvsroot/squirrelmail/squirrelmail/src/right_main.php,v retrieving revision 1.147 retrieving revision 1.148 diff -u -w -r1.147 -r1.148 --- right_main.php 21 Feb 2006 00:02:29 -0000 1.147 +++ right_main.php 6 Mar 2006 20:58:06 -0000 1.148 @@ -288,7 +288,8 @@ $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 @@ $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 @@ $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'); |