diff options
| author | Joas Schilling <nickvergessen@gmx.de> | 2015-04-06 14:27:48 +0200 |
|---|---|---|
| committer | Joas Schilling <nickvergessen@gmx.de> | 2015-04-06 14:27:48 +0200 |
| commit | 370fce1651d82dc208d46453524e9aa05162764e (patch) | |
| tree | b53fc59914a61ae0f8f58ee29389fb6e3f329b0b | |
| parent | 478fed7ee1e228efd7f3e7d055d3319ee0c64c51 (diff) | |
| parent | 7d08bf5b3eab62cdb6ef29d4d3a780e92ced3b27 (diff) | |
| download | forums-370fce1651d82dc208d46453524e9aa05162764e.tar forums-370fce1651d82dc208d46453524e9aa05162764e.tar.gz forums-370fce1651d82dc208d46453524e9aa05162764e.tar.bz2 forums-370fce1651d82dc208d46453524e9aa05162764e.tar.xz forums-370fce1651d82dc208d46453524e9aa05162764e.zip | |
Merge branch '3.1.x'
Conflicts:
phpBB/styles/subsilver2/template/posting_poll_body.html
| -rw-r--r-- | phpBB/docs/events.md | 7 | ||||
| -rw-r--r-- | phpBB/styles/prosilver/template/posting_poll_body.html | 4 |
2 files changed, 10 insertions, 1 deletions
diff --git a/phpBB/docs/events.md b/phpBB/docs/events.md index 2903b44bf6..a0887e71e6 100644 --- a/phpBB/docs/events.md +++ b/phpBB/docs/events.md @@ -903,6 +903,13 @@ posting_pm_header_find_username_before * Since: 3.1.0-RC4 * Purpose: Add content before the find username link on composing pm +posting_poll_body_options_after +=== +* Locations: + + styles/prosilver/template/posting_poll_body.html +* Since: 3.1.4-RC1 +* Purpose: Add content after the poll options on creating a poll + quickreply_editor_panel_after === * Locations: diff --git a/phpBB/styles/prosilver/template/posting_poll_body.html b/phpBB/styles/prosilver/template/posting_poll_body.html index a131c10533..c3eea0d21d 100644 --- a/phpBB/styles/prosilver/template/posting_poll_body.html +++ b/phpBB/styles/prosilver/template/posting_poll_body.html @@ -43,8 +43,10 @@ <dd><label for="poll_vote_change"><input type="checkbox" id="poll_vote_change" name="poll_vote_change"{VOTE_CHANGE_CHECKED} /> {L_POLL_VOTE_CHANGE_EXPLAIN}</label></dd> </dl> <!-- ENDIF --> + <!-- ENDIF --> + <!-- EVENT posting_poll_body_options_after --> - <!-- ELSEIF S_POLL_DELETE --> + <!-- IF S_POLL_DELETE --> <dl class="fields1"> <dt><label for="poll_delete">{L_POLL_DELETE}{L_COLON}</label></dt> <dd><label for="poll_delete"><input type="checkbox" name="poll_delete" id="poll_delete"<!-- IF S_POLL_DELETE_CHECKED --> checked="checked"<!-- ENDIF --> /> </label></dd> |