diff options
author | Dhruv <dhruv.goel92@gmail.com> | 2014-05-28 01:30:18 +0530 |
---|---|---|
committer | Dhruv <dhruv.goel92@gmail.com> | 2014-05-28 01:30:18 +0530 |
commit | 9d41bca27d653a2e9e89b136bcf26543687a08e0 (patch) | |
tree | f4320954c4f41d148f078c340a26fd50b7a20954 | |
parent | 2aef05106c89077d75f36afa5f2b01b8bcac47d9 (diff) | |
parent | e9f28c7be0440761ec67f8d0b975e74e34feb77d (diff) | |
download | forums-9d41bca27d653a2e9e89b136bcf26543687a08e0.tar forums-9d41bca27d653a2e9e89b136bcf26543687a08e0.tar.gz forums-9d41bca27d653a2e9e89b136bcf26543687a08e0.tar.bz2 forums-9d41bca27d653a2e9e89b136bcf26543687a08e0.tar.xz forums-9d41bca27d653a2e9e89b136bcf26543687a08e0.zip |
Merge branch 'develop-ascraeus' into develop
# By Tabitha Backoff
# Via Dhruv Goel (1) and Tabitha Backoff (1)
* develop-ascraeus:
[ticket/12596] Add template event acp_group_options_before/after
-rw-r--r-- | phpBB/adm/style/acp_groups.html | 2 | ||||
-rw-r--r-- | phpBB/docs/events.md | 12 |
2 files changed, 14 insertions, 0 deletions
diff --git a/phpBB/adm/style/acp_groups.html b/phpBB/adm/style/acp_groups.html index cf189f979f..f9846ea7cd 100644 --- a/phpBB/adm/style/acp_groups.html +++ b/phpBB/adm/style/acp_groups.html @@ -56,6 +56,7 @@ <fieldset> <legend>{L_GROUP_OPTIONS_SAVE}</legend> + <!-- EVENT acp_group_options_before --> <!-- IF S_USER_FOUNDER --> <dl> <dt><label for="group_founder_manage">{L_GROUP_FOUNDER_MANAGE}{L_COLON}</label><br /><span>{L_GROUP_FOUNDER_MANAGE_EXPLAIN}</span></dt> @@ -78,6 +79,7 @@ <dt><label for="group_receive_pm">{L_GROUP_RECEIVE_PM}{L_COLON}</label><br /><span>{L_GROUP_RECEIVE_PM_EXPLAIN}</span></dt> <dd><input name="group_receive_pm" type="checkbox" value="1" class="radio" id="group_receive_pm"{GROUP_RECEIVE_PM} /></dd> </dl> + <!-- EVENT acp_group_options_after --> </fieldset> <fieldset> diff --git a/phpBB/docs/events.md b/phpBB/docs/events.md index 4a6a1895dd..4dc55540f3 100644 --- a/phpBB/docs/events.md +++ b/phpBB/docs/events.md @@ -22,6 +22,18 @@ acp_forums_normal_settings_append * Since: 3.1.0-a1 * Purpose: Add settings to forums +acp_group_options_before +=== +* Location: adm/style/acp_groups.html +* Since: 3.1.0-b4 +* Purpose: Add addtional options to group settings (before GROUP_FOUNDER_MANAGE) + +acp_group_options_after +=== +* Location: adm/style/acp_groups.html +* Since: 3.1.0-b4 +* Purpose: Add addtional options to group settings (after GROUP_RECEIVE_PM) + acp_main_actions_append === * Location: adm/style/acp_main.html |