aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB/styles/prosilver/template
diff options
context:
space:
mode:
authorOleg Pudeyev <oleg@bsdpower.com>2012-03-16 06:18:35 -0400
committerOleg Pudeyev <oleg@bsdpower.com>2012-03-16 06:18:35 -0400
commit1fa39ea722ab8e27402d3db67d5f11587570a96d (patch)
tree5674ac40cc9ef8a595599848a8827aca66db378b /phpBB/styles/prosilver/template
parent8de8dc916e51d6f08802b6b1e90f6c65317066df (diff)
parent81eeafbb8dfb6f3511d689169a2ccc46f3d07704 (diff)
downloadforums-1fa39ea722ab8e27402d3db67d5f11587570a96d.tar
forums-1fa39ea722ab8e27402d3db67d5f11587570a96d.tar.gz
forums-1fa39ea722ab8e27402d3db67d5f11587570a96d.tar.bz2
forums-1fa39ea722ab8e27402d3db67d5f11587570a96d.tar.xz
forums-1fa39ea722ab8e27402d3db67d5f11587570a96d.zip
Merge branch 'develop-olympus' into develop
* develop-olympus: [ticket/8636] Add resync option to topic_view moderation page
Diffstat (limited to 'phpBB/styles/prosilver/template')
-rw-r--r--phpBB/styles/prosilver/template/mcp_topic.html1
1 files changed, 1 insertions, 0 deletions
diff --git a/phpBB/styles/prosilver/template/mcp_topic.html b/phpBB/styles/prosilver/template/mcp_topic.html
index 6943dd41b3..85c87b8cca 100644
--- a/phpBB/styles/prosilver/template/mcp_topic.html
+++ b/phpBB/styles/prosilver/template/mcp_topic.html
@@ -158,6 +158,7 @@ onload_functions.push('subPanels()');
<!-- IF S_CAN_DELETE --><option value="delete_post">{L_DELETE_POSTS}</option><!-- ENDIF -->
<!-- IF S_CAN_MERGE --><option value="merge_posts"<!-- IF S_MERGE_VIEW --> selected="selected"<!-- ENDIF -->>{L_MERGE_POSTS}</option><!-- ENDIF -->
<!-- IF S_CAN_SPLIT --><option value="split_all"<!-- IF S_SPLIT_VIEW --> 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 -->
</select>&nbsp;
<input class="button1" type="submit" name="mcp_topic_submit" value="{L_SUBMIT}" />
<div><a href="#" onclick="marklist('mcp', 'post', true); return false;">{L_MARK_ALL}</a> :: <a href="#" onclick="marklist('mcp', 'post', false); return false;">{L_UNMARK_ALL}</a></div>