diff options
| author | Cesar G <prototech91@gmail.com> | 2014-11-18 01:33:13 -0800 |
|---|---|---|
| committer | Cesar G <prototech91@gmail.com> | 2014-11-18 01:33:13 -0800 |
| commit | e1865df7dd8dd1ad8d6f6dc6889ae4353dffb94d (patch) | |
| tree | c8d1a5edb36552d40a6127a7f62d7ff1688945f1 | |
| parent | cddb768772d4eafc945429bcb72607694551dafd (diff) | |
| parent | 052fdcc8d96b98380f9ca9fa210aee297f169f3f (diff) | |
| download | forums-e1865df7dd8dd1ad8d6f6dc6889ae4353dffb94d.tar forums-e1865df7dd8dd1ad8d6f6dc6889ae4353dffb94d.tar.gz forums-e1865df7dd8dd1ad8d6f6dc6889ae4353dffb94d.tar.bz2 forums-e1865df7dd8dd1ad8d6f6dc6889ae4353dffb94d.tar.xz forums-e1865df7dd8dd1ad8d6f6dc6889ae4353dffb94d.zip | |
Merge branch 'develop-ascraeus' into develop
* develop-ascraeus:
[ticket/13023] Add template event posting_editor_buttons_custom_tags_before
Conflicts:
phpBB/styles/subsilver2/template/posting_buttons.html
| -rw-r--r-- | phpBB/docs/events.md | 7 | ||||
| -rw-r--r-- | phpBB/styles/prosilver/template/posting_buttons.html | 3 |
2 files changed, 10 insertions, 0 deletions
diff --git a/phpBB/docs/events.md b/phpBB/docs/events.md index 240ed07b42..6bbaed91b8 100644 --- a/phpBB/docs/events.md +++ b/phpBB/docs/events.md @@ -694,6 +694,13 @@ posting_editor_buttons_before * Since: 3.1.0-a3 * Purpose: Add content before the BBCode posting buttons +posting_editor_buttons_custom_tags_before +=== +* Locations: + + styles/prosilver/template/posting_buttons.html +* Since: 3.1.2-RC1 +* Purpose: Add content inside the BBCode posting buttons and before the customs BBCode + posting_editor_message_after === * Locations: diff --git a/phpBB/styles/prosilver/template/posting_buttons.html b/phpBB/styles/prosilver/template/posting_buttons.html index 3dad6606bb..1555b12369 100644 --- a/phpBB/styles/prosilver/template/posting_buttons.html +++ b/phpBB/styles/prosilver/template/posting_buttons.html @@ -92,6 +92,9 @@ <!-- ENDIF --> </select> <input type="button" class="button2 bbcode-color" name="bbpalette" id="bbpalette" value="{L_FONT_COLOR}" onclick="change_palette();" title="{L_BBCODE_S_HELP}" /> + + <!-- EVENT posting_editor_buttons_custom_tags_before --> + <!-- BEGIN custom_tags --> <input type="button" class="button2 bbcode-{custom_tags.BBCODE_TAG_CLEAN}" name="addbbcode{custom_tags.BBCODE_ID}" value="{custom_tags.BBCODE_TAG}" onclick="bbstyle({custom_tags.BBCODE_ID})" title="{custom_tags.BBCODE_HELPLINE}" /> <!-- END custom_tags --> |