diff options
| -rwxr-xr-x | phpBB/language/lang_english.php | 7 | ||||
| -rw-r--r-- | phpBB/templates/Default/viewtopic_body.tpl | 6 | ||||
| -rw-r--r-- | phpBB/templates/PSO/memberlist_body.tpl | 9 | ||||
| -rw-r--r-- | phpBB/templates/PSO/viewforum_body.tpl | 5 | ||||
| -rw-r--r-- | phpBB/templates/PSO/viewtopic_body.tpl | 14 |
5 files changed, 25 insertions, 16 deletions
diff --git a/phpBB/language/lang_english.php b/phpBB/language/lang_english.php index 0e5c3a7457..a2eafb7d44 100755 --- a/phpBB/language/lang_english.php +++ b/phpBB/language/lang_english.php @@ -60,9 +60,13 @@ $lang['Months'] = "Months"; $lang['Year'] = "Year"; $lang['Years'] = "Years"; -$lang['All_times'] = "All times"; // This is followed by GMT and the timezone offset +$lang['All_times'] = "All times are"; // This is followed by GMT and the timezone offset $lang['GMT'] = "GMT"; +$lang['Goto_page'] = "Goto page"; +$lang['Page'] = "Page"; // Followed by the current page number then 'of x' where x is total pages +$lang['of'] = "of"; // See Page above + // // Login // @@ -75,6 +79,7 @@ $lang['Forgotten_password'] = "I forgot my password"; // // Index page // +$lang['No_Posts'] = "No Posts"; // // Viewforum diff --git a/phpBB/templates/Default/viewtopic_body.tpl b/phpBB/templates/Default/viewtopic_body.tpl index 56bcb54db0..001269675b 100644 --- a/phpBB/templates/Default/viewtopic_body.tpl +++ b/phpBB/templates/Default/viewtopic_body.tpl @@ -68,7 +68,6 @@ <font style="{font-size: 10pt; font-weight: bold;}">{postrow.POSTER_NAME}</font><br> {postrow.POSTER_RANK}<br> {postrow.RANK_IMAGE}<br> - {postrow.POSTER_AVATAR}<br> <br> <font style="{font-size: 8pt;}"> {L_JOINED}: {postrow.POSTER_JOINED}<br>{L_POSTS}: {postrow.POSTER_POSTS}<br>{postrow.POSTER_FROM}</font> @@ -77,7 +76,8 @@ <td align="right" width="15%"><img src="images/posticon.gif"><font style="{font-size: 8pt;}">{L_POSTED}: {postrow.POST_DATE}</font></td> </tr> <tr bgcolor="{postrow.ROW_COLOR}" class="tablebody"> - <td colspan="3">{postrow.MESSAGE}<hr> + <td colspan="3"> + {postrow.MESSAGE}<hr> {postrow.PROFILE_IMG} {postrow.EMAIL_IMG} {postrow.WWW_IMG} {postrow.ICQ_STATUS_IMG} {postrow.ICQ_ADD_IMG} {postrow.AIM_IMG} {postrow.YIM_IMG} {postrow.MSN_IMG} <img src="images/div.gif"> {postrow.EDIT_IMG} {postrow.QUOTE_IMG} {postrow.PMSG_IMG} <img src="images/div.gif"> {postrow.IP_IMG} {postrow.DELPOST_IMG} </td> </tr> @@ -97,7 +97,7 @@ <td width="90%" class="tablebody" bgcolor="#CCCCCC"><table width="100%" cellspacing="0" cellpadding="0" border="0"> <tr> <td align="left" nowrap><b>{S_TIMEZONE}</b></td> - <td align="right" nowrap>This topic is {PAGES} {L_PAGES} long. {PAGINATION}</td> + <td align="right" nowrap>This topic is {TOTAL_PAGES} {L_PAGES} long. {PAGINATION}</td> </tr> </table></td> <td width="5%" class="tableheader" align="center"><a href="{U_VIEW_OLDER_TOPIC}"><img src="images/prev.gif" alt="View previous topic" border="0"></a></td> diff --git a/phpBB/templates/PSO/memberlist_body.tpl b/phpBB/templates/PSO/memberlist_body.tpl index 75b76f85c1..0a7b691073 100644 --- a/phpBB/templates/PSO/memberlist_body.tpl +++ b/phpBB/templates/PSO/memberlist_body.tpl @@ -8,7 +8,7 @@ <tr> <td bgcolor="{T_TH_COLOR1}"><table border="0" cellpadding="4" cellspacing="1" width="100%"> <tr> - <td colspan="6" bgcolor="{T_TH_COLOR2}" align="right"><a href="{U_VIEW_TOP10}">{L_VIEW_TOP10}</a> | <a href="{U_SORTALPHA}">{L_SORTALPHA}</a></td> + <td colspan="6" bgcolor="{T_TH_COLOR2}" align="right"><a href="{U_VIEW_TOP10}"><img src="templates/PSO/images/topten-posters.gif" border="1"></a> <a href="{U_SORTALPHA}"><img src="templates/PSO/images/alphabetical.gif" border="1"></a></td> </tr> <tr> <td bgcolor="{T_TH_COLOR3}"align="center"><font face="verdana" size="{T_FONTSIZE2}"><b>{L_USERNAME}</td> @@ -29,7 +29,12 @@ </tr> <!-- END memberrow --> <tr> - <td colspan="6" bgcolor="{T_TH_COLOR2}" align="right"><font face="{T_FONTFACE1}" size="{T_FONTSIZE2}">Page >> {PAGINATION}</font></td> + <td colspan="6" bgcolor="{T_TH_COLOR2}"><table width="100%" cellspacing="0" cellpadding="0" border="0"> + <tr> + <td><font face="{T_FONTFACE1}" size="{T_FONTSIZE2}"> {L_PAGE} <b>{ON_PAGE}</b> {L_OF} <b>{TOTAL_PAGES}</b></font></td> + <td align="right"><font face="{T_FONTFACE1}" size="{T_FONTSIZE2}">{L_GOTO_PAGE}: {PAGINATION} </font></td> + </tr> + </table></td> </tr> </table></td> </tr> diff --git a/phpBB/templates/PSO/viewforum_body.tpl b/phpBB/templates/PSO/viewforum_body.tpl index 71dbaa85e4..781e809593 100644 --- a/phpBB/templates/PSO/viewforum_body.tpl +++ b/phpBB/templates/PSO/viewforum_body.tpl @@ -37,8 +37,9 @@ <tr> <td colspan="6" bgcolor="{T_TH_COLOR2}"><table width="100%" cellspacing="0" cellpadding="0" border="0"> <tr> - <td align="left" valign="middle"><a href="{U_POST_NEW_TOPIC}"><img src="templates/PSO/images/post.gif" border="1"></a></td> - <td align="right" valign="middle"><font face="{T_FONTFACE2}" size="{T_FONTSIZE2}"> {PAGINATION} </font></td> + <td width="5" align="left" valign="middle"><a href="{U_POST_NEW_TOPIC}"><img src="templates/PSO/images/post.gif" border="1"></a></td> + <td align="left" valign="middle"> <font face="{T_FONTFACE1}" size="{T_FONTSIZE2}">{L_PAGE} <b>{ON_PAGE}</b> {L_OF} <b>{TOTAL_PAGES}</b></font> </td> + <td align="right" valign="middle"><font face="{T_FONTFACE2}" size="{T_FONTSIZE2}">{L_GOTO_PAGE}: {PAGINATION} </font></td> </tr> </table></td> </tr> diff --git a/phpBB/templates/PSO/viewtopic_body.tpl b/phpBB/templates/PSO/viewtopic_body.tpl index a4941ddab4..240a9db5fa 100644 --- a/phpBB/templates/PSO/viewtopic_body.tpl +++ b/phpBB/templates/PSO/viewtopic_body.tpl @@ -22,7 +22,7 @@ </tr> <!-- BEGIN postrow --> <tr bgcolor="{postrow.ROW_COLOR}"> - <td rowspan="2" width="20%" align="left" valign="top"><table height="100%" cellspacing="0" cellpadding="0" border="0"> + <td width="20%" align="left" valign="top"><table height="100%" cellspacing="0" cellpadding="0" border="0"> <tr> <td valign="top"><font face="{T_FONTFACE1}" size="{T_FONTSIZE2}"><b>{postrow.POSTER_NAME}</b></font><br><font face="{T_FONTFACE2}" size="{T_FONTSIZE1}">{postrow.POSTER_RANK}<br><br>{L_JOINED}: {postrow.POSTER_JOINED}<br>{L_POSTS}: {postrow.POSTER_POSTS}<br>{postrow.POSTER_FROM}</font><br><br>{postrow.POSTER_AVATAR}<br><br></td> </tr> @@ -30,12 +30,9 @@ <td valign="bottom"><font face="{T_FONTFACE1}" size="{T_FONTSIZE1}"><a href="#top">Back to top</a></font></td> </tr> </table></td> - <td bgcolor="{T_TH_COLOR2}"><font face="{T_FONTFACE1}" size="{T_FONTSIZE2}">Post Subject: {postrow.POST_SUBJECT}</font></td> - </tr> - <tr bgcolor="{postrow.ROW_COLOR}"> - <td height="100%" width="80%"><table width="100%" height="100%" cellspacing="1" cellpadding="0" border="0"> + <td width="80%" height="100%"><table width="100%" height="100%" cellspacing="1" cellpadding="0" border="0"> <tr> - <td><a name="{postrow.U_POST_ID}"></a><img src="images/posticon.gif" alt="Post image icon"><font face="{T_FONTFACE1}" size="{T_FONTSIZE1}">{L_POSTED}: {postrow.POST_DATE}</font><hr></td> + <td><a name="{postrow.U_POST_ID}"></a><img src="images/posticon.gif" alt="Post image icon"><font face="{T_FONTFACE1}" size="{T_FONTSIZE1}">{L_POSTED}: {postrow.POST_DATE} Post Subject: {postrow.POST_SUBJECT}</font><hr></td> </tr> <tr> <td height="100%" valign="top"><font face="{T_FONTFACE3}" size="{T_FONTSIZE2}" color="{T_FONTCOLOR1}">{postrow.MESSAGE}</font></td> @@ -49,8 +46,9 @@ <tr bgcolor="<?php echo $color1?>"> <td colspan="2" bgcolor="{T_TH_COLOR2}"><table width="100%" cellspacing="0" cellpadding="0" border="0"> <tr> - <td align="left" valign="middle"><a href="{U_POST_REPLY_TOPIC}"><img src="templates/PSO/images/reply.gif" border="1" /></a> <a href="{U_POST_NEW_TOPIC}"><img src="templates/PSO/images/post.gif" border="1" /></a></td> - <td align="right" valign="middle"><font face="{T_FONTFACE2}" size="{T_FONTSIZE2}">{PAGINATION}</font></td> + <td width="140" align="left" valign="middle" nowrap><a href="{U_POST_REPLY_TOPIC}"><img src="templates/PSO/images/reply.gif" border="1"></a> <a href="{U_POST_NEW_TOPIC}"><img src="templates/PSO/images/post.gif" border="1"></a></td> + <td align="left" valign="middle"> <font face="{T_FONTFACE1}" size="{T_FONTSIZE2}">{L_PAGE} <b>{ON_PAGE}</b> {L_OF} <b>{TOTAL_PAGES}</b></font> </td> + <td align="right" valign="middle"><font face="{T_FONTFACE2}" size="{T_FONTSIZE2}">{L_GOTO_PAGE}: {PAGINATION}</font></td> </tr> </table></td> </tr> |