diff options
| author | Joas Schilling <nickvergessen@gmx.de> | 2013-12-20 16:11:02 +0100 |
|---|---|---|
| committer | Joas Schilling <nickvergessen@gmx.de> | 2013-12-20 16:11:02 +0100 |
| commit | 558f3cd21cb925395003ebd1a7a226d240f9fccb (patch) | |
| tree | dbb78a977381ec8723f3a8114bc53ce80d3957a0 /phpBB/adm/style/acp_bbcodes.html | |
| parent | e3e34add7f725457b2a6e4809bbfdd6fa576203d (diff) | |
| parent | 121f2394ff92c7497f2f2a11913d02570695e8e4 (diff) | |
| download | forums-558f3cd21cb925395003ebd1a7a226d240f9fccb.tar forums-558f3cd21cb925395003ebd1a7a226d240f9fccb.tar.gz forums-558f3cd21cb925395003ebd1a7a226d240f9fccb.tar.bz2 forums-558f3cd21cb925395003ebd1a7a226d240f9fccb.tar.xz forums-558f3cd21cb925395003ebd1a7a226d240f9fccb.zip | |
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
...
Diffstat (limited to 'phpBB/adm/style/acp_bbcodes.html')
| -rw-r--r-- | phpBB/adm/style/acp_bbcodes.html | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/phpBB/adm/style/acp_bbcodes.html b/phpBB/adm/style/acp_bbcodes.html index 90a39a3eee..d4ed5cfd10 100644 --- a/phpBB/adm/style/acp_bbcodes.html +++ b/phpBB/adm/style/acp_bbcodes.html @@ -47,6 +47,8 @@ </dl> </fieldset> + <!-- EVENT acp_bbcodes_edit_fieldsets_after --> + <fieldset class="submit-buttons"> <legend>{L_SUBMIT}</legend> <input class="button1" type="submit" id="submit" name="submit" value="{L_SUBMIT}" /> @@ -101,7 +103,7 @@ <!-- BEGIN bbcodes --> <!-- IF bbcodes.S_ROW_COUNT is even --><tr class="row1"><!-- ELSE --><tr class="row2"><!-- ENDIF --> <td style="text-align: center;">{bbcodes.BBCODE_TAG}</td> - <td style="text-align: right; width: 40px;"><a href="{bbcodes.U_EDIT}">{ICON_EDIT}</a> <a href="{bbcodes.U_DELETE}" data-ajax="row_delete">{ICON_DELETE}</a></td> + <td class="actions"><!-- EVENT acp_bbcodes_actions_prepend --> <a href="{bbcodes.U_EDIT}">{ICON_EDIT}</a> <a href="{bbcodes.U_DELETE}" data-ajax="row_delete">{ICON_DELETE}</a> <!-- EVENT acp_bbcodes_actions_append --></td> </tr> <!-- BEGINELSE --> <tr class="row3"> |