diff options
| author | Paul S. Owen <psotfx@users.sourceforge.net> | 2001-09-06 13:12:45 +0000 |
|---|---|---|
| committer | Paul S. Owen <psotfx@users.sourceforge.net> | 2001-09-06 13:12:45 +0000 |
| commit | 1587ff6b0ffa2acb8908204dabfad9f158671d37 (patch) | |
| tree | c5e355072dcbdc31a30e4390f0e739e7ef9d482a /phpBB | |
| parent | 8a37c2bd5e5774b313673df29750ca2534b20c89 (diff) | |
| download | forums-1587ff6b0ffa2acb8908204dabfad9f158671d37.tar forums-1587ff6b0ffa2acb8908204dabfad9f158671d37.tar.gz forums-1587ff6b0ffa2acb8908204dabfad9f158671d37.tar.bz2 forums-1587ff6b0ffa2acb8908204dabfad9f158671d37.tar.xz forums-1587ff6b0ffa2acb8908204dabfad9f158671d37.zip | |
Some minor alterations to template/language
git-svn-id: file:///svn/phpbb/trunk@992 89ea8834-ac86-4346-8a33-228a782c2dd0
Diffstat (limited to 'phpBB')
| -rw-r--r-- | phpBB/admin/admin_users.php | 3 | ||||
| -rwxr-xr-x | phpBB/language/lang_english.php | 10 | ||||
| -rw-r--r-- | phpBB/templates/PSO/admin/user_edit_body.tpl | 270 |
3 files changed, 139 insertions, 144 deletions
diff --git a/phpBB/admin/admin_users.php b/phpBB/admin/admin_users.php index 6f10c40e18..1bb118dba1 100644 --- a/phpBB/admin/admin_users.php +++ b/phpBB/admin/admin_users.php @@ -127,6 +127,9 @@ if ( isset($HTTP_GET_VARS['submit']) ) { ); $template->assign_vars(array( + "L_USER_TITLE" => $lang['User'] . " " . $lang['User_admin'], + "L_USER_EXPLAIN" => $lang['User_admin_explain'], + "USERNAME" => stripslashes($username), "EMAIL" => stripslashes($email), "YIM" => stripslashes($yim), diff --git a/phpBB/language/lang_english.php b/phpBB/language/lang_english.php index ceadee06d6..b3183053dd 100755 --- a/phpBB/language/lang_english.php +++ b/phpBB/language/lang_english.php @@ -837,13 +837,13 @@ $lang['Emotion'] = "Emotion"; // User Management $lang['User_admin'] = "Administration"; -$lang['User_admin_explain'] = "Here you can change your user's information. Do not abuse this power. Changing admin status is not provided here. Use the user permission pages for this."; +$lang['User_admin_explain'] = "Here you can change your user's information and certain specific options. To modify the users permissions please use the user and group permissions system."; $lang['User_delete'] = "Delete this user"; -$lang['User_delete_explain'] = "Click here to delete this user. This cannot be undone."; +$lang['User_delete_explain'] = "Click here to delete this user, this cannot be undone."; $lang['User_deleted'] = "User was successfully deleted."; -$lang['User_status'] = "User active"; -$lang['User_allowpm'] = "Allow PM"; -$lang['User_allowavatar'] = "Allow Avatar"; +$lang['User_status'] = "User is active"; +$lang['User_allowpm'] = "Can send Private Messages"; +$lang['User_allowavatar'] = "Can display avatar"; $lang['Admin_avatar_explain'] = "Here you can see and delete the user's current avatar."; $lang['User_special'] = "Special admin-only fields"; $lang['User_special_explain'] = "These fields are not able to be modified by the users. Here you can set their status and other options that are not given to users."; diff --git a/phpBB/templates/PSO/admin/user_edit_body.tpl b/phpBB/templates/PSO/admin/user_edit_body.tpl index 5ccbebec72..ddd3510baa 100644 --- a/phpBB/templates/PSO/admin/user_edit_body.tpl +++ b/phpBB/templates/PSO/admin/user_edit_body.tpl @@ -1,148 +1,140 @@ -<form action="{S_PROFILE_ACTION}" enctype="multipart/form-data" method="post"><table width="98%" cellspacing="0" cellpadding="4" border="0" align="center"> +<br clear="all" /> + +<h1>{L_USER_TITLE}</h1> + +<p>{L_USER_EXPLAIN}</p> + +<form action="{S_PROFILE_ACTION}" method="post"><table width="98%" cellspacing="1" cellpadding="4" border="0" align="center"> <tr> - <td align="left"><span class="gensmall"><a href="{U_INDEX}">{SITENAME} {L_INDEX}</a></span></td> + <td class="cat" colspan="2"><span class="cattitle"><b>{L_REGISTRATION_INFO}</b></span><br /><span class="gensmall">{L_ITEMS_REQUIRED}</span></td> </tr> -</table> - -<table width="98%" cellpadding="1" cellspacing="0" border="0" align="center"> <tr> - <td class="tablebg"><table border="0" cellpadding="3" cellspacing="1" width="100%"> - <tr> - <td class="cat" colspan="2"><span class="cattitle"><b>{L_REGISTRATION_INFO}</b></span><br /><span class="gensmall">{L_ITEMS_REQUIRED}</span></td> - </tr> - <tr> - <td class="row1" width="38%"><span class="gen">{L_USERNAME}: *</span></td> - <td class="row2"><input type="text" name="username" size="35" maxlength="40" value="{USERNAME}" /></td> - </tr> - <tr> - <td class="row1"><span class="gen">{L_EMAIL_ADDRESS}: *</span></td> - <td class="row2"><input type="text" name="email" size="35" maxlength="255" value="{EMAIL}" /></td> - </tr> - <tr> - <td class="row1"><span class="gen">{L_PASSWORD}: *</span><br /><span class="gensmall">{L_PASSWORD_IF_CHANGED}</span></td> - <td class="row2"><input type="password" name="password" size="35" maxlength="100" value="{PASSWORD}" /></td> - </tr> - <tr> - <td class="row1"><span class="gen">{L_CONFIRM} {L_PASSWORD}: * </span><br /><span class="gensmall">{L_PASSWORD_CONFIRM_IF_CHANGED}</span></td> - <td class="row2"><input type="password" name="password_confirm" size="35" maxlength="100" value="{PASSWORD_CONFIRM}" /></td> - </tr> - <tr> - <td class="cat" colspan="2"><span class="cattitle"><b>{L_PROFILE_INFO}</b></span><br /><span class="gensmall">{L_PROFILE_INFO_NOTICE}</span></td> - </tr> - <tr> - <td class="row1"><span class="gen">{L_ICQ_NUMBER}:</span></td> - <td class="row2"><input type="text" name="icq" size="10" maxlength="15" value="{ICQ}" /></td> - </tr> - <tr> - <td class="row1"><span class="gen">{L_AIM}:</span></td> - <td class="row2"><input type="text" name="aim" size="20" maxlength="255" value="{AIM}" /></td> - </tr> - <tr> - <td class="row1"><span class="gen">{L_MESSENGER}:</span></td> - <td class="row2"><input type="text" name="msn" size="20" maxlength="255" value="{MSN}" /></td> - </tr> - <tr> - <td class="row1"><span class="gen">{L_YAHOO}:</span></td> - <td class="row2"><input type="text" name="yim" size="20" maxlength="255" value="{YIM}" /></td> - </tr> - <tr> - <td class="row1"><span class="gen">{L_WEBSITE}:</span></td> - <td class="row2"><input type="text" name="website" size="35" maxlength="255" value="{WEBSITE}" /></td> - </tr> - <tr> - <td class="row1"><span class="gen">{L_LOCATION}:</span></td> - <td class="row2"><input type="text" name="location" size="35" maxlength="100" value="{LOCATION}" /></td> - </tr> - <tr> - <td class="row1"><span class="gen">{L_OCCUPATION}:</span></td> - <td class="row2"><input type="text" name="occupation" size="35" maxlength="100" value="{OCCUPATION}" /></td> - </tr> - <tr> - <td class="row1"><span class="gen">{L_INTERESTS}:</span></td> - <td class="row2"><input type="text" name="interests" size="35" maxlength="150" value="{INTERESTS}" /></td> - </tr> - <tr> - <td class="row1"><span class="gen">{L_SIGNATURE}:</span><br /><span class="gensmall">{L_SIGNATURE_EXPLAIN}<br /><br />{L_HTML_IS} <u>{HTML_STATUS}</u><br />{L_BBCODE_IS} <u>{BBCODE_STATUS}</u><br />{L_SMILIES_ARE} <u>{SMILIES_STATUS}</u></span></td> - <td class="row2"><textarea name="signature" rows="6" cols="45">{SIGNATURE}</textarea></td> - </tr> - <tr> - <td class="cat" colspan="2"><span class="cattitle"><b>{L_PREFERENCES}</b></span></td> - </tr> - <tr> - <td class="row1"><span class="gen">{L_PUBLIC_VIEW_EMAIL}:</span></td> - <td class="row2"><input type="radio" name="viewemail" value="1" {VIEW_EMAIL_YES} /> <span class="gen">{L_YES}</span> <input type="radio" name="viewemail" value="0" {VIEW_EMAIL_NO} /> <span class="gen">{L_NO}</span></td> - </tr> - <tr> - <td class="row1"><span class="gen">{L_HIDE_USER}:</span></td> - <td class="row2"><input type="radio" name="hideonline" value="1" {HIDE_USER_YES} /> <span class="gen">{L_YES}</span> <input type="radio" name="hideonline" value="0" {HIDE_USER_NO} /> <span class="gen">{L_NO}</span></td> - </tr> - <tr> - <td class="row1"><span class="gen">{L_NOTIFY_ON_PRIVMSG}:</span></td> - <td class="row2"><input type="radio" name="notifypm" value="1" {NOTIFY_PM_YES} /> <span class="gen">{L_YES}</span> <input type="radio" name="notifypm" value="0" {NOTIFY_PM_NO} /> <span class="gen">{L_NO}</span></td> - </tr> - <tr> - <td class="row1"><span class="gen">{L_ALWAYS_ADD_SIGNATURE}:</span></td> - <td class="row2"><input type="radio" name="attachsig" value="1" {ALWAYS_ADD_SIGNATURE_YES} /> <span class="gen">{L_YES}</span> <input type="radio" name="attachsig" value="0" {ALWAYS_ADD_SIGNATURE_NO} /> <span class="gen">{L_NO}</span></td> - </tr> - <tr> - <td class="row1"><span class="gen">{L_ALWAYS_ALLOW_BBCODE}:</span></td> - <td class="row2"><input type="radio" name="allowbbcode" value="1" {ALWAYS_ALLOW_BBCODE_YES} /> <span class="gen">{L_YES}</span> <input type="radio" name="allowbbcode" value="0" {ALWAYS_ALLOW_BBCODE_NO} /> <span class="gen">{L_NO}</span></td> - </tr> - <tr> - <td class="row1"><span class="gen">{L_ALWAYS_ALLOW_HTML}:</span></td> - <td class="row2"><input type="radio" name="allowhtml" value="1" {ALWAYS_ALLOW_HTML_YES} /> <span class="gen">{L_YES}</span> <input type="radio" name="allowhtml" value="0" {ALWAYS_ALLOW_HTML_NO} /> <span class="gen">{L_NO}</span></td> - </tr> - <tr> - <td class="row1"><span class="gen">{L_ALWAYS_ALLOW_SMILIES}:</span></td> - <td class="row2"><input type="radio" name="allowsmilies" value="1" {ALWAYS_ALLOW_SMILIES_YES} /> <span class="gen">{L_YES}</span> <input type="radio" name="allowsmilies" value="0" {ALWAYS_ALLOW_SMILIES_NO} /> <span class="gen">{L_NO}</span></td> - </tr> - <tr> - <td class="row1"><span class="gen">{L_TIMEZONE}:</span></td> - <td class="row2">{TIMEZONE_SELECT}</td> - </tr> - <tr> - <td class="row1"><span class="gen">{L_DATE_FORMAT}:</span><br /><span class="gensmall">{L_DATE_FORMAT_EXPLAIN}</span></td> - <td class="row2"><input type="text" name="dateformat" value="{DATE_FORMAT}" maxlength="16" /></td> - </tr> - <tr> - <td class="cat" colspan="2"><span class="cattitle"><b>{L_AVATAR_PANEL}</b></span></td> - </tr> - <tr> - <td class="row1" colspan="2" align="center"><table width="70%" cellspacing="2" cellpadding="0" border="0"> - <tr> - <td width="65%"><span class="gensmall">{L_AVATAR_EXPLAIN}</span></td> - <td align="center"><span class="gensmall">{L_CURRENT_IMAGE}</span><br />{AVATAR}<br /><input type="checkbox" name="avatardel" /> <span class="gensmall">{L_DELETE_AVATAR}</span></td> - </tr> - </table></td> - </tr> - <tr> - <td class="cat" colspan="2"><span class="cattitle"><B>{L_SPECIAL}</b></span></td> - </tr> - <tr> - <td class="row1" colspan="2" align="center"> - <span class="gensmall">{L_SPECIAL_EXPLAIN}</span> - </td> - </tr> - <tr> - <td class="row1"><span class="gen">{L_STATUS}:</span></td> - <td class="row2"><input type="radio" name="user_status" value="1" {STATUS_YES} /> <span class="gen">{L_YES}</span> <input type="radio" name="user_status" value="0" {STSTUS_NO} /> <span class="gen">{L_NO}</span></td> - </tr> - <tr> - <td class="row1"><span class="gen">{L_ALLOWPM}:</span></td> - <td class="row2"><input type="radio" name="user_allowpm" value="1" {ALLOWPM_YES} /> <span class="gen">{L_YES}</span> <input type="radio" name="user_allowpm" value="0" {ALLOWPM_NO} /> <span class="gen">{L_NO}</span></td> - </tr> - <tr> - <td class="row1"><span class="gen">{L_ALLOWAVATAR}:</span></td> - <td class="row2"><input type="radio" name="user_allowavatar" value="1" {ALLOWAVATAR_YES} /> <span class="gen">{L_YES}</span> <input type="radio" name="user_allowavatar" value="0" {ALLOWAVATAR_NO} /> <span class="gen">{L_NO}</span></td> - </tr> - <tr> - <td class="row1"><span class="gen">{L_DELETE_USER}?</span></td> - <td class="row2"><input type="checkbox" name="deleteuser">{L_DELETE_USER_EXPLAIN}</td> - </tr> + <td class="row1" width="38%"><span class="gen">{L_USERNAME}: *</span></td> + <td class="row2"><input type="text" name="username" size="35" maxlength="40" value="{USERNAME}" /></td> + </tr> + <tr> + <td class="row1"><span class="gen">{L_EMAIL_ADDRESS}: *</span></td> + <td class="row2"><input type="text" name="email" size="35" maxlength="255" value="{EMAIL}" /></td> + </tr> + <tr> + <td class="row1"><span class="gen">{L_PASSWORD}: *</span><br /><span class="gensmall">{L_PASSWORD_IF_CHANGED}</span></td> + <td class="row2"><input type="password" name="password" size="35" maxlength="100" value="{PASSWORD}" /></td> + </tr> + <tr> + <td class="row1"><span class="gen">{L_CONFIRM} {L_PASSWORD}: * </span><br /><span class="gensmall">{L_PASSWORD_CONFIRM_IF_CHANGED}</span></td> + <td class="row2"><input type="password" name="password_confirm" size="35" maxlength="100" value="{PASSWORD_CONFIRM}" /></td> + </tr> + <tr> + <td class="cat" colspan="2"><span class="cattitle"><b>{L_PROFILE_INFO}</b></span><br /><span class="gensmall">{L_PROFILE_INFO_NOTICE}</span></td> + </tr> + <tr> + <td class="row1"><span class="gen">{L_ICQ_NUMBER}:</span></td> + <td class="row2"><input type="text" name="icq" size="10" maxlength="15" value="{ICQ}" /></td> + </tr> + <tr> + <td class="row1"><span class="gen">{L_AIM}:</span></td> + <td class="row2"><input type="text" name="aim" size="20" maxlength="255" value="{AIM}" /></td> + </tr> + <tr> + <td class="row1"><span class="gen">{L_MESSENGER}:</span></td> + <td class="row2"><input type="text" name="msn" size="20" maxlength="255" value="{MSN}" /></td> + </tr> + <tr> + <td class="row1"><span class="gen">{L_YAHOO}:</span></td> + <td class="row2"><input type="text" name="yim" size="20" maxlength="255" value="{YIM}" /></td> + </tr> + <tr> + <td class="row1"><span class="gen">{L_WEBSITE}:</span></td> + <td class="row2"><input type="text" name="website" size="35" maxlength="255" value="{WEBSITE}" /></td> + </tr> + <tr> + <td class="row1"><span class="gen">{L_LOCATION}:</span></td> + <td class="row2"><input type="text" name="location" size="35" maxlength="100" value="{LOCATION}" /></td> + </tr> + <tr> + <td class="row1"><span class="gen">{L_OCCUPATION}:</span></td> + <td class="row2"><input type="text" name="occupation" size="35" maxlength="100" value="{OCCUPATION}" /></td> + </tr> + <tr> + <td class="row1"><span class="gen">{L_INTERESTS}:</span></td> + <td class="row2"><input type="text" name="interests" size="35" maxlength="150" value="{INTERESTS}" /></td> + </tr> + <tr> + <td class="row1"><span class="gen">{L_SIGNATURE}:</span><br /><span class="gensmall">{L_SIGNATURE_EXPLAIN}<br /><br />{L_HTML_IS} <u>{HTML_STATUS}</u><br />{L_BBCODE_IS} <u>{BBCODE_STATUS}</u><br />{L_SMILIES_ARE} <u>{SMILIES_STATUS}</u></span></td> + <td class="row2"><textarea name="signature" rows="6" cols="45">{SIGNATURE}</textarea></td> + </tr> + <tr> + <td class="cat" colspan="2"><span class="cattitle"><b>{L_PREFERENCES}</b></span></td> + </tr> + <tr> + <td class="row1"><span class="gen">{L_PUBLIC_VIEW_EMAIL}:</span></td> + <td class="row2"><input type="radio" name="viewemail" value="1" {VIEW_EMAIL_YES} /> <span class="gen">{L_YES}</span> <input type="radio" name="viewemail" value="0" {VIEW_EMAIL_NO} /> <span class="gen">{L_NO}</span></td> + </tr> + <tr> + <td class="row1"><span class="gen">{L_HIDE_USER}:</span></td> + <td class="row2"><input type="radio" name="hideonline" value="1" {HIDE_USER_YES} /> <span class="gen">{L_YES}</span> <input type="radio" name="hideonline" value="0" {HIDE_USER_NO} /> <span class="gen">{L_NO}</span></td> + </tr> + <tr> + <td class="row1"><span class="gen">{L_NOTIFY_ON_PRIVMSG}:</span></td> + <td class="row2"><input type="radio" name="notifypm" value="1" {NOTIFY_PM_YES} /> <span class="gen">{L_YES}</span> <input type="radio" name="notifypm" value="0" {NOTIFY_PM_NO} /> <span class="gen">{L_NO}</span></td> + </tr> + <tr> + <td class="row1"><span class="gen">{L_ALWAYS_ADD_SIGNATURE}:</span></td> + <td class="row2"><input type="radio" name="attachsig" value="1" {ALWAYS_ADD_SIGNATURE_YES} /> <span class="gen">{L_YES}</span> <input type="radio" name="attachsig" value="0" {ALWAYS_ADD_SIGNATURE_NO} /> <span class="gen">{L_NO}</span></td> + </tr> + <tr> + <td class="row1"><span class="gen">{L_ALWAYS_ALLOW_BBCODE}:</span></td> + <td class="row2"><input type="radio" name="allowbbcode" value="1" {ALWAYS_ALLOW_BBCODE_YES} /> <span class="gen">{L_YES}</span> <input type="radio" name="allowbbcode" value="0" {ALWAYS_ALLOW_BBCODE_NO} /> <span class="gen">{L_NO}</span></td> + </tr> + <tr> + <td class="row1"><span class="gen">{L_ALWAYS_ALLOW_HTML}:</span></td> + <td class="row2"><input type="radio" name="allowhtml" value="1" {ALWAYS_ALLOW_HTML_YES} /> <span class="gen">{L_YES}</span> <input type="radio" name="allowhtml" value="0" {ALWAYS_ALLOW_HTML_NO} /> <span class="gen">{L_NO}</span></td> + </tr> + <tr> + <td class="row1"><span class="gen">{L_ALWAYS_ALLOW_SMILIES}:</span></td> + <td class="row2"><input type="radio" name="allowsmilies" value="1" {ALWAYS_ALLOW_SMILIES_YES} /> <span class="gen">{L_YES}</span> <input type="radio" name="allowsmilies" value="0" {ALWAYS_ALLOW_SMILIES_NO} /> <span class="gen">{L_NO}</span></td> + </tr> + <tr> + <td class="row1"><span class="gen">{L_TIMEZONE}:</span></td> + <td class="row2">{TIMEZONE_SELECT}</td> + </tr> + <tr> + <td class="row1"><span class="gen">{L_DATE_FORMAT}:</span><br /><span class="gensmall">{L_DATE_FORMAT_EXPLAIN}</span></td> + <td class="row2"><input type="text" name="dateformat" value="{DATE_FORMAT}" maxlength="16" /></td> + </tr> + <tr> + <td class="cat" colspan="2"><span class="cattitle"><b>{L_AVATAR_PANEL}</b></span></td> + </tr> + <tr> + <td class="row1" colspan="2" align="center"><table width="70%" cellspacing="2" cellpadding="0" border="0"> <tr> - <td class="cat" colspan="2" align="center">{S_HIDDEN_FIELDS}<input type="submit" name="submit" value="{L_SUBMIT}" /> <input type="reset" value="{L_RESET}" /></td> + <td width="65%"><span class="gensmall">{L_AVATAR_EXPLAIN}</span></td> + <td align="center"><span class="gensmall">{L_CURRENT_IMAGE}</span><br />{AVATAR}<br /><input type="checkbox" name="avatardel" /> <span class="gensmall">{L_DELETE_AVATAR}</span></td> </tr> </table></td> </tr> + <tr> + <td class="cat" colspan="2"><span class="cattitle"><B>{L_SPECIAL}</b></span><br /><span class="gensmall">{L_SPECIAL_EXPLAIN}</span></td> + </tr> + <tr> + <td class="row1"><span class="gen">{L_STATUS}:</span></td> + <td class="row2"><input type="radio" name="user_status" value="1" {STATUS_YES} /> <span class="gen">{L_YES}</span> <input type="radio" name="user_status" value="0" {STSTUS_NO} /> <span class="gen">{L_NO}</span></td> + </tr> + <tr> + <td class="row1"><span class="gen">{L_ALLOWPM}:</span></td> + <td class="row2"><input type="radio" name="user_allowpm" value="1" {ALLOWPM_YES} /> <span class="gen">{L_YES}</span> <input type="radio" name="user_allowpm" value="0" {ALLOWPM_NO} /> <span class="gen">{L_NO}</span></td> + </tr> + <tr> + <td class="row1"><span class="gen">{L_ALLOWAVATAR}:</span></td> + <td class="row2"><input type="radio" name="user_allowavatar" value="1" {ALLOWAVATAR_YES} /> <span class="gen">{L_YES}</span> <input type="radio" name="user_allowavatar" value="0" {ALLOWAVATAR_NO} /> <span class="gen">{L_NO}</span></td> + </tr> + <tr> + <td class="row1"><span class="gen">{L_DELETE_USER}?</span></td> + <td class="row2"><input type="checkbox" name="deleteuser">{L_DELETE_USER_EXPLAIN}</td> + </tr> + <tr> + <td class="cat" colspan="2" align="center">{S_HIDDEN_FIELDS}<input type="submit" name="submit" value="{L_SUBMIT}" /> <input type="reset" value="{L_RESET}" /></td> + </tr> </table></form> + |