diff options
20 files changed, 44 insertions, 148 deletions
diff --git a/phpBB/styles/subSilver/template/breadcrumbs.html b/phpBB/styles/subSilver/template/breadcrumbs.html new file mode 100644 index 0000000000..ad180250ce --- /dev/null +++ b/phpBB/styles/subSilver/template/breadcrumbs.html @@ -0,0 +1,8 @@ + <table class="tablebg" width="100%" cellspacing="1" cellpadding="0" style="margin-top: 5px;"> + <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>
\ No newline at end of file diff --git a/phpBB/styles/subSilver/template/confirm_body.html b/phpBB/styles/subSilver/template/confirm_body.html index af69325446..27d9aa0444 100644 --- a/phpBB/styles/subSilver/template/confirm_body.html +++ b/phpBB/styles/subSilver/template/confirm_body.html @@ -19,14 +19,7 @@ <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> +<!-- INCLUDE breadcrumbs.html --> <br clear="all" /> diff --git a/phpBB/styles/subSilver/template/faq_body.html b/phpBB/styles/subSilver/template/faq_body.html index 55821f289e..81c9b6296c 100644 --- a/phpBB/styles/subSilver/template/faq_body.html +++ b/phpBB/styles/subSilver/template/faq_body.html @@ -54,14 +54,7 @@ </div> -<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> +<!-- INCLUDE breadcrumbs.html --> <br clear="all" /> diff --git a/phpBB/styles/subSilver/template/forumlist_body.html b/phpBB/styles/subSilver/template/forumlist_body.html index aa1c56c3dd..22b3660f7e 100644 --- a/phpBB/styles/subSilver/template/forumlist_body.html +++ b/phpBB/styles/subSilver/template/forumlist_body.html @@ -16,15 +16,15 @@ </tr> <!-- ELSEIF forumrow.S_IS_LINK --> <tr> - <td class="row1" width="50" align="center">{forumrow.FORUM_FOLDER_IMG}</td> - <!-- IF forumrow.CLICKS --><td class="row1"><!-- ELSE --><td class="row1"><!-- ENDIF --> + <td class="row1" width="50" align="center">{forumrow.FORUM_FOLDER_IMG}</td> + <td class="row1"> <a class="forumlink" href="{forumrow.U_VIEWFORUM}">{forumrow.FORUM_NAME}</a> <p class="forumdesc">{forumrow.FORUM_DESC}</p> </td> <!-- IF forumrow.CLICKS --> <td class="row2" colspan="3" align="center"><span class="genmed">{L_REDIRECTS}: {forumrow.CLICKS}</span></td> <!-- ELSE --> - <td class="row2" colspan="3" align="center"></td> + <td class="row2" colspan="3" align="center"> </td> <!-- ENDIF --> </tr> <!-- ELSE --> diff --git a/phpBB/styles/subSilver/template/index_body.html b/phpBB/styles/subSilver/template/index_body.html index 87788d9a07..894549fe08 100644 --- a/phpBB/styles/subSilver/template/index_body.html +++ b/phpBB/styles/subSilver/template/index_body.html @@ -14,14 +14,7 @@ <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></p> - <p class="datetime">{S_TIMEZONE}</p> - </td> -</tr> -</table> +<!-- INCLUDE breadcrumbs.html --> <!-- IF S_DISPLAY_ONLINE_LIST --> <br clear="all" /> diff --git a/phpBB/styles/subSilver/template/login_body.html b/phpBB/styles/subSilver/template/login_body.html index 284b639f7d..d198b9d0ef 100644 --- a/phpBB/styles/subSilver/template/login_body.html +++ b/phpBB/styles/subSilver/template/login_body.html @@ -92,14 +92,7 @@ <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> +<!-- INCLUDE breadcrumbs.html --> <br clear="all" /> diff --git a/phpBB/styles/subSilver/template/login_forum.html b/phpBB/styles/subSilver/template/login_forum.html index 24037aa276..29c85a78ed 100644 --- a/phpBB/styles/subSilver/template/login_forum.html +++ b/phpBB/styles/subSilver/template/login_forum.html @@ -38,14 +38,7 @@ <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> +<!-- INCLUDE breadcrumbs.html --> <br clear="all" /> diff --git a/phpBB/styles/subSilver/template/mcp_approve.html b/phpBB/styles/subSilver/template/mcp_approve.html index e62476879e..b8e89b330a 100644 --- a/phpBB/styles/subSilver/template/mcp_approve.html +++ b/phpBB/styles/subSilver/template/mcp_approve.html @@ -41,14 +41,7 @@ <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> +<!-- INCLUDE breadcrumbs.html --> <br clear="all" /> diff --git a/phpBB/styles/subSilver/template/mcp_footer.html b/phpBB/styles/subSilver/template/mcp_footer.html index 43d31283bc..a575055127 100644 --- a/phpBB/styles/subSilver/template/mcp_footer.html +++ b/phpBB/styles/subSilver/template/mcp_footer.html @@ -18,14 +18,7 @@ <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> +<!-- INCLUDE breadcrumbs.html --> <br clear="all" /> diff --git a/phpBB/styles/subSilver/template/mcp_move.html b/phpBB/styles/subSilver/template/mcp_move.html index 04254307fa..78a0579de6 100644 --- a/phpBB/styles/subSilver/template/mcp_move.html +++ b/phpBB/styles/subSilver/template/mcp_move.html @@ -36,14 +36,7 @@ <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> +<!-- INCLUDE breadcrumbs.html --> <br clear="all" /> diff --git a/phpBB/styles/subSilver/template/memberlist_body.html b/phpBB/styles/subSilver/template/memberlist_body.html index c5e8fd2f94..bc5cc32ee2 100644 --- a/phpBB/styles/subSilver/template/memberlist_body.html +++ b/phpBB/styles/subSilver/template/memberlist_body.html @@ -95,14 +95,7 @@ <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> +<!-- INCLUDE breadcrumbs.html --> <br clear="all" /> diff --git a/phpBB/styles/subSilver/template/memberlist_email.html b/phpBB/styles/subSilver/template/memberlist_email.html index 408c45e280..1e4d7e9930 100644 --- a/phpBB/styles/subSilver/template/memberlist_email.html +++ b/phpBB/styles/subSilver/template/memberlist_email.html @@ -89,14 +89,7 @@ function checkForm(formObj) <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> +<!-- INCLUDE breadcrumbs.html --> <br clear="all" /> diff --git a/phpBB/styles/subSilver/template/memberlist_leaders.html b/phpBB/styles/subSilver/template/memberlist_leaders.html index 009efd5555..82009e1365 100644 --- a/phpBB/styles/subSilver/template/memberlist_leaders.html +++ b/phpBB/styles/subSilver/template/memberlist_leaders.html @@ -62,14 +62,7 @@ <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> +<!-- INCLUDE breadcrumbs.html --> <br clear="all" /> diff --git a/phpBB/styles/subSilver/template/memberlist_view.html b/phpBB/styles/subSilver/template/memberlist_view.html index dd33810495..57f4e05a3b 100644 --- a/phpBB/styles/subSilver/template/memberlist_view.html +++ b/phpBB/styles/subSilver/template/memberlist_view.html @@ -181,14 +181,7 @@ <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> +<!-- INCLUDE breadcrumbs.html --> <br clear="all" /> diff --git a/phpBB/styles/subSilver/template/overall_header.html b/phpBB/styles/subSilver/template/overall_header.html index 933da814f4..ac0f359d5b 100644 --- a/phpBB/styles/subSilver/template/overall_header.html +++ b/phpBB/styles/subSilver/template/overall_header.html @@ -134,13 +134,6 @@ function marklist(id, name, state) <br style="clear: both;" /> - <table class="tablebg" width="100%" cellspacing="1" cellpadding="0" style="margin-top: 5px;"> - <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> + <!-- INCLUDE breadcrumbs.html --> <br /> diff --git a/phpBB/styles/subSilver/template/posting_body.html b/phpBB/styles/subSilver/template/posting_body.html index 8a868825e9..ec16783b75 100644 --- a/phpBB/styles/subSilver/template/posting_body.html +++ b/phpBB/styles/subSilver/template/posting_body.html @@ -472,11 +472,8 @@ function checkForm() <!-- INCLUDE ucp_footer.html --> <!-- ELSE --> - <table class="tablebg" width="100%" cellspacing="1"> - <tr> - <td class="row1"><div class="nav" style="float:left"><a href="{U_INDEX}">{L_INDEX}</a><!-- BEGIN navlinks --> » <a href="{navlinks.U_VIEW_FORUM}">{navlinks.FORUM_NAME}</a><!-- END navlinks --></div><div class="gensmall" style="float:right">{S_TIMEZONE}</div></td> - </tr> - </table> + + <!-- INCLUDE breadcrumbs.html --> </form> diff --git a/phpBB/styles/subSilver/template/report_body.html b/phpBB/styles/subSilver/template/report_body.html index ca66a9d5f2..7065f0f35d 100644 --- a/phpBB/styles/subSilver/template/report_body.html +++ b/phpBB/styles/subSilver/template/report_body.html @@ -33,14 +33,7 @@ <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> +<!-- INCLUDE breadcrumbs.html --> <div style="float: right;"><!-- INCLUDE jumpbox.html --></div> diff --git a/phpBB/styles/subSilver/template/viewforum_body.html b/phpBB/styles/subSilver/template/viewforum_body.html index 28a6379629..f3fe86aa05 100644 --- a/phpBB/styles/subSilver/template/viewforum_body.html +++ b/phpBB/styles/subSilver/template/viewforum_body.html @@ -226,14 +226,7 @@ </div> -<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> +<!-- INCLUDE breadcrumbs.html --> <!-- IF S_DISPLAY_ONLINE_LIST --> <br clear="all" /> @@ -266,14 +259,24 @@ <td class="gensmall">{L_ICON_ANNOUNCEMENT}</td> </tr> <tr> + <td class="gensmall">{FOLDER_NEW_IMG_MINE}</td> + <td class="gensmall">{L_NEW_POSTS_MINE}</td> + <td> </td> + <td class="gensmall">{FOLDER_IMG_MINE}</td> + <td class="gensmall">{L_NO_NEW_POSTS_MINE}</td> + <td> </td> + <td width="20" align="center">{FOLDER_STICKY_IMG}</td> + <td class="gensmall">{L_ICON_STICKY}</td> + </tr> + <tr> <td width="20" align="center">{FOLDER_HOT_NEW_IMG}</td> <td class="gensmall">{L_NEW_POSTS_HOT}</td> <td> </td> <td width="20" align="center">{FOLDER_HOT_IMG}</td> <td class="gensmall">{L_NO_NEW_POSTS_HOT}</td> <td> </td> - <td width="20" align="center">{FOLDER_STICKY_IMG}</td> - <td class="gensmall">{L_ICON_STICKY}</td> + <td width="20" align="center">{FOLDER_MOVED_IMG}</td> + <td class="gensmall">{L_MOVED_TOPIC}</td> </tr> <tr> <td class="gensmall">{FOLDER_LOCKED_NEW_IMG}</td> @@ -282,8 +285,8 @@ <td class="gensmall">{FOLDER_LOCKED_IMG}</td> <td class="gensmall">{L_NO_NEW_POSTS_LOCKED}</td> <td> </td> - <td width="20" align="center">{FOLDER_MOVED_IMG}</td> - <td class="gensmall">{L_MOVED_TOPIC}</td> + <td width="20" align="center"></td> + <td class="gensmall"></td> </tr> </table> </td> diff --git a/phpBB/styles/subSilver/template/viewonline_body.html b/phpBB/styles/subSilver/template/viewonline_body.html index 0fd31c66d9..b0eff81cd9 100644 --- a/phpBB/styles/subSilver/template/viewonline_body.html +++ b/phpBB/styles/subSilver/template/viewonline_body.html @@ -47,14 +47,7 @@ <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> +<!-- INCLUDE breadcrumbs.html --> <br clear="all" /> diff --git a/phpBB/styles/subSilver/template/viewtopic_body.html b/phpBB/styles/subSilver/template/viewtopic_body.html index 9050f3109e..2b4ecbeed8 100644 --- a/phpBB/styles/subSilver/template/viewtopic_body.html +++ b/phpBB/styles/subSilver/template/viewtopic_body.html @@ -302,14 +302,7 @@ <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> +<!-- INCLUDE breadcrumbs.html --> <!-- IF S_DISPLAY_ONLINE_LIST --> <br clear="all" /> |