1
0
mirror of https://github.com/phpbb/phpbb.git synced 2025-08-28 18:49:52 +02:00

Merge remote-tracking branch 'vsephpbb/ticket/12060' into develop

* vsephpbb/ticket/12060: (37 commits)
  [ticket/12060] A little less verbose cleanup of event docblocks
  [ticket/12060] Further clarifying new event docblocks as much as possible
  [ticket/12060] More fixes to dockblock for acp_bbcodes_modify_create event
  [ticket/12060] Remove whitespaces
  [ticket/12060] Fix docblock for acp_bbcodes_modify_create event
  [ticket/12060] Rename event in message parser to modify_format_display_text_after
  [ticket/12060] Add num_predefined_bbcodes to display_custom_bbcodes_modify_sql
  [ticket/12060] Further clarify/fix a var in acp_bbcodes_modify_create event doc block
  [ticket/12060] Use separate template event for acp user signature posting buttons
  [ticket/12060] Rename event from append to after in acp_bbcodes.html
  [ticket/12060] Correctly label alpha versions in event docblocks
  [ticket/12060] Fix u_action comments in docblocks
  [ticket/12060] Change @since in event docblocks
  [ticket/12060] Update the docblock comments in acp core events
  [ticket/12060] Refactor u_action in the events that use it
  [ticket/12060] Use $sql_ary instead of $sql
  [ticket/12060] Update docblock for core event due to addition of another var
  [ticket/12060] Remove re-tabbing of html from subsilver2 files
  [ticket/12060] Add $update_this_message var to the core event
  [ticket/12060] Adjust last item in array to use a comma instead of closing parenthesis
  ...
This commit is contained in:
Joas Schilling
2013-12-20 16:11:02 +01:00
8 changed files with 213 additions and 24 deletions

View File

@@ -59,6 +59,7 @@
</dl>
</div>
<!-- EVENT posting_editor_buttons_before -->
<div id="format-buttons">
<input type="button" class="button2" accesskey="b" name="addbbcode0" value=" B " style="font-weight:bold; width: 30px" onclick="bbstyle(0)" title="{L_BBCODE_B_HELP}" />
<input type="button" class="button2" accesskey="i" name="addbbcode2" value=" i " style="font-style:italic; width: 30px" onclick="bbstyle(2)" title="{L_BBCODE_I_HELP}" />
@@ -95,4 +96,5 @@
<input type="button" class="button2" 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 -->
</div>
<!-- EVENT posting_editor_buttons_after -->
<!-- ENDIF -->

View File

@@ -36,6 +36,8 @@
<!-- INCLUDEJS {T_ASSETS_PATH}/javascript/editor.js -->
<!-- IF S_BBCODE_ALLOWED -->
<!-- EVENT posting_editor_buttons_before -->
<div id="core-bbcode-buttons">
<input type="button" class="btnbbcode" accesskey="b" name="addbbcode0" value=" B " style="font-weight:bold; width: 30px;" onclick="bbstyle(0)" onmouseover="helpline('b')" onmouseout="helpline('tip')" />
<input type="button" class="btnbbcode" accesskey="i" name="addbbcode2" value=" i " style="font-style:italic; width: 30px;" onclick="bbstyle(2)" onmouseover="helpline('i')" onmouseout="helpline('tip')" />
<input type="button" class="btnbbcode" accesskey="u" name="addbbcode4" value=" u " style="text-decoration: underline; width: 30px;" onclick="bbstyle(4)" onmouseover="helpline('u')" onmouseout="helpline('tip')" />
@@ -66,15 +68,19 @@
<!-- ENDIF -->
<!-- ENDIF -->
</select></span>
</div>
<!-- EVENT posting_editor_buttons_after -->
<!-- ENDIF -->
</td>
</tr>
<!-- IF S_BBCODE_ALLOWED and .custom_tags -->
<tr valign="middle" align="{S_CONTENT_FLOW_BEGIN}">
<td colspan="2">
<div id="custom-bbcode-buttons">
<!-- BEGIN custom_tags -->
<input type="button" class="btnbbcode" name="addbbcode{custom_tags.BBCODE_ID}" value="{custom_tags.BBCODE_TAG}" onclick="bbstyle({custom_tags.BBCODE_ID})"<!-- IF custom_tags.BBCODE_HELPLINE !== '' --> onmouseover="helpline('cb_{custom_tags.BBCODE_ID}')" onmouseout="helpline('tip')"<!-- ENDIF --> />
<!-- END custom_tags -->
</div>
</td>
</tr>
<!-- ENDIF -->