Merge branch '3.2.x'

This commit is contained in:
Marc Alexander 2016-12-12 22:09:40 +01:00
commit 5dc31fd03d
No known key found for this signature in database
GPG key ID: 50E0D2423696F995
2 changed files with 8 additions and 0 deletions

View file

@ -803,6 +803,13 @@ mcp_forum_actions_after
* Since: 3.1.11-RC1 * Since: 3.1.11-RC1
* Purpose: Add some information after actions fieldset * Purpose: Add some information after actions fieldset
mcp_forum_actions_append
===
* Locations:
+ styles/prosilver/template/mcp_forum.html
* Since: 3.1.11-RC1
* Purpose: Add additional options to actions select
mcp_forum_actions_before mcp_forum_actions_before
=== ===
* Locations: * Locations:

View file

@ -140,6 +140,7 @@
<!-- IF S_CAN_MAKE_STICKY --><option value="make_sticky">{L_MAKE_STICKY}</option><!-- ENDIF --> <!-- IF S_CAN_MAKE_STICKY --><option value="make_sticky">{L_MAKE_STICKY}</option><!-- ENDIF -->
<!-- IF S_CAN_MAKE_ANNOUNCE --><option value="make_announce">{L_MAKE_ANNOUNCE}</option><!-- ENDIF --> <!-- IF S_CAN_MAKE_ANNOUNCE --><option value="make_announce">{L_MAKE_ANNOUNCE}</option><!-- ENDIF -->
<!-- IF S_CAN_MAKE_ANNOUNCE_GLOBAL --><option value="make_global">{L_MAKE_GLOBAL}</option><!-- ENDIF --> <!-- IF S_CAN_MAKE_ANNOUNCE_GLOBAL --><option value="make_global">{L_MAKE_GLOBAL}</option><!-- ENDIF -->
<!-- EVENT mcp_forum_actions_append -->
</select> </select>
<input class="button2" type="submit" value="{L_SUBMIT}" /> <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> <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>