diff options
| author | Marc Alexander <admin@m-a-styles.de> | 2016-12-12 22:09:21 +0100 |
|---|---|---|
| committer | Marc Alexander <admin@m-a-styles.de> | 2016-12-12 22:09:21 +0100 |
| commit | 37eb22a61d65f436c9be74480459b27af72924b3 (patch) | |
| tree | 014f4315e63d63de5a32370a31bbc95beff4f91d | |
| parent | b7597a347b2acbbcd49ca63aaf334c4d79e2ba25 (diff) | |
| parent | 5235e6de5358f972382e01a8e399f6e510a02105 (diff) | |
| download | forums-37eb22a61d65f436c9be74480459b27af72924b3.tar forums-37eb22a61d65f436c9be74480459b27af72924b3.tar.gz forums-37eb22a61d65f436c9be74480459b27af72924b3.tar.bz2 forums-37eb22a61d65f436c9be74480459b27af72924b3.tar.xz forums-37eb22a61d65f436c9be74480459b27af72924b3.zip | |
Merge branch '3.1.x' into 3.2.x
| -rw-r--r-- | phpBB/docs/events.md | 7 | ||||
| -rw-r--r-- | phpBB/styles/prosilver/template/mcp_forum.html | 1 |
2 files changed, 8 insertions, 0 deletions
diff --git a/phpBB/docs/events.md b/phpBB/docs/events.md index 75a773e906..5d92f4c4b8 100644 --- a/phpBB/docs/events.md +++ b/phpBB/docs/events.md @@ -803,6 +803,13 @@ mcp_forum_actions_after * Since: 3.1.11-RC1 * 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 === * Locations: diff --git a/phpBB/styles/prosilver/template/mcp_forum.html b/phpBB/styles/prosilver/template/mcp_forum.html index b4ef9e66af..f6c518e1df 100644 --- a/phpBB/styles/prosilver/template/mcp_forum.html +++ b/phpBB/styles/prosilver/template/mcp_forum.html @@ -140,6 +140,7 @@ <!-- 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_GLOBAL --><option value="make_global">{L_MAKE_GLOBAL}</option><!-- ENDIF --> + <!-- EVENT mcp_forum_actions_append --> </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> |