diff options
| author | Yuriy Rusko <github@rusko.net> | 2014-05-28 01:02:39 +0200 |
|---|---|---|
| committer | Yuriy Rusko <github@rusko.net> | 2014-05-28 01:02:39 +0200 |
| commit | 2a42aee8acfcab79b0dd43572b9da2c4dd8a288a (patch) | |
| tree | 50400df541c6ac30ecf894830012b7a7c28b45fc /phpBB/adm | |
| parent | 1d61bcedfd1882f84d102c523a354a8c4ae69336 (diff) | |
| parent | 08c01b7cee629701dc62b32b03eb5543e8c9d196 (diff) | |
| download | forums-2a42aee8acfcab79b0dd43572b9da2c4dd8a288a.tar forums-2a42aee8acfcab79b0dd43572b9da2c4dd8a288a.tar.gz forums-2a42aee8acfcab79b0dd43572b9da2c4dd8a288a.tar.bz2 forums-2a42aee8acfcab79b0dd43572b9da2c4dd8a288a.tar.xz forums-2a42aee8acfcab79b0dd43572b9da2c4dd8a288a.zip | |
Merge remote-tracking branch 'upstream/develop-ascraeus' into ticket/12594
Diffstat (limited to 'phpBB/adm')
| -rw-r--r-- | phpBB/adm/index.php | 8 | ||||
| -rw-r--r-- | phpBB/adm/style/acp_groups.html | 2 |
2 files changed, 9 insertions, 1 deletions
diff --git a/phpBB/adm/index.php b/phpBB/adm/index.php index f7343accef..519f6c8310 100644 --- a/phpBB/adm/index.php +++ b/phpBB/adm/index.php @@ -54,7 +54,13 @@ $module_id = request_var('i', ''); $mode = request_var('mode', ''); // Set custom style for admin area -$template->set_custom_style('adm', $phpbb_admin_path . 'style'); +$template->set_custom_style(array( + array( + 'name' => 'adm', + 'ext_path' => 'adm/style/', + ), +), $phpbb_admin_path . 'style'); + $template->assign_var('T_ASSETS_PATH', $phpbb_root_path . 'assets'); $template->assign_var('T_TEMPLATE_PATH', $phpbb_admin_path . 'style'); 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> |