Merge branch '3.2.x'

* 3.2.x:
  [ticket/14786] Add mcp_forum_actions_before/after events
This commit is contained in:
Tristan Darricau 2016-10-02 18:13:13 +02:00
commit 10ae96c9b6
No known key found for this signature in database
GPG key ID: 817043C2E29DB881
2 changed files with 16 additions and 0 deletions

View file

@ -765,6 +765,20 @@ mcp_ban_unban_before
* Since: 3.1.0-RC3 * Since: 3.1.0-RC3
* Purpose: Add additional fields to the unban form in MCP * Purpose: Add additional fields to the unban form in MCP
mcp_forum_actions_after
===
* Locations:
+ styles/prosilver/template/mcp_forum.html
* Since: 3.1.11-RC1
* Purpose: Add some information after actions fieldset
mcp_forum_actions_before
===
* Locations:
+ styles/prosilver/template/mcp_forum.html
* Since: 3.1.11-RC1
* Purpose: Add some information before actions fieldset
mcp_forum_topic_title_before mcp_forum_topic_title_before
=== ===
* Locations: * Locations:

View file

@ -124,6 +124,7 @@
</div> </div>
</div> </div>
<!-- EVENT mcp_forum_actions_before -->
<fieldset class="display-actions"> <fieldset class="display-actions">
<!-- IF not S_MERGE_SELECT --> <!-- IF not S_MERGE_SELECT -->
<select name="action"> <select name="action">
@ -145,6 +146,7 @@
<!-- ENDIF --> <!-- ENDIF -->
{S_FORM_TOKEN} {S_FORM_TOKEN}
</fieldset> </fieldset>
<!-- EVENT mcp_forum_actions_after -->
</form> </form>
<!-- INCLUDE mcp_footer.html --> <!-- INCLUDE mcp_footer.html -->