Thread: SF.net SVN: postfixadmin:[1070] trunk (Page 5)
Brought to you by:
christian_boltz,
gingerdog
Menu
▾
▴
postfixadmin-svn
|
From: <chr...@us...> - 2011-06-02 23:42:12
|
Revision: 1070
http://postfixadmin.svn.sourceforge.net/postfixadmin/?rev=1070&view=rev
Author: christian_boltz
Date: 2011-06-02 23:42:06 +0000 (Thu, 02 Jun 2011)
Log Message:
-----------
smarty.inc.php:
- replaced last usage of $CONF['postfix_admin_path'] with $incpath
config.inc.php:
- drop (now unused) $CONF['postfix_admin_path'] config variable
Modified Paths:
--------------
trunk/config.inc.php
trunk/smarty.inc.php
Modified: trunk/config.inc.php
===================================================================
--- trunk/config.inc.php 2011-06-02 23:13:34 UTC (rev 1069)
+++ trunk/config.inc.php 2011-06-02 23:42:06 UTC (rev 1070)
@@ -34,9 +34,6 @@
// YOU MUST ENTER THE COMPLETE URL e.g. http://domain.tld/postfixadmin
$CONF['postfix_admin_url'] = '';
-// shouldn't need changing.
-$CONF['postfix_admin_path'] = dirname(__FILE__);
-
// Language config
// Language files are located in './languages', change as required..
$CONF['default_language'] = 'en';
Modified: trunk/smarty.inc.php
===================================================================
--- trunk/smarty.inc.php 2011-06-02 23:13:34 UTC (rev 1069)
+++ trunk/smarty.inc.php 2011-06-02 23:42:06 UTC (rev 1070)
@@ -71,7 +71,7 @@
$motd_file = "motd.txt";
}
$smarty->assign('motd_file', '');
-if (file_exists ($CONF ['postfix_admin_path'].'/templates/'.$motd_file)) {
+if (file_exists ($incpath.'/templates/'.$motd_file)) {
$smarty->assign ('motd_file', $motd_file);
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <chr...@us...> - 2011-07-14 21:27:13
|
Revision: 1076
http://postfixadmin.svn.sourceforge.net/postfixadmin/?rev=1076&view=rev
Author: christian_boltz
Date: 2011-07-14 21:27:07 +0000 (Thu, 14 Jul 2011)
Log Message:
-----------
users/vacation.php, edit-vacation.php, backup.php:
- supress warnings about PHP's date.timezone not set.
The risk of doing this is low IMHO - the worst thing that can happen
is a wrong default date for vacation or a "wrong" tempfile name for
backup.php
Modified Paths:
--------------
trunk/backup.php
trunk/edit-vacation.php
trunk/users/vacation.php
Modified: trunk/backup.php
===================================================================
--- trunk/backup.php 2011-07-14 20:29:10 UTC (rev 1075)
+++ trunk/backup.php 2011-07-14 21:27:07 UTC (rev 1076)
@@ -72,6 +72,7 @@
{
umask (077);
$path = (ini_get('upload_tmp_dir') != '') ? ini_get('upload_tmp_dir') : '/tmp';
+ date_default_timezone_set(@date_default_timezone_get()); # Suppress date.timezone warnings
$filename = "postfixadmin-" . date ("Ymd") . "-" . getmypid() . ".sql";
$backup = $path . DIRECTORY_SEPARATOR . $filename;
Modified: trunk/edit-vacation.php
===================================================================
--- trunk/edit-vacation.php 2011-07-14 20:29:10 UTC (rev 1075)
+++ trunk/edit-vacation.php 2011-07-14 21:27:07 UTC (rev 1076)
@@ -55,6 +55,9 @@
$fUsername = $SESSID_USERNAME;
$fDomain = $USERID_DOMAIN;
}
+
+date_default_timezone_set(@date_default_timezone_get()); # Suppress date.timezone warnings
+
$vh = new VacationHandler($fUsername);
$vacation_domain = $CONF['vacation_domain'];
$vacation_goto = preg_replace('/@/', '#', $fUsername);
Modified: trunk/users/vacation.php
===================================================================
--- trunk/users/vacation.php 2011-07-14 20:29:10 UTC (rev 1075)
+++ trunk/users/vacation.php 2011-07-14 21:27:07 UTC (rev 1076)
@@ -42,6 +42,8 @@
exit(0);
}
+date_default_timezone_set(@date_default_timezone_get()); # Suppress date.timezone warnings
+
$vh = new VacationHandler(authentication_get_username());
if ($_SERVER['REQUEST_METHOD'] == "GET")
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <chr...@us...> - 2011-07-18 22:20:13
|
Revision: 1081
http://postfixadmin.svn.sourceforge.net/postfixadmin/?rev=1081&view=rev
Author: christian_boltz
Date: 2011-07-18 22:20:07 +0000 (Mon, 18 Jul 2011)
Log Message:
-----------
edit-active-admin.php, edit-active-domain.php, edit-active.php
- replaced $tMessage with flash_error()
edit-active.php:
- removed a </font> added after $PALANG['pEdit_mailbox_domain_error']
This commit is part of the huge cleanup patch by Dale Blount (lnxus@SF),
https://sourceforge.net/tracker/?func=detail&atid=937966&aid=3370510&group_id=191583
Modified Paths:
--------------
trunk/edit-active-admin.php
trunk/edit-active-domain.php
trunk/edit-active.php
Modified: trunk/edit-active-admin.php
===================================================================
--- trunk/edit-active-admin.php 2011-07-18 22:13:05 UTC (rev 1080)
+++ trunk/edit-active-admin.php 2011-07-18 22:20:07 UTC (rev 1081)
@@ -19,7 +19,7 @@
*
* Template Variables:
*
- * tMessage
+ * none
*
* Form POST \ GET Variables:
*
@@ -41,7 +41,7 @@
if ($result['rows'] != 1)
{
$error = 1;
- $tMessage = $PALANG['pAdminEdit_admin_result_error'];
+ flash_error($PALANG['pAdminEdit_admin_result_error']);
}
if ($error != 1)
@@ -50,7 +50,6 @@
exit;
}
}
-$smarty->assign ('tMessage', $tMessage);
$smarty->assign ('smarty_template', 'message');
$smarty->display ('index.tpl');
Modified: trunk/edit-active-domain.php
===================================================================
--- trunk/edit-active-domain.php 2011-07-18 22:13:05 UTC (rev 1080)
+++ trunk/edit-active-domain.php 2011-07-18 22:20:07 UTC (rev 1081)
@@ -18,7 +18,7 @@
*
* Template Variables:
*
- * tMessage
+ * none
*
* Form POST \ GET Variables:
*
@@ -40,7 +40,7 @@
if ($result['rows'] != 1)
{
$error = 1;
- $tMessage = $PALANG['pAdminEdit_domain_result_error'];
+ flash_error($PALANG['pAdminEdit_domain_result_error']);
}
if ($error != 1)
@@ -50,7 +50,6 @@
}
}
-$smarty->assign ('tMessage', $tMessage);
$smarty->assign ('smarty_template', 'message');
$smarty->display ('index.tpl');
Modified: trunk/edit-active.php
===================================================================
--- trunk/edit-active.php 2011-07-18 22:13:05 UTC (rev 1080)
+++ trunk/edit-active.php 2011-07-18 22:20:07 UTC (rev 1081)
@@ -19,7 +19,7 @@
*
* Template Variables:
*
- * tMessage
+ * none
*
* Form POST \ GET Variables:
*
@@ -49,7 +49,7 @@
if (! (check_owner ($SESSID_USERNAME, $fDomain) || authentication_has_role('global-admin') ) )
{
$error = 1;
- $tMessage = $PALANG['pEdit_mailbox_domain_error'] . "<b>$fDomain</b>!</font>";
+ flash_error($PALANG['pEdit_mailbox_domain_error'] . "<b>$fDomain</b>!");
}
else
{
@@ -61,7 +61,7 @@
if ($result['rows'] != 1)
{
$error = 1;
- $tMessage = $PALANG['pEdit_mailbox_result_error'];
+ flash_error($PALANG['pEdit_mailbox_result_error']);
}
else
{
@@ -74,7 +74,7 @@
if ($result['rows'] != 1)
{
$error = 1;
- $tMessage = $PALANG['pEdit_mailbox_result_error'];
+ flash_error($PALANG['pEdit_mailbox_result_error']);
}
else
{
@@ -87,7 +87,7 @@
if ($result['rows'] != 1)
{
$error = 1;
- $tMessage = $PALANG['pEdit_alias_domain_result_error'];
+ flash_error($PALANG['pEdit_alias_domain_result_error']);
}
else
{
@@ -112,7 +112,6 @@
}
}
-$smarty->assign ('tMessage', $tMessage);
$smarty->assign ('smarty_template', 'message');
$smarty->display ('index.tpl');
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <chr...@us...> - 2011-07-18 22:48:53
|
Revision: 1086
http://postfixadmin.svn.sourceforge.net/postfixadmin/?rev=1086&view=rev
Author: christian_boltz
Date: 2011-07-18 22:48:46 +0000 (Mon, 18 Jul 2011)
Log Message:
-----------
edit-alias.php, edit-domain.php, edit-vacation.php,
create-alias-domain.php, password.php, viewlog.php:
- replaced tMessage with flash_error() / flash_info()
edit-alias.php:
- removed now superfluous code to merge multiple tMessage with <br>
- removed a </span> that was added after $PALANG['pEdit_alias_goto_text_error2']
This commit is part of the huge cleanup patch by Dale Blount (lnxus@SF),
https://sourceforge.net/tracker/?func=detail&atid=937966&aid=3370510&group_id=191583
Modified Paths:
--------------
trunk/create-alias-domain.php
trunk/edit-alias.php
trunk/edit-domain.php
trunk/edit-vacation.php
trunk/password.php
trunk/viewlog.php
Modified: trunk/create-alias-domain.php
===================================================================
--- trunk/create-alias-domain.php 2011-07-18 22:36:38 UTC (rev 1085)
+++ trunk/create-alias-domain.php 2011-07-18 22:48:46 UTC (rev 1086)
@@ -19,7 +19,7 @@
*
* Template Variables:
*
- * tMessage
+ * none
*
* Form POST \ GET Variables:
*
@@ -66,9 +66,10 @@
if (isset($list_aliases[$dom]) || in_array($dom,$list_aliases)) continue;
$alias_domains[] = $dom;
}
+
if (count($alias_domains) == 0) {
$error = 1;
- $tMessage = $PALANG['pCreate_alias_domain_error4'];
+ flash_error($PALANG['pCreate_alias_domain_error4']);
}
# filter available target domains
@@ -102,7 +103,7 @@
check_owner ($SESSID_USERNAME, $fTargetDomain)))
{
$error = 1;
- $tMessage = $PALANG['pCreate_alias_domain_error1'];
+ flash_error($PALANG['pCreate_alias_domain_error1']);
}
if (isset($list_aliases[$fAliasDomain]) || // alias_domain is unique (primary key, a domain can't be an alias for multiple others)
@@ -112,7 +113,7 @@
empty($fAliasDomain) || empty($fTargetDomain)) // explain this, do i?
{
$error = 1;
- $tMessage = $PALANG['pCreate_alias_domain_error2'];
+ flash_error($PALANG['pCreate_alias_domain_error2']);
}
$sqlActive = db_get_boolean($fActive);
@@ -121,7 +122,7 @@
$result = db_query ("INSERT INTO $table_alias_domain (alias_domain,target_domain,created,modified,active) VALUES ('$fAliasDomain','$fTargetDomain',NOW(),NOW(),'$sqlActive')");
if ($result['rows'] != 1) {
$error = 1;
- $tMessage = $PALANG['pCreate_alias_domain_error3'];
+ flash_error($PALANG['pCreate_alias_domain_error3']);
}
else {
db_log ($fAliasDomain, 'create_alias_domain', "$fAliasDomain -> $fTargetDomain");
@@ -133,14 +134,14 @@
}
}
- $tMessage .= "<br />($fAliasDomain -> $fTargetDomain)<br />\n";
+ flash_info("<br />($fAliasDomain -> $fTargetDomain)<br />\n");
}
+
+
$smarty->assign ('alias_domains', (count($alias_domains) > 0));
$smarty->assign ('select_options_alias', select_options ($alias_domains, array ($fAliasDomain)), false);
$smarty->assign ('select_options_target', select_options ($target_domains, array ($fTargetDomain)), false);
if ($fActive) $smarty->assign ('fActive', ' checked="checked"');
-if ($error == 1) $tMessage = '<span class="error_msg">'.$tMessage.'</span>';
-$smarty->assign ('tMessage', $tMessage, false);
$smarty->assign ('smarty_template', 'create-alias-domain');
$smarty->display ('index.tpl');
/* vim: set expandtab softtabstop=3 tabstop=3 shiftwidth=3: */
Modified: trunk/edit-alias.php
===================================================================
--- trunk/edit-alias.php 2011-07-18 22:36:38 UTC (rev 1085)
+++ trunk/edit-alias.php 2011-07-18 22:48:46 UTC (rev 1086)
@@ -19,7 +19,6 @@
*
* Template Variables:
*
- * tMessage
* tGoto
*
* Form POST \ GET Variables:
@@ -99,7 +98,7 @@
{
$error = 1;
$tGoto = $fGoto;
- $tMessage = $PALANG['pEdit_alias_result_error'];
+ flash_error($PALANG['pEdit_alias_result_error']);
}
$goto = preg_replace ('/\\\r\\\n/', ',', $fGoto);
@@ -113,7 +112,7 @@
{
$error = 1;
$tGoto = $_POST['fGoto'];
- $tMessage = $PALANG['pEdit_alias_goto_text_error1'];
+ flash_error($PALANG['pEdit_alias_goto_text_error1']);
}
$new_aliases = array();
@@ -130,8 +129,7 @@
{
$error = 1;
$tGoto = $goto;
- if (!empty($tMessage)) $tMessage .= "<br />";
- $tMessage .= $PALANG['pEdit_alias_goto_text_error2'] . "$address</span>";
+ flash_error($PALANG['pEdit_alias_goto_text_error2'] . "$address");
}
}
@@ -157,7 +155,7 @@
$result = db_query ("UPDATE $table_alias SET goto='$goto',modified=NOW() WHERE address='$fAddress' AND domain='$fDomain'");
if ($result['rows'] != 1)
{
- $tMessage = $PALANG['pEdit_alias_result_error'];
+ flash_error($PALANG['pEdit_alias_result_error']);
}
else
{
@@ -174,7 +172,6 @@
$smarty->assign ('fAddress', $fAddress);
$smarty->assign ('tGoto', $tGoto);
$smarty->assign ('array', $array, false);
-$smarty->assign ('tMessage', $tMessage, false);
$smarty->assign ('smarty_template', 'edit-alias');
$smarty->display ('index.tpl');
Modified: trunk/edit-domain.php
===================================================================
--- trunk/edit-domain.php 2011-07-18 22:36:38 UTC (rev 1085)
+++ trunk/edit-domain.php 2011-07-18 22:48:46 UTC (rev 1086)
@@ -115,7 +115,7 @@
header ("Location: list-domain.php");
exit;
} else {
- $tMessage = $PALANG['pAdminEdit_domain_result_error'];
+ flash_error($PALANG['pAdminEdit_domain_result_error']);
}
}
@@ -128,7 +128,6 @@
$smarty->assign ('select_options', select_options($CONF['transport_options'], array($tTransport)), false);
if ($tBackupmx) $smarty->assign ('tBackupmx', ' checked="checked"');
if ($tActive) $smarty->assign ('tActive', ' checked="checked"');
-$smarty->assign ('tMessage', $tMessage,false);
$smarty->assign ('smarty_template', 'admin_edit-domain');
$smarty->display ('index.tpl');
Modified: trunk/edit-vacation.php
===================================================================
--- trunk/edit-vacation.php 2011-07-18 22:36:38 UTC (rev 1085)
+++ trunk/edit-vacation.php 2011-07-18 22:48:46 UTC (rev 1086)
@@ -20,7 +20,6 @@
* Template Variables:
*
* tUseremail
- * tMessage
* tSubject
* tBody
*
@@ -72,7 +71,6 @@
if ($result['rows'] == 1)
{
$row = db_array($result['result']);
- $tMessage = '';
$tSubject = $row['subject'];
$tBody = $row['body'];
$tActiveFrom = $row['activefrom'];
@@ -137,14 +135,14 @@
if($error == 0) {
if(!empty ($fBack)) {
- $tMessage = $PALANG['pVacation_result_removed'];
+ flash_info($PALANG['pVacation_result_removed']);
}
if(!empty($fChange)) {
- $tMessage= $PALANG['pVacation_result_added'];
+ flash_info($PALANG['pVacation_result_added']);
}
}
else {
- $tMessage = $PALANG['pVacation_result_error'];
+ flash_error($PALANG['pVacation_result_error']);
}
if (empty ($tActiveFrom))
$tActiveFrom = date ("Y-m-d");
@@ -154,7 +152,6 @@
$smarty->assign ('tUseremail', $tUseremail);
$smarty->assign ('tSubject', $tSubject);
$smarty->assign ('tBody', $tBody ,false);
-$smarty->assign ('tMessage', $tMessage, false);
$smarty->assign ('tActiveFrom', date ("d.m.Y", strtotime ($tActiveFrom)));
$smarty->assign ('tActiveUntil', date ("d.m.Y", strtotime ($tActiveUntil)));
$smarty->assign ('fCanceltarget', $fCanceltarget);
Modified: trunk/password.php
===================================================================
--- trunk/password.php 2011-07-18 22:36:38 UTC (rev 1085)
+++ trunk/password.php 2011-07-18 22:48:46 UTC (rev 1086)
@@ -18,7 +18,7 @@
*
* Template Variables:
*
- * tMessage
+ * none
*
* Form POST \ GET Variables:
*
@@ -83,17 +83,16 @@
$result = db_query ("UPDATE $table_admin SET password='$password',modified=NOW() WHERE username='$username'");
if ($result['rows'] == 1)
{
- $tMessage = $PALANG['pPassword_result_success'];
+ flash_info($PALANG['pPassword_result_success']);
}
else
{
- $tMessage = $PALANG['pPassword_result_error'];
+ flash_error($PALANG['pPassword_result_error']);
}
}
$smarty->assign ('pPassword_password_current_text', $pPassword_password_current_text);
$smarty->assign ('pPassword_password_text', $pPassword_password_text);
- $smarty->assign ('tMessage', $tMessage,false);
$smarty->display ('index.tpl');
}
Modified: trunk/viewlog.php
===================================================================
--- trunk/viewlog.php 2011-07-18 22:36:38 UTC (rev 1085)
+++ trunk/viewlog.php 2011-07-18 22:48:46 UTC (rev 1086)
@@ -19,7 +19,6 @@
*
* Template Variables:
*
- * tMessage
* tLog
*
* Form POST \ GET Variables:
@@ -50,7 +49,7 @@
if (! (check_owner ($SESSID_USERNAME, $fDomain) || authentication_has_role('global-admin')))
{
$error = 1;
- $tMessage = $PALANG['pViewlog_result_error'];
+ flash_error($PALANG['pViewlog_result_error']);
}
// we need to initialize $tLog as an array!
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <chr...@us...> - 2011-07-19 19:34:18
|
Revision: 1089
http://postfixadmin.svn.sourceforge.net/postfixadmin/?rev=1089&view=rev
Author: christian_boltz
Date: 2011-07-19 19:34:11 +0000 (Tue, 19 Jul 2011)
Log Message:
-----------
login.tpl, users_login.tpl:
- changed <h4> to <th>
- mark labels with <label>
- added a label to the language selector
- removed tMessage
languages/*:
- added PALANG[pLogin_language]
changes compared to Dale's patch:
- users_login.tpl:
- do not add the <div class="field_container"> ... </div> wraps
- use PALANG[pLogin_language] instead of PALANG[pUsersLogin_language]
to avoid a superfluous string/translation
- login.tpl:
- removed wrong colspan for language selector and login button
- de.lang: added german translation for PALANG[pLogin_language]
This commit is part of the huge cleanup patch by Dale Blount (lnxus@SF),
https://sourceforge.net/tracker/?func=detail&atid=937966&aid=3370510&group_id=191583
Modified Paths:
--------------
trunk/languages/bg.lang
trunk/languages/ca.lang
trunk/languages/cn.lang
trunk/languages/cs.lang
trunk/languages/da.lang
trunk/languages/de.lang
trunk/languages/en.lang
trunk/languages/es.lang
trunk/languages/et.lang
trunk/languages/eu.lang
trunk/languages/fi.lang
trunk/languages/fo.lang
trunk/languages/fr.lang
trunk/languages/hr.lang
trunk/languages/hu.lang
trunk/languages/is.lang
trunk/languages/it.lang
trunk/languages/ja.lang
trunk/languages/lt.lang
trunk/languages/mk.lang
trunk/languages/nb.lang
trunk/languages/nl.lang
trunk/languages/nn.lang
trunk/languages/pl.lang
trunk/languages/pt-br.lang
trunk/languages/ru.lang
trunk/languages/sk.lang
trunk/languages/sl.lang
trunk/languages/sv.lang
trunk/languages/tr.lang
trunk/languages/tw.lang
trunk/templates/login.tpl
trunk/templates/users_login.tpl
Modified: trunk/languages/bg.lang
===================================================================
--- trunk/languages/bg.lang 2011-07-18 23:38:57 UTC (rev 1088)
+++ trunk/languages/bg.lang 2011-07-19 19:34:11 UTC (rev 1089)
@@ -24,6 +24,7 @@
$PALANG['pLogin_welcome'] = 'Администратора може да се логне оттук за администриране на домейн.';
$PALANG['pLogin_username'] = 'Логин (е-мейл)';
$PALANG['pLogin_password'] = 'Парола';
+$PALANG['pLogin_language'] = 'Language'; # XXX
$PALANG['pLogin_button'] = 'Изход';
$PALANG['pLogin_failed'] = 'Your email address or password are not correct.'; # XXX
$PALANG['pLogin_login_users'] = 'Ако сте потребител натиснете тук за логване в потребителската част.';
Modified: trunk/languages/ca.lang
===================================================================
--- trunk/languages/ca.lang 2011-07-18 23:38:57 UTC (rev 1088)
+++ trunk/languages/ca.lang 2011-07-19 19:34:11 UTC (rev 1089)
@@ -23,6 +23,7 @@
$PALANG['pLogin_welcome'] = 'Login d\'administrador per l\'administració de dominis.';
$PALANG['pLogin_username'] = 'Usuari (e-mail)';
$PALANG['pLogin_password'] = 'Contrasenya';
+$PALANG['pLogin_language'] = 'Language'; # XXX
$PALANG['pLogin_button'] = 'Usuari';
$PALANG['pLogin_failed'] = 'Your email address or password are not correct.'; # XXX
$PALANG['pLogin_login_users'] = 'Login per anar a la secció d\'usuaris.';
Modified: trunk/languages/cn.lang
===================================================================
--- trunk/languages/cn.lang 2011-07-18 23:38:57 UTC (rev 1088)
+++ trunk/languages/cn.lang 2011-07-19 19:34:11 UTC (rev 1089)
@@ -23,6 +23,7 @@
$PALANG['pLogin_welcome'] = '邮件管理员请从这里登录以管理你的域名.';
$PALANG['pLogin_username'] = '帐号 (邮件地址)';
$PALANG['pLogin_password'] = '密码';
+$PALANG['pLogin_language'] = 'Language'; # XXX
$PALANG['pLogin_button'] = '登录';
$PALANG['pLogin_failed'] = 'Your email address or password are not correct.'; # XXX
$PALANG['pLogin_login_users'] = '普通用户点击这里进入用户控制面板.';
Modified: trunk/languages/cs.lang
===================================================================
--- trunk/languages/cs.lang 2011-07-18 23:38:57 UTC (rev 1088)
+++ trunk/languages/cs.lang 2011-07-19 19:34:11 UTC (rev 1089)
@@ -28,6 +28,7 @@
$PALANG['pLogin_welcome'] = 'Zde se přihlašují emailoví administrátoři pro administraci svých domén.';
$PALANG['pLogin_username'] = 'Uživatelské jméno (email)';
$PALANG['pLogin_password'] = 'Heslo';
+$PALANG['pLogin_language'] = 'Language'; # XXX
$PALANG['pLogin_button'] = 'Přihlásit';
$PALANG['pLogin_failed'] = 'Your email address or password are not correct.'; # XXX
$PALANG['pLogin_login_users'] = 'Vstup do uživatelské sekce.';
Modified: trunk/languages/da.lang
===================================================================
--- trunk/languages/da.lang 2011-07-18 23:38:57 UTC (rev 1088)
+++ trunk/languages/da.lang 2011-07-19 19:34:11 UTC (rev 1089)
@@ -25,6 +25,7 @@
$PALANG['pLogin_welcome'] = 'Postadministrator: Log ind for at administrere dine domæner.';
$PALANG['pLogin_username'] = 'Brugernavn (email)';
$PALANG['pLogin_password'] = 'Adgangskode';
+$PALANG['pLogin_language'] = 'Language'; # XXX
$PALANG['pLogin_button'] = 'Login';
$PALANG['pLogin_failed'] = 'Your email address or password are not correct.'; # XXX
$PALANG['pLogin_login_users'] = 'Bruger: Log ind på brugersektionen her.';
Modified: trunk/languages/de.lang
===================================================================
--- trunk/languages/de.lang 2011-07-18 23:38:57 UTC (rev 1088)
+++ trunk/languages/de.lang 2011-07-19 19:34:11 UTC (rev 1089)
@@ -25,6 +25,7 @@
$PALANG['pLogin_welcome'] = 'Mail-Administratoren loggen sich bitte hier ein.';
$PALANG['pLogin_username'] = 'Login (eMail)';
$PALANG['pLogin_password'] = 'Passwort';
+$PALANG['pLogin_language'] = 'Sprache';
$PALANG['pLogin_button'] = 'Login';
$PALANG['pLogin_failed'] = 'Ihre Mailadresse oder das Passwort sind nicht korrekt.';
$PALANG['pLogin_login_users'] = 'eMail-Benutzer bitte hier einloggen.';
Modified: trunk/languages/en.lang
===================================================================
--- trunk/languages/en.lang 2011-07-18 23:38:57 UTC (rev 1088)
+++ trunk/languages/en.lang 2011-07-19 19:34:11 UTC (rev 1089)
@@ -25,6 +25,7 @@
$PALANG['pLogin_welcome'] = 'Mail admins login here to administer your domain.';
$PALANG['pLogin_username'] = 'Login (email)';
$PALANG['pLogin_password'] = 'Password';
+$PALANG['pLogin_language'] = 'Language';
$PALANG['pLogin_button'] = 'Login';
$PALANG['pLogin_failed'] = 'Your email address or password are not correct.';
$PALANG['pLogin_login_users'] = 'Users click here to login to the user section.';
Modified: trunk/languages/es.lang
===================================================================
--- trunk/languages/es.lang 2011-07-18 23:38:57 UTC (rev 1088)
+++ trunk/languages/es.lang 2011-07-19 19:34:11 UTC (rev 1089)
@@ -24,6 +24,7 @@
$PALANG['pLogin_welcome'] = 'Login de administrador para administración de dominios.';
$PALANG['pLogin_username'] = 'Usuario (e-mail)';
$PALANG['pLogin_password'] = 'Contraseña';
+$PALANG['pLogin_language'] = 'Language'; # XXX
$PALANG['pLogin_button'] = 'Usuario';
$PALANG['pLogin_failed'] = 'La cuenta de email o la contraseña no son correctas.';
$PALANG['pLogin_login_users'] = 'Login para ir a la sección de usuarios.';
Modified: trunk/languages/et.lang
===================================================================
--- trunk/languages/et.lang 2011-07-18 23:38:57 UTC (rev 1088)
+++ trunk/languages/et.lang 2011-07-19 19:34:11 UTC (rev 1089)
@@ -23,6 +23,7 @@
$PALANG['pLogin_welcome'] = 'E-posti haldaja, logi siit domeeni administreerimiseks sisse.';
$PALANG['pLogin_username'] = 'Kasutajanimi (e-posti aadress)';
$PALANG['pLogin_password'] = 'Parool';
+$PALANG['pLogin_language'] = 'Language'; # XXX
$PALANG['pLogin_button'] = 'Logi sisse';
$PALANG['pLogin_failed'] = 'Your email address or password are not correct.'; # XXX
$PALANG['pLogin_login_users'] = 'Kasutaja, klõpsa siia logimaks sisse kasutaja sektsiooni.';
Modified: trunk/languages/eu.lang
===================================================================
--- trunk/languages/eu.lang 2011-07-18 23:38:57 UTC (rev 1088)
+++ trunk/languages/eu.lang 2011-07-19 19:34:11 UTC (rev 1089)
@@ -23,6 +23,7 @@
$PALANG['pLogin_welcome'] = 'Kudeatzailearen logina domeinuak kudeatzeko.';
$PALANG['pLogin_username'] = 'Erabiltzailea (e-mail)';
$PALANG['pLogin_password'] = 'Pasahitza';
+$PALANG['pLogin_language'] = 'Language'; # XXX
$PALANG['pLogin_button'] = 'Erabiltzailea';
$PALANG['pLogin_failed'] = 'Your email address or password are not correct.'; # XXX
$PALANG['pLogin_login_users'] = 'Erabiltzaileen gunera joateko logina.';
Modified: trunk/languages/fi.lang
===================================================================
--- trunk/languages/fi.lang 2011-07-18 23:38:57 UTC (rev 1088)
+++ trunk/languages/fi.lang 2011-07-19 19:34:11 UTC (rev 1089)
@@ -24,6 +24,7 @@
$PALANG['pLogin_welcome'] = 'Kirjautuminen';
$PALANG['pLogin_username'] = 'Tunnus';
$PALANG['pLogin_password'] = 'Salasana';
+$PALANG['pLogin_language'] = 'Language'; # XXX
$PALANG['pLogin_button'] = 'Kirjaudu';
$PALANG['pLogin_failed'] = 'Sähköpostiosoite tai salasana väärin!';
$PALANG['pLogin_login_users'] = 'Käyttäjien kirjautuminen.';
Modified: trunk/languages/fo.lang
===================================================================
--- trunk/languages/fo.lang 2011-07-18 23:38:57 UTC (rev 1088)
+++ trunk/languages/fo.lang 2011-07-19 19:34:11 UTC (rev 1089)
@@ -23,6 +23,7 @@
$PALANG['pLogin_welcome'] = 'Umsitarar kunnu logga inn her fyri at umsita tykkara navnaøki.';
$PALANG['pLogin_username'] = 'Login (e-post)';
$PALANG['pLogin_password'] = 'Loyniorð';
+$PALANG['pLogin_language'] = 'Language'; # XXX
$PALANG['pLogin_button'] = 'Logga inn';
$PALANG['pLogin_failed'] = 'Your email address or password are not correct.'; # XXX
$PALANG['pLogin_login_users'] = 'Brúkarar kunnu logga inn her.';
Modified: trunk/languages/fr.lang
===================================================================
--- trunk/languages/fr.lang 2011-07-18 23:38:57 UTC (rev 1088)
+++ trunk/languages/fr.lang 2011-07-19 19:34:11 UTC (rev 1089)
@@ -25,6 +25,7 @@
$PALANG['pLogin_welcome'] = 'Entrez votre adresse courriel pour administrer votre domaine.';
$PALANG['pLogin_username'] = 'Adresse courriel';
$PALANG['pLogin_password'] = 'Mot de passe';
+$PALANG['pLogin_language'] = 'Language'; # XXX
$PALANG['pLogin_button'] = 'Entrer';
$PALANG['pLogin_failed'] = 'Votre email ou mot de passe est incorrect.';
$PALANG['pLogin_login_users'] = 'Utilisateurs, cliquez ici pour rejoindre votre section.';
Modified: trunk/languages/hr.lang
===================================================================
--- trunk/languages/hr.lang 2011-07-18 23:38:57 UTC (rev 1088)
+++ trunk/languages/hr.lang 2011-07-19 19:34:11 UTC (rev 1089)
@@ -22,6 +22,7 @@
$PALANG['pLogin_welcome'] = 'Administratori prijavite se ovdje.';
$PALANG['pLogin_username'] = 'Korisničko ime (adresa e-pote)';
$PALANG['pLogin_password'] = 'Lozinka';
+$PALANG['pLogin_language'] = 'Language'; # XXX
$PALANG['pLogin_button'] = 'Prijavi';
$PALANG['pLogin_failed'] = 'Your email address or password are not correct.'; # XXX
$PALANG['pLogin_login_users'] = 'Korisnici kliknite ovdje za prijavu u korisničku sekciju.';
Modified: trunk/languages/hu.lang
===================================================================
--- trunk/languages/hu.lang 2011-07-18 23:38:57 UTC (rev 1088)
+++ trunk/languages/hu.lang 2011-07-19 19:34:11 UTC (rev 1089)
@@ -24,6 +24,7 @@
$PALANG['pLogin_welcome'] = 'Mail adminisztrátorok itt jelentkezzenek be, hogy adminisztrálják a domainjüket.';
$PALANG['pLogin_username'] = 'Bejelentkezés (email)';
$PALANG['pLogin_password'] = 'Jelszó';
+$PALANG['pLogin_language'] = 'Language'; # XXX
$PALANG['pLogin_button'] = 'Bejelentkezés';
$PALANG['pLogin_failed'] = 'Your email address or password are not correct.'; # XXX
$PALANG['pLogin_login_users'] = 'A felhasználók kattintsanak ide a felhasználói felülethez.';
Modified: trunk/languages/is.lang
===================================================================
--- trunk/languages/is.lang 2011-07-18 23:38:57 UTC (rev 1088)
+++ trunk/languages/is.lang 2011-07-19 19:34:11 UTC (rev 1089)
@@ -23,6 +23,7 @@
$PALANG['pLogin_welcome'] = 'Póst kerfisstjóri tengist hér til að viðhalda póstkerfi lénsins þins.';
$PALANG['pLogin_username'] = 'Auðkenni(email)';
$PALANG['pLogin_password'] = 'Lykilorð';
+$PALANG['pLogin_language'] = 'Language'; # XXX
$PALANG['pLogin_button'] = 'Tengjast';
$PALANG['pLogin_failed'] = 'Your email address or password are not correct.'; # XXX
$PALANG['pLogin_login_users'] = 'Notendur smellið hér til að opna almennt notendaviðmót.';
Modified: trunk/languages/it.lang
===================================================================
--- trunk/languages/it.lang 2011-07-18 23:38:57 UTC (rev 1088)
+++ trunk/languages/it.lang 2011-07-19 19:34:11 UTC (rev 1089)
@@ -24,6 +24,7 @@
$PALANG['pLogin_welcome'] = 'Gli amministratori di posta devono effettuare il login qui per amministrare il proprio dominio.';
$PALANG['pLogin_username'] = 'Nome utente (email)';
$PALANG['pLogin_password'] = 'Password';
+$PALANG['pLogin_language'] = 'Language'; # XXX
$PALANG['pLogin_button'] = 'Entra';
$PALANG['pLogin_failed'] = 'Your email address or password are not correct.'; # XXX
$PALANG['pLogin_login_users'] = 'Gli utenti devono cliccare qui per entrare nella propria sezione.';
Modified: trunk/languages/ja.lang
===================================================================
--- trunk/languages/ja.lang 2011-07-18 23:38:57 UTC (rev 1088)
+++ trunk/languages/ja.lang 2011-07-19 19:34:11 UTC (rev 1089)
@@ -25,6 +25,7 @@
$PALANG['pLogin_welcome'] = 'こちらからドメインの管理ができます。';
$PALANG['pLogin_username'] = 'ログイン (メールアドレス)';
$PALANG['pLogin_password'] = 'パスワード';
+$PALANG['pLogin_language'] = 'Language'; # XXX
$PALANG['pLogin_button'] = 'ログイン';
$PALANG['pLogin_failed'] = 'Your email address or password are not correct.'; # XXX
$PALANG['pLogin_login_users'] = '一般ユーザのログインはここをクリックしてください。';
Modified: trunk/languages/lt.lang
===================================================================
--- trunk/languages/lt.lang 2011-07-18 23:38:57 UTC (rev 1088)
+++ trunk/languages/lt.lang 2011-07-19 19:34:11 UTC (rev 1089)
@@ -22,6 +22,7 @@
$PALANG['pLogin_welcome'] = 'Pašto srities administratorius.';
$PALANG['pLogin_username'] = 'Vartotojas (el.paštas)';
$PALANG['pLogin_password'] = 'Slaptažodis';
+$PALANG['pLogin_language'] = 'Language'; # XXX
$PALANG['pLogin_button'] = 'Prisijungti';
$PALANG['pLogin_failed'] = 'Your email address or password are not correct.'; # XXX
$PALANG['pLogin_login_users'] = 'Pašto vartotojo nustatymai.';
Modified: trunk/languages/mk.lang
===================================================================
--- trunk/languages/mk.lang 2011-07-18 23:38:57 UTC (rev 1088)
+++ trunk/languages/mk.lang 2011-07-19 19:34:11 UTC (rev 1089)
@@ -23,6 +23,7 @@
$PALANG['pLogin_welcome'] = 'Логин за администрирање на домени (Само за администратори!)';
$PALANG['pLogin_username'] = 'Корисничко име (email)';
$PALANG['pLogin_password'] = 'Лозинка';
+$PALANG['pLogin_language'] = 'Language'; # XXX
$PALANG['pLogin_button'] = 'Пријава';
$PALANG['pLogin_failed'] = 'Your email address or password are not correct.'; # XXX
$PALANG['pLogin_login_users'] = 'Логин за обични корисници.';
Modified: trunk/languages/nb.lang
===================================================================
--- trunk/languages/nb.lang 2011-07-18 23:38:57 UTC (rev 1088)
+++ trunk/languages/nb.lang 2011-07-19 19:34:11 UTC (rev 1089)
@@ -25,6 +25,7 @@
$PALANG['pLogin_welcome'] = 'E-postadministratorer kan logge inn her for å administrere sine domener';
$PALANG['pLogin_username'] = 'Brukernavn (e-postadresse)';
$PALANG['pLogin_password'] = 'Passord';
+$PALANG['pLogin_language'] = 'Language'; # XXX
$PALANG['pLogin_button'] = 'Logg inn';
$PALANG['pLogin_failed'] = 'E-postadressen eller passordet er ikke korrekt.';
$PALANG['pLogin_login_users'] = 'Vanlige brukere kan klikke her for å gå til brukerseksjonen.';
Modified: trunk/languages/nl.lang
===================================================================
--- trunk/languages/nl.lang 2011-07-18 23:38:57 UTC (rev 1088)
+++ trunk/languages/nl.lang 2011-07-19 19:34:11 UTC (rev 1089)
@@ -24,6 +24,7 @@
$PALANG['pLogin_welcome'] = 'Mail beheerders log hier in om uw domeinen te beheren.';
$PALANG['pLogin_username'] = 'Login (e-mail)';
$PALANG['pLogin_password'] = 'Wachtwoord';
+$PALANG['pLogin_language'] = 'Language'; # XXX
$PALANG['pLogin_button'] = 'Login';
$PALANG['pLogin_failed'] = 'Uw login gegevens zijn onjuist.';
$PALANG['pLogin_login_users'] = 'Gebruikers klik hier om in te loggen.';
Modified: trunk/languages/nn.lang
===================================================================
--- trunk/languages/nn.lang 2011-07-18 23:38:57 UTC (rev 1088)
+++ trunk/languages/nn.lang 2011-07-19 19:34:11 UTC (rev 1089)
@@ -23,6 +23,7 @@
$PALANG['pLogin_welcome'] = 'Postadministrator; Logg inn her for å administrere ditt domene';
$PALANG['pLogin_username'] = 'Brukernavn (e-postadressen)';
$PALANG['pLogin_password'] = 'Passord';
+$PALANG['pLogin_language'] = 'Language'; # XXX
$PALANG['pLogin_button'] = 'Logg inn';
$PALANG['pLogin_failed'] = 'Your email address or password are not correct.'; # XXX
$PALANG['pLogin_login_users'] = 'Brukare, trykk her for å gå til bruker-seksjonen.';
Modified: trunk/languages/pl.lang
===================================================================
--- trunk/languages/pl.lang 2011-07-18 23:38:57 UTC (rev 1088)
+++ trunk/languages/pl.lang 2011-07-19 19:34:11 UTC (rev 1089)
@@ -26,6 +26,7 @@
$PALANG['pLogin_welcome'] = 'Sekcja przeznaczona dla administratorów domen.';
$PALANG['pLogin_username'] = 'Login (email)';
$PALANG['pLogin_password'] = 'Hasło';
+$PALANG['pLogin_language'] = 'Language'; # XXX
$PALANG['pLogin_button'] = 'Zaloguj';
$PALANG['pLogin_failed'] = 'Twój adres Email lub hasło jest niepoprawne.';
$PALANG['pLogin_login_users'] = 'Sekcja przeznaczona dla użytkowników.';
Modified: trunk/languages/pt-br.lang
===================================================================
--- trunk/languages/pt-br.lang 2011-07-18 23:38:57 UTC (rev 1088)
+++ trunk/languages/pt-br.lang 2011-07-19 19:34:11 UTC (rev 1089)
@@ -25,6 +25,7 @@
$PALANG['pLogin_welcome'] = 'Administradores devem se autenticar aqui para gerenciar seus domínios.';
$PALANG['pLogin_username'] = 'Usuário (email)';
$PALANG['pLogin_password'] = 'Senha';
+$PALANG['pLogin_language'] = 'Language'; # XXX
$PALANG['pLogin_button'] = 'Entrar';
$PALANG['pLogin_failed'] = 'Your email address or password are not correct.'; # XXX
$PALANG['pLogin_login_users'] = 'Usuários devem clicar aqui para acessar a seção de usuários.';
Modified: trunk/languages/ru.lang
===================================================================
--- trunk/languages/ru.lang 2011-07-18 23:38:57 UTC (rev 1088)
+++ trunk/languages/ru.lang 2011-07-19 19:34:11 UTC (rev 1089)
@@ -26,6 +26,7 @@
$PALANG['pLogin_welcome'] = 'Вход для администрирования почтовых ящиков.';
$PALANG['pLogin_username'] = 'Имя (адрес e-mail)';
$PALANG['pLogin_password'] = 'Пароль';
+$PALANG['pLogin_language'] = 'Language'; # XXX
$PALANG['pLogin_button'] = 'Войти';
$PALANG['pLogin_failed'] = 'Ваш адрес e-mail или пароль неверен.';
$PALANG['pLogin_login_users'] = 'Вход для обычных пользователей.';
Modified: trunk/languages/sk.lang
===================================================================
--- trunk/languages/sk.lang 2011-07-18 23:38:57 UTC (rev 1088)
+++ trunk/languages/sk.lang 2011-07-19 19:34:11 UTC (rev 1089)
@@ -24,6 +24,7 @@
$PALANG['pLogin_welcome'] = 'Prihlásenie administrátorov pre správu domén';
$PALANG['pLogin_username'] = 'Užívateľské meno (email)';
$PALANG['pLogin_password'] = 'Heslo';
+$PALANG['pLogin_language'] = 'Language'; # XXX
$PALANG['pLogin_button'] = 'Prihlásiť';
$PALANG['pLogin_failed'] = 'Váš email alebo heslo nie je správne.';
$PALANG['pLogin_login_users'] = 'Vstup do užívateľskej sekcie';
Modified: trunk/languages/sl.lang
===================================================================
--- trunk/languages/sl.lang 2011-07-18 23:38:57 UTC (rev 1088)
+++ trunk/languages/sl.lang 2011-07-19 19:34:11 UTC (rev 1089)
@@ -23,6 +23,7 @@
$PALANG['pLogin_welcome'] = 'Administratorji se prijavite tukaj.';
$PALANG['pLogin_username'] = 'Uporabniško ime (e-poštni naslov)';
$PALANG['pLogin_password'] = 'Geslo';
+$PALANG['pLogin_language'] = 'Language'; # XXX
$PALANG['pLogin_button'] = 'Prijavi';
$PALANG['pLogin_failed'] = 'Your email address or password are not correct.'; # XXX
$PALANG['pLogin_login_users'] = 'Uporabniki kliknite tukaj, če želite nastaviti odsotnost ali spremeniti geslo.';
Modified: trunk/languages/sv.lang
===================================================================
--- trunk/languages/sv.lang 2011-07-18 23:38:57 UTC (rev 1088)
+++ trunk/languages/sv.lang 2011-07-19 19:34:11 UTC (rev 1089)
@@ -25,6 +25,7 @@
$PALANG['pLogin_welcome'] = 'Mail administratörer loggar in här för att sköta er domän.';
$PALANG['pLogin_username'] = 'Login (epost)';
$PALANG['pLogin_password'] = 'Lösenord';
+$PALANG['pLogin_language'] = 'Language'; # XXX
$PALANG['pLogin_button'] = 'Login';
$PALANG['pLogin_failed'] = 'Your email address or password are not correct.'; # XXX
$PALANG['pLogin_login_users'] = 'Användare klickar här för att logga in på användardelen.';
Modified: trunk/languages/tr.lang
===================================================================
--- trunk/languages/tr.lang 2011-07-18 23:38:57 UTC (rev 1088)
+++ trunk/languages/tr.lang 2011-07-19 19:34:11 UTC (rev 1089)
@@ -23,6 +23,7 @@
$PALANG['pLogin_welcome'] = 'Posta Yöneticileri buradan domainlerinizi yönetmek için giriþ yapabilirsiniz.';
$PALANG['pLogin_username'] = 'Kullanýcý adý (eposta)';
$PALANG['pLogin_password'] = 'Þifre';
+$PALANG['pLogin_language'] = 'Language'; # XXX
$PALANG['pLogin_button'] = 'Giriþ';
$PALANG['pLogin_failed'] = 'Your email address or password are not correct.'; # XXX
$PALANG['pLogin_login_users'] = 'Kullanýcý iþlemlerine girmek için burayý kullanýnýz.';
Modified: trunk/languages/tw.lang
===================================================================
--- trunk/languages/tw.lang 2011-07-18 23:38:57 UTC (rev 1088)
+++ trunk/languages/tw.lang 2011-07-19 19:34:11 UTC (rev 1089)
@@ -23,6 +23,7 @@
$PALANG['pLogin_welcome'] = '郵件管理員請從這裡登錄以管理你的網域名.';
$PALANG['pLogin_username'] = '帳號 (郵件地址)';
$PALANG['pLogin_password'] = '密碼';
+$PALANG['pLogin_language'] = 'Language'; # XXX
$PALANG['pLogin_button'] = '登錄';
$PALANG['pLogin_failed'] = 'Your email address or password are not correct.'; # XXX
$PALANG['pLogin_login_users'] = '普通用戶點擊這裡進入用戶控制面板.';
Modified: trunk/templates/login.tpl
===================================================================
--- trunk/templates/login.tpl 2011-07-18 23:38:57 UTC (rev 1088)
+++ trunk/templates/login.tpl 2011-07-19 19:34:11 UTC (rev 1089)
@@ -2,26 +2,25 @@
<form name="frmLogin" method="post" action="">
<table id="login_table" cellspacing="10">
<tr>
- <td colspan="2"><h4>{$PALANG.pLogin_welcome}</h4></td>
+ <th colspan="2">{$PALANG.pLogin_welcome}</th>
</tr>
<tr>
- <td>{$PALANG.pLogin_username}:</td>
+ <td class="label"><label>{$PALANG.pLogin_username}:</label></td>
<td><input class="flat" type="text" name="fUsername" /></td>
</tr>
<tr>
- <td>{$PALANG.pLogin_password}:</td>
+ <td class="label"><label>{$PALANG.pLogin_password}:</label></td>
<td><input class="flat" type="password" name="fPassword" /></td>
</tr>
<tr>
- <td colspan="2">{$language_selector}</td>
+ <td class="label"><label>{$PALANG.pLogin_language}:</label></td>
+ <td>{$language_selector}</td>
</tr>
<tr>
- <td colspan="2" class="hlp_center"><input class="button" type="submit" name="submit" value="{$PALANG.pLogin_button}" /></td>
+ <td class="label"> </td>
+ <td><input class="button" type="submit" name="submit" value="{$PALANG.pLogin_button}" /></td>
</tr>
<tr>
- <td colspan="2" class="standout">{$tMessage}</td>
- </tr>
- <tr>
<td colspan="2"><a href="users/">{$PALANG.pLogin_login_users}</a></td>
</tr>
</table>
Modified: trunk/templates/users_login.tpl
===================================================================
--- trunk/templates/users_login.tpl 2011-07-18 23:38:57 UTC (rev 1088)
+++ trunk/templates/users_login.tpl 2011-07-19 19:34:11 UTC (rev 1089)
@@ -2,25 +2,24 @@
<form name="frmLogin" method="post" action="">
<table id="login_table" cellspacing="10">
<tr>
- <td colspan="2"><h4>{$PALANG.pUsersLogin_welcome}</h4></td>
+ <th colspan="2">{$PALANG.pUsersLogin_welcome}</th>
</tr>
<tr>
- <td>{$PALANG.pUsersLogin_username}:</td>
+ <td class="label"><label>{$PALANG.pUsersLogin_username}:</label></td>
<td><input class="flat" type="text" name="fUsername" value="{$tUsername}" /></td>
</tr>
<tr>
- <td>{$PALANG.pUsersLogin_password}:</td>
+ <td class="label"><label>{$PALANG.pUsersLogin_password}:</label></td>
<td><input class="flat" type="password" name="fPassword" /></td>
</tr>
<tr>
- <td colspan="2">{$language_selector}</td>
+ <td class="label"><label>{$PALANG.pLogin_language}:</label></td>
+ <td>{$language_selector}</td>
</tr>
<tr>
- <td colspan="2" class="hlp_center"><input class="button" type="submit" name="submit" value="{$PALANG.pUsersLogin_button}" /></td>
+ <td> </td>
+ <td><input class="button" type="submit" name="submit" value="{$PALANG.pUsersLogin_button}" /></td>
</tr>
- <tr>
- <td colspan="2" class="standout">{$tMessage}</td>
- </tr>
</table>
</form>
</div>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <chr...@us...> - 2011-07-19 19:55:49
|
Revision: 1090
http://postfixadmin.svn.sourceforge.net/postfixadmin/?rev=1090&view=rev
Author: christian_boltz
Date: 2011-07-19 19:55:42 +0000 (Tue, 19 Jul 2011)
Log Message:
-----------
users_edit-alias.tpl, users_password.tpl, users_vacation.tpl:
- replaced <h3> with <th>
- marked labels as <label>
- mark non-editable fields with <em>
- removed tMessage
- aligned buttons with input fields
users_password.tpl:
- put class=error_msg in template (will be removed from $PALANG strings)
- change compared to Dale's patch: use <td class="error_msg"> instead of
<td><span class="error_msg">
users_vacation.tpl:
- added class="flat" to fActiveFrom and fActiveUntil
- added language="JavaScript" to <script>
- removed reference to calendar.css (now included via default.css)
default.css
- added @import calendar.css
This commit is part of the huge cleanup patch by Dale Blount (lnxus@SF),
https://sourceforge.net/tracker/?func=detail&atid=937966&aid=3370510&group_id=191583
Modified Paths:
--------------
trunk/css/default.css
trunk/templates/users_edit-alias.tpl
trunk/templates/users_password.tpl
trunk/templates/users_vacation.tpl
Modified: trunk/css/default.css
===================================================================
--- trunk/css/default.css 2011-07-19 19:34:11 UTC (rev 1089)
+++ trunk/css/default.css 2011-07-19 19:55:42 UTC (rev 1090)
@@ -1,3 +1,4 @@
+@import url(calendar.css);
body {
background: #ffffff;
color: #000000;
Modified: trunk/templates/users_edit-alias.tpl
===================================================================
--- trunk/templates/users_edit-alias.tpl 2011-07-19 19:34:11 UTC (rev 1089)
+++ trunk/templates/users_edit-alias.tpl 2011-07-19 19:55:42 UTC (rev 1090)
@@ -2,15 +2,15 @@
<form name="alias" method="post" action="">
<table>
<tr>
- <td colspan="3"><h3>{$PALANG.pEdit_alias_welcome}<br />{$PALANG.pEdit_alias_help}</h3></td>
+ <th colspan="3">{$PALANG.pEdit_alias_welcome}<br /><em>{$PALANG.pEdit_alias_help}</em></th>
</tr>
<tr>
- <td>{$PALANG.pEdit_alias_address}:</td>
- <td>{$USERID_USERNAME}</td>
+ <td class="label"><label>{$PALANG.pEdit_alias_address}:</label></td>
+ <td><em>{$USERID_USERNAME}</em></td>
<td> </td>
</tr>
<tr>
- <td>{$PALANG.pEdit_alias_goto}:</td>
+ <td class="label"><label>{$PALANG.pEdit_alias_goto}:</label></td>
<td><textarea class="flat" rows="4" cols="50" name="fGoto">
{foreach from=$tGotoArray item=address}
{$address}
@@ -29,14 +29,13 @@
</td>
</tr>
<tr>
- <td colspan="3" class="hlp_center">
+ <td> </td>
+ <td>
<input class="button" type="submit" name="submit" value="{$PALANG.save}" />
<input class="button" type="submit" name="fCancel" value="{$PALANG.exit}" />
</td>
+ <td> </td>
</tr>
- <tr>
- <td colspan="3" class="standout">{$tMessage}</td>
- </tr>
</table>
</form>
</div>
Modified: trunk/templates/users_password.tpl
===================================================================
--- trunk/templates/users_password.tpl 2011-07-19 19:34:11 UTC (rev 1089)
+++ trunk/templates/users_password.tpl 2011-07-19 19:55:42 UTC (rev 1090)
@@ -2,37 +2,36 @@
<form name="alias" method="post" action="">
<table>
<tr>
- <td colspan="3"><h3>{$PALANG.pPassword_welcome}</h3></td>
+ <th colspan="3">{$PALANG.pPassword_welcome}</th>
</tr>
<tr>
- <td>{$PALANG.pPassword_admin}:</td>
- <td>{$USERID_USERNAME}</td>
+ <td class="label"><label>{$PALANG.pPassword_admin}:</label></td>
+ <td><em>{$USERID_USERNAME}</em></td>
<td> </td>
</tr>
<tr>
- <td>{$PALANG.pPassword_password_current}:</td>
+ <td class="label"><label>{$PALANG.pPassword_password_current}:</label></td>
<td><input class="flat" type="password" name="fPassword_current" /></td>
- <td>{$pPassword_password_current_text}</td>
+ <td class="error_msg">{$pPassword_password_current_text}</td>
</tr>
<tr>
- <td>{$PALANG.pPassword_password}:</td>
+ <td class="label"><label>{$PALANG.pPassword_password}:</label></td>
<td><input class="flat" type="password" name="fPassword" /></td>
- <td>{$pPassword_password_text}</td>
+ <td class="error_msg">{$pPassword_password_text}</td>
</tr>
<tr>
- <td>{$PALANG.pPassword_password2}:</td>
+ <td class="label"><label>{$PALANG.pPassword_password2}:</label></td>
<td><input class="flat" type="password" name="fPassword2" /></td>
<td> </td>
</tr>
<tr>
- <td colspan="3" class="hlp_center">
+ <td> </td>
+ <td>
<input class="button" type="submit" name="submit" value="{$PALANG.pPassword_button}" />
<input class="button" type="submit" name="fCancel" value="{$PALANG.exit}" />
</td>
+ <td> </td>
</tr>
- <tr>
- <td colspan="3" class="standout">{$tMessage}</td>
- </tr>
</table>
</form>
</div>
Modified: trunk/templates/users_vacation.tpl
===================================================================
--- trunk/templates/users_vacation.tpl 2011-07-19 19:34:11 UTC (rev 1089)
+++ trunk/templates/users_vacation.tpl 2011-07-19 19:55:42 UTC (rev 1090)
@@ -1,23 +1,22 @@
{literal}
- <script type="text/javascript">
+ <script language="JavaScript" type="text/javascript">
function newLocation() {
window.location="{/literal}{$fCanceltarget}{literal}"
}
</script>
- <script language="JavaScript" src="calendar.js"></script>
- <link rel="stylesheet" href="css/calendar.css">
+ <script language="JavaScript" src="calendar.js" type="text/javascript"></script>
{/literal}
<div id="edit_form">
<form name="vacation" method="post" action=''>
<table>
<tr>
- <td colspan="3"><h3>{$PALANG.pUsersVacation_welcome}</h3></td>
+ <th colspan="3">{$PALANG.pUsersVacation_welcome}</th>
</tr>
<tr>
- <td>{$PALANG.pUsersVacation_activefrom}:</td>
- <td><input name="fActiveFrom" value="{$tActiveFrom}" readonly="readonly" style="background:#eee;"/>
+ <td class="label"><label>{$PALANG.pUsersVacation_activefrom}:</label></td>
+ <td><input class="flat" name="fActiveFrom" value="{$tActiveFrom}" readonly="readonly" style="background:#eee;" />
{literal}
-<script language="JavaScript">
+<script language="JavaScript" type="text/javascript">
new tcal ({
'formname': 'vacation',
'controlname': 'fActiveFrom'
@@ -28,10 +27,10 @@
<td> </td>
</tr>
<tr>
- <td>{$PALANG.pUsersVacation_activeuntil}:</td>
- <td><input name="fActiveUntil" value="{$tActiveUntil}" readonly="readonly" style="background:#eee;"/>
+ <td class="label"><label>{$PALANG.pUsersVacation_activeuntil}:</label></td>
+ <td><input class="flat" name="fActiveUntil" value="{$tActiveUntil}" readonly="readonly" style="background:#eee;" />
{literal}
-<script language="JavaScript">
+<script language="JavaScript" type="text/javascript">
new tcal ({
'formname': 'vacation',
'controlname': 'fActiveUntil'
@@ -42,25 +41,23 @@
<td> </td>
</tr>
<tr>
- <td>{$PALANG.pUsersVacation_subject}:</td>
+ <td class="label"><label>{$PALANG.pUsersVacation_subject}:</label></td>
<td><textarea class="flat" rows="3" cols="60" name="fSubject" >{$tSubject}</textarea></td>
<td> </td>
</tr>
<tr>
- <td>{$PALANG.pUsersVacation_body}:</td>
+ <td class="label"><label>{$PALANG.pUsersVacation_body}:</label></td>
<td><textarea class="flat" rows="10" cols="60" name="fBody" >{$tBody}</textarea></td>
<td> </td>
</tr>
<tr>
- <td colspan="3" class="hlp_center">
+ <td> </td>
+ <td colspan="2">
<input class="button" type="submit" name="fAway" value="{$PALANG.pUsersVacation_button_away}" />
<input class="button" type="submit" name="fBack" value="{$PALANG.pUsersVacation_button_back}" />
<input class="button" type="submit" name="fCancel" value="{$PALANG.exit}" />
</td>
</tr>
- <tr>
- <td colspan="3" class="standout">{$tMessage}</td>
- </tr>
</table>
</form>
</div>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <chr...@us...> - 2011-07-19 20:24:47
|
Revision: 1092
http://postfixadmin.svn.sourceforge.net/postfixadmin/?rev=1092&view=rev
Author: christian_boltz
Date: 2011-07-19 20:24:41 +0000 (Tue, 19 Jul 2011)
Log Message:
-----------
config.inc.php:
- new config option $CONF['theme_custom_css']. This allows to add another
CSS file that is loaded after $CONF['theme_css']. Useful if someone wants to
do some small changes, but doesn't want to edit default.css
templates/header.tpl:
- include $CONF[theme_custom_css] if set
Changes compared to Dale's patch:
- $CONF['theme_custom_css'] is empty by default
- only include $CONF[theme_custom_css] if not empty
This commit is part of the huge cleanup patch by Dale Blount (lnxus@SF),
https://sourceforge.net/tracker/?func=detail&atid=937966&aid=3370510&group_id=191583
Modified Paths:
--------------
trunk/config.inc.php
trunk/templates/header.tpl
Modified: trunk/config.inc.php
===================================================================
--- trunk/config.inc.php 2011-07-19 20:01:57 UTC (rev 1091)
+++ trunk/config.inc.php 2011-07-19 20:24:41 UTC (rev 1092)
@@ -417,6 +417,9 @@
// Specify your own logo and CSS file
$CONF['theme_logo'] = 'images/logo-default.png';
$CONF['theme_css'] = 'css/default.css';
+// If you want to customize some styles without editing the $CONF['theme_css'] file,
+// you can add a custom CSS file. It will be included after $CONF['theme_css'].
+$CONF['theme_custom_css'] = '';
// XMLRPC Interface.
// This should be only of use if you wish to use e.g the
Modified: trunk/templates/header.tpl
===================================================================
--- trunk/templates/header.tpl 2011-07-19 20:01:57 UTC (rev 1091)
+++ trunk/templates/header.tpl 2011-07-19 20:24:41 UTC (rev 1092)
@@ -13,6 +13,9 @@
<head>
<meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
<link rel="stylesheet" type="text/css" href="{$CONF.theme_css}" />
+{if $CONF.theme_custom_css}
+ <link rel="stylesheet" type="text/css" href="{$CONF.theme_custom_css}" />
+{/if}
<title>Postfix Admin - {$smarty.server.HTTP_HOST}</title>
</head>
<body class="lang-{$smarty.session.lang}">
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <chr...@us...> - 2011-07-19 21:12:31
|
Revision: 1093
http://postfixadmin.svn.sourceforge.net/postfixadmin/?rev=1093&view=rev
Author: christian_boltz
Date: 2011-07-19 21:12:25 +0000 (Tue, 19 Jul 2011)
Log Message:
-----------
config.inc.php
- change default of $CONF['admin_email'] to '' and updated the comment.
IMPORTANT: If set, this will be used as mail sender for all mails
(2.3.x used the currently logged admin's username in most cases).
$CONF['admin_email'] = '' will match the 2.3.x behaviour.
functions.inc.php:
- new function smtp_get_admin_email() to get mail sender address
($CONF[admin_email] or currently logged in admin if not set)
- changes compared to Dale's patch:
- added @return in comment
- switched to /** comment style
This commit is part of the huge cleanup patch by Dale Blount (lnxus@SF),
https://sourceforge.net/tracker/?func=detail&atid=937966&aid=3370510&group_id=191583
Modified Paths:
--------------
trunk/config.inc.php
trunk/functions.inc.php
Modified: trunk/config.inc.php
===================================================================
--- trunk/config.inc.php 2011-07-19 20:24:41 UTC (rev 1092)
+++ trunk/config.inc.php 2011-07-19 21:12:25 UTC (rev 1093)
@@ -72,9 +72,11 @@
);
// Site Admin
-// Define the Site Admins email address below.
-// This will be used to send emails from to create mailboxes.
-$CONF['admin_email'] = 'pos...@ch...d';
+// Define the Site Admin's email address below.
+// This will be used to send emails from to create mailboxes and
+// from Send Email / Broadcast message pages.
+// Leave blank to send email from the logged-in Admin's Email address.
+$CONF['admin_email'] = '';
// Mail Server
// Hostname (FQDN) of your mail server.
Modified: trunk/functions.inc.php
===================================================================
--- trunk/functions.inc.php 2011-07-19 20:24:41 UTC (rev 1092)
+++ trunk/functions.inc.php 2011-07-19 21:12:25 UTC (rev 1093)
@@ -1340,6 +1340,19 @@
return true;
}
+/**
+ * smtp_get_admin_email
+ * Action: Get configured email address or current user if nothing configured
+ * Call: smtp_get_admin_email
+ * @return String - username/mail address
+ */
+function smtp_get_admin_email() {
+ global $CONF;
+ if(isset($CONF['admin_email']) && !empty($CONF['admin_email']))
+ return $CONF['admin_email'];
+ else
+ return authentication_get_username();
+}
//
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <chr...@us...> - 2011-07-19 21:41:43
|
Revision: 1094
http://postfixadmin.svn.sourceforge.net/postfixadmin/?rev=1094&view=rev
Author: christian_boltz
Date: 2011-07-19 21:41:37 +0000 (Tue, 19 Jul 2011)
Log Message:
-----------
sendmail.php, broadcast-message.php:
- use smtp_get_admin_email() to determinate the mail sender
- rename $SESSID_USERNAME to $smtp_from_email
- replaced tMessage with flash_error() / flash_info()
sendmail.php:
- changes compared to Dale's patch:
- use flash_info() for $PALANG['pSendmail_result_success']
broadcast-message.php:
- use flash_error() for $PALANG['pBroadcast_error_empty'] instead of
hardcoding it in the template
sendmail.tpl,templates/broadcast-message.tpl:
- replace <h3> with <th>
- replaced $SESSID_USERNAME / $CONF[admin_email] with $smtp_from_email
- mark labels with <label>
- mark non-editable fields with <em>
- align buttons with input fields
- remove tMessage
sendmail.tpl:
- changes compared to Dale's patch:
- fixed colspan for buttons cell
templates/broadcast-message.tpl:
- remove hardcoded error message (see broadcast-message.php change above)
- changes compared to Dale's patch:
- fixed colspan for <th>
This commit is part of the huge cleanup patch by Dale Blount (lnxus@SF),
https://sourceforge.net/tracker/?func=detail&atid=937966&aid=3370510&group_id=191583
Modified Paths:
--------------
trunk/broadcast-message.php
trunk/sendmail.php
trunk/templates/broadcast-message.tpl
trunk/templates/sendmail.tpl
Modified: trunk/broadcast-message.php
===================================================================
--- trunk/broadcast-message.php 2011-07-19 21:12:25 UTC (rev 1093)
+++ trunk/broadcast-message.php 2011-07-19 21:41:37 UTC (rev 1094)
@@ -35,13 +35,14 @@
exit;
}
-$SESSID_USERNAME = authentication_get_username();
+$smtp_from_email = smtp_get_admin_email();
if ($_SERVER['REQUEST_METHOD'] == "POST")
{
if (empty($_POST['subject']) || empty($_POST['message']) || empty($_POST['name']))
{
$error = 1;
+ flash_error($PALANG['pBroadcast_error_empty']);
}
else
{
@@ -63,7 +64,7 @@
while ($row = db_array ($result['result'])) {
$fTo = $row[0];
$fHeaders = 'To: ' . $fTo . "\n";
- $fHeaders .= 'From: ' . $b_name . ' <' . $CONF['admin_email'] . ">\n";
+ $fHeaders .= 'From: ' . $b_name . ' <' . $smtp_from_email . ">\n";
$fHeaders .= 'Subject: ' . $b_subject . "\n";
$fHeaders .= 'MIME-Version: 1.0' . "\n";
$fHeaders .= 'Content-Type: text/plain; charset=UTF-8' . "\n";
@@ -71,17 +72,17 @@
$fHeaders .= $b_message;
- if (!smtp_mail ($fTo, $CONF['admin_email'], $fHeaders))
+ if (!smtp_mail ($fTo, $smtp_from_email, $fHeaders))
{
- $tMessage .= "<br />" . $PALANG['pSendmail_result_error'] . "<br />";
+ flash_error("<br />" . $PALANG['pSendmail_result_error'] . "<br />");
}
else
{
- $tMessage .= "<br />" . $PALANG['pSendmail_result_success'] . "<br />";
+ flash_info("<br />" . $PALANG['pSendmail_result_success'] . "<br />");
}
}
}
- $smarty->assign ('tMessage', $PALANG['pBroadcast_success']);
+ flash_info($PALANG['pBroadcast_success']);
$smarty->assign ('smarty_template', 'message');
$smarty->display ('index.tpl');
// echo '<p>'.$PALANG['pBroadcast_success'].'</p>';
@@ -90,6 +91,7 @@
if ($_SERVER['REQUEST_METHOD'] == "GET" || $error == 1)
{
+ $smarty->assign ('smtp_from_email', $smtp_from_email);
$smarty->assign ('error', $error);
$smarty->assign ('smarty_template', 'broadcast-message');
$smarty->display ('index.tpl');
Modified: trunk/sendmail.php
===================================================================
--- trunk/sendmail.php 2011-07-19 21:12:25 UTC (rev 1093)
+++ trunk/sendmail.php 2011-07-19 21:41:37 UTC (rev 1094)
@@ -18,7 +18,6 @@
*
* Template Variables:
*
- * tMessage
* tFrom
* tSubject
* tBody
@@ -36,12 +35,13 @@
(($CONF['sendmail'] == 'NO') ? header("Location: main.php") && exit : '1');
-$SESSID_USERNAME = authentication_get_username();
+$smtp_from_email = smtp_get_admin_email();
+
if ($_SERVER['REQUEST_METHOD'] == "POST")
{
$fTo = safepost('fTo');
- $fFrom = $SESSID_USERNAME;
+ $fFrom = $smtp_from_email;
$fSubject = safepost('fSubject');
$tBody = $_POST['fBody'];
@@ -55,21 +55,19 @@
$error = 1;
$tTo = escape_string ($_POST['fTo']);
$tSubject = escape_string ($_POST['fSubject']);
- $tMessage = $PALANG['pSendmail_to_text_error'];
+ flash_error($PALANG['pSendmail_to_text_error']);
}
if ($error != 1)
{
if (!smtp_mail ($fTo, $fFrom, $fSubject, $tBody)) {
- $tMessage .= $PALANG['pSendmail_result_error'];
+ flash_error($PALANG['pSendmail_result_error']);
} else {
- $tMessage .= $PALANG['pSendmail_result_success'];
+ flash_info($PALANG['pSendmail_result_success']);
}
}
}
-$smarty->assign ('SESSID_USERNAME', $SESSID_USERNAME);
-$smarty->assign ('tMessage', $tMessage, false);
-
+$smarty->assign ('smtp_from_email', $smtp_from_email);
$smarty->assign ('smarty_template', 'sendmail');
$smarty->display ('index.tpl');
Modified: trunk/templates/broadcast-message.tpl
===================================================================
--- trunk/templates/broadcast-message.tpl 2011-07-19 21:12:25 UTC (rev 1093)
+++ trunk/templates/broadcast-message.tpl 2011-07-19 21:41:37 UTC (rev 1094)
@@ -2,29 +2,27 @@
<form name="broadcast-message" method="post" action="">
<table>
<tr>
- <td colspan="3"><h3>{$PALANG.pBroadcast_title}</h3></td>
+ <th colspan="2">{$PALANG.pBroadcast_title}</th>
</tr>
<tr>
- <td>{$PALANG.pBroadcast_from}:</td>
- <td>{$CONF.admin_email}</td>
+ <td class="label"><label>{$PALANG.pBroadcast_from}:</label></td>
+ <td><em>{$smtp_from_email}</em></td>
</tr>
<tr>
- <td>{$PALANG.pBroadcast_name}:</td>
+ <td class="label"><label>{$PALANG.pBroadcast_name}:</label></td>
<td><input class="flat" size="43" type="text" name="name"/></td>
</tr>
<tr>
- <td>{$PALANG.pBroadcast_subject}:</td>
+ <td class="label"><label>{$PALANG.pBroadcast_subject}:</label></td>
<td><input class="flat" size="43" type="text" name="subject"/></td>
</tr>
<tr>
- <td>{$PALANG.pBroadcast_message}:</td>
+ <td class="label"><label>{$PALANG.pBroadcast_message}:</label></td>
<td><textarea class="flat" cols="40" rows="6" name="message"></textarea></td>
</tr>
<tr>
- <td colspan="3" class="hlp_center">
-{if $error}
- <br/><span class="error_msg">{$PALANG.pBroadcast_error_empty}</span><br/><br/>
-{/if}
+ <td> </td>
+ <td>
<input class="button" type="submit" name="submit" value="{$PALANG.pBroadcast_send}" />
</td>
</tr>
Modified: trunk/templates/sendmail.tpl
===================================================================
--- trunk/templates/sendmail.tpl 2011-07-19 21:12:25 UTC (rev 1093)
+++ trunk/templates/sendmail.tpl 2011-07-19 21:41:37 UTC (rev 1094)
@@ -2,36 +2,34 @@
<form name="mailbox" method="post" action="">
<table>
<tr>
- <td colspan="3"><h3>{$PALANG.pSendmail_welcome}</h3></td>
+ <th colspan="3">{$PALANG.pSendmail_welcome}</th>
</tr>
<tr>
- <td>{$PALANG.pSendmail_admin}:</td>
- <td>{$SESSID_USERNAME}</td>
+ <td class="label"><label>{$PALANG.pSendmail_admin}:</label></td>
+ <td><em>{$smtp_from_email}</em></td>
<td> </td>
</tr>
<tr>
- <td>{$PALANG.pSendmail_to}:</td>
+ <td class="label"><label>{$PALANG.pSendmail_to}:</label></td>
<td><input class="flat" type="text" name="fTo" /></td>
<td> </td>
</tr>
<tr>
- <td>{$PALANG.pSendmail_subject}:</td>
+ <td class="label"><label>{$PALANG.pSendmail_subject}:</label></td>
<td><input class="flat" type="text" name="fSubject" value="{$PALANG.pSendmail_subject_text}" /></td>
<td> </td>
</tr>
<tr>
- <td>{$PALANG.pSendmail_body}:</td>
+ <td class="label"><label>{$PALANG.pSendmail_body}:</label></td>
<td>
<textarea class="flat" rows="10" cols="60" name="fBody">{$CONF.welcome_text}</textarea>
</td>
<td> </td>
</tr>
<tr>
- <td colspan="3" class="hlp_center"><input class="button" type="submit" name="submit" value="{$PALANG.pSendmail_button}" /></td>
+ <td class="label"> </td>
+ <td colspan="2"><input class="button" type="submit" name="submit" value="{$PALANG.pSendmail_button}" /></td>
</tr>
- <tr>
- <td colspan="3" class="standout">{$tMessage}</td>
- </tr>
</table>
</form>
</div>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <chr...@us...> - 2011-07-20 22:39:37
|
Revision: 1098
http://postfixadmin.svn.sourceforge.net/postfixadmin/?rev=1098&view=rev
Author: christian_boltz
Date: 2011-07-20 22:39:31 +0000 (Wed, 20 Jul 2011)
Log Message:
-----------
edit-admin.php:
- use additional column for error messages
- renamed $pAdminEdit_admin_password_text to $pAdminEdit_admin_password_text_error
- removed $tMessage
variables.inc.php:
- remove now unused $pAdminEdit_admin_password_text
(this change was not contained in Dale's patch)
templates/admin_edit-admin.tpl
- added a 4th column for error messages
- HTML cleanup
- changed <h3> to <th>
- marked labels as <label>
- removed tMessage
This commit is part of the huge cleanup patch by Dale Blount (lnxus@SF),
https://sourceforge.net/tracker/?func=detail&atid=937966&aid=3370510&group_id=191583
Modified Paths:
--------------
trunk/edit-admin.php
trunk/templates/admin_edit-admin.tpl
trunk/variables.inc.php
Modified: trunk/edit-admin.php
===================================================================
--- trunk/edit-admin.php 2011-07-19 22:22:23 UTC (rev 1097)
+++ trunk/edit-admin.php 2011-07-20 22:39:31 UTC (rev 1098)
@@ -38,6 +38,8 @@
authentication_require_role('global-admin');
$error = 1;
+$pAdminEdit_admin_password_text_error = "";
+
if(isset($_GET['username'])) {
$username = escape_string ($_GET['username']);
$result = db_query("SELECT * FROM $table_admin WHERE username = '$username'");
@@ -81,12 +83,12 @@
}
else {
$error = 1;
- flash_error(sprintf($PALANG['pPasswordTooShort'], $CONF['min_password_length']));
+ $pAdminEdit_admin_password_text_error = sprintf($PALANG['pPasswordTooShort'], $CONF['min_password_length']);
}
}
else {
$error = 1;
- $pAdminEdit_admin_password_text = $PALANG['pAdminEdit_admin_password_text_error'];
+ $pAdminEdit_admin_password_text_error = $PALANG['pAdminEdit_admin_password_text_error'];
}
}
}
@@ -151,11 +153,10 @@
}
$smarty->assign ('username', $username);
-$smarty->assign ('pAdminEdit_admin_password_text', $pAdminEdit_admin_password_text, false);
+$smarty->assign ('pAdminEdit_admin_password_text_error', $pAdminEdit_admin_password_text_error, false);
$smarty->assign ('tActive_checked', $tActive_checked);
$smarty->assign ('tSadmin_checked', $tSadmin_checked);
$smarty->assign ('select_options', select_options ($tAllDomains, $tDomains), false);
-$smarty->assign ('tMessage', $tMessage, false);
$smarty->assign ('smarty_template', 'admin_edit-admin');
$smarty->display ('index.tpl');
Modified: trunk/templates/admin_edit-admin.tpl
===================================================================
--- trunk/templates/admin_edit-admin.tpl 2011-07-19 22:22:23 UTC (rev 1097)
+++ trunk/templates/admin_edit-admin.tpl 2011-07-20 22:39:31 UTC (rev 1098)
@@ -2,45 +2,44 @@
<form name="alias" method="post" action="">
<table>
<tr>
- <td colspan="3"><h3>{$PALANG.pAdminEdit_admin_welcome}</h3></td></tr>
+ <th colspan="4">{$PALANG.pAdminEdit_admin_welcome}</th>
+ </tr>
<tr>
- <td>{$PALANG.pAdminEdit_admin_username}:</td>
+ <td class="label"><label>{$PALANG.pAdminEdit_admin_username}:</label></td>
<td>{$username}</td>
- <td> </td>
+ <td colspan="2"> </td>
</tr>
<tr>
- <td>{$PALANG.pAdminEdit_admin_password}:</td>
+ <td class="label"><label>{$PALANG.pAdminEdit_admin_password}:</label></td>
<td><input class="flat" type="password" name="fPassword" value=""/></td>
- <td>{$pAdminEdit_admin_password_text}</td>
+ <td> </td>
+ <td><span class="error_msg">{$pAdminEdit_admin_password_text_error}</span></td>
</tr>
<tr>
- <td>{$PALANG.pAdminEdit_admin_password2}:</td>
+ <td class="label"><label>{$PALANG.pAdminEdit_admin_password2}:</label></td>
<td><input class="flat" type="password" name="fPassword2" value="" /></td>
- <td> </td>
+ <td colspan="2"> </td>
</tr>
<tr>
- <td>{$PALANG.pAdminEdit_admin_active}:</td>
+ <td class="label"><label>{$PALANG.pAdminEdit_admin_active}:</label></td>
<td><input class="flat" type="checkbox" name="fActive"{$tActive_checked}/></td>
- <td> </td>
+ <td colspan="2"> </td>
</tr>
<tr>
- <td>{$PALANG.pAdminEdit_admin_super_admin}:</td>
+ <td class="label"><label>{$PALANG.pAdminEdit_admin_super_admin}:</label></td>
<td><input class="flat" type="checkbox" name="fSadmin"{$tSadmin_checked}/></td>
- <td> </td>
+ <td colspan="2"> </td>
</tr>
<tr>
- <td>{$PALANG.pAdminCreate_admin_address}:</td>
- <td>
- <select name="fDomains[]" size="10" multiple="multiple">{$select_options}</select>
+ <td class="label"><label>{$PALANG.pAdminCreate_admin_address}:</label></td>
+ <td><select name="fDomains[]" size="10" multiple="multiple">{$select_options}</select></td>
<td> </td>
- </td>
</tr>
<tr>
- <td colspan="3" class="hlp_center"><input class="button" type="submit" name="submit" value="{$PALANG.save}" /></td>
+ <td> </td>
+ <td><input class="button" type="submit" name="submit" value="{$PALANG.save}" /></td>
+ <td colspan="2"> </td>
</tr>
- <tr>
- <td colspan="3" class="standout">{$tMessage}</td>
- </tr>
</table>
</form>
</div>
Modified: trunk/variables.inc.php
===================================================================
--- trunk/variables.inc.php 2011-07-19 22:22:23 UTC (rev 1097)
+++ trunk/variables.inc.php 2011-07-20 22:39:31 UTC (rev 1098)
@@ -81,7 +81,6 @@
$pAdminCreate_admin_username_text = " ";
$pAdminCreate_domain_defaultaliases_text = " ";
$pAdminCreate_domain_domain_text = " ";
-$pAdminEdit_admin_password_text = " ";
$pCreate_alias_address_text = " ";
$pCreate_alias_goto_text = " ";
$pCreate_mailbox_name_text = " ";
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <chr...@us...> - 2011-07-20 23:19:23
|
Revision: 1099
http://postfixadmin.svn.sourceforge.net/postfixadmin/?rev=1099&view=rev
Author: christian_boltz
Date: 2011-07-20 23:19:17 +0000 (Wed, 20 Jul 2011)
Log Message:
-----------
create-admin.php
- renamed $pAdminCreate_admin_username_text to $pAdminCreate_admin_username_text_error
- renamed $pAdminCreate_admin_password_text to $pAdminCreate_admin_password_text_error
- replaced $tMessage with $infoMessage (displayed via flash_info)
- additional change compared to Dale's patch: removed unused variable
$pAdminCreate_admin_username_text
variables.inc.php:
- removed now unused variables $pAdminCreate_admin_password_text and
$pAdminCreate_admin_username_text
templates/admin_create-admin.tpl:
- added 4th column for error messages
- replaced <h3> with <th>
- marked labels with <label>
- align button with input fields
- remove tMessage
This commit is part of the huge cleanup patch by Dale Blount (lnxus@SF),
https://sourceforge.net/tracker/?func=detail&atid=937966&aid=3370510&group_id=191583
Modified Paths:
--------------
trunk/create-admin.php
trunk/templates/admin_create-admin.tpl
trunk/variables.inc.php
Modified: trunk/create-admin.php
===================================================================
--- trunk/create-admin.php 2011-07-20 22:39:31 UTC (rev 1098)
+++ trunk/create-admin.php 2011-07-20 23:19:17 UTC (rev 1099)
@@ -19,7 +19,6 @@
*
* Template Variables:
*
- * tMessage
* tUsername
* tDomains
*
@@ -36,10 +35,11 @@
authentication_require_role('global-admin');
$list_domains = list_domains ();
$tDomains = array();
+$pAdminCreate_admin_username_text_error = "";
+$pAdminCreate_admin_password_text_error = "";
if ($_SERVER['REQUEST_METHOD'] == "GET")
{
- $pAdminCreate_admin_username_text = $PALANG['pAdminCreate_admin_username_text'];
$tDomains = array ();
}
@@ -50,18 +50,22 @@
if (isset ($_POST['fPassword2'])) $fPassword2 = escape_string ($_POST['fPassword2']);
$fDomains = array();
if (!empty ($_POST['fDomains'])) $fDomains = $_POST['fDomains'];
- list ($error, $tMessage, $pAdminCreate_admin_username_text, $pAdminCreate_admin_password_text) = create_admin($fUsername, $fPassword, $fPassword2, $fDomains);
+ list ($error, $infoMessage, $pAdminCreate_admin_username_text_error, $pAdminCreate_admin_password_text_error) = create_admin($fUsername, $fPassword, $fPassword2, $fDomains);
if ($error != 0) {
if (isset ($_POST['fUsername'])) $tUsername = escape_string ($_POST['fUsername']);
if (isset ($_POST['fDomains'])) $tDomains = $_POST['fDomains'];
}
+
+ if(!empty($infoMessage))
+ flash_info($infoMessage);
+
}
$smarty->assign ('tUsername', $tUsername);
-$smarty->assign ('pAdminCreate_admin_username_text', $pAdminCreate_admin_username_text, false);
-$smarty->assign ('pAdminCreate_admin_password_text', $pAdminCreate_admin_password_text, false);
-$smarty->assign ('tMessage', $tMessage, false);
+$smarty->assign ('pAdminCreate_admin_username_text', $PALANG['pAdminCreate_admin_username_text'], false);
+$smarty->assign ('pAdminCreate_admin_username_text_error', $pAdminCreate_admin_username_text_error, false);
+$smarty->assign ('pAdminCreate_admin_password_text_error', $pAdminCreate_admin_password_text_error, false);
$smarty->assign ('select_options', select_options ($list_domains, $tDomains), false);
$smarty->assign ('smarty_template', 'admin_create-admin');
Modified: trunk/templates/admin_create-admin.tpl
===================================================================
--- trunk/templates/admin_create-admin.tpl 2011-07-20 22:39:31 UTC (rev 1098)
+++ trunk/templates/admin_create-admin.tpl 2011-07-20 23:19:17 UTC (rev 1099)
@@ -2,36 +2,37 @@
<form name="create_admin" method="post" action="">
<table>
<tr>
- <td colspan="3"><h3>{$PALANG.pAdminCreate_admin_welcome}</h3></td>
+ <th colspan="4">{$PALANG.pAdminCreate_admin_welcome}</th>
</tr>
<tr>
- <td>{$PALANG.pAdminCreate_admin_username}:</td>
+ <td class="label"><label>{$PALANG.pAdminCreate_admin_username}:</label></td>
<td><input class="flat" type="text" name="fUsername" value="{$tUsername}" /></td>
<td>{$pAdminCreate_admin_username_text}</td>
+ <td><span class="error_msg">{$pAdminCreate_admin_username_text_error}</span></td>
</tr>
<tr>
- <td>{$PALANG.pAdminCreate_admin_password}:</td>
+ <td class="label"><label>{$PALANG.pAdminCreate_admin_password}:</label></td>
<td><input class="flat" type="password" name="fPassword" /></td>
- <td>{$pAdminCreate_admin_password_text}</td>
+ <td> </td>
+ <td><span class="error_msg">{$pAdminCreate_admin_password_text_error}</span></td>
</tr>
<tr>
- <td>{$PALANG.pAdminCreate_admin_password2}:</td>
+ <td class="label"><label>{$PALANG.pAdminCreate_admin_password2}:</label></td>
<td><input class="flat" type="password" name="fPassword2" /></td>
-
+ <td colspan="2"> </td>
</tr>
<tr>
- <td>{$PALANG.pAdminCreate_admin_address}:</td>
+ <td class="label"><label>{$PALANG.pAdminCreate_admin_address}:</label></td>
<td>
<select name="fDomains[]" size="10" multiple="multiple">{$select_options}</select>
</td>
-
+ <td colspan="2"> </td>
</tr>
<tr>
- <td colspan="3" class="hlp_center"><input class="button" type="submit" name="submit" value="{$PALANG.pAdminCreate_admin_button}" /></td>
+ <td> </td>
+ <td><input class="button" type="submit" name="submit" value="{$PALANG.pAdminCreate_admin_button}" /></td>
+ <td colspan="2"> </td>
</tr>
- <tr>
- <td colspan="3" class="standout">{$tMessage}</td>
- </tr>
</table>
</form>
</div>
Modified: trunk/variables.inc.php
===================================================================
--- trunk/variables.inc.php 2011-07-20 22:39:31 UTC (rev 1098)
+++ trunk/variables.inc.php 2011-07-20 23:19:17 UTC (rev 1099)
@@ -77,8 +77,6 @@
$tUsername = "";
$tTransport = "";
-$pAdminCreate_admin_password_text = " ";
-$pAdminCreate_admin_username_text = " ";
$pAdminCreate_domain_defaultaliases_text = " ";
$pAdminCreate_domain_domain_text = " ";
$pCreate_alias_address_text = " ";
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <chr...@us...> - 2011-07-20 23:38:48
|
Revision: 1101
http://postfixadmin.svn.sourceforge.net/postfixadmin/?rev=1101&view=rev
Author: christian_boltz
Date: 2011-07-20 23:38:42 +0000 (Wed, 20 Jul 2011)
Log Message:
-----------
edit-mailbox.php:
- replace $tMessaeg with flash_error()
- use pEdit_mailbox_quota_text_error instead of pEdit_mailbox_quota_text
for error message
templates/edit-mailbox.tpl:
- added 4th column for error messages
- replaced <h3> with <th>
- marked labels with <label>
- marked non-editable fields with <em>
- aligned buttons with input fields
- removed tMessage
This commit is part of the huge cleanup patch by Dale Blount (lnxus@SF),
https://sourceforge.net/tracker/?func=detail&atid=937966&aid=3370510&group_id=191583
Modified Paths:
--------------
trunk/edit-mailbox.php
trunk/templates/edit-mailbox.tpl
Modified: trunk/edit-mailbox.php
===================================================================
--- trunk/edit-mailbox.php 2011-07-20 23:29:40 UTC (rev 1100)
+++ trunk/edit-mailbox.php 2011-07-20 23:38:42 UTC (rev 1101)
@@ -18,7 +18,6 @@
*
* Template Variables:
*
- * tMessage
* tName
* tQuota
*
@@ -48,15 +47,15 @@
$pEdit_mailbox_name_text = $PALANG['pEdit_mailbox_name_text'];
$pEdit_mailbox_quota_text = $PALANG['pEdit_mailbox_quota_text'];
+$pEdit_mailbox_quota_text_error = "";
-
if (!(check_owner ($SESSID_USERNAME, $fDomain) || authentication_has_role('global-admin')) )
{
$error = 1;
$tName = $fName;
$tQuota = $fQuota;
$tActive = $fActive;
- $tMessage = $PALANG['pEdit_mailbox_domain_error'] . "$fDomain</span>";
+ flash_error($PALANG['pEdit_mailbox_domain_error'] . "$fDomain");
}
$result = db_query("SELECT * FROM $table_mailbox WHERE username = '$fUsername' AND domain = '$fDomain'");
@@ -123,7 +122,7 @@
$tName = $fName;
$tQuota = $fQuota;
$tActive = $fActive;
- $pEdit_mailbox_quota_text = $PALANG['pEdit_mailbox_quota_text_error'];
+ $pEdit_mailbox_quota_text_error = $PALANG['pEdit_mailbox_quota_text_error'];
}
}
if ($error != 1)
@@ -157,7 +156,7 @@
$result = db_update_q('mailbox', "username='$fUsername' AND domain='$fDomain'", $formvars); # TODO: check if we need the AND domain=... clause, if not, switch to db_update()
$maildir = $user_details['maildir'];
if ($result != 1 || !mailbox_postedit($fUsername,$fDomain,$maildir, $quota)) {
- $tMessage = $PALANG['pEdit_mailbox_result_error'];
+ flash_error($PALANG['pEdit_mailbox_result_error']);
}
else {
db_log ($fDomain, 'edit_mailbox', $fUsername);
@@ -182,8 +181,8 @@
$smarty->assign ('tMaxquota', $tMaxquota);
$smarty->assign ('tQuota', $tQuota);
$smarty->assign ('pEdit_mailbox_quota_text', $pEdit_mailbox_quota_text);
+$smarty->assign ('pEdit_mailbox_quota_text_error', $pEdit_mailbox_quota_text_error);
if ($tActive) $smarty->assign ('tActive', ' checked="checked"');
-$smarty->assign ('tMessage', $tMessage, false);
$smarty->assign ('smarty_template', 'edit-mailbox');
$smarty->display ('index.tpl');
/* vim: set expandtab softtabstop=3 tabstop=3 shiftwidth=3: */
Modified: trunk/templates/edit-mailbox.tpl
===================================================================
--- trunk/templates/edit-mailbox.tpl 2011-07-20 23:29:40 UTC (rev 1100)
+++ trunk/templates/edit-mailbox.tpl 2011-07-20 23:38:42 UTC (rev 1101)
@@ -3,49 +3,53 @@
<form name="mailbox" method="post" action="">
<table>
<tr>
- <td colspan="3"><h3>{$PALANG.pEdit_mailbox_welcome}</h3></td>
+ <th colspan="4">{$PALANG.pEdit_mailbox_welcome}</th>
</tr>
<tr>
- <td>{$PALANG.pEdit_mailbox_username}</td>
- <td>{$fUsername}</td>
+ <td class="label"><label>{$PALANG.pEdit_mailbox_username}:</label></td>
+ <td><em>{$fUsername}</em></td>
<td>{$pEdit_mailbox_username_text}</td>
+ <td> </td>
</tr>
<tr>
- <td>{$PALANG.pEdit_mailbox_password}:</td>
+ <td class="label"><label>{$PALANG.pEdit_mailbox_password}:</label></td>
<td><input class="flat" type="password" name="fPassword" /></td>
<td>{$pEdit_mailbox_password_text}</td>
+ <td> </td>
</tr>
<tr>
- <td>{$PALANG.pEdit_mailbox_password2}:</td>
+ <td class="label"><label>{$PALANG.pEdit_mailbox_password2}:</label></td>
<td><input class="flat" type="password" name="fPassword2" /></td>
<td> </td>
+ <td> </td>
</tr>
<tr>
- <td>{$PALANG.pEdit_mailbox_name}:</td>
+ <td class="label"><label>{$PALANG.pEdit_mailbox_name}:</label></td>
<td><input class="flat" type="text" name="fName" value="{$tName}" /></td>
<td>{$pEdit_mailbox_name_text}</td>
+ <td> </td>
</tr>
{if $CONF.quota===YES}
<tr>
- <td>{$PALANG.pEdit_mailbox_quota} (max: {$tMaxquota}):</td>
+ <td class="label"><label>{$PALANG.pEdit_mailbox_quota} (max: {$tMaxquota}):</label></td>
<td><input class="flat" type="text" name="fQuota" value="{$tQuota}" /></td>
<td>{$pEdit_mailbox_quota_text}</td>
+ <td>{$pEdit_mailbox_quota_text_error}</td>
</tr>
{/if}
<tr>
- <td>{$PALANG.pCreate_mailbox_active}:</td>
+ <td class="label"><label>{$PALANG.pCreate_mailbox_active}:</label></td>
<td><input class="flat" type="checkbox" name="fActive"{$tActive}/></td>
- <td> </td>
+ <td colspan="2"> </td>
</tr>
- <tr>
- <td colspan="3" class="hlp_center">
+ <tr>
+ <td> </td>
+ <td>
<input class="button" type="submit" name="submit" value="{$PALANG.save}" />
<input class="button" type="submit" name="cancel" value="{$PALANG.exit}"/>
</td>
+ <td colspan="2"> </td>
</tr>
- <tr>
- <td colspan="3" class="standout">{$tMessage}</td>
- </tr>
</table>
</form>
</div>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <chr...@us...> - 2011-07-21 22:20:32
|
Revision: 1102
http://postfixadmin.svn.sourceforge.net/postfixadmin/?rev=1102&view=rev
Author: christian_boltz
Date: 2011-07-21 22:20:25 +0000 (Thu, 21 Jul 2011)
Log Message:
-----------
create-domain.php:
- renamed $pAdminCreate_domain_domain_text to $pAdminCreate_domain_domain_text_error
- replaced $tMessage with flash_error(), flash_info() and
$pAdminCreate_domain_domain_text_error
- differences to Dale's patch:
- removed now always empty smarty->assign for $pAdminCreate_domain_domain_text
templates/admin_create-domain.tpl:
- added 4th column for error messages
- marked labels as <label>
- aligned button to input fields
- removed tMessage
- differences to Dale's patch:
- removed now unused $pAdminCreate_domain_domain_text
variables.inc.php:
- removed now unused $pAdminCreate_domain_domain_text
(this was not part of Dale's patch)
This commit is part of the huge cleanup patch by Dale Blount (lnxus@SF),
https://sourceforge.net/tracker/?func=detail&atid=937966&aid=3370510&group_id=191583
Modified Paths:
--------------
trunk/create-domain.php
trunk/templates/admin_create-domain.tpl
trunk/variables.inc.php
Modified: trunk/create-domain.php
===================================================================
--- trunk/create-domain.php 2011-07-20 23:38:42 UTC (rev 1101)
+++ trunk/create-domain.php 2011-07-21 22:20:25 UTC (rev 1102)
@@ -18,7 +18,6 @@
*
* Template Variables:
*
- * tMessage
* tDomain
* tDescription
* tAliases
@@ -102,8 +101,8 @@
if (isset ($_POST['fTransport'])) $tTransport = $fTransport;
if (isset ($_POST['fDefaultaliases'])) $tDefaultaliases = $fDefaultaliases;
if (isset ($_POST['fBackupmx'])) $tBackupmx = $fBackupmx;
- $pAdminCreate_domain_domain_text = $PALANG['pAdminCreate_domain_domain_text_error2'];
- if (domain_exist ($fDomain)) $pAdminCreate_domain_domain_text = $PALANG['pAdminCreate_domain_domain_text_error'];
+ $pAdminCreate_domain_domain_text_error = $PALANG['pAdminCreate_domain_domain_text_error2'];
+ if (domain_exist ($fDomain)) $pAdminCreate_domain_domain_text_error = $PALANG['pAdminCreate_domain_domain_text_error'];
}
if ($error != 1)
@@ -128,7 +127,7 @@
$result = db_query($sql_query);
if ($result['rows'] != 1)
{
- $tMessage = $PALANG['pAdminCreate_domain_result_error'] . "<br />($fDomain)<br />";
+ $pAdminCreate_domain_domain_text_error = $PALANG['pAdminCreate_domain_result_error'] . "<br />($fDomain)<br />";
}
else
{
@@ -140,17 +139,19 @@
$result = db_query ("INSERT INTO $table_alias (address,goto,domain,created,modified) VALUES ('$address','$goto','$fDomain',NOW(),NOW())");
}
}
- $tMessage = $PALANG['pAdminCreate_domain_result_success'] . "<br />($fDomain)</br />";
+ flash_info($PALANG['pAdminCreate_domain_result_success'] . "<br />($fDomain)</br />");
}
if (!domain_postcreation($fDomain))
{
- $tMessage = $PALANG['pAdminCreate_domain_error'];
+ flash_error($PALANG['pAdminCreate_domain_error']);
}
}
}
+
$smarty->assign ('tDomain', $tDomain);
$smarty->assign ('pAdminCreate_domain_domain_text', $pAdminCreate_domain_domain_text, false);
+$smarty->assign ('pAdminCreate_domain_domain_text_error', $pAdminCreate_domain_domain_text_error, false);
$smarty->assign ('tDescription', $tDescription, false);
$smarty->assign ('tAliases', $tAliases);
$smarty->assign ('tMailboxes', $tMailboxes);
@@ -159,7 +160,6 @@
$smarty->assign ('select_options', select_options ($CONF ['transport_options'], array ($tTransport)),false);
$smarty->assign ('tDefaultaliases', ($tDefaultaliases == 'on') ? ' checked="checked"' : '');
$smarty->assign ('tBackupmx', ($tBackupmx == 'on') ? ' checked="checked"' : '');
-$smarty->assign ('tMessage', $tMessage, false);
$smarty->assign ('smarty_template', 'admin_create-domain');
$smarty->display ('index.tpl');
Modified: trunk/templates/admin_create-domain.tpl
===================================================================
--- trunk/templates/admin_create-domain.tpl 2011-07-20 23:38:42 UTC (rev 1101)
+++ trunk/templates/admin_create-domain.tpl 2011-07-21 22:20:25 UTC (rev 1102)
@@ -2,65 +2,72 @@
<form name="create_domain" method="post" action="">
<table>
<tr>
- <td colspan="3"><h3>{$PALANG.pAdminCreate_domain_welcome}</h3></td>
+ <th colspan="4">{$PALANG.pAdminCreate_domain_welcome}</th>
</tr>
<tr>
- <td>{$PALANG.pAdminCreate_domain_domain}:</td>
+ <td class="label"><label>{$PALANG.pAdminCreate_domain_domain}:</label></td>
<td><input class="flat" type="text" name="fDomain" value="{$tDomain}" /></td>
- <td>{$pAdminCreate_domain_domain_text}</td>
+ <td> </td>
+ <td><span class="error_msg">{$pAdminCreate_domain_domain_text_error}</span></td>
</tr>
<tr>
- <td>{$PALANG.pAdminCreate_domain_description}:</td>
+ <td class="label"><label>{$PALANG.pAdminCreate_domain_description}:</label></td>
<td><input class="flat" type="text" name="fDescription" value="{$tDescription}" /></td>
- <td> </td>
+ <td colspan="2"> </td>
</tr>
<tr>
- <td>{$PALANG.pAdminCreate_domain_aliases}:</td>
+ <td class="label"><label>{$PALANG.pAdminCreate_domain_aliases}:</label></td>
<td><input class="flat" type="text" name="fAliases" value="{$tAliases}" /></td>
<td>{$PALANG.pAdminCreate_domain_aliases_text}</td>
+ <td> </td>
</tr>
<tr>
- <td>{$PALANG.pAdminCreate_domain_mailboxes}:</td>
+ <td class="label"><label>{$PALANG.pAdminCreate_domain_mailboxes}:</label></td>
<td><input class="flat" type="text" name="fMailboxes" value="{$tMailboxes}" /></td>
<td>{$PALANG.pAdminCreate_domain_mailboxes_text}</td>
+ <td> </td>
</tr>
{if $CONF.domain_quota===YES}
<tr>
- <td>{$PALANG.pAdminEdit_domain_quota}:</td>
+ <td class="label"><label>{$PALANG.pAdminEdit_domain_quota}:</label></td>
<td><input class="flat" type="text" name="fDomainquota" value="{$tDomainquota}" /></td>
<td>{$PALANG.pAdminCreate_domain_maxquota_text}</td>
+ <td> </td>
</tr>
{/if}
{if $CONF.quota===YES}
<tr>
- <td>{$PALANG.pAdminCreate_domain_maxquota}:</td>
+ <td class="label"><label>{$PALANG.pAdminCreate_domain_maxquota}:</label></td>
<td><input class="flat" type="text" name="fMaxquota" value="{$tMaxquota}" /></td>
<td>{$PALANG.pAdminCreate_domain_maxquota_text}</td>
+ <td> </td>
</tr>
{/if}
{if $CONF.transport===YES}
<tr>
- <td>{$PALANG.pAdminCreate_domain_transport}:</td>
+ <td class="label"><label>{$PALANG.pAdminCreate_domain_transport}:</label></td>
<td><select class="flat" name="fTransport">{$select_options}</select></td>
<td>{$PALANG.pAdminCreate_domain_transport_text}</td>
+ <td> </td>
</tr>
{/if}
<tr>
- <td>{$PALANG.pAdminCreate_domain_defaultaliases}:</td>
+ <td class="label"><label>{$PALANG.pAdminCreate_domain_defaultaliases}:</label></td>
<td><input class="flat" type="checkbox" value='on' name="fDefaultaliases"{$tDefaultaliases}/></td>
<td>{$PALANG.pAdminCreate_domain_defaultaliases_text}</td>
+ <td> </td>
</tr>
<tr>
- <td>{$PALANG.pAdminCreate_domain_backupmx}:</td>
+ <td class="label"><label>{$PALANG.pAdminCreate_domain_backupmx}:</label></td>
<td><input class="flat" type="checkbox" value='on' name="fBackupmx"{$tBackupmx}/></td>
<td> </td>
+ <td> </td>
</tr>
<tr>
- <td colspan="3" class="hlp_center"><input class="button" type="submit" name="submit" value="{$PALANG.pAdminCreate_domain_button}" /></td>
+ <td> </td>
+ <td><input class="button" type="submit" name="submit" value="{$PALANG.pAdminCreate_domain_button}" /></td>
+ <td colspan="2"> </td>
</tr>
- <tr>
- <td colspan="3" class="standout">{$tMessage}</td>
- </tr>
</table>
</form>
</div>
Modified: trunk/variables.inc.php
===================================================================
--- trunk/variables.inc.php 2011-07-20 23:38:42 UTC (rev 1101)
+++ trunk/variables.inc.php 2011-07-21 22:20:25 UTC (rev 1102)
@@ -77,7 +77,6 @@
$tUsername = "";
$tTransport = "";
-$pAdminCreate_domain_domain_text = " ";
$pCreate_alias_address_text = " ";
$pCreate_alias_goto_text = " ";
$pCreate_mailbox_password_text = " ";
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <chr...@us...> - 2011-07-22 18:36:28
|
Revision: 1104
http://postfixadmin.svn.sourceforge.net/postfixadmin/?rev=1104&view=rev
Author: christian_boltz
Date: 2011-07-22 18:36:21 +0000 (Fri, 22 Jul 2011)
Log Message:
-----------
create-alias.php:
- renamed $pCreate_alias_address_text to $pCreate_alias_address_text_error
- replaced $tMessage with flash_error() / flash_info()
- changes compared to Dale's patch:
- do not add $fAddress and $fGoto to $PALANG['pCreate_alias_goto_text_error']
error message
templates/create-alias.tpl:
- added 4th column for error messages
- replace <h3> with <th>
- mark labels with <label>
- aligned button with input fields
- added $PALANG[pCreate_alias_help]
- removed tMessage
This commit is part of the huge cleanup patch by Dale Blount (lnxus@SF),
https://sourceforge.net/tracker/?func=detail&atid=937966&aid=3370510&group_id=191583
Modified Paths:
--------------
trunk/create-alias.php
trunk/templates/create-alias.tpl
Modified: trunk/create-alias.php
===================================================================
--- trunk/create-alias.php 2011-07-21 22:47:53 UTC (rev 1103)
+++ trunk/create-alias.php 2011-07-22 18:36:21 UTC (rev 1104)
@@ -19,7 +19,6 @@
*
* Template Variables:
*
- * tMessage
* tAddress
* tGoto
* tDomain
@@ -45,6 +44,7 @@
}
$pCreate_alias_goto_text = $PALANG['pCreate_alias_goto_text'];
+$pCreate_alias_address_text_error = "";
if ($_SERVER['REQUEST_METHOD'] == "GET")
{
@@ -87,7 +87,7 @@
$tAddress = escape_string ($_POST['fAddress']);
$tGoto = $fGoto;
$tDomain = $fDomain;
- $pCreate_alias_address_text = $PALANG['pCreate_alias_address_text_error1'];
+ $pCreate_alias_address_text_error = $PALANG['pCreate_alias_address_text_error1'];
}
if(!check_alias($fDomain)) {
@@ -95,7 +95,7 @@
$tAddress = escape_string ($_POST['fAddress']);
$tGoto = $fGoto;
$tDomain = $fDomain;
- $pCreate_alias_address_text = $PALANG['pCreate_alias_address_text_error3'];
+ $pCreate_alias_address_text_error = $PALANG['pCreate_alias_address_text_error3'];
}
if(empty ($fAddress) || !check_email ($fAddress)) {
@@ -103,7 +103,7 @@
$tAddress = escape_string ($_POST['fAddress']);
$tGoto = $fGoto;
$tDomain = $fDomain;
- $pCreate_alias_address_text = $PALANG['pCreate_alias_address_text_error1'];
+ $pCreate_alias_address_text_error = $PALANG['pCreate_alias_address_text_error1'];
}
// Begin check alias email
@@ -117,7 +117,7 @@
if (empty ($goto) && !authentication_has_role('global-admin')) {
$error = 1;
$tGoto = $_POST['fGoto'];
- $tMessage = $PALANG['pEdit_alias_goto_text_error1'];
+ flash_error($PALANG['pEdit_alias_goto_text_error1']);
}
$new_aliases = array();
@@ -132,8 +132,7 @@
if (!check_email($address)) {
$error = 1;
$tGoto = $goto;
- if (!empty($tMessage)) $tMessage .= "<br />";
- $tMessage .= $PALANG['pEdit_alias_goto_text_error2'] . "$address</span>";
+ flash_error($PALANG['pEdit_alias_goto_text_error2'] . "$address");
}
}
@@ -146,7 +145,7 @@
$tAddress = escape_string ($_POST['fAddress']);
$tGoto = $fGoto;
$tDomain = $fDomain;
- $pCreate_alias_goto_text = $PALANG['pCreate_alias_goto_text_error'];
+ flash_error($PALANG['pCreate_alias_goto_text_error']");
}
if (escape_string($_POST['fAddress']) == "*") {
@@ -160,7 +159,7 @@
$tAddress = escape_string ($_POST['fAddress']);
$tGoto = $fGoto;
$tDomain = $fDomain;
- $pCreate_alias_address_text = $PALANG['pCreate_alias_address_text_error2'];
+ $pCreate_alias_address_text_error = $PALANG['pCreate_alias_address_text_error2'];
}
if ($fActive == "on") {
@@ -178,13 +177,13 @@
$result = db_query ("INSERT INTO $table_alias (address,goto,domain,created,modified,active) VALUES ('$fAddress','$fGoto','$fDomain',NOW(),NOW(),'$sqlActive')");
if ($result['rows'] != 1) {
$tDomain = $fDomain;
- $tMessage = $PALANG['pCreate_alias_result_error'] . "<br />($fAddress -> $fGoto)<br />\n";
+ flash_error($PALANG['pCreate_alias_result_error'] . "<br />($fAddress -> $fGoto)<br />\n");
}
else {
db_log ($fDomain, 'create_alias', "$fAddress -> $fGoto");
$tDomain = $fDomain;
- $tMessage = $PALANG['pCreate_alias_result_success'] . "<br />($fAddress -> $fGoto)<br />\n";
+ flash_info($PALANG['pCreate_alias_result_success'] . "<br />($fAddress -> $fGoto)<br />\n");
}
} else { # on error
$tAddress = htmlentities($_POST['fAddress']);
@@ -196,9 +195,9 @@
$smarty->assign ('tAddress', $tAddress);
$smarty->assign ('select_options', select_options ($list_domains, array ($tDomain)), false);
$smarty->assign ('pCreate_alias_address_text', $pCreate_alias_address_text, false);
+$smarty->assign ('pCreate_alias_address_text_error', $pCreate_alias_address_text_error, false);
$smarty->assign ('tGoto', $tGoto, false);
$smarty->assign ('pCreate_alias_goto_text', $pCreate_alias_goto_text);
-$smarty->assign ('tMessage', $tMessage, false);
$smarty->assign ('smarty_template', 'create-alias');
$smarty->display ('index.tpl');
Modified: trunk/templates/create-alias.tpl
===================================================================
--- trunk/templates/create-alias.tpl 2011-07-21 22:47:53 UTC (rev 1103)
+++ trunk/templates/create-alias.tpl 2011-07-22 18:36:21 UTC (rev 1104)
@@ -3,34 +3,33 @@
<form name="alias" method="post" action="">
<table>
<tr>
- <td colspan="3"><h3>{$PALANG.pCreate_alias_welcome}</h3></td>
+ <th colspan="4">{$PALANG.pCreate_alias_welcome}</th>
</tr>
<tr>
- <td>{$PALANG.pCreate_alias_address}</td>
- <td><input class="flat" type="text" name="fAddress" value="{$tAddress}" /></td>
- <td>@
+ <td class="label"><label>{$PALANG.pCreate_alias_address}:</label></td>
+ <td colspan="2"><input class="flat" type="text" name="fAddress" value="{$tAddress}" />
+ @
<select class="flat" name="fDomain">{$select_options}</select>
{$pCreate_alias_address_text}
</td>
+ <td><span class="error_msg">{$pCreate_alias_address_text_error}</span></td>
</tr>
<tr>
- <td>{$PALANG.pCreate_alias_goto}:</td>
- <td colspan="2"><textarea class="flat" rows="10" cols="60" name="fGoto">{$tGoto}</textarea></td>
+ <td class="label"><label>{$PALANG.pCreate_alias_goto}:</label></td>
+ <td><textarea class="flat" rows="10" cols="35" name="fGoto">{$tGoto}</textarea></td>
+ <td>{$PALANG.pCreate_alias_help}<br /><br />{$PALANG.pCreate_alias_catchall_text}</td>
+ <td> </td>
</tr>
<tr>
- <td>{$PALANG.pCreate_alias_active}:</td>
+ <td class="label"><label>{$PALANG.pCreate_alias_active}:</label></td>
<td><input class="flat" type="checkbox" name="fActive" checked="checked"/></td>
- <td> </td>
+ <td colspan="2"> </td>
</tr>
<tr>
- <td colspan="3" class="hlp_center"><input class="button" type="submit" name="submit" value="{$PALANG.pCreate_alias_button}" /></td>
+ <td> </td>
+ <td><input class="button" type="submit" name="submit" value="{$PALANG.pCreate_alias_button}" /></td>
+ <td colspan="2"> </td>
</tr>
- <tr>
- <td colspan="3" class="standout">{$tMessage}</td>
- </tr>
- <tr>
- <td colspan="3" class="help_text">{$PALANG.pCreate_alias_catchall_text}</td>
- </tr>
</table>
</form>
</div>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <chr...@us...> - 2011-07-22 19:56:10
|
Revision: 1105
http://postfixadmin.svn.sourceforge.net/postfixadmin/?rev=1105&view=rev
Author: christian_boltz
Date: 2011-07-22 19:56:04 +0000 (Fri, 22 Jul 2011)
Log Message:
-----------
create-alias.php:
- fixed syntax error introduced in the last revision
- removed $pCreate_alias_goto_text and $pCreate_alias_address_text
(replaced by PALANG texts in the template)
templates/create-alias.tpl:
- removed colspan to allow helptext in "alias" row
- moved PALANG.pCreate_alias_catchall_text to alias row
- removed pCreate_alias_address_text (always empty)
- replaced PALANG.pCreate_alias_help (empty) with PALANG.pCreate_alias_goto_text
- some whitespace fixes
variables.inc.php
- removed now unused $pCreate_alias_address_text and $pCreate_alias_goto_text
(These changes are _not_ part of Dale's patch ;-)
Modified Paths:
--------------
trunk/create-alias.php
trunk/templates/create-alias.tpl
trunk/variables.inc.php
Modified: trunk/create-alias.php
===================================================================
--- trunk/create-alias.php 2011-07-22 18:36:21 UTC (rev 1104)
+++ trunk/create-alias.php 2011-07-22 19:56:04 UTC (rev 1105)
@@ -43,7 +43,6 @@
$list_domains = list_domains_for_admin ($username);
}
-$pCreate_alias_goto_text = $PALANG['pCreate_alias_goto_text'];
$pCreate_alias_address_text_error = "";
if ($_SERVER['REQUEST_METHOD'] == "GET")
@@ -145,7 +144,7 @@
$tAddress = escape_string ($_POST['fAddress']);
$tGoto = $fGoto;
$tDomain = $fDomain;
- flash_error($PALANG['pCreate_alias_goto_text_error']");
+ flash_error($PALANG['pCreate_alias_goto_text_error']);
}
if (escape_string($_POST['fAddress']) == "*") {
@@ -194,10 +193,8 @@
$smarty->assign ('tAddress', $tAddress);
$smarty->assign ('select_options', select_options ($list_domains, array ($tDomain)), false);
-$smarty->assign ('pCreate_alias_address_text', $pCreate_alias_address_text, false);
$smarty->assign ('pCreate_alias_address_text_error', $pCreate_alias_address_text_error, false);
$smarty->assign ('tGoto', $tGoto, false);
-$smarty->assign ('pCreate_alias_goto_text', $pCreate_alias_goto_text);
$smarty->assign ('smarty_template', 'create-alias');
$smarty->display ('index.tpl');
Modified: trunk/templates/create-alias.tpl
===================================================================
--- trunk/templates/create-alias.tpl 2011-07-22 18:36:21 UTC (rev 1104)
+++ trunk/templates/create-alias.tpl 2011-07-22 19:56:04 UTC (rev 1105)
@@ -7,17 +7,18 @@
</tr>
<tr>
<td class="label"><label>{$PALANG.pCreate_alias_address}:</label></td>
- <td colspan="2"><input class="flat" type="text" name="fAddress" value="{$tAddress}" />
- @
- <select class="flat" name="fDomain">{$select_options}</select>
- {$pCreate_alias_address_text}
+ <td>
+ <input class="flat" type="text" name="fAddress" value="{$tAddress}" />
+ @
+ <select class="flat" name="fDomain">{$select_options}</select>
</td>
+ <td>{$PALANG.pCreate_alias_catchall_text}</td>
<td><span class="error_msg">{$pCreate_alias_address_text_error}</span></td>
</tr>
<tr>
<td class="label"><label>{$PALANG.pCreate_alias_goto}:</label></td>
<td><textarea class="flat" rows="10" cols="35" name="fGoto">{$tGoto}</textarea></td>
- <td>{$PALANG.pCreate_alias_help}<br /><br />{$PALANG.pCreate_alias_catchall_text}</td>
+ <td>{$PALANG.pCreate_alias_goto_text}</td>
<td> </td>
</tr>
<tr>
Modified: trunk/variables.inc.php
===================================================================
--- trunk/variables.inc.php 2011-07-22 18:36:21 UTC (rev 1104)
+++ trunk/variables.inc.php 2011-07-22 19:56:04 UTC (rev 1105)
@@ -77,8 +77,6 @@
$tUsername = "";
$tTransport = "";
-$pCreate_alias_address_text = " ";
-$pCreate_alias_goto_text = " ";
$pCreate_mailbox_password_text = " ";
$pCreate_mailbox_quota_text = " ";
$pCreate_mailbox_username_text = " ";
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <chr...@us...> - 2011-07-22 20:25:12
|
Revision: 1107
http://postfixadmin.svn.sourceforge.net/postfixadmin/?rev=1107&view=rev
Author: christian_boltz
Date: 2011-07-22 20:25:06 +0000 (Fri, 22 Jul 2011)
Log Message:
-----------
create-mailbox.php:
- renamed $pCreate_mailbox_*_text to $pCreate_mailbox_*_text_error
- replaced $tMessage with flash_error() / flash_info()
templates/create-mailbox.tpl:
- added 4th column for error messaegs
- replaced <h3> with <th>
- marked lables with <label>
- aligned button with input fields
- removed tMessage
This commit is part of the huge cleanup patch by Dale Blount (lnxus@SF),
https://sourceforge.net/tracker/?func=detail&atid=937966&aid=3370510&group_id=191583
Modified Paths:
--------------
trunk/create-mailbox.php
trunk/templates/create-mailbox.tpl
Modified: trunk/create-mailbox.php
===================================================================
--- trunk/create-mailbox.php 2011-07-22 20:17:17 UTC (rev 1106)
+++ trunk/create-mailbox.php 2011-07-22 20:25:06 UTC (rev 1107)
@@ -17,7 +17,6 @@
*
* Template Variables:
*
- * tMessage
* tUsername
* tName
* tQuota
@@ -49,6 +48,9 @@
$pCreate_mailbox_password_text = $PALANG['pCreate_mailbox_password_text'];
$pCreate_mailbox_quota_text = $PALANG['pCreate_mailbox_quota_text'];
+$pCreate_mailbox_username_text_error = "";
+$pCreate_mailbox_password_text_error = "";
+$pCreate_mailbox_quota_text_error = "";
if ($_SERVER['REQUEST_METHOD'] == "GET")
{
@@ -88,7 +90,7 @@
$tName = $fName;
$tQuota = $fQuota;
$tDomain = $fDomain;
- $pCreate_mailbox_username_text = $PALANG['pCreate_mailbox_username_text_error1'];
+ $pCreate_mailbox_username_text_error = $PALANG['pCreate_mailbox_username_text_error1'];
}
if (!check_mailbox ($fDomain))
@@ -98,7 +100,7 @@
$tName = $fName;
$tQuota = $fQuota;
$tDomain = $fDomain;
- $pCreate_mailbox_username_text = $PALANG['pCreate_mailbox_username_text_error3'];
+ $pCreate_mailbox_username_text_error = $PALANG['pCreate_mailbox_username_text_error3'];
}
if (empty ($fUsername) or !check_email ($fUsername))
@@ -108,7 +110,7 @@
$tName = $fName;
$tQuota = $fQuota;
$tDomain = $fDomain;
- $pCreate_mailbox_username_text = $PALANG['pCreate_mailbox_username_text_error1'];
+ $pCreate_mailbox_username_text_error = $PALANG['pCreate_mailbox_username_text_error1'];
}
$tPassGenerated = 0;
@@ -126,7 +128,7 @@
$tName = $fName;
$tQuota = $fQuota;
$tDomain = $fDomain;
- $pCreate_mailbox_password_text = $PALANG['pCreate_mailbox_password_text_error'];
+ $pCreate_mailbox_password_text_error = $PALANG['pCreate_mailbox_password_text_error'];
}
}
@@ -139,7 +141,7 @@
$tName = $fName;
$tQuota = $fQuota;
$tDomain = $fDomain;
- $pCreate_mailbox_quota_text = $PALANG['pCreate_mailbox_quota_text_error'];
+ $pCreate_mailbox_quota_text_error = $PALANG['pCreate_mailbox_quota_text_error'];
}
}
@@ -151,7 +153,7 @@
$tName = $fName;
$tQuota = $fQuota;
$tDomain = $fDomain;
- $pCreate_mailbox_username_text = $PALANG['pCreate_mailbox_username_text_error2'];
+ $pCreate_mailbox_username_text_error = $PALANG['pCreate_mailbox_username_text_error2'];
}
if ($error != 1)
@@ -204,7 +206,7 @@
if ($result['rows'] != 1)
{
$tDomain = $fDomain;
- $tMessage = $PALANG['pAlias_result_error'] . "<br />($fUsername -> $fUsername)</br />";
+ flash_error($PALANG['pAlias_result_error'] . "<br />($fUsername -> $fUsername)");
}
// apparently uppercase usernames really confuse some IMAP clients.
@@ -218,7 +220,7 @@
if ($result['rows'] != 1 || !mailbox_postcreation($fUsername,$fDomain,$maildir, $quota))
{
$tDomain = $fDomain;
- $tMessage .= $PALANG['pCreate_mailbox_result_error'] . "<br />($fUsername)<br />";
+ flash_error($PALANG['pCreate_mailbox_result_error'] . "<br />($fUsername)");
db_query('ROLLBACK');
}
else
@@ -238,11 +240,11 @@
if (!smtp_mail ($fTo, $fFrom, $fSubject, $fBody))
{
- $tMessage .= "<br />" . $PALANG['pSendmail_result_error'] . "<br />";
+ flash_error($PALANG['pSendmail_result_error']);
}
else
{
- $tMessage .= "<br />" . $PALANG['pSendmail_result_success'] . "<br />";
+ flash_info($PALANG['pSendmail_result_success']);
}
}
@@ -251,9 +253,9 @@
if (create_mailbox_subfolders($fUsername,$fPassword))
{
- $tMessage .= $PALANG['pCreate_mailbox_result_success'] . "<br />($fUsername$tShowpass)";
+ flash_info($PALANG['pCreate_mailbox_result_success'] . "<br />($fUsername$tShowpass)");
} else {
- $tMessage .= $PALANG['pCreate_mailbox_result_succes_nosubfolders'] . "<br />($fUsername$tShowpass)";
+ flash_info($PALANG['pCreate_mailbox_result_succes_nosubfolders'] . "<br />($fUsername$tShowpass)");
}
}
@@ -263,11 +265,13 @@
$smarty->assign ('tUsername', $tUsername);
$smarty->assign ('select_options', select_options ($list_domains, array ($tDomain)), false);
$smarty->assign ('pCreate_mailbox_username_text', $pCreate_mailbox_username_text, false);
+$smarty->assign ('pCreate_mailbox_username_text_error', $pCreate_mailbox_username_text_error, false);
$smarty->assign ('pCreate_mailbox_password_text', $pCreate_mailbox_password_text, false);
+$smarty->assign ('pCreate_mailbox_password_text_error', $pCreate_mailbox_password_text_error, false);
$smarty->assign ('tName', $tName, false);
$smarty->assign ('tQuota', $tQuota);
$smarty->assign ('pCreate_mailbox_quota_text', $pCreate_mailbox_quota_text, false);
-$smarty->assign ('tMessage', $tMessage, false);
+$smarty->assign ('pCreate_mailbox_quota_text_error', $pCreate_mailbox_quota_text_error, false);
$smarty->assign ('smarty_template', 'create-mailbox');
$smarty->display ('index.tpl');
Modified: trunk/templates/create-mailbox.tpl
===================================================================
--- trunk/templates/create-mailbox.tpl 2011-07-22 20:17:17 UTC (rev 1106)
+++ trunk/templates/create-mailbox.tpl 2011-07-22 20:25:06 UTC (rev 1107)
@@ -3,54 +3,57 @@
<form name="mailbox" method="post" action="">
<table>
<tr>
- <td colspan="3"><h3>{$PALANG.pCreate_mailbox_welcome}</h3></td>
+ <th colspan="4">{$PALANG.pCreate_mailbox_welcome}</th>
</tr>
<tr>
- <td>{$PALANG.pCreate_mailbox_username}:</td>
+ <td class="label"><label>{$PALANG.pCreate_mailbox_username}:</label></td>
<td><input class="flat" type="text" name="fUsername" value="{$tUsername}"/></td>
<td>@
<select name="fDomain">{$select_options}</select>
{$pCreate_mailbox_username_text}
</td>
+ <td><span class="error_msg">{$pCreate_mailbox_username_text_error}</span></td>
</tr>
<tr>
- <td>{$PALANG.pCreate_mailbox_password}:</td>
+ <td class="label"><label>{$PALANG.pCreate_mailbox_password}:</label></td>
<td><input class="flat" type="password" name="fPassword" /></td>
<td>{$pCreate_mailbox_password_text}</td>
+ <td><span class="error_msg">{$pCreate_mailbox_password_text_error}</span></td>
</tr>
<tr>
- <td>{$PALANG.pCreate_mailbox_password2}:</td>
+ <td class="label"><label>{$PALANG.pCreate_mailbox_password2}:</label></td>
<td><input class="flat" type="password" name="fPassword2" /></td>
- <td> </td>
+ <td colspan="2"> </td>
</tr>
<tr>
- <td>{$PALANG.pCreate_mailbox_name}:</td>
+ <td class="label"><label>{$PALANG.pCreate_mailbox_name}:</label></td>
<td><input class="flat" type="text" name="fName" value="{$tName}" /></td>
<td>{$PALANG.pCreate_mailbox_name_text}</td>
+ <td> </td>
</tr>
{if $CONF.quota===YES}
<tr>
- <td>{$PALANG.pCreate_mailbox_quota}:</td>
+ <td class="label"><label>{$PALANG.pCreate_mailbox_quota}:</label></td>
<td><input class="flat" type="text" name="fQuota" value="{$tQuota}" /></td>
<td>{$pCreate_mailbox_quota_text}</td>
+ <td><span class="error_msg">{$pCreate_mailbox_quota_text_error}</span></td>
</tr>
{/if}
<tr>
- <td>{$PALANG.pCreate_mailbox_active}:</td>
+ <td class="label"><label>{$PALANG.pCreate_mailbox_active}:</label></td>
<td><input class="flat" type="checkbox" name="fActive" checked="checked" /></td>
- <td> </td>
+ <td colspan="2"> </td>
</tr>
<tr>
- <td>{$PALANG.pCreate_mailbox_mail}:</td>
+ <td class="label"><label>{$PALANG.pCreate_mailbox_mail}:</label></td>
<td><input class="flat" type="checkbox" name="fMail" checked="checked" /></td>
- <td> </td>
+ <td colspan="2"> </td>
</tr>
<tr>
- <td colspan="3" class="hlp_center"><input class="button" type="submit" name="submit" value="{$PALANG.pCreate_mailbox_button}" /></td>
+ <td> </td>
+ <td><input class="button" type="submit" name="submit" value="{$PALANG.pCreate_mailbox_button}" /></td>
+ <td colspan="2"> </td>
</tr>
- <tr>
- <td colspan="3" class="standout">{$tMessage}</td>
- </tr>
</table>
</form>
</div>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <chr...@us...> - 2011-07-22 21:08:39
|
Revision: 1110
http://postfixadmin.svn.sourceforge.net/postfixadmin/?rev=1110&view=rev
Author: christian_boltz
Date: 2011-07-22 21:08:33 +0000 (Fri, 22 Jul 2011)
Log Message:
-----------
variables.inc.php,
admin_edit-domain.tpl, create-alias-domain.tpl, edit-alias.tpl,
edit-vacation.tpl, password.tpl:
- remove now unused $tMessage
(the change in variables.inc.php was not contained in Dale's patch)
This commit is part of the huge cleanup patch by Dale Blount (lnxus@SF),
https://sourceforge.net/tracker/?func=detail&atid=937966&aid=3370510&group_id=191583
Modified Paths:
--------------
trunk/templates/admin_edit-domain.tpl
trunk/templates/create-alias-domain.tpl
trunk/templates/edit-alias.tpl
trunk/templates/edit-vacation.tpl
trunk/templates/password.tpl
trunk/variables.inc.php
Modified: trunk/templates/admin_edit-domain.tpl
===================================================================
--- trunk/templates/admin_edit-domain.tpl 2011-07-22 20:59:41 UTC (rev 1109)
+++ trunk/templates/admin_edit-domain.tpl 2011-07-22 21:08:33 UTC (rev 1110)
@@ -59,9 +59,6 @@
<td> </td>
<td colspan="2"><input type="submit" class="button" name="submit" value="{$PALANG.save}" /></td>
</tr>
- <tr>
- <td colspan="3" class="standout">{$tMessage}</td>
- </tr>
</table>
</form>
</div>
Modified: trunk/templates/create-alias-domain.tpl
===================================================================
--- trunk/templates/create-alias-domain.tpl 2011-07-22 20:59:41 UTC (rev 1109)
+++ trunk/templates/create-alias-domain.tpl 2011-07-22 21:08:33 UTC (rev 1110)
@@ -21,9 +21,6 @@
<td> </td>
</tr>
{/if}
- <tr>
- <td colspan="3" class="standout">{$tMessage}</td>
- </tr>
{if $alias_domains}
<tr>
<td> </td>
Modified: trunk/templates/edit-alias.tpl
===================================================================
--- trunk/templates/edit-alias.tpl 2011-07-22 20:59:41 UTC (rev 1109)
+++ trunk/templates/edit-alias.tpl 2011-07-22 21:08:33 UTC (rev 1110)
@@ -24,9 +24,6 @@
<td> </td>
<td colspan="2"><input class="button" type="submit" name="submit" value="{$PALANG.save}" /></td>
</tr>
- <tr>
- <td colspan="3" class="standout">{$tMessage}</td>
- </tr>
</table>
</form>
</div>
Modified: trunk/templates/edit-vacation.tpl
===================================================================
--- trunk/templates/edit-vacation.tpl 2011-07-22 20:59:41 UTC (rev 1109)
+++ trunk/templates/edit-vacation.tpl 2011-07-22 21:08:33 UTC (rev 1110)
@@ -63,9 +63,6 @@
<input class="button" type="button" name="fCancel" value="{$PALANG.exit}" onclick="newLocation()" />
</td>
</tr>
- <tr>
- <td colspan="3" class="standout">{$tMessage}</td>
- </tr>
</table>
</form>
</div>
Modified: trunk/templates/password.tpl
===================================================================
--- trunk/templates/password.tpl 2011-07-22 20:59:41 UTC (rev 1109)
+++ trunk/templates/password.tpl 2011-07-22 21:08:33 UTC (rev 1110)
@@ -29,9 +29,6 @@
<td><input class="button" type="submit" name="submit" value="{$PALANG.pPassword_button}" /></td>
<td> </td>
</tr>
- <tr>
- <td colspan="3" class="standout">{$tMessage}</td>
- </tr>
</table>
</form>
</div>
Modified: trunk/variables.inc.php
===================================================================
--- trunk/variables.inc.php 2011-07-22 20:59:41 UTC (rev 1109)
+++ trunk/variables.inc.php 2011-07-22 21:08:33 UTC (rev 1110)
@@ -70,7 +70,6 @@
$tMailbox = "";
$tMailboxes = "";
$tMaxquota = "";
-$tMessage = " ";
$tName = "";
$tQuota = "";
$tSubject = "";
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <chr...@us...> - 2011-07-23 22:33:14
|
Revision: 1122
http://postfixadmin.svn.sourceforge.net/postfixadmin/?rev=1122&view=rev
Author: christian_boltz
Date: 2011-07-23 22:33:08 +0000 (Sat, 23 Jul 2011)
Log Message:
-----------
default.css:
- redesign login form - now has an image on the right
- change width from 730px to 990px
- change menu :hover background color from green to dark grey
- change button :hover background color from green to light grey
- change table row :hover color in list mode from green to light grey
- add padding to input fields
- remove background color and border in edit form header
- remove border-left from list-virtual submenu (show all / mailboxes / ...)
- change main.php :hover from green left + bottom border to dark grey and
only left border
- removed green background in overview row (the line containing the search box)
- removed table borders (list and edit mode)
- add text-align:right for edit form labels
- some whitespace fixes
images/mail_bg.gif:
- [new file] the image in the login form
This commit is based on Dale's patch, but some styles were moved around
in the CSS file (to keep the diff of this commit somehow readable).
Some of Dale's changes are not yet included in this commit.
This commit is part of the huge cleanup patch by Dale Blount (lnxus@SF),
https://sourceforge.net/tracker/?func=detail&atid=937966&aid=3370510&group_id=191583
Modified Paths:
--------------
trunk/css/default.css
Added Paths:
-----------
trunk/images/mail_bg.gif
Modified: trunk/css/default.css
===================================================================
--- trunk/css/default.css 2011-07-23 20:40:59 UTC (rev 1121)
+++ trunk/css/default.css 2011-07-23 22:33:08 UTC (rev 1122)
@@ -8,6 +8,10 @@
text-align: left;
}
+#container {
+ width:970px;
+ margin:auto;
+}
a {
text-decoration: none;
color: #888888;
@@ -29,17 +33,22 @@
text-align: left;
}
+input, .button, textarea {
+ padding: 6px;
+ font-size: 13px;
+}
+
.button {
border: 1px solid #aaaaaa;
color: #777777;
background: #dddddd;
padding: 3px 3px 3px 3px;
- font-size: 11px;
}
.button:hover, .button:focus {
- background: #BCFF36;
- color: #888888;
+ background: #eee;
+ color: #666;
+ text-decoration:none;
}
.flat {
@@ -49,7 +58,7 @@
ul.flash-info {
border:2px solid #AFE1A6; /* medium green */
padding:1em;
- max-width:730px;
+ max-width:970px;
margin-left:auto;
margin-right:auto;
list-style:none;
@@ -58,7 +67,7 @@
ul.flash-error {
border:2px solid #FF6347; /* tomato */
padding:1em;
- max-width:730px;
+ max-width:970px;
margin-left:auto;
margin-right:auto;
list-style:none;
@@ -78,7 +87,7 @@
#admin_domains, #admin_virtual, .nav_bar, #alias_domain_table,
#alias_table, #mailbox_table, #overview_table, #log_table,
#admin_table, #footer, .subnav {
- width: 750px;
+ width: 990px;
margin: 0 auto;
}
@@ -88,16 +97,17 @@
}
#login {
- width: 750px;
+ width: 990px;
margin: 0 auto;
+ background:#fff url(../images/mail_bg.gif) right 50% no-repeat;
}
#login_table {
- border-left: 8px solid gray;
- border-right: 8px solid gray;
- background: #eeeeee;
- width: 350px;
- margin: 0 auto;
+ border-left: none;
+ border-right: 1px solid #999;
+ background: #fff;
+ width: 400px;
+ margin: 0 0 0 200px;
border-collapse: separate;
border-spacing: 10px;
}
@@ -134,11 +144,10 @@
border-top: 4px solid #aaaaaa;
position:relative;
right:50%;
- /* border-bottom: 4px solid #aaaaaa; */
}
#menu li:hover, #menu li.sfhover, #tabbar li:hover, #tabbar li.sfhover {
- background: #BFFF00;
+ background: #ccc;
}
#menu li ul, #tabbar li ul {
@@ -151,40 +160,34 @@
border:2px solid white;
border-top:none;
}
+
#menu li:hover ul, #menu li.sfhover ul, #tabbar li:hover ul, #tabbar li.sfhover ul {
left: auto;
}
-
#menu li ul li, #tabbar li ul li {
float: none;
margin-right: 0px;
border-top:2px solid white;
text-align:left;
- /* border-bottom: none; */
right:auto;
}
-
#menu a, #tabbar a {
display: block;
width: auto;
padding: 20px 5px 5px 5px;
- color: #888888;
}
-#menu a:hover, #tabbar a:hover {
+#menu a, #tabbar a, #menu a:hover, #tabbar a:hover {
color: #888888;
}
-
-
#menu li ul li a, #tabbar li ul li a {
padding: 5px 5px 5px 5px;
}
.subnav p {
- border-left: 4px solid #aaaaaa;
padding-left:10px;
margin-top:2em;
margin-bottom:0;
@@ -195,18 +198,13 @@
margin: 0 auto;
padding-top: 10px;
text-align: left;
- width: 500px;
- border: 1px solid #efefef;
}
-#edit_form h3 {
- text-align: center;
+#edit_form th {
+ text-align: left;
font-size: 12px;
margin: 0;
- background: #AFE1A6; /*#b4004a;*/
- border: 1px solid #bbb;
line-height: 25px;
- color: #555555;
}
.hlp_center {
@@ -214,9 +212,6 @@
}
.help_text {
- background: #efefef;
- border-left: 1px solid #bbbbbb;
- border-right: 1px solid #bbbbbb;
text-align: center;
padding-top: 5px;
padding-bottom: 5px;
@@ -240,16 +235,17 @@
}
#main_menu a:hover {
- color: #40B33C; /*#CD6A6A;*/
+ color: #333;
text-decoration: none;
padding-left: 4px;
- border-bottom: 1px solid #40B33C;
- border-left: 4px solid #40B33C;
+ border-bottom: none;
+ border-left: 4px solid #333;
}
-#overview, #admin_domains, #admin_virtual {
- background: #AFE1A6; /*#9ACD32;*/
- border: 1px solid #bbb;
+#overview {
+/* background: #AFE1A6; /*#9ACD32;*/
+/* border: 1px solid #bbb;
+*/
}
#overview h4, #overview P, #overview FORM, #admin_virtual h4, #admin_virtual P, #admin_virtual FORM {
@@ -258,44 +254,63 @@
line-height: 30px;
}
-#alias_domain_table, #alias_table, #mailbox_table, #overview_table, #log_table, #admin_table {
- border: 1px solid #efefef;
-}
-
#alias_domain_table .header, #alias_table .header, #mailbox_table .header, #overview_table .header, #log_table .header, #admin_table .header {
line-height: 20px;
background: #efefef;
color: black;
}
+#alias_domain_table h3, #alias_table h3, #mailbox_table h3, #overview_table h3, #log_table h3, #admin_table h3 {
+ text-align: left;
+ font-size: 12px;
+ font-weight: bold;
+ padding-left: 20px;
+ line-height: 25px;
+ margin: 0;
+}
+
#alias_domain_table .hilightoff, #alias_table .hilightoff, #mailbox_table .hilightoff, #overview_table .hilightoff, #log_table .hilightoff, #admin_table .hilighoff {
background: white;
}
#alias_domain_table .hilighton, #alias_table .hilighton, #mailbox_table .hilighton, #overview_table .hilighton, #log_table .hilighton, #admin_table .hilighton {
- background: #D9FF43; /*#D6FF85;*/ /*#ffdddd;*/
+ background: #eee; /*#D6FF85;*/ /*#ffdddd;*/
}
#alias_domain_table tr:hover, #alias_table tr:hover, #mailbox_table tr:hover, #overview_table tr:hover, #log_table tr:hover, #admin_table tr:hover {
- background: #D9FF43; /*#D6FF85;*/ /*#ffdddd;*/
+ background: #eee; /*#D6FF85;*/ /*#ffdddd;*/
}
+th {
+ text-align: center;
+ padding:7px 0;
+ margin: 0 0 14px 0;
+ background: #fff;
+ border-bottom: 1px solid #bbb;
+ color: #555555;
+}
-#alias_domain_table h3, #alias_table h3, #mailbox_table h3, #overview_table h3, #log_table h3, #admin_table h3 {
- background: silver;
- text-align: left;
- font-size: 12px;
- font-weight: bold;
- padding-left: 20px;
- line-height: 25px;
- margin: 0;
+td {
+ padding:7px 7px;
}
+td.label {
+ text-align:right;
+ margin-right:0px;
+}
+
+label {
+ padding-right:0;
+ font-weight:bold;
+ vertical-align:middle;
+}
+
#alias_domain_table td, #alias_table td, #mailbox_table td, #overview_table td, #log_table td, #admin_table td {
-text-align : left;
+ text-align: left;
}
#footer {
+ width:975px;
margin: 20px auto;
border-top: 1px solid #bbbbbb;
background: #efefef;
Added: trunk/images/mail_bg.gif
===================================================================
(Binary files differ)
Property changes on: trunk/images/mail_bg.gif
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <chr...@us...> - 2011-07-25 23:18:58
|
Revision: 1129
http://postfixadmin.svn.sourceforge.net/postfixadmin/?rev=1129&view=rev
Author: christian_boltz
Date: 2011-07-25 23:18:52 +0000 (Mon, 25 Jul 2011)
Log Message:
-----------
templates/edit-vacation.tpl, templates/users_vacation.tpl:
- replaced hardcoded background-color with class=readonly
css/default.css:
- new style .readonly for vacation start/end input fields
Modified Paths:
--------------
trunk/css/default.css
trunk/templates/edit-vacation.tpl
trunk/templates/users_vacation.tpl
Modified: trunk/css/default.css
===================================================================
--- trunk/css/default.css 2011-07-25 22:59:39 UTC (rev 1128)
+++ trunk/css/default.css 2011-07-25 23:18:52 UTC (rev 1129)
@@ -38,6 +38,10 @@
font-size: 13px;
}
+.readonly {
+ background:#eee;
+}
+
.button {
border: 1px solid #aaaaaa;
color: #777777;
Modified: trunk/templates/edit-vacation.tpl
===================================================================
--- trunk/templates/edit-vacation.tpl 2011-07-25 22:59:39 UTC (rev 1128)
+++ trunk/templates/edit-vacation.tpl 2011-07-25 23:18:52 UTC (rev 1129)
@@ -19,7 +19,7 @@
</tr>
<tr>
<td class="label"><label>{$PALANG.pUsersVacation_activefrom}:</label></td>
- <td><input class="flat" name="activefrom" value="{$tActiveFrom}" readonly="readonly" style="background:#eee;"/>
+ <td><input class="flat readonly" name="activefrom" value="{$tActiveFrom}" readonly="readonly" />
{literal}
<script language="JavaScript" type="text/javascript">
new tcal ({
@@ -33,7 +33,7 @@
</tr>
<tr>
<td class="label"><label>{$PALANG.pUsersVacation_activeuntil}:</label></td>
- <td><input class="flat" name="activeuntil" value="{$tActiveUntil}" readonly="readonly" style="background:#eee;"/>
+ <td><input class="flat readonly" name="activeuntil" value="{$tActiveUntil}" readonly="readonly" />
{literal}
<script language="JavaScript" type="text/javascript">
new tcal ({
Modified: trunk/templates/users_vacation.tpl
===================================================================
--- trunk/templates/users_vacation.tpl 2011-07-25 22:59:39 UTC (rev 1128)
+++ trunk/templates/users_vacation.tpl 2011-07-25 23:18:52 UTC (rev 1129)
@@ -14,7 +14,7 @@
</tr>
<tr>
<td class="label"><label>{$PALANG.pUsersVacation_activefrom}:</label></td>
- <td><input class="flat" name="fActiveFrom" value="{$tActiveFrom}" readonly="readonly" style="background:#eee;" />
+ <td><input class="flat readonly" name="fActiveFrom" value="{$tActiveFrom}" readonly="readonly" />
{literal}
<script language="JavaScript" type="text/javascript">
new tcal ({
@@ -28,7 +28,7 @@
</tr>
<tr>
<td class="label"><label>{$PALANG.pUsersVacation_activeuntil}:</label></td>
- <td><input class="flat" name="fActiveUntil" value="{$tActiveUntil}" readonly="readonly" style="background:#eee;" />
+ <td><input class="flat readonly" name="fActiveUntil" value="{$tActiveUntil}" readonly="readonly" />
{literal}
<script language="JavaScript" type="text/javascript">
new tcal ({
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <chr...@us...> - 2011-07-25 23:43:18
|
Revision: 1132
http://postfixadmin.svn.sourceforge.net/postfixadmin/?rev=1132&view=rev
Author: christian_boltz
Date: 2011-07-25 23:43:12 +0000 (Mon, 25 Jul 2011)
Log Message:
-----------
create-mailbox.php, variables.inc.php, create-mailbox.tpl
- removed always empty variable $pCreate_mailbox_username_text
- replaced "static" variables $pCreate_mailbox_password_text and
$pCreate_mailbox_quota_text with their PALANG content in the template
Modified Paths:
--------------
trunk/create-mailbox.php
trunk/templates/create-mailbox.tpl
trunk/variables.inc.php
Modified: trunk/create-mailbox.php
===================================================================
--- trunk/create-mailbox.php 2011-07-25 23:30:27 UTC (rev 1131)
+++ trunk/create-mailbox.php 2011-07-25 23:43:12 UTC (rev 1132)
@@ -46,8 +46,6 @@
}
-$pCreate_mailbox_password_text = $PALANG['pCreate_mailbox_password_text'];
-$pCreate_mailbox_quota_text = $PALANG['pCreate_mailbox_quota_text'];
$pCreate_mailbox_username_text_error = "";
$pCreate_mailbox_password_text_error = "";
$pCreate_mailbox_quota_text_error = "";
@@ -264,13 +262,10 @@
$smarty->assign ('tUsername', $tUsername);
$smarty->assign ('select_options', select_options ($list_domains, array ($tDomain)), false);
-$smarty->assign ('pCreate_mailbox_username_text', $pCreate_mailbox_username_text, false);
$smarty->assign ('pCreate_mailbox_username_text_error', $pCreate_mailbox_username_text_error, false);
-$smarty->assign ('pCreate_mailbox_password_text', $pCreate_mailbox_password_text, false);
$smarty->assign ('pCreate_mailbox_password_text_error', $pCreate_mailbox_password_text_error, false);
$smarty->assign ('tName', $tName, false);
$smarty->assign ('tQuota', $tQuota);
-$smarty->assign ('pCreate_mailbox_quota_text', $pCreate_mailbox_quota_text, false);
$smarty->assign ('pCreate_mailbox_quota_text_error', $pCreate_mailbox_quota_text_error, false);
$smarty->assign ('smarty_template', 'create-mailbox');
$smarty->display ('index.tpl');
Modified: trunk/templates/create-mailbox.tpl
===================================================================
--- trunk/templates/create-mailbox.tpl 2011-07-25 23:30:27 UTC (rev 1131)
+++ trunk/templates/create-mailbox.tpl 2011-07-25 23:43:12 UTC (rev 1132)
@@ -10,14 +10,13 @@
<td><input class="flat" type="text" name="fUsername" value="{$tUsername}"/></td>
<td>@
<select name="fDomain">{$select_options}</select>
- {$pCreate_mailbox_username_text}
</td>
<td><span class="error_msg">{$pCreate_mailbox_username_text_error}</span></td>
</tr>
<tr>
<td class="label"><label>{$PALANG.pCreate_mailbox_password}:</label></td>
<td><input class="flat" type="password" name="fPassword" /></td>
- <td>{$pCreate_mailbox_password_text}</td>
+ <td>{$PALANG.pCreate_mailbox_password_text}</td>
<td><span class="error_msg">{$pCreate_mailbox_password_text_error}</span></td>
</tr>
<tr>
@@ -35,7 +34,7 @@
<tr>
<td class="label"><label>{$PALANG.pCreate_mailbox_quota}:</label></td>
<td><input class="flat" type="text" name="fQuota" value="{$tQuota}" /></td>
- <td>{$pCreate_mailbox_quota_text}</td>
+ <td>{$PALANG.pCreate_mailbox_quota_text}</td>
<td><span class="error_msg">{$pCreate_mailbox_quota_text_error}</span></td>
</tr>
{/if}
Modified: trunk/variables.inc.php
===================================================================
--- trunk/variables.inc.php 2011-07-25 23:30:27 UTC (rev 1131)
+++ trunk/variables.inc.php 2011-07-25 23:43:12 UTC (rev 1132)
@@ -76,9 +76,6 @@
$tUsername = "";
$tTransport = "";
-$pCreate_mailbox_password_text = " ";
-$pCreate_mailbox_quota_text = " ";
-$pCreate_mailbox_username_text = " ";
$pEdit_mailbox_password_text = " ";
$pEdit_mailbox_quota_text = " ";
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <chr...@us...> - 2011-07-25 23:50:04
|
Revision: 1133
http://postfixadmin.svn.sourceforge.net/postfixadmin/?rev=1133&view=rev
Author: christian_boltz
Date: 2011-07-25 23:49:58 +0000 (Mon, 25 Jul 2011)
Log Message:
-----------
edit-mailbox.php, edit-mailbox.tpl, variables.inc.php
- removed always empty variable $pEdit_mailbox_password_text
- replaced "static" variable $pEdit_mailbox_quota_text with its
PALANG content in the template
Modified Paths:
--------------
trunk/edit-mailbox.php
trunk/templates/edit-mailbox.tpl
trunk/variables.inc.php
Modified: trunk/edit-mailbox.php
===================================================================
--- trunk/edit-mailbox.php 2011-07-25 23:43:12 UTC (rev 1132)
+++ trunk/edit-mailbox.php 2011-07-25 23:49:58 UTC (rev 1133)
@@ -46,7 +46,6 @@
if (isset ($_GET['domain'])) $fDomain = escape_string ($_GET['domain']);
$pEdit_mailbox_name_text = $PALANG['pEdit_mailbox_name_text'];
-$pEdit_mailbox_quota_text = $PALANG['pEdit_mailbox_quota_text'];
$pEdit_mailbox_quota_text_error = "";
if (!(check_owner ($SESSID_USERNAME, $fDomain) || authentication_has_role('global-admin')) )
@@ -175,12 +174,10 @@
}
$smarty->assign ('fUsername', $fUsername);
-$smarty->assign ('pEdit_mailbox_password_text', $pEdit_mailbox_password_text, false);
$smarty->assign ('tName', $tName, false);
$smarty->assign ('pEdit_mailbox_name_text', $pEdit_mailbox_name_text,false);
$smarty->assign ('tMaxquota', $tMaxquota);
$smarty->assign ('tQuota', $tQuota);
-$smarty->assign ('pEdit_mailbox_quota_text', $pEdit_mailbox_quota_text);
$smarty->assign ('pEdit_mailbox_quota_text_error', $pEdit_mailbox_quota_text_error);
if ($tActive) $smarty->assign ('tActive', ' checked="checked"');
$smarty->assign ('smarty_template', 'edit-mailbox');
Modified: trunk/templates/edit-mailbox.tpl
===================================================================
--- trunk/templates/edit-mailbox.tpl 2011-07-25 23:43:12 UTC (rev 1132)
+++ trunk/templates/edit-mailbox.tpl 2011-07-25 23:49:58 UTC (rev 1133)
@@ -14,8 +14,8 @@
<tr>
<td class="label"><label>{$PALANG.pEdit_mailbox_password}:</label></td>
<td><input class="flat" type="password" name="fPassword" /></td>
- <td>{$pEdit_mailbox_password_text}</td>
<td> </td>
+ <td> </td>
</tr>
<tr>
<td class="label"><label>{$PALANG.pEdit_mailbox_password2}:</label></td>
@@ -33,7 +33,7 @@
<tr>
<td class="label"><label>{$PALANG.pEdit_mailbox_quota} (max: {$tMaxquota}):</label></td>
<td><input class="flat" type="text" name="fQuota" value="{$tQuota}" /></td>
- <td>{$pEdit_mailbox_quota_text}</td>
+ <td>{$PALANG.pEdit_mailbox_quota_text}</td>
<td>{$pEdit_mailbox_quota_text_error}</td>
</tr>
{/if}
Modified: trunk/variables.inc.php
===================================================================
--- trunk/variables.inc.php 2011-07-25 23:43:12 UTC (rev 1132)
+++ trunk/variables.inc.php 2011-07-25 23:49:58 UTC (rev 1133)
@@ -76,8 +76,5 @@
$tUsername = "";
$tTransport = "";
-$pEdit_mailbox_password_text = " ";
-$pEdit_mailbox_quota_text = " ";
-
/* vim: set expandtab softtabstop=4 tabstop=4 shiftwidth=4: */
?>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <chr...@us...> - 2011-07-26 00:33:51
|
Revision: 1134
http://postfixadmin.svn.sourceforge.net/postfixadmin/?rev=1134&view=rev
Author: christian_boltz
Date: 2011-07-26 00:33:44 +0000 (Tue, 26 Jul 2011)
Log Message:
-----------
variables.inc.php:
- moved some variables from variables.inc.php to the (only) file that
uses them
- removed unused $escaped_string
create-domain.php
- target for $fDefaultaliases and $tDefaultaliases
list-virtual.php
- target for $tDisplay_back, $tDisplay_back_show, $tDisplay_up_show,
$tDisplay_next, $tDisplay_next_show
Modified Paths:
--------------
trunk/create-domain.php
trunk/list-virtual.php
trunk/variables.inc.php
Modified: trunk/create-domain.php
===================================================================
--- trunk/create-domain.php 2011-07-25 23:49:58 UTC (rev 1133)
+++ trunk/create-domain.php 2011-07-26 00:33:44 UTC (rev 1134)
@@ -74,6 +74,9 @@
$fDomain = strtolower($fDomain);
+$fDefaultaliases = "";
+$tDefaultaliases = "";
+
if ($_SERVER['REQUEST_METHOD'] == "GET")
{
/* default values as set above */
Modified: trunk/list-virtual.php
===================================================================
--- trunk/list-virtual.php 2011-07-25 23:49:58 UTC (rev 1133)
+++ trunk/list-virtual.php 2011-07-26 00:33:44 UTC (rev 1134)
@@ -246,6 +246,12 @@
$tCanAddAlias = false;
$tCanAddMailbox = false;
+$tDisplay_back = "";
+$tDisplay_back_show = "";
+$tDisplay_up_show = "";
+$tDisplay_next = "";
+$tDisplay_next_show = "";
+
$limit = get_domain_properties($fDomain);
if (isset ($limit)) {
if ($fDisplay >= $page_size) {
Modified: trunk/variables.inc.php
===================================================================
--- trunk/variables.inc.php 2011-07-25 23:49:58 UTC (rev 1133)
+++ trunk/variables.inc.php 2011-07-26 00:33:44 UTC (rev 1134)
@@ -19,14 +19,12 @@
*/
$error = "";
-$escaped_string = "";
$quota = "";
$vacation = "";
$fActive = "";
$fAddress = "";
$fAliases = "";
$fBackupmx = "";
-$fDefaultaliases = "";
$fDelete = "";
$fDescription = "";
$fDomain = "";
@@ -55,13 +53,7 @@
$tAlias = "";
$tAliases = "";
$tBody = "";
-$tDefaultaliases = "";
$tDescription = "";
-$tDisplay_back = "";
-$tDisplay_back_show = "";
-$tDisplay_up_show = "";
-$tDisplay_next = "";
-$tDisplay_next_show = "";
$tDomain = "";
$tDomains = "";
$tFrom = "";
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <chr...@us...> - 2011-07-29 18:04:16
|
Revision: 1137
http://postfixadmin.svn.sourceforge.net/postfixadmin/?rev=1137&view=rev
Author: christian_boltz
Date: 2011-07-29 18:04:09 +0000 (Fri, 29 Jul 2011)
Log Message:
-----------
Merge template for admin login and user login
login.php, users/login.php:
- set logintype=admin/user smarty variable
- cleanup: move smarty assignments outside of GET/POST handling - it's
the same for both
users/login.php:
- do not pre-fill username on failed login
templates/login.tpl:
- merge in users_login.tpl
- add some {if} to handle the differences between admin and user login
templates/users_login.tpl:
- deleted
*.lang:
- mark pUsersLogin_username, pUsersLogin_password, pUsersLogin_language
and pUsersLogin_button as obsolete
- add some notes if pLogin_* and pUsersLogin differ
Modified Paths:
--------------
trunk/languages/bg.lang
trunk/languages/ca.lang
trunk/languages/cn.lang
trunk/languages/cs.lang
trunk/languages/da.lang
trunk/languages/de.lang
trunk/languages/en.lang
trunk/languages/es.lang
trunk/languages/et.lang
trunk/languages/eu.lang
trunk/languages/fi.lang
trunk/languages/fo.lang
trunk/languages/fr.lang
trunk/languages/hr.lang
trunk/languages/hu.lang
trunk/languages/is.lang
trunk/languages/it.lang
trunk/languages/ja.lang
trunk/languages/lt.lang
trunk/languages/mk.lang
trunk/languages/nb.lang
trunk/languages/nl.lang
trunk/languages/nn.lang
trunk/languages/pl.lang
trunk/languages/pt-br.lang
trunk/languages/ru.lang
trunk/languages/sk.lang
trunk/languages/sl.lang
trunk/languages/sv.lang
trunk/languages/tr.lang
trunk/languages/tw.lang
trunk/login.php
trunk/templates/login.tpl
trunk/users/login.php
Removed Paths:
-------------
trunk/templates/users_login.tpl
Modified: trunk/languages/bg.lang
===================================================================
--- trunk/languages/bg.lang 2011-07-27 21:57:48 UTC (rev 1136)
+++ trunk/languages/bg.lang 2011-07-29 18:04:09 UTC (rev 1137)
@@ -25,7 +25,7 @@
$PALANG['pLogin_username'] = 'Логин (е-мейл)';
$PALANG['pLogin_password'] = 'Парола';
$PALANG['pLogin_language'] = 'Language'; # XXX
-$PALANG['pLogin_button'] = 'Изход';
+$PALANG['pLogin_button'] = 'Изход'; # XXX compare with pUsersLogin_button - should be "Login"
$PALANG['pLogin_failed'] = 'Your email address or password are not correct.'; # XXX
$PALANG['pLogin_login_users'] = 'Ако сте потребител натиснете тук за логване в потребителската част.';
@@ -330,10 +330,10 @@
$PALANG['pAdminEdit_admin_result_success'] = 'Админ-а беше модифициран!';
$PALANG['pUsersLogin_welcome'] = 'Потребителски вход за смяна на парола и alias-и.';
-$PALANG['pUsersLogin_username'] = 'Логин (е-мейл)';
-$PALANG['pUsersLogin_password'] = 'Парола';
-$PALANG['pUsersLogin_language'] = 'Language'; # XXX
-$PALANG['pUsersLogin_button'] = 'Вход';
+$PALANG['pUsersLogin_username'] = 'Логин (е-мейл)'; # obsolete
+$PALANG['pUsersLogin_password'] = 'Парола'; # obsolete
+$PALANG['pUsersLogin_language'] = 'Language'; # XXX # obsolete
+$PALANG['pUsersLogin_button'] = 'Вход'; # obsolete
$PALANG['pUsersLogin_username_incorrect'] = 'Вашият логин не е правилен. Моля проверете за коректност на вашият е-мейл адрес!';
$PALANG['pUsersLogin_password_incorrect'] = 'Вашата парола не е правилна!';
Modified: trunk/languages/ca.lang
===================================================================
--- trunk/languages/ca.lang 2011-07-27 21:57:48 UTC (rev 1136)
+++ trunk/languages/ca.lang 2011-07-29 18:04:09 UTC (rev 1137)
@@ -21,10 +21,10 @@
$PALANG['pFooter_logged_as'] = 'Logged as %s'; # XXX # XXX Text change: 'logged in as %s' (the 'in' was missing)
$PALANG['pLogin_welcome'] = 'Login d\'administrador per l\'administració de dominis.';
-$PALANG['pLogin_username'] = 'Usuari (e-mail)';
+$PALANG['pLogin_username'] = 'Usuari (e-mail)'; # XXX compare with pUsersLogin_username - should be "Login (email)"
$PALANG['pLogin_password'] = 'Contrasenya';
$PALANG['pLogin_language'] = 'Language'; # XXX
-$PALANG['pLogin_button'] = 'Usuari';
+$PALANG['pLogin_button'] = 'Usuari'; # XXX compare with pUsersLogin_button - should be "Login"
$PALANG['pLogin_failed'] = 'Your email address or password are not correct.'; # XXX
$PALANG['pLogin_login_users'] = 'Login per anar a la secció d\'usuaris.';
$PALANG['pMenu_main'] = 'Main'; # XXX
@@ -329,10 +329,10 @@
$PALANG['pAdminEdit_admin_result_success'] = 'L\'administrador ha estat modificat!';
$PALANG['pUsersLogin_welcome'] = 'Login d\'usuaris per canviar la contrasenya i els àlies.';
-$PALANG['pUsersLogin_username'] = 'Login (e-mail)';
-$PALANG['pUsersLogin_password'] = 'Contrasenya';
-$PALANG['pUsersLogin_language'] = 'Language'; # XXX
-$PALANG['pUsersLogin_button'] = 'Login';
+$PALANG['pUsersLogin_username'] = 'Login (e-mail)'; # obsolete
+$PALANG['pUsersLogin_password'] = 'Contrasenya'; # obsolete
+$PALANG['pUsersLogin_language'] = 'Language'; # XXX # obsolete
+$PALANG['pUsersLogin_button'] = 'Login'; # obsolete
$PALANG['pUsersLogin_username_incorrect'] = 'El seu login no és correcte. Asseguri\'s d\'haver introduït la seva adreça d\'e-mail com a login!';
$PALANG['pUsersLogin_password_incorrect'] = 'La seva contrasenya no és correcta!';
Modified: trunk/languages/cn.lang
===================================================================
--- trunk/languages/cn.lang 2011-07-27 21:57:48 UTC (rev 1136)
+++ trunk/languages/cn.lang 2011-07-29 18:04:09 UTC (rev 1137)
@@ -21,7 +21,7 @@
$PALANG['pFooter_logged_as'] = 'Logged as %s'; # XXX # XXX Text change: 'logged in as %s' (the 'in' was missing)
$PALANG['pLogin_welcome'] = '邮件管理员请从这里登录以管理你的域名.';
-$PALANG['pLogin_username'] = '帐号 (邮件地址)';
+$PALANG['pLogin_username'] = '帐号 (邮件地址)'; # XXX compare with pUsersLogin_username - should be "Login (email)"
$PALANG['pLogin_password'] = '密码';
$PALANG['pLogin_language'] = 'Language'; # XXX
$PALANG['pLogin_button'] = '登录';
@@ -329,10 +329,10 @@
$PALANG['pAdminEdit_admin_result_success'] = '编辑域管理员成功!';
$PALANG['pUsersLogin_welcome'] = '邮件用户从这里登录管理你的密码和别名.';
-$PALANG['pUsersLogin_username'] = '帐号 (邮箱地址)';
-$PALANG['pUsersLogin_password'] = '密码';
-$PALANG['pUsersLogin_language'] = 'Language'; # XXX
-$PALANG['pUsersLogin_button'] = '登录';
+$PALANG['pUsersLogin_username'] = '帐号 (邮箱地址)'; # obsolete
+$PALANG['pUsersLogin_password'] = '密码'; # obsolete
+$PALANG['pUsersLogin_language'] = 'Language'; # XXX # obsolete
+$PALANG['pUsersLogin_button'] = '登录'; # obsolete
$PALANG['pUsersLogin_username_incorrect'] = '登录失败. 请确认你是使用你的邮箱地址登录!';
$PALANG['pUsersLogin_password_incorrect'] = '登录密码不正确!';
Modified: trunk/languages/cs.lang
===================================================================
--- trunk/languages/cs.lang 2011-07-27 21:57:48 UTC (rev 1136)
+++ trunk/languages/cs.lang 2011-07-29 18:04:09 UTC (rev 1137)
@@ -338,10 +338,10 @@
$PALANG['pAdminEdit_admin_result_success'] = 'Administrátor byl upraven!';
$PALANG['pUsersLogin_welcome'] = 'Zde se přihlašují uživatelé pro změnu hesla, přesměrování nebo automatické odpovědi.';
-$PALANG['pUsersLogin_username'] = 'Uživatelské jméno (email)';
-$PALANG['pUsersLogin_password'] = 'Heslo';
-$PALANG['pUsersLogin_language'] = 'Language'; # XXX
-$PALANG['pUsersLogin_button'] = 'Přihlásit';
+$PALANG['pUsersLogin_username'] = 'Uživatelské jméno (email)'; # obsolete
+$PALANG['pUsersLogin_password'] = 'Heslo'; # obsolete
+$PALANG['pUsersLogin_language'] = 'Language'; # XXX # obsolete
+$PALANG['pUsersLogin_button'] = 'Přihlásit'; # obsolete
$PALANG['pUsersLogin_username_incorrect'] = 'Nesprávné uživatelské jmeno. Přihlašujte se svojí emailovou adresou!';
$PALANG['pUsersLogin_password_incorrect'] = 'Nesprávné heslo!';
Modified: trunk/languages/da.lang
===================================================================
--- trunk/languages/da.lang 2011-07-27 21:57:48 UTC (rev 1136)
+++ trunk/languages/da.lang 2011-07-29 18:04:09 UTC (rev 1137)
@@ -26,7 +26,7 @@
$PALANG['pLogin_username'] = 'Brugernavn (email)';
$PALANG['pLogin_password'] = 'Adgangskode';
$PALANG['pLogin_language'] = 'Language'; # XXX
-$PALANG['pLogin_button'] = 'Login';
+$PALANG['pLogin_button'] = 'Login'; # XXX compare with pUsersLogin_button - should be "Login"
$PALANG['pLogin_failed'] = 'Your email address or password are not correct.'; # XXX
$PALANG['pLogin_login_users'] = 'Bruger: Log ind på brugersektionen her.';
@@ -336,10 +336,10 @@
$PALANG['pAdminEdit_admin_result_success'] = 'Administrator er rettet!';
$PALANG['pUsersLogin_welcome'] = 'Postboksbruger: Login for at ændre adgangskode og videresending.';
-$PALANG['pUsersLogin_username'] = 'Brugernavn (email)';
-$PALANG['pUsersLogin_password'] = 'Adgangskode';
-$PALANG['pUsersLogin_language'] = 'Language'; # XXX
-$PALANG['pUsersLogin_button'] = 'Log ind';
+$PALANG['pUsersLogin_username'] = 'Brugernavn (email)'; # obsolete
+$PALANG['pUsersLogin_password'] = 'Adgangskode'; # obsolete
+$PALANG['pUsersLogin_language'] = 'Language'; # XXX # obsolete
+$PALANG['pUsersLogin_button'] = 'Log ind'; # obsolete
$PALANG['pUsersLogin_username_incorrect'] = 'Dit brugernavn er forkert. Tjek at du bruger din emailadresse som brugernavn!';
$PALANG['pUsersLogin_password_incorrect'] = 'Din adgangskode er ikke korrekt!';
Modified: trunk/languages/de.lang
===================================================================
--- trunk/languages/de.lang 2011-07-27 21:57:48 UTC (rev 1136)
+++ trunk/languages/de.lang 2011-07-29 18:04:09 UTC (rev 1137)
@@ -335,10 +335,10 @@
$PALANG['pAdminEdit_admin_result_success'] = 'Admin geändert!';
$PALANG['pUsersLogin_welcome'] = 'Benutzer bitte hier einloggen, um Weiterleitungen bzw. das Passwort zu ändern.';
-$PALANG['pUsersLogin_username'] = 'Login (email)';
-$PALANG['pUsersLogin_password'] = 'Passwort';
-$PALANG['pUsersLogin_language'] = 'Sprache';
-$PALANG['pUsersLogin_button'] = 'Login';
+$PALANG['pUsersLogin_username'] = 'Login (email)'; # obsolete
+$PALANG['pUsersLogin_password'] = 'Passwort'; # obsolete
+$PALANG['pUsersLogin_language'] = 'Sprache'; # obsolete
+$PALANG['pUsersLogin_button'] = 'Login'; # obsolete
$PALANG['pUsersLogin_username_incorrect'] = 'Falscher Login! Bitte benutzen Sie ihre Email-Adresse als Login';
$PALANG['pUsersLogin_password_incorrect'] = 'Falsches Passwort!';
Modified: trunk/languages/en.lang
===================================================================
--- trunk/languages/en.lang 2011-07-27 21:57:48 UTC (rev 1136)
+++ trunk/languages/en.lang 2011-07-29 18:04:09 UTC (rev 1137)
@@ -337,10 +337,10 @@
$PALANG['pAdminEdit_admin_result_success'] = 'Admin has been modified!';
$PALANG['pUsersLogin_welcome'] = 'Mailbox users login to change your password and aliases.';
-$PALANG['pUsersLogin_username'] = 'Login (email)';
-$PALANG['pUsersLogin_password'] = 'Password';
-$PALANG['pUsersLogin_language'] = 'Language';
-$PALANG['pUsersLogin_button'] = 'Login';
+$PALANG['pUsersLogin_username'] = 'Login (email)'; # obsolete
+$PALANG['pUsersLogin_password'] = 'Password'; # obsolete
+$PALANG['pUsersLogin_language'] = 'Language'; # obsolete
+$PALANG['pUsersLogin_button'] = 'Login'; # obsolete
$PALANG['pUsersLogin_username_incorrect'] = 'Your login is not correct. Make sure that you login with your email address!';
$PALANG['pUsersLogin_password_incorrect'] = 'Your password is not correct!';
Modified: trunk/languages/es.lang
===================================================================
--- trunk/languages/es.lang 2011-07-27 21:57:48 UTC (rev 1136)
+++ trunk/languages/es.lang 2011-07-29 18:04:09 UTC (rev 1137)
@@ -22,10 +22,10 @@
$PALANG['pFooter_logged_as'] = 'Autenticado como %s'; # XXX Text change: 'logged in as %s' (the 'in' was missing)
$PALANG['pLogin_welcome'] = 'Login de administrador para administración de dominios.';
-$PALANG['pLogin_username'] = 'Usuario (e-mail)';
+$PALANG['pLogin_username'] = 'Usuario (e-mail)'; # XXX compare with pUsersLogin_username - should be "Login (email)"
$PALANG['pLogin_password'] = 'Contraseña';
$PALANG['pLogin_language'] = 'Language'; # XXX
-$PALANG['pLogin_button'] = 'Usuario';
+$PALANG['pLogin_button'] = 'Usuario'; # XXX compare with pUsersLogin_button - should be "Login"
$PALANG['pLogin_failed'] = 'La cuenta de email o la contraseña no son correctas.';
$PALANG['pLogin_login_users'] = 'Login para ir a la sección de usuarios.';
$PALANG['pMenu_main'] = 'Principal';
@@ -331,10 +331,10 @@
$PALANG['pAdminEdit_admin_result_success'] = '¡El administrador ha sido modificado!';
$PALANG['pUsersLogin_welcome'] = 'Login de usuarios para cambiar la contraseña y alias.';
-$PALANG['pUsersLogin_username'] = 'Login (e-mail)';
-$PALANG['pUsersLogin_password'] = 'Contraseña';
-$PALANG['pUsersLogin_language'] = 'Language'; # XXX
-$PALANG['pUsersLogin_button'] = 'Login';
+$PALANG['pUsersLogin_username'] = 'Login (e-mail)'; # obsolete
+$PALANG['pUsersLogin_password'] = 'Contraseña'; # obsolete
+$PALANG['pUsersLogin_language'] = 'Language'; # XXX # obsolete
+$PALANG['pUsersLogin_button'] = 'Login'; # obsolete
$PALANG['pUsersLogin_username_incorrect'] = 'Su login no es correcto. ¡Asegúrese de haber introducido su dirección de e-mail como login!';
$PALANG['pUsersLogin_password_incorrect'] = '¡Su contraseña no es correcta!';
Modified: trunk/languages/et.lang
===================================================================
--- trunk/languages/et.lang 2011-07-27 21:57:48 UTC (rev 1136)
+++ trunk/languages/et.lang 2011-07-29 18:04:09 UTC (rev 1137)
@@ -329,10 +329,10 @@
$PALANG['pAdminEdit_admin_result_success'] = 'Haldaja on muudetud!';
$PALANG['pUsersLogin_welcome'] = 'Postkasti kasutaja sisse logimine muutmaks parooli ja aliast.';
-$PALANG['pUsersLogin_username'] = 'Kasutajanimi (e-posti aadress)';
-$PALANG['pUsersLogin_password'] = 'Parool';
-$PALANG['pUsersLogin_language'] = 'Language'; # XXX
-$PALANG['pUsersLogin_button'] = 'Logi sisse';
+$PALANG['pUsersLogin_username'] = 'Kasutajanimi (e-posti aadress)'; # obsolete
+$PALANG['pUsersLogin_password'] = 'Parool'; # obsolete
+$PALANG['pUsersLogin_language'] = 'Language'; # XXX # obsolete
+$PALANG['pUsersLogin_button'] = 'Logi sisse'; # obsolete
$PALANG['pUsersLogin_username_incorrect'] = 'Kasutajanimi pole õige. Veendu, et sisestatud kasutajanimi on e-posti aadress!';
$PALANG['pUsersLogin_password_incorrect'] = 'Parool pole õige!';
Modified: trunk/languages/eu.lang
===================================================================
--- trunk/languages/eu.lang 2011-07-27 21:57:48 UTC (rev 1136)
+++ trunk/languages/eu.lang 2011-07-29 18:04:09 UTC (rev 1137)
@@ -21,10 +21,10 @@
$PALANG['pFooter_logged_as'] = 'Logged as %s'; # XXX # XXX Text change: 'logged in as %s' (the 'in' was missing)
$PALANG['pLogin_welcome'] = 'Kudeatzailearen logina domeinuak kudeatzeko.';
-$PALANG['pLogin_username'] = 'Erabiltzailea (e-mail)';
+$PALANG['pLogin_username'] = 'Erabiltzailea (e-mail)'; # XXX compare with pUsersLogin_username - should be "Login (email)"
$PALANG['pLogin_password'] = 'Pasahitza';
$PALANG['pLogin_language'] = 'Language'; # XXX
-$PALANG['pLogin_button'] = 'Erabiltzailea';
+$PALANG['pLogin_button'] = 'Erabiltzailea'; # XXX compare with pUsersLogin_button - should be "Login"
$PALANG['pLogin_failed'] = 'Your email address or password are not correct.'; # XXX
$PALANG['pLogin_login_users'] = 'Erabiltzaileen gunera joateko logina.';
$PALANG['pMenu_main'] = 'Main'; # XXX
@@ -328,10 +328,10 @@
$PALANG['pAdminEdit_admin_result_success'] = 'Kudeatzailea aldatu da!';
$PALANG['pUsersLogin_welcome'] = 'Erabiltzaileen logina pasahitz eta aliasa aldatzeko.';
-$PALANG['pUsersLogin_username'] = 'Login (e-mail)';
-$PALANG['pUsersLogin_password'] = 'Pasahitza';
-$PALANG['pUsersLogin_language'] = 'Language'; # XXX
-$PALANG['pUsersLogin_button'] = 'Login';
+$PALANG['pUsersLogin_username'] = 'Login (e-mail)'; # obsolete
+$PALANG['pUsersLogin_password'] = 'Pasahitza'; # obsolete
+$PALANG['pUsersLogin_language'] = 'Language'; # XXX # obsolete
+$PALANG['pUsersLogin_button'] = 'Login'; # obsolete
$PALANG['pUsersLogin_username_incorrect'] = 'Login okerra. Ziurta zaitez posta helbidea login gisa sartu duzula!';
$PALANG['pUsersLogin_password_incorrect'] = 'Pasahitz okerra!';
Modified: trunk/languages/fi.lang
===================================================================
--- trunk/languages/fi.lang 2011-07-27 21:57:48 UTC (rev 1136)
+++ trunk/languages/fi.lang 2011-07-29 18:04:09 UTC (rev 1137)
@@ -329,10 +329,10 @@
$PALANG['pAdminEdit_admin_result_success'] = 'Ylläpitäjän muokkaus onnistui!';
$PALANG['pUsersLogin_welcome'] = 'Salasanan vaihto.';
-$PALANG['pUsersLogin_username'] = 'Tunnus';
-$PALANG['pUsersLogin_password'] = 'Salasana';
-$PALANG['pUsersLogin_language'] = 'Language'; # XXX
-$PALANG['pUsersLogin_button'] = 'Kirjaudu';
+$PALANG['pUsersLogin_username'] = 'Tunnus'; # obsolete
+$PALANG['pUsersLogin_password'] = 'Salasana'; # obsolete
+$PALANG['pUsersLogin_language'] = 'Language'; # XXX # obsolete
+$PALANG['pUsersLogin_button'] = 'Kirjaudu'; # obsolete
$PALANG['pUsersLogin_username_incorrect'] = 'Käyttäjätunnus tai salasana väärin!';
$PALANG['pUsersLogin_password_incorrect'] = 'Käyttäjätunnus tai salasana väärin!';
Modified: trunk/languages/fo.lang
===================================================================
--- trunk/languages/fo.lang 2011-07-27 21:57:48 UTC (rev 1136)
+++ trunk/languages/fo.lang 2011-07-29 18:04:09 UTC (rev 1137)
@@ -329,10 +329,10 @@
$PALANG['pAdminEdit_admin_result_success'] = 'Umsitari er broyttur!';
$PALANG['pUsersLogin_welcome'] = 'Postkassa brúkarar loggi inn fyri at broyta loyniorð, víðarisending ella frítíðarboð.';
-$PALANG['pUsersLogin_username'] = 'Login (e-post)';
-$PALANG['pUsersLogin_password'] = 'Loyniorð';
-$PALANG['pUsersLogin_language'] = 'Language'; # XXX
-$PALANG['pUsersLogin_button'] = 'Logga inn';
+$PALANG['pUsersLogin_username'] = 'Login (e-post)'; # obsolete
+$PALANG['pUsersLogin_password'] = 'Loyniorð'; # obsolete
+$PALANG['pUsersLogin_language'] = 'Language'; # XXX # obsolete
+$PALANG['pUsersLogin_button'] = 'Logga inn'; # obsolete
$PALANG['pUsersLogin_username_incorrect'] = 'Títt login er skeivt. Minst til at logga inn við tíni e-post adressu!';
$PALANG['pUsersLogin_password_incorrect'] = 'Títt loyniorð er skeivt!';
Modified: trunk/languages/fr.lang
===================================================================
--- trunk/languages/fr.lang 2011-07-27 21:57:48 UTC (rev 1136)
+++ trunk/languages/fr.lang 2011-07-29 18:04:09 UTC (rev 1137)
@@ -331,10 +331,10 @@
$PALANG['pAdminEdit_admin_result_success'] = 'L\'administrateur a été ajouté!';
$PALANG['pUsersLogin_welcome'] = 'Entrer votre adresse courriel pour modifier votre mot de passe et vos transferts.';
-$PALANG['pUsersLogin_username'] = 'Adresse courriel';
-$PALANG['pUsersLogin_password'] = 'Mot de passe';
-$PALANG['pUsersLogin_language'] = 'Language'; # XXX
-$PALANG['pUsersLogin_button'] = 'Entrer';
+$PALANG['pUsersLogin_username'] = 'Adresse courriel'; # obsolete
+$PALANG['pUsersLogin_password'] = 'Mot de passe'; # obsolete
+$PALANG['pUsersLogin_language'] = 'Language'; # XXX # obsolete
+$PALANG['pUsersLogin_button'] = 'Entrer'; # obsolete
$PALANG['pUsersLogin_username_incorrect'] = 'L\'adresse courriel est invalide. Assurez-vous d\'avoir correctement saisie votre adresse courriel!';
$PALANG['pUsersLogin_password_incorrect'] = 'Votre mot de passe est invalide!';
Modified: trunk/languages/hr.lang
===================================================================
--- trunk/languages/hr.lang 2011-07-27 21:57:48 UTC (rev 1136)
+++ trunk/languages/hr.lang 2011-07-29 18:04:09 UTC (rev 1137)
@@ -20,10 +20,10 @@
$PALANG['pFooter_logged_as'] = 'Logged as %s'; # XXX # XXX Text change: 'logged in as %s' (the 'in' was missing)
$PALANG['pLogin_welcome'] = 'Administratori prijavite se ovdje.';
-$PALANG['pLogin_username'] = 'Korisničko ime (adresa e-pote)';
+$PALANG['pLogin_username'] = 'Korisničko ime (adresa e-pote)'; # XXX compare with pUsersLogin_username - should be "Login (email)"
$PALANG['pLogin_password'] = 'Lozinka';
$PALANG['pLogin_language'] = 'Language'; # XXX
-$PALANG['pLogin_button'] = 'Prijavi';
+$PALANG['pLogin_button'] = 'Prijavi'; # XXX compare with pUsersLogin_button - should be "Login"
$PALANG['pLogin_failed'] = 'Your email address or password are not correct.'; # XXX
$PALANG['pLogin_login_users'] = 'Korisnici kliknite ovdje za prijavu u korisničku sekciju.';
@@ -328,10 +328,10 @@
$PALANG['pAdminEdit_admin_result_success'] = 'Admininstrator je uspjeno promjenjen!';
$PALANG['pUsersLogin_welcome'] = 'Korisnici potanskih ormarića ukoliko elite promjeniti lozinku ili aliase.';
-$PALANG['pUsersLogin_username'] = 'Prijava (adresa e-pote)';
-$PALANG['pUsersLogin_password'] = 'Lozinka';
-$PALANG['pUsersLogin_language'] = 'Language'; # XXX
-$PALANG['pUsersLogin_button'] = 'Prijava';
+$PALANG['pUsersLogin_username'] = 'Prijava (adresa e-pote)'; # obsolete
+$PALANG['pUsersLogin_password'] = 'Lozinka'; # obsolete
+$PALANG['pUsersLogin_language'] = 'Language'; # XXX # obsolete
+$PALANG['pUsersLogin_button'] = 'Prijava'; # obsolete
$PALANG['pUsersLogin_username_incorrect'] = 'Korisničko ime nije pravilno! Morate upotrijebiti adresu vae e-pote!';
$PALANG['pUsersLogin_password_incorrect'] = 'Lozinka nije pravilna!';
Modified: trunk/languages/hu.lang
===================================================================
--- trunk/languages/hu.lang 2011-07-27 21:57:48 UTC (rev 1136)
+++ trunk/languages/hu.lang 2011-07-29 18:04:09 UTC (rev 1137)
@@ -22,10 +22,10 @@
$PALANG['pFooter_logged_as'] = '%s-ként bejelentkezve'; # XXX Text change: 'logged in as %s' (the 'in' was missing)
$PALANG['pLogin_welcome'] = 'Mail adminisztrátorok itt jelentkezzenek be, hogy adminisztrálják a domainjüket.';
-$PALANG['pLogin_username'] = 'Bejelentkezés (email)';
+$PALANG['pLogin_username'] = 'Bejelentkezés (email)'; # XXX compare with pUsersLogin_username - should be "Login (email)"
$PALANG['pLogin_password'] = 'Jelszó';
$PALANG['pLogin_language'] = 'Language'; # XXX
-$PALANG['pLogin_button'] = 'Bejelentkezés';
+$PALANG['pLogin_button'] = 'Bejelentkezés'; # XXX compare with pUsersLogin_button - should be "Login"
$PALANG['pLogin_failed'] = 'Your email address or password are not correct.'; # XXX
$PALANG['pLogin_login_users'] = 'A felhasználók kattintsanak ide a felhasználói felülethez.';
@@ -335,10 +335,10 @@
$PALANG['pAdminEdit_admin_result_success'] = 'Az Admin módosítása megtörtént!';
$PALANG['pUsersLogin_welcome'] = 'A felhasználók ezen a felületen tudnak bejelentkezni a levelezõ rendszerbe a saját felhasználó nevükkel (azaz email címükkel) és itt tudják megváltoztatni az aliasokat, stb..'; # XXX check/beautify - was split in two lines before
-$PALANG['pUsersLogin_username'] = 'Login (email)';
-$PALANG['pUsersLogin_password'] = 'Jelszó';
-$PALANG['pUsersLogin_language'] = 'Language'; # XXX
-$PALANG['pUsersLogin_button'] = 'Login';
+$PALANG['pUsersLogin_username'] = 'Login (email)'; # obsolete
+$PALANG['pUsersLogin_password'] = 'Jelszó'; # obsolete
+$PALANG['pUsersLogin_language'] = 'Language'; # XXX # obsolete
+$PALANG['pUsersLogin_button'] = 'Login'; # obsolete
$PALANG['pUsersLogin_username_incorrect'] = 'Nem megfelelõ a Login (email) cím! Kérlek pontosítsd!';
$PALANG['pUsersLogin_password_incorrect'] = 'Nem megfelelõ a jelszavad!';
Modified: trunk/languages/is.lang
===================================================================
--- trunk/languages/is.lang 2011-07-27 21:57:48 UTC (rev 1136)
+++ trunk/languages/is.lang 2011-07-29 18:04:09 UTC (rev 1137)
@@ -21,10 +21,10 @@
$PALANG['pFooter_logged_as'] = 'Logged as %s'; # XXX # XXX Text change: 'logged in as %s' (the 'in' was missing)
$PALANG['pLogin_welcome'] = 'Póst kerfisstjóri tengist hér til að viðhalda póstkerfi lénsins þins.';
-$PALANG['pLogin_username'] = 'Auðkenni(email)';
+$PALANG['pLogin_username'] = 'Auðkenni(email)'; # XXX compare with pUsersLogin_username - should be "Login (email)"
$PALANG['pLogin_password'] = 'Lykilorð';
$PALANG['pLogin_language'] = 'Language'; # XXX
-$PALANG['pLogin_button'] = 'Tengjast';
+$PALANG['pLogin_button'] = 'Tengjast'; # XXX compare with pUsersLogin_button - should be "Login"
$PALANG['pLogin_failed'] = 'Your email address or password are not correct.'; # XXX
$PALANG['pLogin_login_users'] = 'Notendur smellið hér til að opna almennt notendaviðmót.';
@@ -328,10 +328,10 @@
$PALANG['pAdminEdit_admin_result_success'] = 'Kerfisstjórinn hefur verið breyttur!';
$PALANG['pUsersLogin_welcome'] = 'Pósthólf notenda til að tengjast svo hægt er að breyta lykilorði eða alias.';
-$PALANG['pUsersLogin_username'] = 'Innskrá (email)';
-$PALANG['pUsersLogin_password'] = 'Lykilorð';
-$PALANG['pUsersLogin_language'] = 'Language'; # XXX
-$PALANG['pUsersLogin_button'] = 'Innskrá';
+$PALANG['pUsersLogin_username'] = 'Innskrá (email)'; # obsolete
+$PALANG['pUsersLogin_password'] = 'Lykilorð'; # obsolete
+$PALANG['pUsersLogin_language'] = 'Language'; # XXX # obsolete
+$PALANG['pUsersLogin_button'] = 'Innskrá'; # obsolete
$PALANG['pUsersLogin_username_incorrect'] = 'Innskráning þín er röng, gaktu úr skugga um að þú tengist með réttu póstfangi (email address)!';
$PALANG['pUsersLogin_password_incorrect'] = 'Lykilorð þitt er rangt!';
Modified: trunk/languages/it.lang
===================================================================
--- trunk/languages/it.lang 2011-07-27 21:57:48 UTC (rev 1136)
+++ trunk/languages/it.lang 2011-07-29 18:04:09 UTC (rev 1137)
@@ -330,10 +330,10 @@
$PALANG['pAdminEdit_admin_result_success'] = 'L\'amministratore è stato modificato!';
$PALANG['pUsersLogin_welcome'] = 'Gli utenti di caselle di posta devono entrare qui per modificare le proprie opzioni.';
-$PALANG['pUsersLogin_username'] = 'Nome utente (email)';
-$PALANG['pUsersLogin_password'] = 'Password';
-$PALANG['pUsersLogin_language'] = 'Language'; # XXX
-$PALANG['pUsersLogin_button'] = 'Entra';
+$PALANG['pUsersLogin_username'] = 'Nome utente (email)'; # obsolete
+$PALANG['pUsersLogin_password'] = 'Password'; # obsolete
+$PALANG['pUsersLogin_language'] = 'Language'; # XXX # obsolete
+$PALANG['pUsersLogin_button'] = 'Entra'; # obsolete
$PALANG['pUsersLogin_username_incorrect'] = 'Il tuo nome utente non è corretto. Assicurati di avere inserito il tuo indirizzo email!';
$PALANG['pUsersLogin_password_incorrect'] = 'La tua password non è corretta!';
Modified: trunk/languages/ja.lang
===================================================================
--- trunk/languages/ja.lang 2011-07-27 21:57:48 UTC (rev 1136)
+++ trunk/languages/ja.lang 2011-07-29 18:04:09 UTC (rev 1137)
@@ -335,10 +335,10 @@
$PALANG['pAdminEdit_admin_result_success'] = '管理者を修正しました。';
$PALANG['pUsersLogin_welcome'] = 'あなたのパスワードと転送先が変更できます。';
-$PALANG['pUsersLogin_username'] = 'ログイン (メールアドレス)';
-$PALANG['pUsersLogin_password'] = 'パスワード';
-$PALANG['pUsersLogin_language'] = 'Language'; # XXX
-$PALANG['pUsersLogin_button'] = 'ログイン';
+$PALANG['pUsersLogin_username'] = 'ログイン (メールアドレス)'; # obsolete
+$PALANG['pUsersLogin_password'] = 'パスワード'; # obsolete
+$PALANG['pUsersLogin_language'] = 'Language'; # XXX # obsolete
+$PALANG['pUsersLogin_button'] = 'ログイン'; # obsolete
$PALANG['pUsersLogin_username_incorrect'] = 'ログインが違います。正しいメールアドレスを入力してください。';
$PALANG['pUsersLogin_password_incorrect'] = 'パスワードが違います。';
Modified: trunk/languages/lt.lang
===================================================================
--- trunk/languages/lt.lang 2011-07-27 21:57:48 UTC (rev 1136)
+++ trunk/languages/lt.lang 2011-07-29 18:04:09 UTC (rev 1137)
@@ -328,10 +328,10 @@
$PALANG['pAdminEdit_admin_result_success'] = 'Administratorius pakeistas!';
$PALANG['pUsersLogin_welcome'] = 'Pašto vartotojai prisijungia ir keičia Mailbox users login to change your password and aliases.';
-$PALANG['pUsersLogin_username'] = 'Vartotojas (el.paštas)';
-$PALANG['pUsersLogin_password'] = 'Slaptažodis';
-$PALANG['pUsersLogin_language'] = 'Language'; # XXX
-$PALANG['pUsersLogin_button'] = 'Prisijungti';
+$PALANG['pUsersLogin_username'] = 'Vartotojas (el.paštas)'; # obsolete
+$PALANG['pUsersLogin_password'] = 'Slaptažodis'; # obsolete
+$PALANG['pUsersLogin_language'] = 'Language'; # XXX # obsolete
+$PALANG['pUsersLogin_button'] = 'Prisijungti'; # obsolete
$PALANG['pUsersLogin_username_incorrect'] = 'Prisijungti nepavyko. Įsitikinkite, kad gerai įvedėte savo el.pašto adresą!';
$PALANG['pUsersLogin_password_incorrect'] = 'Slaptažodis neteisingas!';
Modified: trunk/languages/mk.lang
===================================================================
--- trunk/languages/mk.lang 2011-07-27 21:57:48 UTC (rev 1136)
+++ trunk/languages/mk.lang 2011-07-29 18:04:09 UTC (rev 1137)
@@ -330,10 +330,10 @@
$PALANG['pAdminEdit_admin_result_success'] = 'Администраторот е модифициран!';
$PALANG['pUsersLogin_welcome'] = 'Логин за корисници на поштенски сандачиња.Промена на логин и лозинка';
-$PALANG['pUsersLogin_username'] = 'Корисничко име (email)';
-$PALANG['pUsersLogin_password'] = 'Лозинка';
-$PALANG['pUsersLogin_language'] = 'Language'; # XXX
-$PALANG['pUsersLogin_button'] = 'Пријава';
+$PALANG['pUsersLogin_username'] = 'Корисничко име (email)'; # obsolete
+$PALANG['pUsersLogin_password'] = 'Лозинка'; # obsolete
+$PALANG['pUsersLogin_language'] = 'Language'; # XXX # obsolete
+$PALANG['pUsersLogin_button'] = 'Пријава'; # obsolete
$PALANG['pUsersLogin_username_incorrect'] = 'Погрешно корисничко име. Логирајте се со вашата email адреса!';
$PALANG['pUsersLogin_password_incorrect'] = 'Погрешна лозинка!';
Modified: trunk/languages/nb.lang
===================================================================
--- trunk/languages/nb.lang 2011-07-27 21:57:48 UTC (rev 1136)
+++ trunk/languages/nb.lang 2011-07-29 18:04:09 UTC (rev 1137)
@@ -330,10 +330,10 @@
$PALANG['pAdminEdit_admin_result_success'] = 'Administratoren er blitt endret!';
$PALANG['pUsersLogin_welcome'] = 'Brukere kan logge inn her for å endre passord og videresending.';
-$PALANG['pUsersLogin_username'] = 'Brukernavn (e-postadresse)';
-$PALANG['pUsersLogin_password'] = 'Passord';
-$PALANG['pUsersLogin_language'] = 'Language'; # XXX
-$PALANG['pUsersLogin_button'] = 'Logg inn';
+$PALANG['pUsersLogin_username'] = 'Brukernavn (e-postadresse)'; # obsolete
+$PALANG['pUsersLogin_password'] = 'Passord'; # obsolete
+$PALANG['pUsersLogin_language'] = 'Language'; # XXX # obsolete
+$PALANG['pUsersLogin_button'] = 'Logg inn'; # obsolete
$PALANG['pUsersLogin_username_incorrect'] = 'Påloggingsinformasjonen er ikke korrekt. Husk å bruke e-postadressen som brukernavn.';
$PALANG['pUsersLogin_password_incorrect'] = 'Feil passord!';
Modified: trunk/languages/nl.lang
===================================================================
--- trunk/languages/nl.lang 2011-07-27 21:57:48 UTC (rev 1136)
+++ trunk/languages/nl.lang 2011-07-29 18:04:09 UTC (rev 1137)
@@ -330,10 +330,10 @@
$PALANG['pAdminEdit_admin_result_success'] = 'Beheerder is bewerkt!';
$PALANG['pUsersLogin_welcome'] = 'Mailbox gebruikers login om uw wachtwoord en aliassen te bewerken.';
-$PALANG['pUsersLogin_username'] = 'Login (email)';
-$PALANG['pUsersLogin_password'] = 'Wachtwoord';
-$PALANG['pUsersLogin_language'] = 'Language'; # XXX
-$PALANG['pUsersLogin_button'] = 'Login';
+$PALANG['pUsersLogin_username'] = 'Login (email)'; # obsolete
+$PALANG['pUsersLogin_password'] = 'Wachtwoord'; # obsolete
+$PALANG['pUsersLogin_language'] = 'Language'; # XXX # obsolete
+$PALANG['pUsersLogin_button'] = 'Login'; # obsolete
$PALANG['pUsersLogin_username_incorrect'] = 'Uw login is niet correct. U dient in te loggen met uw e-mail adres.';
$PALANG['pUsersLogin_password_incorrect'] = 'Uw wachtwoord is niet correct.';
Modified: trunk/languages/nn.lang
===================================================================
--- trunk/languages/nn.lang 2011-07-27 21:57:48 UTC (rev 1136)
+++ trunk/languages/nn.lang 2011-07-29 18:04:09 UTC (rev 1137)
@@ -326,10 +326,10 @@
$PALANG['pAdminEdit_admin_result_success'] = 'Administratoren er endret/oppdatert!';
$PALANG['pUsersLogin_welcome'] = 'Brukere, logg inn for å endre passord og videresending.';
-$PALANG['pUsersLogin_username'] = 'Brukernavn (e-post adr.)';
-$PALANG['pUsersLogin_password'] = 'Passord';
-$PALANG['pUsersLogin_language'] = 'Language'; # XXX
-$PALANG['pUsersLogin_button'] = 'Logg inn';
+$PALANG['pUsersLogin_username'] = 'Brukernavn (e-post adr.)'; # obsolete
+$PALANG['pUsersLogin_password'] = 'Passord'; # obsolete
+$PALANG['pUsersLogin_language'] = 'Language'; # XXX # obsolete
+$PALANG['pUsersLogin_button'] = 'Logg inn'; # obsolete
$PALANG['pUsersLogin_username_incorrect'] = 'Feil brukernavn! Bruk e-postadressen din for å logge inn!';
$PALANG['pUsersLogin_password_incorrect'] = 'Feil passord!';
Modified: trunk/languages/pl.lang
===================================================================
--- trunk/languages/pl.lang 2011-07-27 21:57:48 UTC (rev 1136)
+++ trunk/languages/pl.lang 2011-07-29 18:04:09 UTC (rev 1137)
@@ -24,7 +24,7 @@
$PALANG['pFooter_logged_as'] = 'Zalogowano jako %s'; # XXX Text change: 'logged in as %s' (the 'in' was missing)
$PALANG['pLogin_welcome'] = 'Sekcja przeznaczona dla administratorów domen.';
-$PALANG['pLogin_username'] = 'Login (email)';
+$PALANG['pLogin_username'] = 'Login (email)'; # XXX compare with pUsersLogin_username - should be "Login (email)"
$PALANG['pLogin_password'] = 'Hasło';
$PALANG['pLogin_language'] = 'Language'; # XXX
$PALANG['pLogin_button'] = 'Zaloguj';
@@ -332,10 +332,10 @@
$PALANG['pAdminEdit_admin_result_success'] = 'Administrator został zmodyfikowany!';
$PALANG['pUsersLogin_welcome'] = 'Zaloguj się żeby zmienić hasło albo dodać aliasy.';
-$PALANG['pUsersLogin_username'] = 'Użytkownik (email)';
-$PALANG['pUsersLogin_password'] = 'Hasło';
-$PALANG['pUsersLogin_language'] = 'Language'; # XXX
-$PALANG['pUsersLogin_button'] = 'Zaloguj';
+$PALANG['pUsersLogin_username'] = 'Użytkownik (email)'; # obsolete
+$PALANG['pUsersLogin_password'] = 'Hasło'; # obsolete
+$PALANG['pUsersLogin_language'] = 'Language'; # XXX # obsolete
+$PALANG['pUsersLogin_button'] = 'Zaloguj'; # obsolete
$PALANG['pUsersLogin_username_incorrect'] = 'Podana nazwa użytkownika jest nieprawidłowa! ';
$PALANG['pUsersLogin_password_incorrect'] = 'Podane hasło jest nieprawidłowe!';
Modified: trunk/languages/pt-br.lang
===================================================================
--- trunk/languages/pt-br.lang 2011-07-27 21:57:48 UTC (rev 1136)
+++ trunk/languages/pt-br.lang 2011-07-29 18:04:09 UTC (rev 1137)
@@ -337,10 +337,10 @@
$PALANG['pAdminEdit_admin_result_success'] = 'Administrador editado!';
$PALANG['pUsersLogin_welcome'] = 'Usuários devem se autenticar aqui para troca de senha e configuração de redirecionamento de mensagens.';
-$PALANG['pUsersLogin_username'] = 'Usuário (email)';
-$PALANG['pUsersLogin_password'] = 'Senha';
-$PALANG['pUsersLogin_language'] = 'Language'; # XXX
-$PALANG['pUsersLogin_button'] = 'Entrar';
+$PALANG['pUsersLogin_username'] = 'Usuário (email)'; # obsolete
+$PALANG['pUsersLogin_password'] = 'Senha'; # obsolete
+$PALANG['pUsersLogin_language'] = 'Language'; # XXX # obsolete
+$PALANG['pUsersLogin_button'] = 'Entrar'; # obsolete
$PALANG['pUsersLogin_username_incorrect'] = 'Usuário inválido. Certifique-se de ter digitado o email corretamente!';
$PALANG['pUsersLogin_password_incorrect'] = 'Senha inválida!';
Modified: trunk/languages/ru.lang
===================================================================
--- trunk/languages/ru.lang 2011-07-27 21:57:48 UTC (rev 1136)
+++ trunk/languages/ru.lang 2011-07-29 18:04:09 UTC (rev 1137)
@@ -24,7 +24,7 @@
$PALANG['pFooter_logged_as'] = 'Вошли как %s'; # XXX Text change: 'logged in as %s' (the 'in' was missing)
$PALANG['pLogin_welcome'] = 'Вход для администрирования почтовых ящиков.';
-$PALANG['pLogin_username'] = 'Имя (адрес e-mail)';
+$PALANG['pLogin_username'] = 'Имя (адрес e-mail)'; # XXX compare with pUsersLogin_username - should be "Login (email)"
$PALANG['pLogin_password'] = 'Пароль';
$PALANG['pLogin_language'] = 'Language'; # XXX
$PALANG['pLogin_button'] = 'Войти';
@@ -337,10 +337,10 @@
$PALANG['pAdminEdit_admin_result_success'] = 'Администратор был изменен!';
$PALANG['pUsersLogin_welcome'] = 'Вход пользователей для изменения паролей и алиасов.';
-$PALANG['pUsersLogin_username'] = 'Имя (адрес)';
-$PALANG['pUsersLogin_password'] = 'Пароль';
-$PALANG['pUsersLogin_language'] = 'Language'; # XXX
-$PALANG['pUsersLogin_button'] = 'Войти';
+$PALANG['pUsersLogin_username'] = 'Имя (адрес)'; # obsolete
+$PALANG['pUsersLogin_password'] = 'Пароль'; # obsolete
+$PALANG['pUsersLogin_language'] = 'Language'; # XXX # obsolete
+$PALANG['pUsersLogin_button'] = 'Войти'; # obsolete
$PALANG['pUsersLogin_username_incorrect'] = 'Введено неправильное имя. Проверьте, что вы ввели свой адрес электронной почты!';
$PALANG['pUsersLogin_password_incorrect'] = 'Введен неверный пароль!';
Modified: trunk/languages/sk.lang
===================================================================
--- trunk/languages/sk.lang 2011-07-27 21:57:48 UTC (rev 1136)
+++ trunk/languages/sk.lang 2011-07-29 18:04:09 UTC (rev 1137)
@@ -330,10 +330,10 @@
$PALANG['pAdminEdit_admin_result_success'] = 'Administrátor bol upravený!';
$PALANG['pUsersLogin_welcome'] = 'Prihlásenie užívateľov pre zmenu hesla alebo presmerovanie';
-$PALANG['pUsersLogin_username'] = 'Užívateľské meno (email)';
-$PALANG['pUsersLogin_password'] = 'Heslo';
-$PALANG['pUsersLogin_language'] = 'Language'; # XXX
-$PALANG['pUsersLogin_button'] = 'Prihlásiť';
+$PALANG['pUsersLogin_username'] = 'Užívateľské meno (email)'; # obsolete
+$PALANG['pUsersLogin_password'] = 'Heslo'; # obsolete
+$PALANG['pUsersLogin_language'] = 'Language'; # XXX # obsolete
+$PALANG['pUsersLogin_button'] = 'Prihlásiť'; # obsolete
$PALANG['pUsersLogin_username_incorrect'] = 'Nesprávné užívateľské meno. Prihlasujte sa svojou emailovou adresou!';
$PALANG['pUsersLogin_password_incorrect'] = 'Nesprávne heslo!';
Modified: trunk/languages/sl.lang
===================================================================
--- trunk/languages/sl.lang 2011-07-27 21:57:48 UTC (rev 1136)
+++ trunk/languages/sl.lang 2011-07-29 18:04:09 UTC (rev 1137)
@@ -21,10 +21,10 @@
$PALANG['pFooter_logged_as'] = 'Logged as %s'; # XXX # XXX Text change: 'logged in as %s' (the 'in' was missing)
$PALANG['pLogin_welcome'] = 'Administratorji se prijavite tukaj.';
-$PALANG['pLogin_username'] = 'Uporabniško ime (e-poštni naslov)';
+$PALANG['pLogin_username'] = 'Uporabniško ime (e-poštni naslov)'; # XXX compare with pUsersLogin_username - should be "Login (email)"
$PALANG['pLogin_password'] = 'Geslo';
$PALANG['pLogin_language'] = 'Language'; # XXX
-$PALANG['pLogin_button'] = 'Prijavi';
+$PALANG['pLogin_button'] = 'Prijavi'; # XXX compare with pUsersLogin_button - should be "Login"
$PALANG['pLogin_failed'] = 'Your email address or password are not correct.'; # XXX
$PALANG['pLogin_login_users'] = 'Uporabniki kliknite tukaj, če želite nastaviti odsotnost ali spremeniti geslo.';
@@ -329,10 +329,10 @@
$PALANG['pAdminEdit_admin_result_success'] = 'Admininstrator je bil uspešno spremenjen!';
$PALANG['pUsersLogin_welcome'] = 'Če želite spremeniti gesli ali nastaviti sporočilo o odsotnosti, se prijavite.';
-$PALANG['pUsersLogin_username'] = 'E-poštni naslov';
-$PALANG['pUsersLogin_password'] = 'Geslo';
-$PALANG['pUsersLogin_language'] = 'Language'; # XXX
-$PALANG['pUsersLogin_button'] = 'Prijava';
+$PALANG['pUsersLogin_username'] = 'E-poštni naslov'; # obsolete
+$PALANG['pUsersLogin_password'] = 'Geslo'; # obsolete
+$PALANG['pUsersLogin_language'] = 'Language'; # XXX # obsolete
+$PALANG['pUsersLogin_button'] = 'Prijava'; # obsolete
$PALANG['pUsersLogin_username_incorrect'] = 'Uporabniško ime ni pravilno! Uporabiti morate svoj e-poštni naslov!';
$PALANG['pUsersLogin_password_incorrect'] = 'Geslo ni pravilno!';
Modified: trunk/languages/sv.lang
===================================================================
--- trunk/languages/sv.lang 2011-07-27 21:57:48 UTC (rev 1136)
+++ trunk/languages/sv.lang 2011-07-29 18:04:09 UTC (rev 1137)
@@ -23,7 +23,7 @@
$PALANG['pFooter_logged_as'] = 'Inloggad som %s'; # XXX Text change: 'logged in as %s' (the 'in' was missing)
$PALANG['pLogin_welcome'] = 'Mail administratörer loggar in här för att sköta er domän.';
-$PALANG['pLogin_username'] = 'Login (epost)';
+$PALANG['pLogin_username'] = 'Login (epost)'; # XXX compare with pUsersLogin_username - should be "Login (email)"
$PALANG['pLogin_password'] = 'Lösenord';
$PALANG['pLogin_language'] = 'Language'; # XXX
$PALANG['pLogin_button'] = 'Login';
@@ -331,10 +331,10 @@
$PALANG['pAdminEdit_admin_result_success'] = 'Admin har ändrats!';
$PALANG['pUsersLogin_welcome'] = 'Mailbox användare logga in här för att ändra ert lösenord och alias.';
-$PALANG['pUsersLogin_username'] = 'Login (epostadress)';
-$PALANG['pUsersLogin_password'] = 'Lösenord';
-$PALANG['pUsersLogin_language'] = 'Language'; # XXX
-$PALANG['pUsersLogin_button'] = 'Login';
+$PALANG['pUsersLogin_username'] = 'Login (epostadress)'; # obsolete
+$PALANG['pUsersLogin_password'] = 'Lösenord'; # obsolete
+$PALANG['pUsersLogin_language'] = 'Language'; # XXX # obsolete
+$PALANG['pUsersLogin_button'] = 'Login'; # obsolete
$PALANG['pUsersLogin_username_incorrect'] = 'Ditt login är felaktigt. Logga in med din epostadress!';
$PALANG['pUsersLogin_password_incorrect'] = 'Ditt lösenord är felaktigt!';
Modified: trunk/languages/tr.lang
===================================================================
--- trunk/languages/tr.lang 2011-07-27 21:57:48 UTC (rev 1136)
+++ trunk/languages/tr.lang 2011-07-29 18:04:09 UTC (rev 1137)
@@ -18,13 +18,13 @@
$PALANG['invalid_parameter'] = 'Invalid parameter!'; # XXX
$PALANG['show'] = 'Show:'; # XXX
$PALANG['all'] = 'All'; # XXX
-$PALANG['pFooter_logged_as'] = 'Logged as %s'; # XXX # XXX Text change: 'logged in as %s' (the 'in' was missing)
+$PALANG['pFooter_logged_as'] = 'Logged in as %s'; # XXX
$PALANG['pLogin_welcome'] = 'Posta Yöneticileri buradan domainlerinizi yönetmek için giriþ yapabilirsiniz.';
-$PALANG['pLogin_username'] = 'Kullanýcý adý (eposta)';
-$PALANG['pLogin_password'] = 'Þifre';
+$PALANG['pLogin_username'] = 'Kullanýcý adý (eposta)'; # XXX compare with pUsersLogin_username - should be "Login (email)"
+$PALANG['pLogin_password'] = 'Þifre'; # XXX compare with pUsersLogin_password - should be "Password"
$PALANG['pLogin_language'] = 'Language'; # XXX
-$PALANG['pLogin_button'] = 'Giriþ';
+$PALANG['pLogin_button'] = 'Giriþ'; # XXX compare with pUsersLogin_button - should be "Login"
$PALANG['pLogin_failed'] = 'Your email address or password are not correct.'; # XXX
$PALANG['pLogin_login_users'] = 'Kullanýcý iþlemlerine girmek için burayý kullanýnýz.';
@@ -329,10 +329,10 @@
$PALANG['pAdminEdit_admin_result_success'] = 'Yönetici düzenlendi!';
$PALANG['pUsersLogin_welcome'] = 'Posta kutusu sahipleri, þifre ddeðiþtirmek için giriþ yapýn.';
-$PALANG['pUsersLogin_username'] = 'Giriþ (eposta)';
-$PALANG['pUsersLogin_password'] = 'þifre';
-$PALANG['pUsersLogin_language'] = 'Language'; # XXX
-$PALANG['pUsersLogin_button'] = 'Kullanýcý adý';
+$PALANG['pUsersLogin_username'] = 'Giriþ (eposta)'; # obsolete
+$PALANG['pUsersLogin_password'] = 'þifre'; # obsolete
+$PALANG['pUsersLogin_language'] = 'Language'; # XXX # obsolete
+$PALANG['pUsersLogin_button'] = 'Kullanýcý adý'; # obsolete
$PALANG['pUsersLogin_username_incorrect'] = 'Kullanýcý adýnýz doðru deðil. E-posta adresiniz ile giriþ yaptýðýnýzdan emin olunuz!';
$PALANG['pUsersLogin_password_incorrect'] = 'Þifreniz doðru deðil!';
Modified: trunk/languages/tw.lang
===================================================================
--- trunk/languages/tw.lang 2011-07-27 21:57:48 UTC (rev 1136)
+++ trunk/languages/tw.lang 2011-07-29 18:04:09 UTC (rev 1137)
@@ -21,7 +21,7 @@
$PALANG['pFooter_logged_as'] = 'Logged as %s'; # XXX # XXX Text change: 'logged in as %s' (the 'in' was missing)
$PALANG['pLogin_welcome'] = '郵件管理員請從這裡登錄以管理你的網域名.';
-$PALANG['pLogin_username'] = '帳號 (郵件地址)';
+$PALANG['pLogin_username'] = '帳號 (郵件地址)'; # XXX compare with pUsersLogin_username - should be "Login (email)"
$PALANG['pLogin_password'] = '密碼';
$PALANG['pLogin_language'] = 'Language'; # XXX
$PALANG['pLogin_button'] = '登錄';
@@ -329,10 +329,10 @@
$PALANG['pAdminEdit_admin_result_success'] = '編輯網域管理員成功!';
$PALANG['pUsersLogin_welcome'] = '郵件用戶從這裡登錄管理你的密碼和別名.';
-$PALANG['pUsersLogin_username'] = '帳號 (郵箱地址)';
-$PALANG['pUsersLogin_password'] = '密碼';
-$PALANG['pUsersLogin_language'] = 'Language'; # XXX
-$PALANG['pUsersLogin_button'] = '登錄';
+$PALANG['pUsersLogin_username'] = '帳號 (郵箱地址)'; # obsolete
+$PALANG['pUsersLogin_password'] = '密碼'; # obsolete
+$PALANG['pUsersLogin_language'] = 'Language'; # XXX # obsolete
+$PALANG['pUsersLogin_button'] = '登錄'; # obsolete
$PALANG['pUsersLogin_username_incorrect'] = '登錄失敗. 請確認你是使用你的郵箱地址登錄!';
$PALANG['pUsersLogin_password_incorrect'] = '登錄密碼不正確!';
Modified: trunk/login.php
===================================================================
--- trunk/login.php 2011-07-27 21:57:48 UTC (rev 1136)
+++ trunk/login.php 2011-07-29 18:04:09 UTC (rev 1137)
@@ -34,14 +34,7 @@
exit;
}
-$smarty->assign ('language_selector', language_selector(), false);
-if ($_SERVER['REQUEST_METHOD'] == "GET")
-{
- $smarty->assign ('smarty_template', 'login');
- $smarty->display ('index.tpl');
-}
-
if ($_SERVER['REQUEST_METHOD'] == "POST")
{
$fUsername = '';
@@ -92,10 +85,12 @@
header("Location: main.php");
exit(0);
}
-
- $smarty->assign ('smarty_template', 'login');
- $smarty->display ('index.tpl');
}
+$smarty->assign ('language_selector', language_selector(), false);
+$smarty->assign ('logintype', 'admin');
+$smarty->assign ('smarty_template', 'login');
+$smarty->display ('index.tpl');
+
/* vim: set expandtab softtabstop=4 tabstop=4 shiftwidth=4: */
?>
Modified: trunk/templates/login.tpl
===================================================================
--- trunk/templates/login.tpl 2011-07-27 21:57:48 UTC (rev 1136)
+++ trunk/templates/login.tpl 2011-07-29 18:04:09 UTC (rev 1137)
@@ -2,7 +2,11 @@
<form name="frmLogin" method="post" action="">
<table id="login_table" cellspacing="10">
<tr>
- <th colspan="2">{$PALANG.pLogin_welcome}</th>
+ <th colspan="2">
+{if $logintype=='admin'}{$PALANG.pLogin_welcome}
+{else}{$PALANG.pUsersLogin_welcome}
+{/if}
+ </th>
</tr>
<tr>
<td class="label"><label>{$PALANG.pLogin_username}:</label></td>
@@ -20,9 +24,11 @@
<td class="label"> </td>
<td><input class="button" type="submit" name="submit" value="{$PALANG.pLogin_button}" /></td>
</tr>
+{if $logintype == 'admin'}
<tr>
<td colspan="2"><a href="users/">{$PALANG.pLogin_login_users}</a></td>
</tr>
+{/if}
</table>
</form>
{literal}
Deleted: trunk/templates/users_login.tpl
===================================================================
--- trunk/templates/users_login.tpl 2011-07-27 21:57:48 UTC (rev 1136)
+++ trunk/templates/users_login.tpl 2011-07-29 18:04:09 UTC (rev 1137)
@@ -1,25 +0,0 @@
-<div id="login">
-<form name="frmLogin" method="post" action="">
-<table id="login_table" cellspacing="10">
- <tr>
- <th colspan="2">{$PALANG.pUsersLogin_welcome}</th>
- </tr>
- <tr>
- <td class="label"><label>{$PALANG.pUsersLogin_username}:</label></td>
- <td><input class="flat" type="text" name="fUsername" value="{$tUsername}" /></td>
- </tr>
- <tr>
- <td class="label"><label>{$PALANG.pUsersLogin_password}:</label></td>
- <td><input class="flat" type="password" name="fPassword" /></td>
- </tr>
- <tr>
- <td class="label"><label>{$PALANG.pLogin_language}:</label></td>
- <td>{$language_selector}</td>
- </tr>
- <tr>
- <td> </td>
- <td><input class="button" type="submit" name="submit" value="{$PALANG.pUsersLogin_button}" /></td>
- </tr>
-</table>
-</form>
-</div>
Modified: trunk/users/login.php
===================================================================
--- trunk/users/login.php 2011-07-27 21:57:48 UTC (rev 1136)
+++ trunk/users/login.php 2011-07-29 18:04:09 UTC (rev 1137)
@@ -29,17 +29,9 @@
require_once("../common.php");
-$smarty->assign ('language_selector', language_selector(), false);
-if ($_SERVER['REQUEST_METHOD'] == "GET")
-{
- $smarty->assign ('smarty_template', 'users_login');
- $smarty->display ('index.tpl');
-}
-
if ($_SERVER['REQUEST_METHOD'] == "POST")
{
-
$lang = safepost('lang');
if ( $lang != check_language(0) ) { # only set cookie if language selection was changed
@@ -62,11 +54,13 @@
else {
$error = 1;
flash_error($PALANG['pLogin_failed']);;
- $tUsername = $fUsername;
}
- $smarty->assign ('tUsername', $tUsername);
- $smarty->assign ('smarty_template', 'users_login');
- $smarty->display ('index.tpl');
}
+
+$smarty->assign ('language_selector', language_selector(), false);
+$smarty->assign ('smarty_template', 'login');
+$smarty->assign ('logintype', 'user');
+$smarty->display ('index.tpl');
+
/* vim: set expandtab softtabstop=3 tabstop=3 shiftwidth=3: */
?>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <chr...@us...> - 2011-07-29 19:48:24
|
Revision: 1140
http://postfixadmin.svn.sourceforge.net/postfixadmin/?rev=1140&view=rev
Author: christian_boltz
Date: 2011-07-29 19:48:17 +0000 (Fri, 29 Jul 2011)
Log Message:
-----------
Merge password.tpl and users_password.tpl
users/password.php:
- use SESSID_USERNAME instead of USERID_USERNAME to match the smarty
variable name in the password module for admins
- switch to 'password' template
templates/password.tpl:
- display "exit" button if logged in as user
- change form name to something more useful
templates/users_password.tpl:
- deleted
Modified Paths:
--------------
trunk/templates/password.tpl
trunk/users/password.php
Removed Paths:
-------------
trunk/templates/users_password.tpl
Modified: trunk/templates/password.tpl
===================================================================
--- trunk/templates/password.tpl 2011-07-29 19:42:46 UTC (rev 1139)
+++ trunk/templates/password.tpl 2011-07-29 19:48:17 UTC (rev 1140)
@@ -1,5 +1,5 @@
<div id="edit_form">
-<form name="mailbox" method="post" action="">
+<form name="password" method="post" action="">
<table>
<tr>
<th colspan="3">{$PALANG.pPassword_welcome}</th>
@@ -26,7 +26,11 @@
</tr>
<tr>
<td class="label"> </td>
- <td><input class="button" type="submit" name="submit" value="{$PALANG.pPassword_button}" /></td>
+ <td>
+ <input class="button" type="submit" name="submit" value="{$PALANG.pPassword_button}" /></td>
+ {if $authentication_has_role.user}
+ <input class="button" type="submit" name="fCancel" value="{$PALANG.exit}" />
+ {/if}
<td> </td>
</tr>
</table>
Deleted: trunk/templates/users_password.tpl
===================================================================
--- trunk/templates/users_password.tpl 2011-07-29 19:42:46 UTC (rev 1139)
+++ trunk/templates/users_password.tpl 2011-07-29 19:48:17 UTC (rev 1140)
@@ -1,37 +0,0 @@
-<div id="edit_form">
-<form name="alias" method="post" action="">
-<table>
- <tr>
- <th colspan="3">{$PALANG.pPassword_welcome}</th>
- </tr>
- <tr>
- <td class="label"><label>{$PALANG.pPassword_admin}:</label></td>
- <td><em>{$USERID_USERNAME}</em></td>
- <td> </td>
- </tr>
- <tr>
- <td class="label"><label>{$PALANG.pPassword_password_current}:</label></td>
- <td><input class="flat" type="password" name="fPassword_current" /></td>
- <td class="error_msg">{$pPassword_password_current_text}</td>
- </tr>
- <tr>
- <td class="label"><label>{$PALANG.pPassword_password}:</label></td>
- <td><input class="flat" type="password" name="fPassword" /></td>
- <td class="error_msg">{$pPassword_password_text}</td>
- </tr>
- <tr>
- <td class="label"><label>{$PALANG.pPassword_password2}:</label></td>
- <td><input class="flat" type="password" name="fPassword2" /></td>
- <td> </td>
- </tr>
- <tr>
- <td> </td>
- <td>
- <input class="button" type="submit" name="submit" value="{$PALANG.pPassword_button}" />
- <input class="button" type="submit" name="fCancel" value="{$PALANG.exit}" />
- </td>
- <td> </td>
- </tr>
-</table>
-</form>
-</div>
Modified: trunk/users/password.php
===================================================================
--- trunk/users/password.php 2011-07-29 19:42:46 UTC (rev 1139)
+++ trunk/users/password.php 2011-07-29 19:48:17 UTC (rev 1140)
@@ -14,7 +14,7 @@
*
* File: password.php
* Used by users to change their mailbox (and login) password.
- * Template File: users_password.php
+ * Template File: password.tpl
*
* Template Variables:
*
@@ -76,11 +76,11 @@
}
}
-$smarty->assign ('USERID_USERNAME', $username);
+$smarty->assign ('SESSID_USERNAME', $username);
$smarty->assign ('pPassword_password_current_text', $pPassword_password_current_text, false);
$smarty->assign ('pPassword_password_text', $pPassword_password_text, false);
-$smarty->assign ('smarty_template', 'users_password');
+$smarty->assign ('smarty_template', 'password');
$smarty->display ('index.tpl');
/* vim: set expandtab softtabstop=4 tabstop=4 shiftwidth=4: */
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <chr...@us...> - 2011-07-29 20:34:42
|
Revision: 1142
http://postfixadmin.svn.sourceforge.net/postfixadmin/?rev=1142&view=rev
Author: christian_boltz
Date: 2011-07-29 20:34:36 +0000 (Fri, 29 Jul 2011)
Log Message:
-----------
Replaced motd*.txt with $CONF[motd_*] options
config.inc.php:
- new config options $CONF['motd_user'], $CONF['motd_admin'] and
$CONF['motd_superadmin']
templates/index.tpl:
- added $CONF[motd_*] handling
css/default.css:
- new style #motd
templates/users_menu.tpl, templates/menu.tpl:
- removed inclusion of motd-users.txt / $motd_file
smarty.inc.php:
- removed handling for motd*.txt files
templates/motd-users.txt, templates/motd.txt:
- deleted
Modified Paths:
--------------
trunk/config.inc.php
trunk/css/default.css
trunk/smarty.inc.php
trunk/templates/index.tpl
trunk/templates/menu.tpl
trunk/templates/users_menu.tpl
Removed Paths:
-------------
trunk/templates/motd-users.txt
trunk/templates/motd.txt
Modified: trunk/config.inc.php
===================================================================
--- trunk/config.inc.php 2011-07-29 20:20:16 UTC (rev 1141)
+++ trunk/config.inc.php 2011-07-29 20:34:36 UTC (rev 1142)
@@ -286,6 +286,13 @@
$CONF['footer_text'] = 'Return to change-this-to-your.domain.tld';
$CONF['footer_link'] = 'http://change-this-to-your.domain.tld';
+// MOTD ("Motto of the day")
+// You can display a MOTD below the menu on all pages.
+// This can be configured seperately for users, domain admins and superadmins
+$CONF['motd_user'] = '';
+$CONF['motd_admin'] = '';
+$CONF['motd_superadmin'] = '';
+
// Welcome Message
// This message is send to every newly created mailbox.
// Change the text between EOM.
Modified: trunk/css/default.css
===================================================================
--- trunk/css/default.css 2011-07-29 20:20:16 UTC (rev 1141)
+++ trunk/css/default.css 2011-07-29 20:34:36 UTC (rev 1142)
@@ -81,6 +81,11 @@
color: #d01313;
}
+#motd {
+ color: maroon;
+ padding-top:2em;
+}
+
.standout {
color: maroon;
padding: 3px 3px 3px 3px;
Modified: trunk/smarty.inc.php
===================================================================
--- trunk/smarty.inc.php 2011-07-29 20:20:16 UTC (rev 1141)
+++ trunk/smarty.inc.php 2011-07-29 20:34:36 UTC (rev 1142)
@@ -66,16 +66,6 @@
$smarty->assign ('boolconf_alias_domain', boolconf('alias_domain'));
$smarty->assign ('authentication_has_role', array ('global_admin' => authentication_has_role ('global-admin'), 'admin' => authentication_has_role ('admin'), 'user' => authentication_has_role ('user')));
-if (authentication_has_role('global-admin')) {
- $motd_file = "motd-admin.txt";
-} else {
- $motd_file = "motd.txt";
-}
-$smarty->assign('motd_file', '');
-if (file_exists ($incpath.'/templates/'.$motd_file)) {
- $smarty->assign ('motd_file', $motd_file);
-}
-
function select_options($aValues, $aSelected) {
$ret_val = '';
foreach ($aValues as $val) {
Modified: trunk/templates/index.tpl
===================================================================
--- trunk/templates/index.tpl 2011-07-29 20:20:16 UTC (rev 1141)
+++ trunk/templates/index.tpl 2011-07-29 20:34:36 UTC (rev 1142)
@@ -9,6 +9,16 @@
{include file='menu.tpl'}
{/if}
{/if}
+<br clear="all" />
+
+{if $authentication_has_role.user && $CONF.motd_user}
+ <div id="motd">{$CONF.motd_user}</div>
+{elseif $authentication_has_role.global_admin && $CONF.motd_superadmin}
+ <div id="motd">{$CONF.motd_superadmin}</div>
+{elseif $authentication_has_role.admin && $CONF.motd_admin}
+ <div id="motd">{$CONF.motd_admin}</div>
+{/if}
+
{include file='flash_error.tpl'}
{if $smarty_template}
{include file="$smarty_template.tpl"}
Modified: trunk/templates/menu.tpl
===================================================================
--- trunk/templates/menu.tpl 2011-07-29 20:20:16 UTC (rev 1141)
+++ trunk/templates/menu.tpl 2011-07-29 20:34:36 UTC (rev 1142)
@@ -81,11 +81,6 @@
<li class="logout"><a target="_top" href="{#url_logout#}">{$PALANG.pMenu_logout}</a></li>
</ul>
</div>
-{if !empty($motd_file)}
- <div id="motd">
- {include file=$motd_file}
- </div>
-{/if}
{literal}
<script type='text/javascript'>
// <
Want the latest updates on software, tech news, and AI?
Get latest updates about software, tech news, and AI from SourceForge directly in your inbox once a month.
Thanks for helping keep SourceForge clean.
X