[geeklog-cvs] geeklog: Cosmetic change to the mail form to make the look more ...
geeklog-cvs at lists.geeklog.net
geeklog-cvs at lists.geeklog.net
Mon Apr 20 08:13:55 EDT 2009
details: http://project.geeklog.net/cgi-bin/hgweb.cgi/rev/04bf6514d64c
changeset: 6978:04bf6514d64c
user: Dirk Haun <dirk at haun-online.de>
date: Mon Apr 20 11:01:39 2009 +0200
description:
Cosmetic change to the mail form to make the look more consistent with the other admin panels
diffstat:
3 files changed, 65 insertions(+), 40 deletions(-)
public_html/admin/mail.php | 93 ++++++++-----
public_html/docs/english/theme.html | 4
public_html/layout/professional/admin/mail/mailform.thtml | 8 -
diffs (159 lines):
diff -r 13162f373fa7 -r 04bf6514d64c public_html/admin/mail.php
--- a/public_html/admin/mail.php Sun Apr 19 23:12:48 2009 +0200
+++ b/public_html/admin/mail.php Mon Apr 20 11:01:39 2009 +0200
@@ -30,7 +30,19 @@
// | |
// +---------------------------------------------------------------------------+
+/**
+* Simple email form that lets you send emails to certain groups of users.
+*
+*/
+
+/**
+* Geeklog common function library
+*/
require_once '../lib-common.php';
+
+/**
+* Security check to ensure user even belongs on this page
+*/
require_once 'auth.inc.php';
$display = '';
@@ -54,22 +66,36 @@
*/
function display_mailform ()
{
- global $_CONF, $_TABLES, $_USER, $LANG31;
+ global $_CONF, $LANG31, $LANG_ADMIN, $_IMAGE_TYPE;
+
+ require_once $_CONF['path_system'] . 'lib-admin.php';
$retval = '';
- $mail_templates = new Template ($_CONF['path_layout'] . 'admin/mail');
- $mail_templates->set_file (array ('form' => 'mailform.thtml'));
- $mail_templates->set_var ('site_url', $_CONF['site_url']);
- $mail_templates->set_var ('site_admin_url', $_CONF['site_admin_url']);
- $mail_templates->set_var ('layout_url', $_CONF['layout_url']);
- $mail_templates->set_var ('startblock_email', COM_startBlock ($LANG31[1],
- '', COM_getBlockTemplate ('_admin_block', 'header')));
- $mail_templates->set_var ('php_self', $_CONF['site_admin_url']
- . '/mail.php');
- $mail_templates->set_var ('lang_note', $LANG31[19]);
- $mail_templates->set_var ('lang_to', $LANG31[18]);
- $mail_templates->set_var ('lang_selectgroup', $LANG31[25]);
+ $retval .= COM_startBlock($LANG31[1], '',
+ COM_getBlockTemplate('_admin_block', 'header'));
+
+ $menu_arr = array(
+ array('url' => $_CONF['site_admin_url'],
+ 'text' => $LANG_ADMIN['admin_home'])
+ );
+
+ $desc = '<p>' . $LANG31[19] . '</p>';
+ $icon = $_CONF['layout_url'] . '/images/icons/mail.' . $_IMAGE_TYPE;
+ $retval .= ADMIN_createMenu($menu_arr, $desc, $icon);
+
+ $mail_templates = new Template($_CONF['path_layout'] . 'admin/mail');
+ $mail_templates->set_file(array('form' => 'mailform.thtml'));
+ $mail_templates->set_var('site_url', $_CONF['site_url']);
+ $mail_templates->set_var('site_admin_url', $_CONF['site_admin_url']);
+ $mail_templates->set_var('layout_url', $_CONF['layout_url']);
+ $mail_templates->set_var('startblock_email', COM_startBlock($LANG31[1],
+ '', COM_getBlockTemplate('_admin_block', 'header')));
+ $mail_templates->set_var('php_self', $_CONF['site_admin_url']
+ . '/mail.php');
+ $mail_templates->set_var('lang_note', $LANG31[19]);
+ $mail_templates->set_var('lang_to', $LANG31[18]);
+ $mail_templates->set_var('lang_selectgroup', $LANG31[25]);
$thisUsersGroups = SEC_getUserGroups();
uksort($thisUsersGroups, 'strcasecmp');
@@ -81,28 +107,31 @@
}
}
- $mail_templates->set_var ('group_options', $group_options);
- $mail_templates->set_var ('lang_from', $LANG31[2]);
- $mail_templates->set_var ('site_name', $_CONF['site_name']);
- $mail_templates->set_var ('lang_replyto', $LANG31[3]);
- $mail_templates->set_var ('site_mail', $_CONF['site_mail']);
- $mail_templates->set_var ('lang_subject', $LANG31[4]);
- $mail_templates->set_var ('lang_body', $LANG31[5]);
- $mail_templates->set_var ('lang_sendto', $LANG31[6]);
- $mail_templates->set_var ('lang_allusers', $LANG31[7]);
- $mail_templates->set_var ('lang_admin', $LANG31[8]);
- $mail_templates->set_var ('lang_options', $LANG31[9]);
- $mail_templates->set_var ('lang_HTML', $LANG31[10]);
- $mail_templates->set_var ('lang_urgent', $LANG31[11]);
- $mail_templates->set_var ('lang_ignoreusersettings', $LANG31[14]);
- $mail_templates->set_var ('lang_send', $LANG31[12]);
- $mail_templates->set_var ('end_block', COM_endBlock (COM_getBlockTemplate ('_admin_block', 'footer')));
- $mail_templates->set_var ('xhtml', XHTML);
+ $mail_templates->set_var('group_options', $group_options);
+ $mail_templates->set_var('lang_from', $LANG31[2]);
+ $mail_templates->set_var('site_name', $_CONF['site_name']);
+ $mail_templates->set_var('lang_replyto', $LANG31[3]);
+ $mail_templates->set_var('site_mail', $_CONF['site_mail']);
+ $mail_templates->set_var('lang_subject', $LANG31[4]);
+ $mail_templates->set_var('lang_body', $LANG31[5]);
+ $mail_templates->set_var('lang_sendto', $LANG31[6]);
+ $mail_templates->set_var('lang_allusers', $LANG31[7]);
+ $mail_templates->set_var('lang_admin', $LANG31[8]);
+ $mail_templates->set_var('lang_options', $LANG31[9]);
+ $mail_templates->set_var('lang_HTML', $LANG31[10]);
+ $mail_templates->set_var('lang_urgent', $LANG31[11]);
+ $mail_templates->set_var('lang_ignoreusersettings', $LANG31[14]);
+ $mail_templates->set_var('lang_send', $LANG31[12]);
+ $mail_templates->set_var('end_block',
+ COM_endBlock(COM_getBlockTemplate('_admin_block', 'footer')));
+ $mail_templates->set_var('xhtml', XHTML);
$mail_templates->set_var('gltoken_name', CSRF_TOKEN);
$mail_templates->set_var('gltoken', SEC_createToken());
- $mail_templates->parse ('output', 'form');
- $retval = $mail_templates->finish ($mail_templates->get_var ('output'));
+ $mail_templates->parse('output', 'form');
+ $retval .= $mail_templates->finish($mail_templates->get_var('output'));
+
+ $retval .= COM_endBlock(COM_getBlockTemplate('_admin_block', 'footer'));
return $retval;
}
diff -r 13162f373fa7 -r 04bf6514d64c public_html/docs/english/theme.html
--- a/public_html/docs/english/theme.html Sun Apr 19 23:12:48 2009 +0200
+++ b/public_html/docs/english/theme.html Mon Apr 20 11:01:39 2009 +0200
@@ -233,6 +233,10 @@
editor).</li>
<li>Added a "send copy to myself" option to
<tt>profiles/contactuserform.thtml</tt></li>
+<li>Cosmetic changes to the <tt>admin/mail/mailform.thtml</tt> template file:
+ Removed <code>{startblock_email}</code> and <code>{endblock_email}</code>
+ and the top table. These elements are now added automatically to make the
+ the mail form look more consistent with the other admin panels.</li>
</ul>
<h3>Plugins</h3>
diff -r 13162f373fa7 -r 04bf6514d64c public_html/layout/professional/admin/mail/mailform.thtml
--- a/public_html/layout/professional/admin/mail/mailform.thtml Sun Apr 19 23:12:48 2009 +0200
+++ b/public_html/layout/professional/admin/mail/mailform.thtml Mon Apr 20 11:01:39 2009 +0200
@@ -1,11 +1,4 @@
<form action="{php_self}" method="post">
- {startblock_email}
- <table cellspacing="0" cellpadding="2" width="100%" style="margin:5px 0px 10px 0px;">
- <tr>
- <td><img src="{layout_url}/images/icons/mail.png" alt=""{xhtml}></td>
- <td>{lang_note}</td>
- </tr>
- </table>
<table cellpadding="2" cellspacing="0">
<tr>
<td class="alignright">{lang_to}:</td>
@@ -55,5 +48,4 @@
</td>
</tr>
</table>
- {end_block}
</form>
More information about the geeklog-cvs
mailing list