diff options
Diffstat (limited to 'phpBB')
| -rw-r--r-- | phpBB/index.php | 2 | ||||
| -rw-r--r-- | phpBB/profile.php | 92 | ||||
| -rw-r--r-- | phpBB/templates/PSO/profile_add_body.tpl | 31 | ||||
| -rw-r--r-- | phpBB/templates/PSO/profile_view_body.tpl | 26 |
4 files changed, 80 insertions, 71 deletions
diff --git a/phpBB/index.php b/phpBB/index.php index a7c04f27f8..dc13581e40 100644 --- a/phpBB/index.php +++ b/phpBB/index.php @@ -306,7 +306,7 @@ if($total_categories = $db->sql_numrows($q_categories)) "LAST_POST" => $last_post, "MODERATORS" => $moderators_links, - "U_VIEWFORUM" => append_sid("viewforum.$phpEx?" . POST_FORUM_URL . "=$forum_id&" . $forum_rows[$j]['forum_posts'])) + "U_VIEWFORUM" => append_sid("viewforum.$phpEx?" . POST_FORUM_URL . "=$forum_id")) ); $count++; diff --git a/phpBB/profile.php b/phpBB/profile.php index a3ef9e2219..eeba6a7221 100644 --- a/phpBB/profile.php +++ b/phpBB/profile.php @@ -58,12 +58,17 @@ if(isset($HTTP_GET_VARS['mode']) || isset($HTTP_POST_VARS['mode'])) "body" => "profile_view_body.tpl", "jumpbox" => "jumpbox.tpl") ); + $jumpbox = make_jumpbox(); $template->assign_vars(array( + "L_GO" => $lang['Go'], + "L_JUMP_TO" => $lang['Jump_to'], + "L_SELECT_FORUM" => $lang['Select_forum'], "JUMPBOX_LIST" => $jumpbox, "SELECT_NAME" => POST_FORUM_URL) ); $template->assign_var_from_handle("JUMPBOX", "jumpbox"); + // // End header // @@ -99,21 +104,21 @@ if(isset($HTTP_GET_VARS['mode']) || isset($HTTP_POST_VARS['mode'])) // Replace the @ with 'at'. Some anti-spam mesures. $email_addr = str_replace("@", " at ", $profiledata['user_email']); $email = "<a href=\"mailto:$email_addr\">$email_addr</a>"; - $email_img = "<a href=\"mailto:$email_addr\"><img src=\"" . $images['icon_email'] . "\" alt=\"" . $lang['Send_email'] . " " . stripslashes($profiledata['username']) . "\" border=\"0\"></a>"; + $email_img = "<a href=\"mailto:$email_addr\"><img src=\"" . $images['icon_email'] . "\" alt=\"" . $lang['Send_email'] . " " . stripslashes($profiledata['username']) . "\" border=\"0\" /></a>"; } else { $email = $lang['Hidden_email']; - $email_img = $lang['Hidden_email']; + $email_img = ""; } - $avatar_img = ( !empty($profiledata['user_avatar']) ) ? "<img src=\"" . $board_config['avatar_path'] . "/" . stripslashes($profiledata['user_avatar']) . "\" border=\"0\">" : " "; + $avatar_img = ( !empty($profiledata['user_avatar']) ) ? "<img src=\"" . $board_config['avatar_path'] . "/" . stripslashes($profiledata['user_avatar']) . "\" border=\"0\" alt=\"\" />" : " "; if($members[$i]['user_icq']) { - $icq_status_img = "<a href=\"http://wwp.icq.com/" . $profiledata['user_icq'] . "#pager\"><img src=\"http://online.mirabilis.com/scripts/online.dll?icq=" . $profiledata['user_icq'] . "&img=5\" border=\"0\"></a>"; + $icq_status_img = "<a href=\"http://wwp.icq.com/" . $profiledata['user_icq'] . "#pager\"><img src=\"http://online.mirabilis.com/scripts/online.dll?icq=" . $profiledata['user_icq'] . "&img=5\" border=\"0\" alt=\"\" /></a>"; - $icq_add_img = "<a href=\"http://wwp.icq.com/scripts/search.dll?to=" . $profiledata['user_icq'] . "\"><img src=\"" . $images['icon_icq'] . "\" alt=\"" . $lang['ICQ'] . "\" border=\"0\"></a>"; + $icq_add_img = "<a href=\"http://wwp.icq.com/scripts/search.dll?to=" . $profiledata['user_icq'] . "\"><img src=\"" . $images['icon_icq'] . "\" alt=\"" . $lang['ICQ'] . "\" border=\"0\" /></a>"; } else { @@ -121,18 +126,18 @@ if(isset($HTTP_GET_VARS['mode']) || isset($HTTP_POST_VARS['mode'])) $icq_add_img = " "; } - $aim_img = ($profiledata['user_aim']) ? "<a href=\"aim:goim?screenname=" . $profiledata['user_aim'] . "&message=Hello+Are+you+there?\"><img src=\"" . $images['icon_aim'] . "\" border=\"0\"></a>" : " "; + $aim_img = ($profiledata['user_aim']) ? "<a href=\"aim:goim?screenname=" . $profiledata['user_aim'] . "&message=Hello+Are+you+there?\"><img src=\"" . $images['icon_aim'] . "\" border=\"0\" alt=\"" . $lang['AIM'] . "\" /></a>" : " "; - $msnm_img = ($profiledata['user_msnm']) ? "<a href=\"profile.$phpEx?mode=viewprofile&" . POST_USERS_URL . "=$poster_id\"><img src=\"" . $images['icon_msnm'] . "\" border=\"0\"></a>" : " "; + $msnm_img = ($profiledata['user_msnm']) ? "<a href=\"profile.$phpEx?mode=viewprofile&" . POST_USERS_URL . "=$poster_id\"><img src=\"" . $images['icon_msnm'] . "\" border=\"0\" alt=\"" . $lang['MSNM'] . "\" /></a>" : " "; - $yim_img = ($members[$i]['user_yim']) ? "<a href=\"http://edit.yahoo.com/config/send_webmesg?.target=" . $members[$i]['user_yim'] . "&.src=pg\"><img src=\"" . $images['icon_yim'] . "\" border=\"0\"></a>" : " "; + $yim_img = ($members[$i]['user_yim']) ? "<a href=\"http://edit.yahoo.com/config/send_webmesg?.target=" . $members[$i]['user_yim'] . "&.src=pg\"><img src=\"" . $images['icon_yim'] . "\" border=\"0\" alt=\"" . $lang['YIM'] . "\" /></a>" : " "; - $search_img = "<a href=\"" . append_sid("search.$phpEx?a=" . urlencode($profiledata['username']) . "&f=all&b=0&d=DESC&c=100&dosearch=1") . "\"><img src=\"" . $images['icon_search'] . "\" border=\"0\" alt=\"" . $lang['Search_user_posts'] . "\"></a>"; - $search = "<a href=\"" . append_sid("search.$phpEx?a=" . urlencode($profiledata['username']) . "&f=all&b=0&d=DESC&c=100&dosearch=1") . "\">" . $lang['Search_user_posts'] . "</a>"; + $search_img = "<a href=\"" . append_sid("search.$phpEx?a=" . urlencode($profiledata['username']) . "&f=all&b=0&d=DESC&c=100&dosearch=1") . "\"><img src=\"" . $images['icon_search'] . "\" border=\"0\" alt=\"" . $lang['Search_user_posts'] . "\" /></a>"; + $search = "<a href=\"" . append_sid("search.$phpEx?a=" . urlencode($profiledata['username']) . "&f=all&b=0&d=DESC&c=100&dosearch=1") . "\">" . $lang['Search_user_posts'] . "</a>"; - $www_img = ($profiledata['user_website']) ? "<img src=\"" . $images['icon_www'] . "\" alt=\"" . $lang['Visit_website'] . "\" border=\"0\"></a>" : " "; + $www_img = ($profiledata['user_website']) ? "<a href=\"" . stripslashes($profiledata['user_website']) . "\"><img src=\"" . $images['icon_www'] . "\" alt=\"" . $lang['Visit_website'] . "\" border=\"0\" /></a>" : " "; - $pm_img = "<a href=\"" . append_sid("privmsg.$phpEx?mode=post&" . POST_USERS_URL . "=" . $profiledata['user_id']) . "\"><img src=\"". $images['icon_pm'] . "\" alt=\"" . $lang['Private_messaging'] . "\" border=\"0\"></a>"; + $pm_img = "<a href=\"" . append_sid("privmsg.$phpEx?mode=post&" . POST_USERS_URL . "=" . $profiledata['user_id']) . "\"><img src=\"". $images['icon_pm'] . "\" alt=\"" . $lang['Private_messaging'] . "\" border=\"0\" /></a>"; $template->assign_vars(array( "USERNAME" => stripslashes($profiledata['username']), @@ -147,17 +152,17 @@ if(isset($HTTP_GET_VARS['mode']) || isset($HTTP_POST_VARS['mode'])) "SEARCH_IMG" => $search_img, "ICQ_ADD_IMG" => $icq_add_img, "ICQ_STATUS_IMG" => $icq_status_img, - "AIM" => ( ($profiledata['user_aim']) ? stripslashes($profiledata['user_aim']) : "" ), + "AIM" => ( ($profiledata['user_aim']) ? stripslashes($profiledata['user_aim']) : " " ), "AIM_IMG" => $aim_img, - "MSN" => ( ($profiledata['user_msnm']) ? stripslashes($profiledata['user_msnm']) : "" ), + "MSN" => ( ($profiledata['user_msnm']) ? stripslashes($profiledata['user_msnm']) : " " ), "MSN_IMG" => $msnm_img, - "YIM" => ( ($profiledata['user_yim']) ? stripslashes($profiledata['user_yim']) : "" ), + "YIM" => ( ($profiledata['user_yim']) ? stripslashes($profiledata['user_yim']) : " " ), "YIM_IMG" => $yim_img, - "WEBSITE" => ( ($profiledata['user_website']) ? stripslashes($profiledata['user_website']) : "" ), + "WEBSITE" => ( ($profiledata['user_website']) ? stripslashes($profiledata['user_website']) : " " ), "WEBSITE_IMG" => $www_img, - "LOCATION" => ( ($profiledatas['user_from']) ? stripslashes($profiledata['user_from']) : "" ), - "OCCUPATION" => ( ($profiledata['user_occ']) ? stripslashes($profiledata['user_occ']) : "" ), - "INTERESTS" => ( ($profiledata['user_interests']) ? stripslashes($profiledata['user_interests']) : "" ), + "LOCATION" => ( ($profiledatas['user_from']) ? stripslashes($profiledata['user_from']) : " " ), + "OCCUPATION" => ( ($profiledata['user_occ']) ? stripslashes($profiledata['user_occ']) : " " ), + "INTERESTS" => ( ($profiledata['user_interests']) ? stripslashes($profiledata['user_interests']) : " " ), "AVATAR_IMG" => $avatar_img, "L_VIEWING_PROFILE" => $lang['Viewing_profile_of'], @@ -176,8 +181,7 @@ if(isset($HTTP_GET_VARS['mode']) || isset($HTTP_POST_VARS['mode'])) "L_OCCUPATION" => $lang['Occupation'], "L_INTERESTS" => $lang['Interests'], - "U_SEARCH_USER" => append_sid("search.$phpEx?a=" . urlencode($profiledata['username']) . "&f=all&b=0&d=DESC&c=100&dosearch=1"), - "U_USER_WEBSITE" => stripslashes($profiledata['user_website']), + "U_SEARCH_USER" => append_sid("search.$phpEx?a=" . urlencode($profiledata['username']) . "&f=all&b=0&d=DESC&c=100&dosearch=1"), "S_PROFILE_ACTION" => append_sid("profile.$phpEx")) ); @@ -215,17 +219,22 @@ if(isset($HTTP_GET_VARS['mode']) || isset($HTTP_POST_VARS['mode'])) "body" => "agreement.tpl", "jumpbox" => "jumpbox.tpl") ); + $jumpbox = make_jumpbox(); $template->assign_vars(array( + "L_GO" => $lang['Go'], + "L_JUMP_TO" => $lang['Jump_to'], + "L_SELECT_FORUM" => $lang['Select_forum'], "JUMPBOX_LIST" => $jumpbox, "SELECT_NAME" => POST_FORUM_URL) ); $template->assign_var_from_handle("JUMPBOX", "jumpbox"); + $template->assign_vars(array( "COPPA" => $coppa, - "U_AGREE_OVER13" => append_sid("profile.$phpEx?mode=register&agreed=true"), - "U_AGREE_UNDER13" => append_sid("profile.$phpEx?mode=register&agreed=true&coppa=true")) + "U_AGREE_OVER13" => append_sid("profile.$phpEx?mode=register&agreed=true"), + "U_AGREE_UNDER13" => append_sid("profile.$phpEx?mode=register&agreed=true&coppa=true")) ); $template->pparse("body"); @@ -803,10 +812,10 @@ if(isset($HTTP_GET_VARS['mode']) || isset($HTTP_POST_VARS['mode'])) $bbcode_status = ($board_config['allow_bbcode']) ? $lang['ON'] : $lang['OFF']; $smilies_status = ($board_config['allow_smilies']) ? $lang['ON'] : $lang['OFF']; - $s_hidden_fields = '<input type="hidden" name="mode" value="' . $mode . '"><input type="hidden" name="agreed" value="true"><input type="hidden" name="coppa" value="' . $coppa . '">'; + $s_hidden_fields = '<input type="hidden" name="mode" value="' . $mode . '" /><input type="hidden" name="agreed" value="true" /><input type="hidden" name="coppa" value="' . $coppa . '" />'; if($mode == "editprofile") { - $s_hidden_fields .= '<input type="hidden" name="user_id" value="' . $userdata['user_id'] . '">'; + $s_hidden_fields .= '<input type="hidden" name="user_id" value="' . $userdata['user_id'] . '" />'; } $template->set_filenames(array( @@ -816,6 +825,9 @@ if(isset($HTTP_GET_VARS['mode']) || isset($HTTP_POST_VARS['mode'])) $jumpbox = make_jumpbox(); $template->assign_vars(array( + "L_GO" => $lang['Go'], + "L_JUMP_TO" => $lang['Jump_to'], + "L_SELECT_FORUM" => $lang['Select_forum'], "JUMPBOX_LIST" => $jumpbox, "SELECT_NAME" => POST_FORUM_URL) ); @@ -833,22 +845,22 @@ if(isset($HTTP_GET_VARS['mode']) || isset($HTTP_POST_VARS['mode'])) "LOCATION" => stripslashes($location), "WEBSITE" => stripslashes($website), "SIGNATURE" => stripslashes(str_replace("<br />", "\n", $signature)), - "VIEW_EMAIL_YES" => ($viewemail) ? "CHECKED" : "", - "VIEW_EMAIL_NO" => (!$viewemail) ? "CHECKED" : "", - "HIDE_USER_YES" => (!$allowviewonline) ? "CHECKED" : "", - "HIDE_USER_NO" => ($allowviewonline) ? "CHECKED" : "", - "NOTIFY_PM_YES" => ($notifypm) ? "CHECKED" : "", - "NOTIFY_PM_NO" => (!$notifypm) ? "CHECKED" : "", - "ALWAYS_ADD_SIGNATURE_YES" => ($attachsig) ? "CHECKED" : "", - "ALWAYS_ADD_SIGNATURE_NO" => (!$attachsig) ? "CHECKED" : "", - "ALWAYS_ALLOW_BBCODE_YES" => ($allowbbcode) ? "CHECKED" : "", - "ALWAYS_ALLOW_BBCODE_NO" => (!$allowbbcode) ? "CHECKED" : "", - "ALWAYS_ALLOW_HTML_YES" => ($allowhtml) ? "CHECKED" : "", - "ALWAYS_ALLOW_HTML_NO" => (!$allowhtml) ? "CHECKED" : "", - "ALWAYS_ALLOW_SMILIES_YES" => ($allowsmilies) ? "CHECKED" : "", - "ALWAYS_ALLOW_SMILIES_NO" => (!$allowsmilies) ? "CHECKED" : "", + "VIEW_EMAIL_YES" => ($viewemail) ? "checked=\"checked\"" : "", + "VIEW_EMAIL_NO" => (!$viewemail) ? "checked=\"checked\"" : "", + "HIDE_USER_YES" => (!$allowviewonline) ? "checked=\"checked\"" : "", + "HIDE_USER_NO" => ($allowviewonline) ? "checked=\"checked\"" : "", + "NOTIFY_PM_YES" => ($notifypm) ? "checked=\"checked\"" : "", + "NOTIFY_PM_NO" => (!$notifypm) ? "checked=\"checked\"" : "", + "ALWAYS_ADD_SIGNATURE_YES" => ($attachsig) ? "checked=\"checked\"" : "", + "ALWAYS_ADD_SIGNATURE_NO" => (!$attachsig) ? "checked=\"checked\"" : "", + "ALWAYS_ALLOW_BBCODE_YES" => ($allowbbcode) ? "checked=\"checked\"" : "", + "ALWAYS_ALLOW_BBCODE_NO" => (!$allowbbcode) ? "checked=\"checked\"" : "", + "ALWAYS_ALLOW_HTML_YES" => ($allowhtml) ? "checked=\"checked\"" : "", + "ALWAYS_ALLOW_HTML_NO" => (!$allowhtml) ? "checked=\"checked\"" : "", + "ALWAYS_ALLOW_SMILIES_YES" => ($allowsmilies) ? "checked=\"checked\"" : "", + "ALWAYS_ALLOW_SMILIES_NO" => (!$allowsmilies) ? "checked=\"checked\"" : "", "ALLOW_AVATAR" => $board_config['allow_avatar_upload'], - "AVATAR" => ($user_avatar != "") ? "<img src=\"".$board_config['avatar_path']."/$user_avatar\">" : "", + "AVATAR" => ($user_avatar != "") ? "<img src=\"".$board_config['avatar_path']."/$user_avatar\" alt=\"\" />" : "", "AVATAR_SIZE" => $board_config['avatar_filesize'], "LANGUAGE_SELECT" => language_select($user_lang), "THEME_SELECT" => theme_select($user_theme), diff --git a/phpBB/templates/PSO/profile_add_body.tpl b/phpBB/templates/PSO/profile_add_body.tpl index e78c25efea..2c5b30afd8 100644 --- a/phpBB/templates/PSO/profile_add_body.tpl +++ b/phpBB/templates/PSO/profile_add_body.tpl @@ -1,33 +1,34 @@ -<table width="98%" cellspacing="0" cellpadding="4" border="0" align="center"> + +<form action="{S_PROFILE_ACTION}" enctype="multipart/form-data" method="post"><table width="98%" cellspacing="0" cellpadding="4" border="0" align="center"> <tr> <td align="left"><span class="gensmall"><a href="{U_INDEX}">{SITENAME} {L_INDEX}</a></span></td> </tr> </table> <table width="98%" cellpadding="1" cellspacing="0" border="0" align="center"> - <tr><form action="{S_PROFILE_ACTION}" enctype="multipart/form-data" method="post"> + <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> </th> + <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}: *</b><br>{L_USER_UNIQ}</td> + <td class="row1" width="38%"><span class="gen">{L_USERNAME}: *<br />{L_USER_UNIQ}</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}: *</b></td> + <td class="row1"><span class="gen">{L_EMAIL_ADDRESS}: *</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}: *</b></span><br /><span class="gensmall">{L_PASSWORD_IF_CHANGED}</span></td> + <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}: * </b></span><br /><span class="gensmall">{L_PASSWORD_CONFIRM_IF_CHANGED}</span></td> + <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> + <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> @@ -62,7 +63,7 @@ <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}:</b></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="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> @@ -123,8 +124,8 @@ <tr> <td class="row1" colspan="2" align="center"><table width="70%" cellspacing="2" cellpadding="0" border="0"> <tr> - <td width="65%"><span class="gen"><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> + <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> @@ -134,13 +135,13 @@ <td class="row2"><input type="hidden" name="MAX_FILE_SIZE" value="{AVATAR_SIZE}"><input type="file" name="avatar"></td> </tr> <tr> - <td class="row1"><span class="gen">{L_UPLOAD_AVATAR_URL}:</span><br><span class="gensmall">{L_UPLOAD_AVATAR_URL_EXPLAIN}</span></td> + <td class="row1"><span class="gen">{L_UPLOAD_AVATAR_URL}:</span><br /><span class="gensmall">{L_UPLOAD_AVATAR_URL_EXPLAIN}</span></td> <td class="row2"><input type="text" name="avatarurl" size="40"></td> </tr> <!-- END avatarupload --> <!-- BEGIN avatarremote --> <tr> - <td class="row1"><span class="gen">{L_LINK_REMOTE_AVATAR}:</span><br><span class="gensmall">{L_LINK_REMOTE_AVATAR_EXPLAIN}</span></td> + <td class="row1"><span class="gen">{L_LINK_REMOTE_AVATAR}:</span><br /><span class="gensmall">{L_LINK_REMOTE_AVATAR_EXPLAIN}</span></td> <td class="row2"><input type="text" name="avatarremoteurl" size="40"></td> </tr> <!-- END avatarremote --> @@ -155,8 +156,8 @@ <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></td> - </form></tr> -</table> + </tr> +</table></form> <!-- IF $S_ALLOW_AVATAR_UPLOAD eq TRUE || $S_ALLOW_AVATAR_LOCAL eq TRUE || $S_ALLOW_AVATAR_REMOTE eq TRUE --> <!-- IF $S_ALLOW_AVATAR_LOCAL eq TRUE --> diff --git a/phpBB/templates/PSO/profile_view_body.tpl b/phpBB/templates/PSO/profile_view_body.tpl index 04ddefa618..cf9e8d2aa8 100644 --- a/phpBB/templates/PSO/profile_view_body.tpl +++ b/phpBB/templates/PSO/profile_view_body.tpl @@ -8,7 +8,7 @@ <tr> <td class="tablebg"><table border="0" cellpadding="3" cellspacing="1" width="100%"> <tr> - <td class="cat" colspan="2"><span class="cattitle"><b>{L_VIEWING_PROFILE} <i>{USERNAME}</i></b></td> + <td class="cat" colspan="2"><span class="cattitle"><b>{L_VIEWING_PROFILE} <i>{USERNAME}</i></b></span></td> </tr> <tr> <td class="row1" width="20%" height="25"><span class="gen">{L_USERNAME}:</span></td> @@ -32,39 +32,33 @@ <td> </td> <td><span class="gen">[ {PERCENTAGE} {L_OF_TOTAL} / {POSTS_PER_DAY} {L_PER_DAY}]</span></td> <td> </td> - <td><span class="gen"><b><a href="{U_SEARCH_USER}">{SEARCH_IMG}</a></b></span></td> + <td><a href="{U_SEARCH_USER}">{SEARCH_IMG}</a></td> </tr> </table></td> </tr> <tr> <td class="row2" height="25"><span class="gen">{L_CONTACT}:</span></td> - <td class="row2"><table cellspacing="0" cellpadding="0" border="0"> - <tr> - <td><span class="gen"><b> {EMAIL_IMG} </b></span></td> - <td> </td> - <td><span class="gen"><b> {PM_IMG} </b></span></td> - </tr> - </table></td> + <td class="row2">{PM_IMG} {EMAIL_IMG}</td> </tr> <tr> <td class="row1" height="25"><span class="gen">{L_ICQ_NUMBER}:</span></td> - <td class="row1"><span class="gen">{ICQ_IMG}</span></td> + <td class="row1">{ICQ_IMG}</td> </tr> <tr> <td class="row2" height="25"><span class="gen">{L_AIM}:</span></td> - <td class="row2"><span class="gen">{AIM_IMG}</span></td> + <td class="row2">{AIM_IMG}</td> </tr> <tr> <td class="row1" height="25"><span class="gen">{L_MESSENGER}:</span></td> - <td class="row1"><span class="gen">{MSN_IMG}</span></td> + <td class="row1">{MSN_IMG}</td> </tr> <tr> <td class="row2" height="25"><span class="gen">{L_YAHOO}:</span></td> - <td class="row2"><span class="gen">{YIM_IMG}</span></td> + <td class="row2">{YIM_IMG}</td> </tr> <tr> <td class="row1" height="25"><span class="gen">{L_WEBSITE}:</span></td> - <td class="row1"><span class="gen"><a href="{U_USER_WEBSITE}" target="_userwww">{WEBSITE_IMG}</a></span></td> + <td class="row1">{WEBSITE_IMG}</td> </tr> <tr> <td class="row2" height="25"><span class="gen">{L_LOCATION}:</span></td> @@ -82,9 +76,11 @@ </tr> </table> +<br clear="all" /> + <table cellspacing="2" border="0" width="98%" align="center"> <tr> <td width="40%" valign="top"><span class="gensmall"><b>{S_TIMEZONE}</b></span></td> - <td align="right" valign="top" nowrap>{JUMPBOX}</td> + <td align="right" valign="top" nowrap="nowrap">{JUMPBOX}</td> </tr> </table> |