diff options
8 files changed, 88 insertions, 68 deletions
diff --git a/phpBB/styles/subSilver/template/confirm_body.html b/phpBB/styles/subSilver/template/confirm_body.html index beaf58c206..47680c1d15 100644 --- a/phpBB/styles/subSilver/template/confirm_body.html +++ b/phpBB/styles/subSilver/template/confirm_body.html @@ -9,7 +9,7 @@ <th>{MESSAGE_TITLE}</th> </tr> <tr> - <td class="row1" align="center"><br /><p class="gen">{MESSAGE_TEXT}</p><br />{S_HIDDEN_FIELDS}<input type="submit" name="confirm" value="{L_YES}" class="btnmain" /> <input type="submit" name="cancel" value="{L_NO}" class="btnlite" /></span></td> + <td class="row1" align="center"><br /><p class="gen">{MESSAGE_TEXT}</p><br />{S_HIDDEN_FIELDS}<input type="submit" name="confirm" value="{YES_VALUE}" class="btnmain" /> <input type="submit" name="cancel" value="{L_NO}" class="btnlite" /></span></td> </tr> </table></form> diff --git a/phpBB/styles/subSilver/template/mcp_forum.html b/phpBB/styles/subSilver/template/mcp_forum.html index 462cc2defc..b43813b60a 100644 --- a/phpBB/styles/subSilver/template/mcp_forum.html +++ b/phpBB/styles/subSilver/template/mcp_forum.html @@ -1,6 +1,6 @@ <!-- INCLUDE mcp_header.html --> - <!-- $ Id: $ --> + <!-- $Id$ --> <form method="post" name="mcp" action="{S_MCP_ACTION}"><table class="tablebg" width="100%" cellspacing="1"> <tr> diff --git a/phpBB/styles/subSilver/template/posting_attach_body.html b/phpBB/styles/subSilver/template/posting_attach_body.html index e50500d946..a4b5707803 100644 --- a/phpBB/styles/subSilver/template/posting_attach_body.html +++ b/phpBB/styles/subSilver/template/posting_attach_body.html @@ -18,6 +18,24 @@ </script> <!-- ENDIF --> +<script language="javascript" type="text/javascript"> +<!-- + function popup_progress_bar() + { + close_waitscreen = 0; + window.open('{U_PROGRESS_BAR}', '_upload', 'HEIGHT=200,resizable=yes,scrollbars=no,WIDTH=400'); + } +//--> +</script> + +<!-- IF S_CLOSE_PROGRESS_WINDOW --> +<script language="javascript" type="text/javascript"> +<!-- + close_waitscreen = 1; +//--> +</script> +<!-- ENDIF --> + <tr> <th colspan="2" height="28">{L_ADD_ATTACHMENT}</th> </tr> diff --git a/phpBB/styles/subSilver/template/report_body.html b/phpBB/styles/subSilver/template/report_body.html index 0df62ad1fe..ee9cc3987c 100644 --- a/phpBB/styles/subSilver/template/report_body.html +++ b/phpBB/styles/subSilver/template/report_body.html @@ -3,44 +3,44 @@ <!-- $Id$ --> <form method="post" action="{S_REPORT_ACTION}" name="report"> - <table class="tablebg" width="100%" cellspacing="1"> - <tr> - <th colspan="2">{L_REPORT_POST}</th> - </tr> - <tr> - <td class="row3" colspan="2"><span class="gensmall">{L_REPORT_POST_EXPLAIN}</span></td> - </tr> - <tr> - <td class="row1" width="22%"><b class="gen">{L_REASON}:</b></td> - <td class="row2" width="78%"><select name="reason_id"><!-- BEGIN reason --><option value="{reason.ID}"<!-- IF reason.S_SELECTED --> selected="selected"<!-- ENDIF -->>{reason.DESCRIPTION}</option><!-- END reason --></select></td> - </tr> - <!-- IF S_CAN_NOTIFY --> - <tr> - <td class="row1"><span class="gen"><b>{L_REPORT_NOTIFY}:</b></span><br /><span class="gensmall">{L_REPORT_NOTIFY_EXPLAIN}</span></td> - <td class="row2"><span class="gen"><input type="radio" name="notify" value="1" <!-- IF S_NOTIFY -->checked="checked" <!-- ENDIF -->/>{L_YES} <input type="radio" name="notify" value="0" <!-- IF not S_NOTIFY -->checked="checked" <!-- ENDIF -->/>{L_NO}</span></td> - </tr> - <!-- ENDIF --> - <tr> - <td class="row1" valign="top"><span class="gen"><b>{L_MORE_INFO}:</b></span><br /><span class="gensmall">{L_CAN_LEAVE_BLANK}</span></td> - <td class="row2"><textarea class="post" style="width:500px" name="report_text" rows="25" cols="40" class="post">{REPORT_TEXT}</textarea></td> - </tr> - <tr> - <td class="cat" colspan="2" align="center"><input type="submit" name="submit" class="btnmain" value="{L_SUBMIT}" /> <input type="submit" name="cancel" class="btnlite" value="{L_CANCEL}"></td> - </tr> - </table> +<table class="tablebg" width="100%" cellspacing="1"> +<tr> + <th colspan="2">{L_REPORT_POST}</th> +</tr> +<tr> + <td class="row3" colspan="2"><span class="gensmall">{L_REPORT_POST_EXPLAIN}</span></td> +</tr> +<tr> + <td class="row1" width="22%"><b class="gen">{L_REASON}:</b></td> + <td class="row2" width="78%"><select name="reason_id"><!-- BEGIN reason --><option value="{reason.ID}"<!-- IF reason.S_SELECTED --> selected="selected"<!-- ENDIF -->>{reason.DESCRIPTION}</option><!-- END reason --></select></td> +</tr> +<!-- IF S_CAN_NOTIFY --> +<tr> + <td class="row1"><span class="gen"><b>{L_REPORT_NOTIFY}:</b></span><br /><span class="gensmall">{L_REPORT_NOTIFY_EXPLAIN}</span></td> + <td class="row2"><span class="gen"><input type="radio" name="notify" value="1" <!-- IF S_NOTIFY -->checked="checked" <!-- ENDIF -->/>{L_YES} <input type="radio" name="notify" value="0" <!-- IF not S_NOTIFY -->checked="checked" <!-- ENDIF -->/>{L_NO}</span></td> +</tr> +<!-- ENDIF --> +<tr> + <td class="row1" valign="top"><span class="gen"><b>{L_MORE_INFO}:</b></span><br /><span class="gensmall">{L_CAN_LEAVE_BLANK}</span></td> + <td class="row2"><textarea class="post" style="width:500px" name="report_text" rows="25" cols="40" class="post">{REPORT_TEXT}</textarea></td> +</tr> +<tr> + <td class="cat" colspan="2" align="center"><input type="submit" name="submit" class="btnmain" value="{L_SUBMIT}" /> <input type="submit" name="cancel" class="btnlite" value="{L_CANCEL}"></td> +</tr> +</table> </form> - <br clear="all" /> +<br clear="all" /> - <table class="tablebg" width="100%" cellspacing="1" cellpadding="0"> - <tr> - <td class="row1"> - <p class="breadcrumbs"><a href="{U_INDEX}">{L_INDEX}</a><!-- BEGIN navlinks --> » <a href="{navlinks.U_VIEW_FORUM}">{navlinks.FORUM_NAME}</a><!-- END navlinks --></p> - <p class="datetime">{S_TIMEZONE}</p> - </td> - </tr> - </table> +<table class="tablebg" width="100%" cellspacing="1" cellpadding="0"> +<tr> + <td class="row1"> + <p class="breadcrumbs"><a href="{U_INDEX}">{L_INDEX}</a><!-- BEGIN navlinks --> » <a href="{navlinks.U_VIEW_FORUM}">{navlinks.FORUM_NAME}</a><!-- END navlinks --></p> + <p class="datetime">{S_TIMEZONE}</p> + </td> +</tr> +</table> - <div style="float: right;"><!-- INCLUDE jumpbox.html --></div> +<div style="float: right;"><!-- INCLUDE jumpbox.html --></div> <!-- INCLUDE overall_footer.html -->
\ No newline at end of file diff --git a/phpBB/styles/subSilver/template/ucp_attachments.html b/phpBB/styles/subSilver/template/ucp_attachments.html index c6d42d8bfa..463b4b468b 100644 --- a/phpBB/styles/subSilver/template/ucp_attachments.html +++ b/phpBB/styles/subSilver/template/ucp_attachments.html @@ -2,25 +2,13 @@ <!-- $Id$ --> -<!-- IF S_CONFIRM_DELETE --> - -<table class="tablebg" width="100%" cellspacing="1"> - <tr> - <th valign="middle">{MESSAGE_TITLE}</th> - </tr> - <tr> - <td class="row1" align="center"><span class="gen"><br />{MESSAGE_TEXT}<br /><br />{S_HIDDEN_FIELDS}<input class="btnmain" type="submit" name="confirm" value="{L_YES}" /> <input class="btnlite" type="submit" name="cancel" value="{L_NO}" /></span></td> - </tr> -</table> - -<!-- ELSEIF S_ATTACHMENT_ROWS --> +<!-- IF S_ATTACHMENT_ROWS --> <table class="tablebg" width="100%" cellspacing="1"> <tr> <th nowrap="nowrap">#</th> <th nowrap="nowrap" width="15%"><a class="th" href="{U_SORT_FILENAME}">{L_FILENAME}</a></th> <th nowrap="nowrap" width="5%"><a class="th" href="{U_SORT_POST_TIME}">{L_POST_TIME}</a></th> - <!-- th nowrap="nowrap" width="25%"><a class="th" href="{U_SORT_FILE_COMMENT}">{L_FILE_COMMENT}</a></th --> <th nowrap="nowrap" width="5%"><a class="th" href="{U_SORT_FILESIZE}">{L_FILESIZE}</a></th> <th nowrap="nowrap" width="5%"><a class="th" href="{U_SORT_DOWNLOADS}">{L_DOWNLOADS}</a></th> <th width="2%" nowrap="nowrap">{L_DELETE}</th> @@ -31,9 +19,8 @@ <!-- IF attachrow.S_ROW_COUNT is even --><tr class="row2"><!-- ELSE --><tr class="row1"><!-- ENDIF --> <td class="gen" style="padding: 4px;" align="center" width="2%"> {attachrow.ROW_NUMBER} </td> - <td style="padding: 4px;"><a class="gen" href="{attachrow.U_VIEW_ATTACHMENT}" target="file">{attachrow.FILENAME}</a><br /><span class="gensmall">{L_TOPIC}: <a href="{attachrow.U_VIEW_TOPIC}">{attachrow.TOPIC_TITLE}</a></span></td> + <td style="padding: 4px;"><a class="gen" href="{attachrow.U_VIEW_ATTACHMENT}" target="file">{attachrow.FILENAME}</a><br /><span class="gensmall"><!-- IF attachrow.S_IN_MESSAGE -->{L_PM}: <!-- ELSE -->{L_TOPIC}: <!-- ENDIF --><a href="{attachrow.U_VIEW_TOPIC}">{attachrow.TOPIC_TITLE}</a></span></td> <td class="gensmall" style="padding: 4px;" align="center" valign="middle" nowrap="nowrap"> {attachrow.POST_TIME} </td> - <!-- td class="gen" align="center">{attachrow.COMMENT}</td --> <td class="gen" style="padding: 4px;" align="center" valign="middle" nowrap="nowrap">{attachrow.SIZE}</td> <td class="gen" style="padding: 4px;" align="center">{attachrow.DOWNLOAD_COUNT}</td> <td style="padding: 4px;" align="center" valign="middle"><input type="checkbox" name="attachment[{attachrow.ATTACH_ID}]" value="1" /></td> @@ -51,7 +38,7 @@ <table class="tablebg" width="100%" cellspacing="1"> <tr> - <th height="28">{L_UCP}</th> + <th height="28">{L_TITLE}</th> </tr> <tr class="row1"> <td height="25" align="center"><b class="genmed">{L_UCP_NO_ATTACHMENTS}</b></td> diff --git a/phpBB/styles/subSilver/template/ucp_main_front.html b/phpBB/styles/subSilver/template/ucp_main_front.html index 5c6bcf1ef1..b82cc6f557 100644 --- a/phpBB/styles/subSilver/template/ucp_main_front.html +++ b/phpBB/styles/subSilver/template/ucp_main_front.html @@ -38,6 +38,10 @@ </td> </tr> + <!-- BEGINELSE --> + <tr class="row1"> + <td align="center"><b class="gen">{L_NO_IMPORTANT_NEWS}</b></td> + </tr> <!-- END topicrow --> <tr> @@ -46,12 +50,20 @@ <tr> <td class="row1" colspan="3"><table width="100%" cellspacing="1" cellpadding="4"> <tr> - <td align="right" valign="middle" nowrap="nowrap"><b class="genmed">{L_JOINED}: </b></td> + <td align="right" valign="top" nowrap="nowrap"><b class="genmed">{L_JOINED}: </b></td> <td width="100%"><b class="gen">{JOINED}</b></td> </tr> <tr> - <td align="right" valign="top" nowrap="nowrap"><b class="genmed">{L_TOTAL_POSTS}: </b></td> - <td valign="top"><!-- IF POSTS_PCT --><b class="gen">{POSTS}</b><br /><span class="genmed">[{POSTS_PCT} / {POSTS_DAY}]<br /><a href="{U_SEARCH_USER}">{L_SEARCH_YOUR_POSTS}</a></span><!-- ELSE --><b class="gen">{POSTS}<b><!-- ENDIF --></td> + <td align="right" valign="top" nowrap="nowrap"><b class="genmed">{L_TOTAL_POSTS}: </b></td> + <td><!-- IF POSTS_PCT neq 0 --><b class="gen">{POSTS}</b><br /><span class="genmed">[{POSTS_PCT} / {POSTS_DAY}]<br /><a href="{U_SEARCH_USER}">{L_SEARCH_USER_POSTS}</a></span><!-- ELSE --><b class="gen">{POSTS}<b><!-- ENDIF --></td> + </tr> + <tr> + <td align="right" valign="top" nowrap="nowrap"><b class="genmed">{L_ACTIVE_IN_FORUM}: </b></td> + <td><!-- IF ACTIVE_FORUM_PCT neq 0 --><b><a class="gen" href="{U_ACTIVE_FORUM}">{ACTIVE_FORUM}</a></b><br /><span class="genmed">[ {ACTIVE_FORUM_POSTS} / {ACTIVE_FORUM_PCT} ]</span><!-- ELSE --><span class="gen">-</span><!-- ENDIF --></td> + </tr> + <tr> + <td align="right" valign="top" nowrap="nowrap"><b class="genmed">{L_ACTIVE_IN_TOPIC}: </b></td> + <td><!-- IF ACTIVE_TOPIC_PCT neq 0 --><b><a class="gen" href="{U_ACTIVE_TOPIC}">{ACTIVE_TOPIC}</a></b><br /><span class="gensmall">[ {ACTIVE_TOPIC_POSTS} / {ACTIVE_TOPIC_PCT} ]</span><!-- ELSE --><span class="gen">-</span><!-- ENDIF --></td> </tr> <!-- IF KARMA --> <tr> diff --git a/phpBB/styles/subSilver/template/viewforum_body.html b/phpBB/styles/subSilver/template/viewforum_body.html index 84c05981b7..2916165c4e 100644 --- a/phpBB/styles/subSilver/template/viewforum_body.html +++ b/phpBB/styles/subSilver/template/viewforum_body.html @@ -53,12 +53,12 @@ <td class="row1" width="120" align="center"> <p class="topicdetails">{topicrow.LAST_POST_TIME}</p> <p class="topicdetails"> - <!-- IF forumrow.U_LAST_POSTER --> - <a href="{forumrow.U_LAST_POST_AUTHOR}">{topicrow.LAST_POST_AUTHOR}</a> + <!-- IF topicrow.U_LAST_POST_AUTHOR --> + <a href="{topicrow.U_LAST_POST_AUTHOR}">{topicrow.LAST_POST_AUTHOR}</a> <!-- ELSE --> {topicrow.LAST_POST_AUTHOR} <!-- ENDIF --> - <a href="{forumrow.U_LAST_POST}">{topicrow.LAST_POST_IMG}</a> + <a href="{topicrow.U_LAST_POST}">{topicrow.LAST_POST_IMG}</a> </p> </td> </tr> @@ -124,7 +124,7 @@ <tr> <td class="cat" colspan="<!-- IF S_TOPIC_ICONS -->7<!-- ELSE -->6<!-- ENDIF -->"><table width="100%" cellspacing="0"> <tr class="nav"> - <td valign="middle"> <!-- IF S_WATCH_FORUM -->{S_WATCH_FORUM}<!-- ENDIF --></td> + <td valign="middle"> <!-- IF S_WATCH_FORUM_LINK --><a href="{S_WATCH_FORUM_LINK}">{S_WATCH_FORUM_TITLE}</a><!-- ENDIF --></td> <td align="right" valign="middle"><a href="{U_MARK_TOPICS}">{L_MARK_TOPICS_READ}</a> </td> </tr> </table></td> @@ -173,12 +173,12 @@ <td class="row1" width="120" align="center"> <p class="topicdetails">{topicrow.LAST_POST_TIME}</p> <p class="topicdetails"> - <!-- IF forumrow.U_LAST_POSTER --> - <a href="{forumrow.U_LAST_POST_AUTHOR}">{topicrow.LAST_POST_AUTHOR}</a> + <!-- IF topicrow.U_LAST_POSTER --> + <a href="{topicrow.U_LAST_POST_AUTHOR}">{topicrow.LAST_POST_AUTHOR}</a> <!-- ELSE --> {topicrow.LAST_POST_AUTHOR} <!-- ENDIF --> - <a href="{forumrow.U_LAST_POST}">{topicrow.LAST_POST_IMG}</a> + <a href="{topicrow.U_LAST_POST}">{topicrow.LAST_POST_IMG}</a> </p> </td> </tr> @@ -254,7 +254,7 @@ <td class="gensmall">{L_NO_NEW_POSTS}</td> <td> </td> <td width="20" align="center">{FOLDER_ANNOUNCE_IMG}</td> - <td class="gensmall">{L_POST_ANNOUNCEMENT}</td> + <td class="gensmall">{L_ICON_ANNOUNCEMENT}</td> </tr> <tr> <td width="20" align="center">{FOLDER_HOT_NEW_IMG}</td> @@ -264,7 +264,7 @@ <td class="gensmall">{L_NO_NEW_POSTS_HOT}</td> <td> </td> <td width="20" align="center">{FOLDER_STICKY_IMG}</td> - <td class="gensmall">{L_POST_STICKY}</td> + <td class="gensmall">{L_ICON_STICKY}</td> </tr> <tr> <td class="gensmall">{FOLDER_LOCKED_NEW_IMG}</td> diff --git a/phpBB/styles/subSilver/template/viewtopic_body.html b/phpBB/styles/subSilver/template/viewtopic_body.html index 728333c24e..cea26f5a47 100644 --- a/phpBB/styles/subSilver/template/viewtopic_body.html +++ b/phpBB/styles/subSilver/template/viewtopic_body.html @@ -205,16 +205,19 @@ <span class="postbody"><br />_________________<br />{postrow.SIGNATURE}</span> <!-- ENDIF --> <!-- IF postrow.EDITED_MESSAGE or postrow.EDIT_REASON --> - <span class="gensmall">{postrow.EDITED_MESSAGE}</span> <!-- IF postrow.EDIT_REASON --> + <br /><br /> <table class="tablebg" width="100%" cellspacing="1"> <tr> - <td class="row3"><b class="genmed">{L_REASON}: </b></td> + <td class="row3"><span class="gensmall">{postrow.EDITED_MESSAGE}</span></td> </tr> <tr> <td class="row2"><span class="genmed">{postrow.EDIT_REASON}</span></td> </tr> </table> + <!-- ELSE --> + <br /><br /> + <span class="gensmall">{postrow.EDITED_MESSAGE}</span> <!-- ENDIF --> <!-- ENDIF --> <!-- IF postrow.BUMPED_MESSAGE --> @@ -242,7 +245,7 @@ <!-- ELSE --> <tr class="row2"> <!-- ENDIF --> - <td></td> + <td nowrap="nowrap"><span class="gensmall"><!-- IF postrow.U_MCP_DETAILS -->[ <a href="{postrow.U_MCP_DETAILS}">{L_POST_DETAILS}</a> ]<!-- ENDIF --></span></td> <td><div class="gensmall" style="float:left"> <!-- IF postrow.U_PROFILE --><a href="{postrow.U_PROFILE}">{PROFILE_IMG}</a> <!-- ENDIF --> <!-- IF postrow.U_PM --><a href="{postrow.U_PM}">{PM_IMG}</a> <!-- ENDIF --> <!-- IF postrow.U_EMAIL --><a href="{postrow.U_EMAIL}">{EMAIL_IMG}</a> <!-- ENDIF --> </div> <div class="gensmall" style="float:right"><!-- IF postrow.U_QUOTE --><a href="{postrow.U_QUOTE}">{QUOTE_IMG}</a> <!-- ENDIF --> <!-- IF postrow.U_EDIT --><a href="{postrow.U_EDIT}">{EDIT_IMG}</a> <!-- ENDIF --> </div></td> </tr> |