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
This commit is contained in:
Cesar G 2014-11-18 01:33:13 -08:00
commit e1865df7dd
2 changed files with 10 additions and 0 deletions

View file

@ -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:

View file

@ -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 -->