diff options
Diffstat (limited to 'phpBB/styles/subsilver2')
17 files changed, 229 insertions, 35 deletions
diff --git a/phpBB/styles/subsilver2/template/bbcode.html b/phpBB/styles/subsilver2/template/bbcode.html index efcf5e1acb..5558716cad 100644 --- a/phpBB/styles/subsilver2/template/bbcode.html +++ b/phpBB/styles/subsilver2/template/bbcode.html @@ -21,11 +21,11 @@ <!-- END quote_close --> <!-- BEGIN code_open --> -<div class="codetitle"><b>{L_CODE}{L_COLON}</b></div><div class="codecontent"> +<div class="codetitle"><b>{L_CODE}{L_COLON}</b></div><pre class="codecontent"> <!-- END code_open --> <!-- BEGIN code_close --> -</div> +</pre> <!-- END code_close --> <!-- BEGIN inline_attachment_open --> diff --git a/phpBB/styles/subsilver2/template/confirm_delete_body.html b/phpBB/styles/subsilver2/template/confirm_delete_body.html new file mode 100644 index 0000000000..9e416f5195 --- /dev/null +++ b/phpBB/styles/subsilver2/template/confirm_delete_body.html @@ -0,0 +1,56 @@ +<!-- INCLUDE overall_header.html --> + +<div id="pagecontent"> + + <form name="confirm" action="{S_CONFIRM_ACTION}" method="post"> + + <table class="tablebg" width="100%" cellspacing="1"> + <tr> + <th>{MESSAGE_TITLE}</th> + </tr> + <tr> + <td class="row1" align="center"> + <br /> + <p class="gen">{MESSAGE_TEXT}</p> + <br /> + + <!-- IF not S_SOFTDELETED and (S_DELETE_REASON or (S_ALLOWED_DELETE and S_ALLOWED_SOFTDELETE)) --> + <table border="0" width="90%" cellspacing="2" cellpadding="1"> + <!-- IF S_ALLOWED_DELETE and S_ALLOWED_SOFTDELETE --> + <tr> + <td class="row1" width="22%"><b class="gen">{L_DELETE_PERMANENTLY}{L_COLON}</b></td> + <td class="row1" width="78%"> + <input id="delete_permanent" name="delete_permanent" type="checkbox" value="1" {S_CHECKED_PERMANENT} /> + <!-- IF S_TOPIC_MODE -->{L_DELETE_TOPIC_PERMANENTLY}<!-- ELSE -->{L_DELETE_POST_PERMANENTLY}<!-- ENDIF --> + </td> + </tr> + <!-- ENDIF --> + <!-- IF S_DELETE_REASON --> + <tr> + <td class="row1" valign="top"><span class="gen"><b>{L_DELETE_REASON}{L_COLON}</b></span><br /><span class="gensmall">{L_DELETE_REASON_EXPLAIN}</span></td> + <td class="row1"><input type="text" name="delete_reason" value="" class="inputbox autowidth" maxlength="120" size="45" /></td> + </tr> + <!-- ENDIF --> + </table> + <br /> + <!-- ENDIF --> + {S_HIDDEN_FIELDS} + <input type="submit" name="confirm" value="{L_YES}" class="btnmain" /> + <input type="submit" name="cancel" value="{L_NO}" class="btnlite" /> + </td> + </tr> + </table> + + </form> + +</div> + +<br clear="all" /> + +<!-- INCLUDE breadcrumbs.html --> + +<br clear="all" /> + +<div align="{S_CONTENT_FLOW_END}"><!-- INCLUDE jumpbox.html --></div> + +<!-- INCLUDE overall_footer.html --> diff --git a/phpBB/styles/subsilver2/template/forumlist_body.html b/phpBB/styles/subsilver2/template/forumlist_body.html index 3e30561f3a..a222607ae8 100644 --- a/phpBB/styles/subsilver2/template/forumlist_body.html +++ b/phpBB/styles/subsilver2/template/forumlist_body.html @@ -64,7 +64,14 @@ <!-- EVENT forumlist_body_last_post_title_prepend --> <p class="topicdetails"><a href="{forumrow.U_LAST_POST}" title="{forumrow.LAST_POST_SUBJECT}" class="lastsubject">{forumrow.LAST_POST_SUBJECT_TRUNCATED}</a></p> <!-- ENDIF --> - <p class="topicdetails"><!-- IF forumrow.U_UNAPPROVED_TOPICS --><a href="{forumrow.U_UNAPPROVED_TOPICS}" class="imageset">{UNAPPROVED_IMG}</a> <!-- ENDIF -->{forumrow.LAST_POST_TIME}</p> + <p class="topicdetails"> + <!-- IF forumrow.U_UNAPPROVED_TOPICS --> + <a href="{forumrow.U_UNAPPROVED_TOPICS}" class="imageset">{UNAPPROVED_IMG}</a> + <!-- ELSEIF forumrow.U_UNAPPROVED_POSTS --> + <a href="{forumrow.U_UNAPPROVED_POSTS}" class="imageset">{UNAPPROVED_POST_IMG}</a> + <!-- ENDIF --> + {forumrow.LAST_POST_TIME} + </p> <p class="topicdetails">{forumrow.LAST_POSTER_FULL} <!-- IF not S_IS_BOT --><a href="{forumrow.U_LAST_POST}" class="imageset">{LAST_POST_IMG}</a><!-- ENDIF --> </p> diff --git a/phpBB/styles/subsilver2/template/mcp_approve.html b/phpBB/styles/subsilver2/template/mcp_approve.html index 5ad7d2f9b5..8c2ef0806b 100644 --- a/phpBB/styles/subsilver2/template/mcp_approve.html +++ b/phpBB/styles/subsilver2/template/mcp_approve.html @@ -16,7 +16,7 @@ <!-- IF S_NOTIFY_POSTER --> <input type="checkbox" class="radio" name="notify_poster" checked="checked" /><span class="gen"><!-- IF S_APPROVE -->{L_NOTIFY_POSTER_APPROVAL}<!-- ELSE -->{L_NOTIFY_POSTER_DISAPPROVAL}<!-- ENDIF --></span><br /> <!-- ENDIF --> - <!-- IF not S_APPROVE --> + <!-- IF not S_APPROVE and not S_RESTORE and .reason --> <br /> <table border="0" width="90%" cellspacing="2" cellpadding="1"> <tr> diff --git a/phpBB/styles/subsilver2/template/mcp_forum.html b/phpBB/styles/subsilver2/template/mcp_forum.html index 6972f14b79..b168bf3ac8 100644 --- a/phpBB/styles/subsilver2/template/mcp_forum.html +++ b/phpBB/styles/subsilver2/template/mcp_forum.html @@ -33,6 +33,9 @@ <!-- IF topicrow.S_TOPIC_UNAPPROVED or topicrow.S_POSTS_UNAPPROVED --> <a href="{topicrow.U_MCP_QUEUE}" class="imageset">{topicrow.UNAPPROVED_IMG}</a> <!-- ENDIF --> + <!-- IF topicrow.S_TOPIC_DELETED or topicrow.S_POSTS_DELETED --> + <a href="{topicrow.U_MCP_QUEUE}" class="imageset">{topicrow.DELETED_IMG}</a> + <!-- ENDIF --> <!-- IF topicrow.S_TOPIC_REPORTED and topicrow.U_MCP_REPORT --> <a href="{topicrow.U_MCP_REPORT}" class="imageset">{REPORTED_IMG}</a> <!-- ENDIF --> @@ -58,6 +61,7 @@ <select name="action"> <option value="" selected="selected">{L_SELECT_ACTION}</option> <!-- IF S_CAN_DELETE --><option value="delete_topic">{L_DELETE}</option><!-- ENDIF --> + <!-- IF S_CAN_RESTORE --><option value="restore_topic">{L_RESTORE}</option><!-- ENDIF --> <!-- IF S_CAN_MERGE --><option value="merge_topics">{L_MERGE}</option><!-- ENDIF --> <!-- IF S_CAN_MOVE --><option value="move">{L_MOVE}</option><!-- ENDIF --> <!-- IF S_CAN_FORK --><option value="fork">{L_FORK}</option><!-- ENDIF --> diff --git a/phpBB/styles/subsilver2/template/mcp_post.html b/phpBB/styles/subsilver2/template/mcp_post.html index 910accd09f..a3ebb00d06 100644 --- a/phpBB/styles/subsilver2/template/mcp_post.html +++ b/phpBB/styles/subsilver2/template/mcp_post.html @@ -50,7 +50,12 @@ </tr> <tr> <td class="row1"><b class="gen"><!-- IF S_PM -->{L_PM_SUBJECT}<!-- ELSE -->{L_POST_SUBJECT}<!-- ENDIF -->{L_COLON} </b></td> - <td class="row2"><span class="gen">{POST_SUBJECT}</span> <!-- IF S_POST_UNAPPROVED --><span class="postapprove">{UNAPPROVED_IMG} <a href="{U_MCP_APPROVE}">{L_POST_UNAPPROVED}</a></span> <!-- ENDIF --> <!-- IF S_POST_REPORTED and not S_MCP_REPORT --><span class="postreported">{REPORTED_IMG} <a href="{U_MCP_REPORT}">{L_POST_REPORTED}</a></span><!-- ENDIF --></td> + <td class="row2"> + <span class="gen">{POST_SUBJECT}</span> + <!-- IF S_POST_UNAPPROVED --><span class="postapprove">{UNAPPROVED_IMG} <a href="{U_MCP_APPROVE}">{L_POST_UNAPPROVED}</a></span> <!-- ENDIF --> + <!-- IF S_POST_DELETED --><span class="postapprove">{DELETED_IMG} <a href="{U_MCP_APPROVE}">{L_POST_DELETED}</a></span> <!-- ENDIF --> + <!-- IF S_POST_REPORTED and not S_MCP_REPORT --><span class="postreported">{REPORTED_IMG} <a href="{U_MCP_REPORT}">{L_POST_REPORTED}</a></span><!-- ENDIF --> + </td> </tr> <tr> <td class="row1" width="20%"><b class="gen"><!-- IF S_PM -->{L_PM_FROM}<!-- ELSE -->{L_POSTER}<!-- ENDIF -->{L_COLON} </b></td> diff --git a/phpBB/styles/subsilver2/template/mcp_queue.html b/phpBB/styles/subsilver2/template/mcp_queue.html index febde7e59c..7ca659b5da 100644 --- a/phpBB/styles/subsilver2/template/mcp_queue.html +++ b/phpBB/styles/subsilver2/template/mcp_queue.html @@ -23,15 +23,37 @@ <td style="padding: 4px;" align="{S_CONTENT_FLOW_BEGIN}" valign="top" nowrap="nowrap"><span class="gen">{postrow.POST_AUTHOR_FULL}</span><br /> <span class="gensmall">[ <a href="{postrow.U_VIEW_DETAILS}">{L_VIEW_DETAILS}</a> ]</span></td> <td class="postdetails" style="padding: 4px;" align="{S_CONTENT_FLOW_BEGIN}" valign="top" nowrap="nowrap">{postrow.POST_TIME}</td> - <td align="center"><input type="checkbox" class="radio" name="post_id_list[]" value="{postrow.POST_ID}" /></td> + <td align="center"> + <!-- IF S_TOPICS --> + <input type="checkbox" class="radio" name="topic_id_list[]" value="{postrow.TOPIC_ID}" /> + <!-- ELSE --> + <input type="checkbox" class="radio" name="post_id_list[]" value="{postrow.POST_ID}" /> + <!-- ENDIF --> + </td> </tr> <!-- BEGINELSE --> <tr> - <td class="row1" colspan="4" height="30" align="center" valign="middle"><span class="gen"><!-- IF S_TOPICS -->{L_NO_TOPICS_QUEUE}<!-- ELSE -->{L_NO_POSTS_QUEUE}<!-- ENDIF --></span></td> + <td class="row1" colspan="4" height="30" align="center" valign="middle"> + <span class="gen"> + <!-- IF S_RESTORE --> + <!-- IF S_TOPICS -->{L_NO_TOPICS_DELETED}<!-- ELSE -->{L_NO_POSTS_DELETED}<!-- ENDIF --> + <!-- ELSE --> + <!-- IF S_TOPICS -->{L_NO_TOPICS_QUEUE}<!-- ELSE -->{L_NO_POSTS_QUEUE}<!-- ENDIF --> + <!-- ENDIF --> + </span> + </td> </tr> <!-- END postrow --> <tr> - <td class="cat" colspan="4" align="center"><input class="btnmain" type="submit" name="action[approve]" value="{L_APPROVE}" /> <input class="btnlite" type="submit" name="action[disapprove]" value="{L_DISAPPROVE}" /></td> + <td class="cat" colspan="4" align="center"> + <!-- IF S_RESTORE --> + <input class="btnlite" type="submit" name="action[delete]" value="{L_DELETE}" /> + <input class="btnmain" type="submit" name="action[restore]" value="{L_RESTORE}" /> + <!-- ELSE --> + <input class="btnmain" type="submit" name="action[approve]" value="{L_APPROVE}" /> + <input class="btnlite" type="submit" name="action[disapprove]" value="{L_DISAPPROVE}" /> + <!-- ENDIF --> + </td> </tr> </table> {S_FORM_TOKEN} @@ -39,7 +61,15 @@ <table width="100%" cellspacing="2" cellpadding="2" border="0" align="center"> <tr> - <td align="{S_CONTENT_FLOW_END}" valign="top" nowrap="nowrap"><b class="gensmall"><a href="#" onclick="marklist('mcp', '', true); return false;">{L_MARK_ALL}</a> :: <a href="#" onclick="marklist('mcp', '', false); return false;">{L_UNMARK_ALL}</a></b></td> + <td align="{S_CONTENT_FLOW_END}" valign="top" nowrap="nowrap"> + <b class="gensmall"> + <!-- IF S_TOPICS --> + <a href="#" onclick="marklist('mcp', 'topic_id_list', true); return false;">{L_MARK_ALL}</a> :: <a href="#" onclick="marklist('mcp', 'topic_id_list', false); return false;">{L_UNMARK_ALL}</a> + <!-- ELSE --> + <a href="#" onclick="marklist('mcp', 'post_id_list', true); return false;">{L_MARK_ALL}</a> :: <a href="#" onclick="marklist('mcp', 'post_id_list', false); return false;">{L_UNMARK_ALL}</a> + <!-- ENDIF --> + </b> + </td> </tr> </table> diff --git a/phpBB/styles/subsilver2/template/mcp_topic.html b/phpBB/styles/subsilver2/template/mcp_topic.html index 014d8b9468..d3b4408243 100644 --- a/phpBB/styles/subsilver2/template/mcp_topic.html +++ b/phpBB/styles/subsilver2/template/mcp_topic.html @@ -112,6 +112,7 @@ <tr valign="middle"> <td width="100%"> <!-- IF postrow.S_POST_UNAPPROVED and postrow.U_MCP_APPROVE --><span class="postapprove">{UNAPPROVED_IMG} <a href="{postrow.U_MCP_APPROVE}">{L_POST_UNAPPROVED}</a></span><br /><!-- ENDIF --> + <!-- IF postrow.S_POST_DELETED and postrow.U_MCP_APPROVE --><span class="postapprove">{DELETED_IMG} <a href="{postrow.U_MCP_APPROVE}">{L_POST_DELETED}</a></span><br /><!-- ENDIF --> <!-- IF postrow.S_POST_REPORTED and postrow.U_MCP_REPORT --><span class="postreported">{REPORTED_IMG} <a href="{postrow.U_MCP_REPORT}">{L_POST_REPORTED}</a></span><!-- ENDIF --> </td> <td width="10" nowrap="nowrap">{postrow.MINI_POST_IMG}</td> @@ -133,6 +134,7 @@ <!-- IF S_CAN_APPROVE --><option value="approve">{L_APPROVE_POSTS}</option><!-- ENDIF --> <!-- IF S_CAN_LOCK --><option value="lock_post">{L_LOCK_POST_POSTS} [ {L_LOCK_POST_EXPLAIN} ]</option><option value="unlock_post">{L_UNLOCK_POST_POSTS}</option><!-- ENDIF --> <!-- IF S_CAN_DELETE --><option value="delete_post">{L_DELETE_POSTS}</option><!-- ENDIF --> + <!-- IF S_CAN_RESTORE --><option value="restore">{L_RESTORE_POSTS}</option><!-- ENDIF --> <!-- IF S_CAN_MERGE --><option value="merge_posts"<!-- IF ACTION eq 'merge' --> selected="selected"<!-- ENDIF -->>{L_MERGE_POSTS}</option><!-- ENDIF --> <!-- IF S_CAN_SPLIT --><option value="split_all"<!-- IF ACTION eq 'split' --> selected="selected"<!-- ENDIF -->>{L_SPLIT_POSTS}</option><option value="split_beyond">{L_SPLIT_AFTER}</option><!-- ENDIF --> <!-- IF S_CAN_SYNC --><option value="resync">{L_RESYNC}</option><!-- ENDIF --> diff --git a/phpBB/styles/subsilver2/template/overall_header.html b/phpBB/styles/subsilver2/template/overall_header.html index bc2307154b..b0d7ce6fab 100644 --- a/phpBB/styles/subsilver2/template/overall_header.html +++ b/phpBB/styles/subsilver2/template/overall_header.html @@ -154,8 +154,8 @@ function marklist(id, name, state) <table width="100%" cellspacing="0"> <tr> <td class="genmed"> - <!-- IF S_NOTIFICATIONS_DISPLAY --> - [ <a href="{U_VIEW_ALL_NOTIFICATIONS}" id="notification_list_button">{NOTIFICATIONS_COUNT}</a> ] • + <!-- IF S_NOTIFICATIONS_DISPLAY and not S_IS_BOT and S_USER_LOGGED_IN --> + [ <a href="{U_VIEW_ALL_NOTIFICATIONS}" id="notification_list_button">{NOTIFICATIONS_COUNT}</a> ] <div id="notification_list" class="notification_list"> <div class="row1 header"> {L_NOTIFICATIONS} diff --git a/phpBB/styles/subsilver2/template/posting_body.html b/phpBB/styles/subsilver2/template/posting_body.html index 4feb4e955a..635b05aaa0 100644 --- a/phpBB/styles/subsilver2/template/posting_body.html +++ b/phpBB/styles/subsilver2/template/posting_body.html @@ -114,13 +114,6 @@ </tr> <!-- ENDIF --> -<!-- IF S_DELETE_ALLOWED --> - <tr> - <td class="row1"><b class="genmed">{L_DELETE_POST}{L_COLON}</b></td> - <td class="row2"><input type="checkbox" class="radio" name="delete" /> <span class="gensmall">[ {L_DELETE_POST_WARN} ]</span></td> - </tr> -<!-- ENDIF --> - <!-- IF S_SHOW_TOPIC_ICONS or S_SHOW_PM_ICONS --> <tr> <td class="row1"><b class="genmed">{L_ICON}{L_COLON}</b></td> @@ -310,7 +303,7 @@ <!-- IF S_TYPE_TOGGLE --> <tr> - <td> </td> + <td></td> <td class="gen"><!-- IF S_EDIT_POST -->{L_CHANGE_TOPIC_TO}<!-- ELSE -->{L_POST_TOPIC_AS}<!-- ENDIF -->{L_COLON} <!-- BEGIN topic_type --><input type="radio" class="radio" name="topic_type" value="{topic_type.VALUE}"{topic_type.S_CHECKED} />{topic_type.L_TOPIC_TYPE} <!-- END topic_type --></td> </tr> <!-- ENDIF --> @@ -319,6 +312,26 @@ </td> </tr> +<!-- IF S_SOFTDELETE_ALLOWED or S_DELETE_ALLOWED --> + <tr> + <td class="row1" valign="top"><b class="genmed">{L_DELETE_POST}{L_COLON}</b></td> + <td class="row2"> + <table cellpadding="1"> + <tr> + <td><input type="checkbox" class="radio" name="delete" /></td> + <td class="gen">{L_DELETE_POST_WARN}</td> + </tr> + <!-- IF S_SOFTDELETE_ALLOWED and S_DELETE_ALLOWED --> + <tr> + <td><input type="checkbox" class="radio" name="delete_permanent" /></td> + <td class="gen">{L_DELETE_POST_PERMANENTLY}</td> + </tr> + <!-- ENDIF --> + </table> + </td> + </tr> +<!-- ENDIF --> + <!-- IF S_TOPIC_TYPE_ANNOUNCE or S_TOPIC_TYPE_STICKY --> <tr> <td class="row1"><b class="genmed">{L_STICK_TOPIC_FOR}{L_COLON}</b><br /><span class="gensmall">{L_STICKY_ANNOUNCE_TIME_LIMIT}</span></td> diff --git a/phpBB/styles/subsilver2/template/posting_smilies.html b/phpBB/styles/subsilver2/template/posting_smilies.html index 30a80e26ab..d0ced9ff12 100644 --- a/phpBB/styles/subsilver2/template/posting_smilies.html +++ b/phpBB/styles/subsilver2/template/posting_smilies.html @@ -2,8 +2,8 @@ <script type="text/javascript"> // <![CDATA[ - var form_name = 'postform'; - var text_name = 'message'; + var form_name = opener.form_name; + var text_name = opener.text_name; // ]]> </script> <script type="text/javascript" src="{T_SUPER_TEMPLATE_PATH}/editor.js"></script> diff --git a/phpBB/styles/subsilver2/template/search_results.html b/phpBB/styles/subsilver2/template/search_results.html index 8ced5a5301..19ba0b196a 100644 --- a/phpBB/styles/subsilver2/template/search_results.html +++ b/phpBB/styles/subsilver2/template/search_results.html @@ -34,11 +34,15 @@ <!-- ENDIF --> </td> <td class="row1"> + <!-- EVENT topiclist_row_prepend --> <!-- IF searchresults.S_UNREAD_TOPIC --><a href="{searchresults.U_NEWEST_POST}" class="imageset">{NEWEST_POST_IMG}</a><!-- ENDIF --> {searchresults.ATTACH_ICON_IMG} <a href="{searchresults.U_VIEW_TOPIC}" class="topictitle">{searchresults.TOPIC_TITLE}</a> <!-- IF searchresults.S_TOPIC_UNAPPROVED or searchresults.S_POSTS_UNAPPROVED --> <a href="{searchresults.U_MCP_QUEUE}" class="imageset">{searchresults.UNAPPROVED_IMG}</a> <!-- ENDIF --> + <!-- IF searchresults.S_TOPIC_DELETED --> + <a href="{searchresults.U_MCP_QUEUE}" class="imageset">{DELETED_IMG}</a> + <!-- ENDIF --> <!-- IF searchresults.S_TOPIC_REPORTED --> <a href="{searchresults.U_MCP_REPORT}" class="imageset">{REPORTED_IMG}</a> <!-- ENDIF --> @@ -55,6 +59,7 @@ ] </p> <!-- ENDIF --> <p class="gensmall">{L_IN} <a href="{searchresults.U_VIEW_FORUM}">{searchresults.FORUM_TITLE}</a></p> + <!-- EVENT topiclist_row_append --> </td> <td class="row2" width="100" align="center"><p class="topicauthor">{searchresults.TOPIC_AUTHOR_FULL}</p></td> <td class="row1" width="50" align="center"><p class="topicdetails">{searchresults.TOPIC_REPLIES}</p></td> diff --git a/phpBB/styles/subsilver2/template/ucp_profile_signature.html b/phpBB/styles/subsilver2/template/ucp_profile_signature.html index 467018dd1c..85c8b0f616 100644 --- a/phpBB/styles/subsilver2/template/ucp_profile_signature.html +++ b/phpBB/styles/subsilver2/template/ucp_profile_signature.html @@ -1,13 +1,22 @@ <!-- INCLUDE ucp_header.html --> +<script type="text/javascript"> +// <![CDATA[ + var form_name = 'ucp'; + var text_name = 'signature'; +// ]]> +</script> + <!-- DEFINE $S_SIGNATURE = 1 --> <table class="tablebg" width="100%" cellspacing="1"> <tr> <th colspan="2">{L_TITLE}</th> </tr> +<!-- IF not S_SMILIES_ALLOWED --> <tr> <td colspan="2" class="row1">{L_SIGNATURE_EXPLAIN}</td> </tr> +<!-- ENDIF --> <!-- IF ERROR --> <tr> @@ -16,14 +25,32 @@ <!-- ENDIF --> <tr> - <td colspan="2" class="row2"> - <script type="text/javascript"> - // <![CDATA[ - var form_name = 'ucp'; - var text_name = 'signature'; - // ]]> - </script> - + <!-- IF S_SMILIES_ALLOWED --> + <td class="row1" width="22%" valign="top"> + {L_SIGNATURE_EXPLAIN} + <table width="100%" cellspacing="5" cellpadding="0" border="0" align="center"> + <tr> + <td class="gensmall" align="center"><b>{L_SMILIES}</b></td> + </tr> + <tr> + <td align="center"> + <!-- BEGIN smiley --> + <a href="#" onclick="insert_text('{smiley.A_SMILEY_CODE}', true); return false;" style="line-height: 20px;"><img src="{smiley.SMILEY_IMG}" width="{smiley.SMILEY_WIDTH}" height="{smiley.SMILEY_HEIGHT}" alt="{smiley.SMILEY_CODE}" title="{smiley.SMILEY_DESC}" hspace="2" vspace="2" /></a> + <!-- END smiley --> + </td> + </tr> + <!-- IF S_SHOW_SMILEY_LINK --> + <tr> + <td align="center"><a class="nav" href="{U_MORE_SMILIES}" onclick="popup(this.href, 300, 350, '_phpbbsmilies'); return false;">{L_MORE_SMILIES}</a></td> + </tr> + <!-- ENDIF --> + </table> + </td> + <td class="row2"> + <!-- ELSE --> + <td class="row2" colspan="2"> + <!-- ENDIF --> + <table cellspacing="0" cellpadding="2" border="0" width="99%"> <!-- INCLUDE posting_buttons.html --> <tr> diff --git a/phpBB/styles/subsilver2/template/viewforum_body.html b/phpBB/styles/subsilver2/template/viewforum_body.html index 664a6a26c5..dfbe0a605b 100644 --- a/phpBB/styles/subsilver2/template/viewforum_body.html +++ b/phpBB/styles/subsilver2/template/viewforum_body.html @@ -40,10 +40,14 @@ <td class="row1" width="25" align="center"><!-- IF topicrow.TOPIC_ICON_IMG --><img src="{T_ICONS_PATH}{topicrow.TOPIC_ICON_IMG}" width="{topicrow.TOPIC_ICON_IMG_WIDTH}" height="{topicrow.TOPIC_ICON_IMG_HEIGHT}" alt="" title="" /><!-- ENDIF --></td> <!-- ENDIF --> <td class="row1"> + <!-- EVENT topiclist_row_prepend --> <!-- IF topicrow.S_UNREAD_TOPIC --><a href="{topicrow.U_NEWEST_POST}" class="imageset">{NEWEST_POST_IMG}</a><!-- ENDIF --> {topicrow.ATTACH_ICON_IMG} <!-- IF topicrow.S_HAS_POLL or topicrow.S_TOPIC_MOVED --><b>{topicrow.TOPIC_TYPE}</b> <!-- ENDIF --><a title="{L_POSTED}{L_COLON} {topicrow.FIRST_POST_TIME}" href="{topicrow.U_VIEW_TOPIC}"class="topictitle">{topicrow.TOPIC_TITLE}</a> <!-- IF topicrow.S_TOPIC_UNAPPROVED or topicrow.S_POSTS_UNAPPROVED --> - <a href="{topicrow.U_MCP_QUEUE}" class="imageset">{UNAPPROVED_IMG}</a> + <a href="{topicrow.U_MCP_QUEUE}" class="imageset">{topicrow.UNAPPROVED_IMG}</a> + <!-- ENDIF --> + <!-- IF topicrow.S_TOPIC_DELETED --> + <a href="{topicrow.U_MCP_QUEUE}" class="imageset">{DELETED_IMG}</a> <!-- ENDIF --> <!-- IF topicrow.S_TOPIC_REPORTED --> <a href="{topicrow.U_MCP_REPORT}" class="imageset">{REPORTED_IMG}</a> @@ -60,6 +64,7 @@ <!-- END pagination --> ] </p> <!-- ENDIF --> + <!-- EVENT topiclist_row_append --> </td> <td class="row2" width="130" align="center"><p class="topicauthor">{topicrow.TOPIC_AUTHOR_FULL}</p></td> <td class="row1" width="50" align="center"><p class="topicdetails">{topicrow.REPLIES}</p></td> @@ -200,11 +205,15 @@ <td class="row1" width="25" align="center"><!-- IF topicrow.TOPIC_ICON_IMG --><img src="{T_ICONS_PATH}{topicrow.TOPIC_ICON_IMG}" width="{topicrow.TOPIC_ICON_IMG_WIDTH}" height="{topicrow.TOPIC_ICON_IMG_HEIGHT}" alt="" title="" /><!-- ENDIF --></td> <!-- ENDIF --> <td class="row1"> + <!-- EVENT topiclist_row_prepend --> <!-- IF topicrow.S_UNREAD_TOPIC --><a href="{topicrow.U_NEWEST_POST}" class="imageset">{NEWEST_POST_IMG}</a><!-- ENDIF --> {topicrow.ATTACH_ICON_IMG} <!-- IF topicrow.S_HAS_POLL or topicrow.S_TOPIC_MOVED --><b>{topicrow.TOPIC_TYPE}</b> <!-- ENDIF --><a title="{L_POSTED}{L_COLON} {topicrow.FIRST_POST_TIME}" href="{topicrow.U_VIEW_TOPIC}" class="topictitle">{topicrow.TOPIC_TITLE}</a> <!-- IF topicrow.S_TOPIC_UNAPPROVED or topicrow.S_POSTS_UNAPPROVED --> <a href="{topicrow.U_MCP_QUEUE}" class="imageset">{topicrow.UNAPPROVED_IMG}</a> <!-- ENDIF --> + <!-- IF topicrow.S_TOPIC_DELETED --> + <a href="{topicrow.U_MCP_QUEUE}" class="imageset">{DELETED_IMG}</a> + <!-- ENDIF --> <!-- IF topicrow.S_TOPIC_REPORTED --> <a href="{topicrow.U_MCP_REPORT}" class="imageset">{REPORTED_IMG}</a> <!-- ENDIF --> @@ -221,6 +230,7 @@ ] </p> <!-- ENDIF --> <!-- IF topicrow.S_POST_GLOBAL and FORUM_ID != topicrow.FORUM_ID --><p class="gensmall">{L_IN} <a href="{topicrow.U_VIEW_FORUM}">{topicrow.FORUM_NAME}</a></p><!-- ENDIF --> + <!-- EVENT topiclist_row_append --> </td> <td class="row2" width="130" align="center"><p class="topicauthor">{topicrow.TOPIC_AUTHOR_FULL}</p></td> <td class="row1" width="50" align="center"><p class="topicdetails">{topicrow.REPLIES}</p></td> diff --git a/phpBB/styles/subsilver2/template/viewtopic_body.html b/phpBB/styles/subsilver2/template/viewtopic_body.html index b561b99abd..299b8219eb 100644 --- a/phpBB/styles/subsilver2/template/viewtopic_body.html +++ b/phpBB/styles/subsilver2/template/viewtopic_body.html @@ -136,8 +136,19 @@ <!-- ENDIF --> <!-- IF postrow.S_ROW_COUNT is even --><tr class="row1"><!-- ELSE --><tr class="row2"><!-- ENDIF --> - <!-- IF postrow.S_IGNORE_POST --> - <td class="gensmall" colspan="2" height="25" align="center"><!-- IF postrow.S_FIRST_UNREAD --><a name="unread"></a><!-- ENDIF --><a name="p{postrow.POST_ID}"></a>{postrow.L_IGNORE_POST}</td> + <!-- IF postrow.S_POST_HIDDEN --> + <td class="gensmall" colspan="2" height="25" align="center"> + <!-- IF postrow.S_FIRST_UNREAD --><a name="unread"></a><!-- ENDIF --> + <a name="p{postrow.POST_ID}"></a> + <!-- IF postrow.S_POST_HIDDEN --> + <!-- IF postrow.S_POST_DELETED --> + {postrow.L_POST_DELETED_MESSAGE} + <!-- ELSEIF postrow.S_IGNORE_POST --> + {postrow.L_IGNORE_POST} + <!-- ENDIF --> + <br />{postrow.L_POST_DISPLAY} + <!-- ENDIF --> + </td> <!-- ELSE --> <td align="center" valign="middle"> @@ -207,10 +218,14 @@ <table width="100%" cellspacing="5"> <tr> <td> - <!-- IF postrow.S_POST_UNAPPROVED or postrow.S_POST_REPORTED --> + <!-- IF postrow.S_POST_UNAPPROVED or postrow.S_POST_DELETED or postrow.S_POST_REPORTED --> <table width="100%" cellspacing="0"> <tr> - <td class="gensmall"><!-- IF postrow.S_POST_UNAPPROVED --><span class="postapprove">{UNAPPROVED_IMG} <a href="{postrow.U_MCP_APPROVE}">{L_POST_UNAPPROVED}</a></span><br /> <!-- ENDIF --> <!-- IF postrow.S_POST_REPORTED --><span class="postreported">{REPORTED_IMG} <a href="{postrow.U_MCP_REPORT}">{L_POST_REPORTED}</a></span><!-- ENDIF --></td> + <td class="gensmall"> + <!-- IF postrow.S_POST_UNAPPROVED --><span class="postapprove">{UNAPPROVED_IMG} <a href="{postrow.U_MCP_APPROVE}">{L_POST_UNAPPROVED}</a></span><br /> <!-- ENDIF --> + <!-- IF postrow.S_POST_DELETED --><span class="postapprove">{DELETED_IMG} <a href="{postrow.U_MCP_RESTORE}">{L_POST_DELETED}</a></span><br /> <!-- ENDIF --> + <!-- IF postrow.S_POST_REPORTED --><span class="postreported">{REPORTED_IMG} <a href="{postrow.U_MCP_REPORT}">{L_POST_REPORTED}</a></span><!-- ENDIF --> + </td> </tr> </table> @@ -241,7 +256,22 @@ <div class="postbody"><br />_________________<br />{postrow.SIGNATURE}</div> <!-- ENDIF --> - <!-- IF postrow.EDITED_MESSAGE or postrow.EDIT_REASON --> + <!-- IF postrow.DELETED_MESSAGE or postrow.DELETE_REASON --> + <!-- IF postrow.DELETE_REASON --> + <br /><br /> + <table class="tablebg" width="100%" cellspacing="1"> + <tr> + <td class="row3"><span class="gensmall">{postrow.DELETED_MESSAGE}</span></td> + </tr> + <tr> + <td class="row2"><span class="genmed">{postrow.DELETE_REASON}</span></td> + </tr> + </table> + <!-- ELSE --> + <br /><br /> + <span class="gensmall">{postrow.DELETED_MESSAGE}</span> + <!-- ENDIF --> + <!-- ELSEIF postrow.EDITED_MESSAGE or postrow.EDIT_REASON --> <!-- IF postrow.EDIT_REASON --> <br /><br /> <table class="tablebg" width="100%" cellspacing="1"> diff --git a/phpBB/styles/subsilver2/theme/images/icon_topic_deleted.png b/phpBB/styles/subsilver2/theme/images/icon_topic_deleted.png Binary files differnew file mode 100644 index 0000000000..494b4fb563 --- /dev/null +++ b/phpBB/styles/subsilver2/theme/images/icon_topic_deleted.png diff --git a/phpBB/styles/subsilver2/theme/stylesheet.css b/phpBB/styles/subsilver2/theme/stylesheet.css index df46c91d8d..bfb80a53b5 100644 --- a/phpBB/styles/subsilver2/theme/stylesheet.css +++ b/phpBB/styles/subsilver2/theme/stylesheet.css @@ -985,6 +985,11 @@ a.imageset { padding-left: 19px; padding-top: 18px; } +.imageset.icon_topic_deleted { + background-image: url("./images/icon_topic_deleted.png"); + padding-left: 14px; + padding-top: 14px; +} /* English images for fallback */ |
