diff options
| author | Paul S. Owen <psotfx@users.sourceforge.net> | 2001-07-20 17:39:42 +0000 |
|---|---|---|
| committer | Paul S. Owen <psotfx@users.sourceforge.net> | 2001-07-20 17:39:42 +0000 |
| commit | dc6d590da6e7f1bf39d778e404b4ea2e272e8f71 (patch) | |
| tree | 532b99cae575df425e82a1b143ede63342ade38d | |
| parent | 0c03ef5dce4f21bbff2b45861b871b57aad3632c (diff) | |
| download | forums-dc6d590da6e7f1bf39d778e404b4ea2e272e8f71.tar forums-dc6d590da6e7f1bf39d778e404b4ea2e272e8f71.tar.gz forums-dc6d590da6e7f1bf39d778e404b4ea2e272e8f71.tar.bz2 forums-dc6d590da6e7f1bf39d778e404b4ea2e272e8f71.tar.xz forums-dc6d590da6e7f1bf39d778e404b4ea2e272e8f71.zip | |
Fixed over-written lang var and updated add profile templates
git-svn-id: file:///svn/phpbb/trunk@710 89ea8834-ac86-4346-8a33-228a782c2dd0
| -rwxr-xr-x | phpBB/language/lang_english.php | 4 | ||||
| -rw-r--r-- | phpBB/profile.php | 4 | ||||
| -rwxr-xr-x | phpBB/templates/Default/profile_add_body.tpl | 47 | ||||
| -rw-r--r-- | phpBB/templates/PSO/profile_add_body.tpl | 2 |
4 files changed, 40 insertions, 17 deletions
diff --git a/phpBB/language/lang_english.php b/phpBB/language/lang_english.php index 2cdbfc8c58..50b2bd4cf8 100755 --- a/phpBB/language/lang_english.php +++ b/phpBB/language/lang_english.php @@ -318,7 +318,7 @@ $lang['No_folder'] = "No folder specified"; $lang['Viewing_profile_of'] = "Viewing profile of"; // followed by username $lang['Preferences'] = "Preferences"; $lang['Items_required'] = "Items marked with a * are required unless stated otherwise"; -$lang['Registration_info'] = "Registraction Information"; +$lang['Registration_info'] = "Registration Information"; $lang['Profile_info'] = "Profile Information"; $lang['Profile_info_warn'] = "This information will be publicly viewable"; $lang['Avatar_panel'] = "Avatar control panel"; @@ -329,7 +329,7 @@ $lang['Contact'] = "Contact"; $lang['Email_address'] = "Email address"; $lang['Email'] = "Email"; $lang['Private_message'] = "Send Private Message"; -$lang['Hidden'] = "[ Hidden email address ]"; +$lang['Hidden_email'] = "[ Hidden email address ]"; $lang['Search_user_posts'] = "Search for posts by this user"; $lang['Interests'] = "Interests"; $lang['Occupation'] = "Occupation"; diff --git a/phpBB/profile.php b/phpBB/profile.php index 763c27a938..93066c62f5 100644 --- a/phpBB/profile.php +++ b/phpBB/profile.php @@ -253,8 +253,8 @@ if(isset($HTTP_GET_VARS['mode']) || isset($HTTP_POST_VARS['mode'])) } else { - $email = $lang['Hidden']; - $email_img = $lang['Hidden']; + $email = $lang['Hidden_email']; + $email_img = $lang['Hidden_email']; } if($members[$i]['user_icq']) diff --git a/phpBB/templates/Default/profile_add_body.tpl b/phpBB/templates/Default/profile_add_body.tpl index 1712c023c1..0a59baa7f9 100755 --- a/phpBB/templates/Default/profile_add_body.tpl +++ b/phpBB/templates/Default/profile_add_body.tpl @@ -59,18 +59,6 @@ <td bgcolor="#CCCCCC"><input type="text" name="interests" size="35" maxlength="150" value="{INTERESTS}"></td> </tr> <tr class="tablebody"> - <td bgcolor="#DDDDDD"><b>{L_AVATAR}:</b><br /><font face="{T_FONTFACE1}" size="{T_FONTSIZE1}">{L_AVATAR_EXPLAIN}</font></td> - <td bgcolor="#CCCCCC"><table cellspacing="2" cellpadding="0" border="0"> - <tr class="tablebody"> - <td align="center">{L_CURRENT_IMAGE}</font></td> - <td rowspan="2" valign="bottom"> {L_UPLOAD_IMAGE}:<br> <input type="hidden" name="MAX_FILE_SIZE" value="{AVATAR_SIZE}"><input type="file" name="avatar"><br> {L_DELETE_IMAGE}:<input type="checkbox" name="avatardel"></td> - </tr> - <tr class="tablebody"> - <td align="center"> {AVATAR} </td> - </tr> - </table></td> - </tr> - <tr class="tablebody"> <td bgcolor="#DDDDDD"><b>{L_SIGNATURE}:</b><br><font style="{font-size: 8pt;}">{L_SIGNATURE_EXPLAIN}</font></td> <td bgcolor="#CCCCCC"><textarea name="signature" rows="6" cols="45">{SIGNATURE}</textarea></td> </tr> @@ -126,6 +114,41 @@ <td bgcolor="#CCCCCC"><input type="text" name="dateformat" value="{DATE_FORMAT}" maxlength="16"></td> </tr> <tr class="tableheader"> + <td colspan="2"><b>{L_AVATAR_PANEL}</b></td> + </tr> + <!-- IF $S_ALLOW_AVATAR_UPLOAD eq TRUE || $S_ALLOW_AVATAR_LOCAL eq TRUE || $S_ALLOW_AVATAR_REMOTE eq TRUE --> + <tr class="tablebody"> + <td bgcolor="#CCCCCC" colspan="2" align="center"><table width="70%" cellspacing="2" cellpadding="0" border="0"> + <tr> + <td width="65%">{L_AVATAR_EXPLAIN}</td> + <td align="center">{L_CURRENT_IMAGE}<br>{AVATAR}<br><input type="checkbox" name="avatardel"> {L_DELETE_AVATAR}</td> + </tr> + </table></td> + </tr> + <!-- ENDIF --> + <!-- IF $S_ALLOW_AVATAR_UPLOAD eq TRUE --> + <tr class="tablebody"> + <td bgcolor="#DDDDDD"><span class="gen">{L_UPLOAD_AVATAR_FILE}:</span></td> + <td bgcolor="#CCCCCC"><input type="hidden" name="MAX_FILE_SIZE" value="{AVATAR_SIZE}"><input type="file" name="avatar"></td> + </tr> + <tr class="tablebody"> + <td bgcolor="#DDDDDD">{L_UPLOAD_AVATAR_URL}:<br>{L_UPLOAD_AVATAR_URL_EXPLAIN}</td> + <td bgcolor="#CCCCCC"><input type="text" name="avatarurl" size="40"></td> + </tr> + <!-- ENDIF --> + <!-- IF $S_ALLOW_AVATAR_REMOTE eq TRUE --> + <tr class="tablebody"> + <td bgcolor="#DDDDDD">{L_LINK_REMOTE_AVATAR}:<br>{L_LINK_REMOTE_AVATAR_EXPLAIN}</td> + <td bgcolor="#CCCCCC"><input type="text" name="avatarremoteurl" size="40"></td> + </tr> + <!-- ENDIF --> + <!-- IF $S_ALLOW_AVATAR_LOCAL eq TRUE --> + <tr class="tablebody"> + <td bgcolor="#DDDDDD">{L_AVATAR_GALLERY}:</td> + <td bgcolor="#CCCCCC"><input type="submit" name="avatargallery" value="{L_SHOW_GALLERY}"></td> + </tr> + <!-- ENDIF --> + <tr class="tableheader"> <td align="center" colspan="2">{S_HIDDEN_FIELDS}<input type="submit" name="submit" value="{L_SUBMIT}"> </td> </tr> </table> diff --git a/phpBB/templates/PSO/profile_add_body.tpl b/phpBB/templates/PSO/profile_add_body.tpl index e74ef63cb2..9b3a088409 100644 --- a/phpBB/templates/PSO/profile_add_body.tpl +++ b/phpBB/templates/PSO/profile_add_body.tpl @@ -113,7 +113,7 @@ <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_EXPLANATION}</span></td> + <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> |