diff options
| author | Marc Alexander <admin@m-a-styles.de> | 2014-09-01 22:46:08 +0200 |
|---|---|---|
| committer | Marc Alexander <admin@m-a-styles.de> | 2014-09-01 22:46:08 +0200 |
| commit | da9888d04f3a691a73013d9bb2c14a8809012512 (patch) | |
| tree | 757cfde58241f65c9fd904b3ef7b8997072e31b9 /phpBB | |
| parent | d5003877e3779cbb9e10ca3d3f0fd95a8983915a (diff) | |
| parent | d86817ef07de8d6b581dd50c5a18796ceea7f471 (diff) | |
| download | forums-da9888d04f3a691a73013d9bb2c14a8809012512.tar forums-da9888d04f3a691a73013d9bb2c14a8809012512.tar.gz forums-da9888d04f3a691a73013d9bb2c14a8809012512.tar.bz2 forums-da9888d04f3a691a73013d9bb2c14a8809012512.tar.xz forums-da9888d04f3a691a73013d9bb2c14a8809012512.zip | |
Merge branch 'develop-ascraeus' into develop
Conflicts:
phpBB/styles/subsilver2/template/mcp_warn_post.html
phpBB/styles/subsilver2/template/mcp_warn_user.html
Diffstat (limited to 'phpBB')
| -rw-r--r-- | phpBB/docs/events.md | 28 | ||||
| -rw-r--r-- | phpBB/styles/prosilver/template/mcp_warn_post.html | 4 | ||||
| -rw-r--r-- | phpBB/styles/prosilver/template/mcp_warn_user.html | 4 |
3 files changed, 36 insertions, 0 deletions
diff --git a/phpBB/docs/events.md b/phpBB/docs/events.md index 2129c43757..c476ac556a 100644 --- a/phpBB/docs/events.md +++ b/phpBB/docs/events.md @@ -406,6 +406,34 @@ memberlist_view_user_statistics_before * Since: 3.1.0-a1 * Purpose: Add entries before the user statistics part of any user profile +mcp_warn_post_add_warning_field_after +=== +* Locations: + + styles/prosilver/template/mcp_warn_post.html +* Since: 3.1.0-RC4 +* Purpose: Add content during warning for a post - after add warning field. + +mcp_warn_post_add_warning_field_before +=== +* Locations: + + styles/prosilver/template/mcp_warn_post.html +* Since: 3.1.0-RC4 +* Purpose: Add content during warning for a post - before add warning field. + +mcp_warn_user_add_warning_field_after +=== +* Locations: + + styles/prosilver/template/mcp_warn_user.html +* Since: 3.1.0-RC4 +* Purpose: Add content during warning a user - after add warning field. + +mcp_warn_user_add_warning_field_before +=== +* Locations: + + styles/prosilver/template/mcp_warn_user.html +* Since: 3.1.0-RC4 +* Purpose: Add content during warning a user - before add warning field. + navbar_header_logged_out_content === * Locations: diff --git a/phpBB/styles/prosilver/template/mcp_warn_post.html b/phpBB/styles/prosilver/template/mcp_warn_post.html index 0dd2e14d92..59c7d0d495 100644 --- a/phpBB/styles/prosilver/template/mcp_warn_post.html +++ b/phpBB/styles/prosilver/template/mcp_warn_post.html @@ -44,6 +44,8 @@ </div> </div> +<!-- EVENT mcp_warn_post_add_warning_field_before --> + <div class="panel"> <div class="inner"> @@ -64,6 +66,8 @@ </div> </div> +<!-- EVENT mcp_warn_post_add_warning_field_after --> + <fieldset class="submit-buttons"> <input type="reset" value="{L_RESET}" name="reset" class="button2" /> <input type="submit" name="action[add_warning]" value="{L_SUBMIT}" class="button1" /> diff --git a/phpBB/styles/prosilver/template/mcp_warn_user.html b/phpBB/styles/prosilver/template/mcp_warn_user.html index 1541f2e5f6..1ad6df7ade 100644 --- a/phpBB/styles/prosilver/template/mcp_warn_user.html +++ b/phpBB/styles/prosilver/template/mcp_warn_user.html @@ -28,6 +28,8 @@ </div> </div> +<!-- EVENT mcp_warn_user_add_warning_field_before --> + <div class="panel"> <div class="inner"> @@ -48,6 +50,8 @@ </div> </div> +<!-- EVENT mcp_warn_user_add_warning_field_after --> + <fieldset class="submit-buttons"> <input type="reset" value="{L_RESET}" name="reset" class="button2" /> <input type="submit" name="action[add_warning]" value="{L_SUBMIT}" class="button1" /> |