diff options
Diffstat (limited to 'phpBB/styles')
| -rw-r--r-- | phpBB/styles/prosilver/template/mcp_forum.html | 6 | ||||
| -rw-r--r-- | phpBB/styles/subsilver2/template/mcp_forum.html | 6 |
2 files changed, 10 insertions, 2 deletions
diff --git a/phpBB/styles/prosilver/template/mcp_forum.html b/phpBB/styles/prosilver/template/mcp_forum.html index ceb10f4b76..abca202c73 100644 --- a/phpBB/styles/prosilver/template/mcp_forum.html +++ b/phpBB/styles/prosilver/template/mcp_forum.html @@ -26,7 +26,7 @@ <dt>{L_TOPICS}</dt> <dd class="posts">{L_REPLIES}</dd> <dd class="lastpost"><span>{L_LAST_POST}</span></dd> - <dd class="mark">{L_MARK}</dd> + <!-- IF not S_MERGE_SELECT --><dd class="mark">{L_MARK}</dd><!-- ENDIF --> </dl> </li> </ul> @@ -47,9 +47,11 @@ <dd class="posts">{topicrow.REPLIES} <dfn>{L_REPLIES}</dfn></dd> <dd class="lastpost"><span><dfn>{L_LAST_POST} </dfn>{L_POST_BY_AUTHOR} {topicrow.LAST_POST_AUTHOR_FULL} {L_POSTED_ON_DATE}<br />{topicrow.LAST_POST_TIME}</span> </dd> + <!-- IF not S_MERGE_SELECT --> <dd class="mark"> <!-- IF not topicrow.S_MOVED_TOPIC --><input type="checkbox" name="topic_id_list[]" value="{topicrow.TOPIC_ID}"<!-- IF topicrow.S_TOPIC_CHECKED --> checked="checked"<!-- ENDIF --> /><!-- ELSE --> <!-- ENDIF --> </dd> + <!-- ENDIF --> </dl> </li> <!-- END topicrow --> @@ -83,6 +85,7 @@ </div> <fieldset class="display-actions"> + <!-- IF not S_MERGE_SELECT --> <select name="action"> <option value="" selected="selected">{L_SELECT_ACTION}</option> <!-- IF S_CAN_DELETE --><option value="delete_topic">{L_DELETE}</option><!-- ENDIF --> @@ -100,6 +103,7 @@ </select> <input class="button2" type="submit" value="{L_SUBMIT}" /> <div><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></div> + <!-- ENDIF --> {S_FORM_TOKEN} </fieldset> </form> diff --git a/phpBB/styles/subsilver2/template/mcp_forum.html b/phpBB/styles/subsilver2/template/mcp_forum.html index 956d253aa6..80a6047858 100644 --- a/phpBB/styles/subsilver2/template/mcp_forum.html +++ b/phpBB/styles/subsilver2/template/mcp_forum.html @@ -44,7 +44,7 @@ <td class="row1" width="50" align="center"><p class="topicdetails">{topicrow.REPLIES}</p></td> <td class="row1" width="120" align="center"><p class="topicdetails">{topicrow.LAST_POST_TIME}</p></td> <td class="row2" align="center"> - <!-- IF not topicrow.S_MOVED_TOPIC --><input type="checkbox" class="radio" name="topic_id_list[]" value="{topicrow.TOPIC_ID}"<!-- IF topicrow.S_TOPIC_CHECKED --> checked="checked"<!-- ENDIF --> /><!-- ELSE --> <!-- ENDIF --> + <!-- IF not topicrow.S_MOVED_TOPIC and not S_MERGE_SELECT --><input type="checkbox" class="radio" name="topic_id_list[]" value="{topicrow.TOPIC_ID}"<!-- IF topicrow.S_TOPIC_CHECKED --> checked="checked"<!-- ENDIF --> /><!-- ELSE --> <!-- ENDIF --> </td> </tr> <!-- BEGINELSE --> @@ -52,6 +52,7 @@ <td class="row1" colspan="8" align="center"><p class="gen">{L_NO_TOPICS}</p></td> </tr> <!-- END topicrow --> +<!-- IF not S_MERGE_SELECT --> <tr> <td class="cat" colspan="6" align="{S_CONTENT_FLOW_END}"> <select name="action"> @@ -72,14 +73,17 @@ <input class="btnmain" type="submit" value="{L_SUBMIT}" /> </td> </tr> +<!-- ENDIF --> </table> {S_FORM_TOKEN} </form> +<!-- IF not S_MERGE_SELECT --> <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', '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></b></td> </tr> </table> +<!-- ENDIF --> <!-- INCLUDE mcp_footer.html -->
\ No newline at end of file |