makary/phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-06-28 06:08:52 +00:00
Code Issues Projects Releases Packages Wiki Activity

Merge branch '3.1.x'

Browse source 
Conflicts:
	phpBB/styles/subsilver2/template/posting_poll_body.html
This commit is contained in:
Joas Schilling 2015-04-06 14:27:48 +02:00
commit 370fce1651
2 changed files with 10 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
phpBB/docs/events.md
View file

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

4
phpBB/styles/prosilver/template/posting_poll_body.html
View file

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