mirror/php-phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-04-13 12:22:03 +02:00
Code Issues Releases Wiki Activity

Merge branch '3.1.x'

Browse Source
This commit is contained in:
Marc Alexander 2015-11-10 17:40:41 +01:00
commit fc1008f6a3
12 changed files with 270 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
phpBB/adm/style/acp_ban.html
View File

@ -52,7 +52,7 @@
<legend>{L_TITLE}</legend>
<dl>
<dt><label for="ban">{L_BAN_CELL}{L_COLON}</label></dt>
<dd><textarea name="ban" cols="40" rows="3" id="ban"></textarea></dd>
<dd><!-- EVENT acp_ban_cell_prepend --><textarea name="ban" cols="40" rows="3" id="ban"></textarea><!-- EVENT acp_ban_cell_append --></dd>
<!-- IF S_USERNAME_BAN --><dd>[ <a href="{U_FIND_USERNAME}" onclick="find_username(this.href); return false;">{L_FIND_USERNAME}</a> ]</dd><!-- ENDIF -->
</dl>
<dl>

4
phpBB/adm/style/acp_email.html
View File

@ -19,12 +19,14 @@
<legend>{L_COMPOSE}</legend>
<dl>
<dt><label for="group">{L_SEND_TO_GROUP}{L_COLON}</label></dt>
<!-- EVENT acp_email_group_options_prepend -->
<dd><select id="group" name="g">{S_GROUP_OPTIONS}</select></dd>
<!-- EVENT acp_email_group_options_append -->
</dl>
<dl>
<dt><label for="usernames">{L_SEND_TO_USERS}{L_COLON}</label><br /><span>{L_SEND_TO_USERS_EXPLAIN}</span></dt>
<dd><textarea name="usernames" id="usernames" rows="5" cols="40">{USERNAMES}</textarea></dd>
<dd>[ <a href="{U_FIND_USERNAME}" onclick="find_username(this.href); return false;">{L_FIND_USERNAME}</a> ]</dd>
<dd><!-- EVENT acp_email_find_username_prepend -->[ <a href="{U_FIND_USERNAME}" onclick="find_username(this.href); return false;">{L_FIND_USERNAME}</a> ]<!-- EVENT acp_email_find_username_append --></dd>
</dl>
<dl>
<dt><label for="subject">{L_SUBJECT}{L_COLON}</label></dt>

2
phpBB/adm/style/acp_forums.html
View File

@ -498,7 +498,7 @@
<fieldset class="quick">
{L_SELECT_FORUM}{L_COLON} <select name="parent_id" onchange="if(this.options[this.selectedIndex].value != -1){ this.form.submit(); }">{FORUM_BOX}</select>
<input class="button2" type="submit" value="{L_GO}" />
<!-- EVENT acp_forums_quick_select_button_prepend --><input class="button2" type="submit" value="{L_GO}" /><!-- EVENT acp_forums_quick_select_button_append -->
{S_FORM_TOKEN}
</fieldset>
</form>

4
phpBB/adm/style/acp_groups.html
View File

@ -236,7 +236,7 @@
<dl>
<dt><label for="usernames">{L_USERNAME}{L_COLON}</label><br /><span>{L_USERNAMES_EXPLAIN}</span></dt>
<dd><textarea id="usernames" name="usernames" cols="40" rows="5"></textarea></dd>
<dd>[ <a href="{U_FIND_USERNAME}" onclick="find_username(this.href); return false;">{L_FIND_USERNAME}</a> ]</dd>
<dd><!-- EVENT acp_groups_find_username_prepend -->[ <a href="{U_FIND_USERNAME}" onclick="find_username(this.href); return false;">{L_FIND_USERNAME}</a> ]<!-- EVENT acp_groups_find_username_append --></dd>
</dl>
<p class="quick">
@ -265,6 +265,7 @@
<form id="acp_groups" method="post" action="{U_ACTION}">
<!-- EVENT acp_groups_manage_before -->
<table class="table1">
<col class="col1" /><col class="col1" /><col class="col2" /><col class="col2" /><col class="col2" />
<thead>
@ -285,6 +286,7 @@
<!-- ENDIF -->
</tbody>
</table>
<!-- EVENT acp_groups_manage_after -->
<fieldset class="quick">
<!-- IF S_GROUP_ADD -->

4
phpBB/adm/style/acp_groups_position.html
View File

@ -65,8 +65,10 @@
<option<!-- IF add_legend.GROUP_SPECIAL --> class="sep"<!-- ENDIF --> value="{add_legend.GROUP_ID}">{add_legend.GROUP_NAME}</option>
<!-- END add_legend -->
</select>
<!-- EVENT acp_groups_position_legend_add_button_before -->
<input class="button2" type="submit" name="submit" value="{L_ADD}" />
<input type="hidden" name="action" value="add" />
<!-- EVENT acp_groups_position_legend_add_button_after -->
{S_FORM_TOKEN}
</fieldset>
</form>
@ -162,8 +164,10 @@
<option<!-- IF add_teampage.GROUP_SPECIAL --> class="sep"<!-- ENDIF --> value="{add_teampage.GROUP_ID}">{add_teampage.GROUP_NAME}</option>
<!-- END add_teampage -->
</select>
<!-- EVENT acp_groups_position_teampage_add_button_before -->
<input class="button2" type="submit" name="submit" value="{L_ADD}" />
<input type="hidden" name="action" value="add" />
<!-- EVENT acp_groups_position_teampage_add_button_after -->
{S_FORM_TOKEN}
</fieldset>
</form>

2
phpBB/adm/style/acp_logs.html
View File

@ -73,7 +73,7 @@
<!-- IF S_SHOW_FORUMS -->
<fieldset class="quick">
{L_SELECT_FORUM}{L_COLON} <select name="f" onchange="if(this.options[this.selectedIndex].value != -1){ this.form.submit(); }">{S_FORUM_BOX}</select>
<input class="button2" type="submit" value="{L_GO}" />
<!-- EVENT acp_logs_quick_select_forum_button_prepend --><input class="button2" type="submit" value="{L_GO}" /><!-- EVENT acp_logs_quick_select_forum_button_append -->
</fieldset>
<!-- ENDIF -->

12
phpBB/adm/style/acp_permissions.html
View File

@ -30,7 +30,7 @@
<legend>{L_LOOK_UP_FORUM}</legend>
<!-- IF S_FORUM_MULTIPLE --><p>{L_LOOK_UP_FORUMS_EXPLAIN}</p><!-- ENDIF -->
<dl>
<dt><label for="forum">{L_LOOK_UP_FORUM}{L_COLON}</label></dt>
<dt><!-- EVENT acp_permissions_select_multiple_forum_prepend --><label for="forum">{L_LOOK_UP_FORUM}{L_COLON}</label><!-- EVENT acp_permissions_select_multiple_forum_append --></dt>
<dd><select id="forum" name="forum_id[]"<!-- IF S_FORUM_MULTIPLE --> multiple="multiple"<!-- ENDIF --> size="10">{S_FORUM_OPTIONS}</select></dd>
<!-- IF S_FORUM_ALL --><dd><label><input type="checkbox" class="radio" name="all_forums" value="1" /> {L_ALL_FORUMS}</label></dd><!-- ENDIF -->
</dl>
@ -52,7 +52,7 @@
<legend>{L_LOOK_UP_FORUM}</legend>
<p>{L_SELECT_FORUM_SUBFORUM_EXPLAIN}</p>
<dl>
<dt><label for="sforum">{L_LOOK_UP_FORUM}{L_COLON}</label></dt>
<dt><!-- EVENT acp_permissions_select_forum_prepend --><label for="sforum">{L_LOOK_UP_FORUM}{L_COLON}</label><!-- EVENT acp_permissions_select_forum_append --></dt>
<dd><select id="sforum" name="subforum_id">{S_SUBFORUM_OPTIONS}</select></dd>
</dl>
@ -95,7 +95,7 @@
<fieldset>
<legend>{L_LOOK_UP_GROUP}</legend>
<dl>
<dt><label for="group">{L_LOOK_UP_GROUP}{L_COLON}</label></dt>
<dt><!-- EVENT acp_permissions_select_group_prepend --><label for="group">{L_LOOK_UP_GROUP}{L_COLON}</label><!-- EVENT acp_permissions_select_group_append --></dt>
<dd><select name="group_id[]" id="group">{S_GROUP_OPTIONS}</select></dd>
</dl>
@ -140,7 +140,7 @@
<p>{L_USERNAMES_EXPLAIN}</p>
<dl>
<dd class="full"><textarea id="username" name="usernames" rows="5" cols="5" style="width: 100%; height: 60px;"></textarea></dd>
<dd class="full" style="text-align: left;"><div style="float: {S_CONTENT_FLOW_END};">[ <a href="{U_FIND_USERNAME}" onclick="find_username(this.href); return false;">{L_FIND_USERNAME}</a> ]</div><label><input type="checkbox" class="radio" id="anonymous" name="user_id[]" value="{ANONYMOUS_USER_ID}" /> {L_SELECT_ANONYMOUS}</label></dd>
<dd class="full" style="text-align: left;"><!-- EVENT acp_permissions_find_username_prepend --><div style="float: {S_CONTENT_FLOW_END};">[ <a href="{U_FIND_USERNAME}" onclick="find_username(this.href); return false;">{L_FIND_USERNAME}</a> ]</div><!-- EVENT acp_permissions_find_username_append --><label><input type="checkbox" class="radio" id="anonymous" name="user_id[]" value="{ANONYMOUS_USER_ID}" /> {L_SELECT_ANONYMOUS}</label></dd>
</dl>
</fieldset>
@ -183,7 +183,7 @@
<fieldset>
<legend>{L_ADD_GROUPS}</legend>
<dl>
<dd class="full"><select name="group_id[]" style="width: 100%; height: 107px;" multiple="multiple">{S_ADD_GROUP_OPTIONS}</select></dd>
<dd class="full"><!-- EVENT acp_permissions_add_group_options_prepend --><select name="group_id[]" style="width: 100%; height: 107px;" multiple="multiple">{S_ADD_GROUP_OPTIONS}</select><!-- EVENT acp_permissions_add_group_options_append --></dd>
</dl>
</fieldset>
@ -267,7 +267,9 @@
<legend>{L_LOOK_UP_GROUP}</legend>
<dl>
<dt><label for="group_select">{L_LOOK_UP_GROUP}{L_COLON}</label></dt>
<!-- EVENT acp_permissions_select_group_before -->
<dd><select name="group_id[]" id="group_select">{S_ADD_GROUP_OPTIONS}</select></dd>
<!-- EVENT acp_permissions_select_group_after -->
<dd>&nbsp;</dd>
</dl>
</fieldset>

2
phpBB/adm/style/acp_prune_forums.html
View File

@ -43,7 +43,7 @@
<legend>{L_SELECT_FORUM}</legend>
<p>{L_LOOK_UP_FORUMS_EXPLAIN}</p>
<dl>
<dt><label for="forum">{L_LOOK_UP_FORUM}{L_COLON}</label></dt>
<dt><!-- EVENT acp_prune_forums_prepend --><label for="forum">{L_LOOK_UP_FORUM}{L_COLON}</label><!-- EVENT acp_prune_forums_append --></dt>
<dd><select id="forum" name="f[]" multiple="multiple" size="10">{S_FORUM_OPTIONS}</select></dd>
<dd><label><input type="checkbox" class="radio" name="all_forums" value="1" /> {L_ALL_FORUMS}</label></dd>
</dl>

2
phpBB/adm/style/acp_prune_users.html
View File

@ -50,7 +50,7 @@
<dl>
<dt><label for="users">{L_ACP_PRUNE_USERS}{L_COLON}</label><br /><span>{L_SELECT_USERS_EXPLAIN}</span></dt>
<dd><textarea id="users" name="users" cols="40" rows="5"></textarea></dd>
<dd>[ <a href="{U_FIND_USERNAME}" onclick="find_username(this.href); return false;">{L_FIND_USERNAME}</a> ]</dd>
<dd><!-- EVENT acp_prune_users_find_username_prepend -->[ <a href="{U_FIND_USERNAME}" onclick="find_username(this.href); return false;">{L_FIND_USERNAME}</a> ]<!-- EVENT acp_prune_users_find_username_append --></dd>
</dl>
</fieldset>

2
phpBB/adm/style/acp_users.html
View File

@ -146,7 +146,9 @@
<!-- IF S_GROUP_OPTIONS -->
<fieldset class="quick">
<!-- EVENT acp_users_select_group_before -->
{L_USER_GROUP_ADD}{L_COLON} <select name="g">{S_GROUP_OPTIONS}</select> <input class="button1" type="submit" name="update" value="{L_SUBMIT}" />
<!-- EVENT acp_users_select_group_after -->
{S_FORM_TOKEN}
</fieldset>
<!-- ENDIF -->

4
phpBB/adm/style/permission_forum_copy.html
View File

@ -12,7 +12,7 @@
<legend>{L_LOOK_UP_FORUM}</legend>
<dl>
<dt><label for="src_forum">{L_COPY_PERMISSIONS_FROM}{L_COLON}</label><br /><span>{L_COPY_PERMISSIONS_FORUM_FROM_EXPLAIN}</span></dt>
<dt><!-- EVENT acp_permission_forum_copy_src_forum_prepend --><label for="src_forum">{L_COPY_PERMISSIONS_FROM}{L_COLON}</label><br /><span>{L_COPY_PERMISSIONS_FORUM_FROM_EXPLAIN}</span><!-- EVENT acp_permission_forum_copy_src_forum_append --></dt>
<dd><select id="src_forum" name="src_forum_id"><option value="0">{L_SELECT_FORUM}</option><option value="-1">------------------</option>{S_FORUM_OPTIONS}</select></dd>
</dl>
</fieldset>
@ -22,7 +22,7 @@
<p>{L_LOOK_UP_FORUMS_EXPLAIN}</p>
<dl>
<dt><label for="dest_forums">{L_COPY_PERMISSIONS_TO}{L_COLON}</label><br /><span>{L_COPY_PERMISSIONS_FORUM_TO_EXPLAIN}</span></dt>
<dt><!-- EVENT acp_permission_forum_copy_dest_forum_prepend --><label for="dest_forums">{L_COPY_PERMISSIONS_TO}{L_COLON}</label><br /><span>{L_COPY_PERMISSIONS_FORUM_TO_EXPLAIN}</span><!-- EVENT acp_permission_forum_copy_dest_forum_append --></dt>
<dd><select id="dest_forums" name="dest_forum_ids[]" multiple="multiple" size="10">{S_FORUM_OPTIONS}</select></dd>
</dl>
</fieldset>

244
phpBB/docs/events.md
View File

@ -1,3 +1,15 @@
acp_ban_cell_append
===
* Location: adm/style/acp_ban.html
* Since: 3.1.7-RC1
* Purpose: Add content at the end of the ban cell area
acp_ban_cell_prepend
===
* Location: adm/style/acp_ban.html
* Since: 3.1.7-RC1
* Purpose: Add content at the start of the ban cell area
acp_bbcodes_actions_append
===
* Location: adm/style/acp_bbcodes.html
@ -16,6 +28,30 @@ acp_bbcodes_edit_fieldsets_after
* Since: 3.1.0-a3
* Purpose: Add settings to BBCode add/edit form
acp_email_group_options_append
===
* Location: adm/style/acp_email.html
* Since: 3.1.7-RC1
* Purpose: Add content at the end of the group options select box
acp_email_group_options_prepend
===
* Location: adm/style/acp_email.html
* Since: 3.1.7-RC1
* Purpose: Add content at the start of the group options select box
acp_email_find_username_append
===
* Location: adm/style/acp_email.html
* Since: 3.1.7-RC1
* Purpose: Add content at the end of the fimd username link
acp_email_find_username_prepend
===
* Location: adm/style/acp_email.html
* Since: 3.1.7-RC1
* Purpose: Add content at the start of the fimd username link
acp_email_options_after
===
* Location: adm/style/acp_email.html
@ -64,6 +100,18 @@ acp_forums_prune_settings_prepend
* Since: 3.1.2-RC1
* Purpose: Add settings to forums before prune settings section
acp_forums_quick_select_button_append
===
* Location: adm/style/acp_forums.html
* Since: 3.1.7-RC1
* Purpose: Add content after the quick select forum submit button
acp_forums_quick_select_button_prepend
===
* Location: adm/style/acp_forums.html
* Since: 3.1.7-RC1
* Purpose: Add content before the quick select forum submit button
acp_forums_rules_settings_append
===
* Location: adm/style/acp_forums.html
@ -88,6 +136,66 @@ acp_group_options_after
* Since: 3.1.0-b4
* Purpose: Add addtional options to group settings (after GROUP_RECEIVE_PM)
acp_groups_find_username_append
===
* Location: adm/style/acp_groups.html
* Since: 3.1.7-RC1
* Purpose: Add content at the end of the find username link
acp_groups_find_username_prepend
===
* Location: adm/style/acp_groups.html
* Since: 3.1.7-RC1
* Purpose: Add content at the start of the find username link
acp_groups_manage_after
===
* Location: adm/style/acp_groups.html
* Since: 3.1.7-RC1
* Purpose: Add content after the manage groups table
acp_groups_manage_before
===
* Location: adm/style/acp_groups.html
* Since: 3.1.7-RC1
* Purpose: Add content before the manage groups table
acp_groups_position_legend_add_button_after
===
* Location: adm/style/acp_groups_position.html
* Since: 3.1.7-RC1
* Purpose: Add content after adding group to legend submit button
acp_groups_position_legend_add_button_before
===
* Location: adm/style/acp_groups_position.html
* Since: 3.1.7-RC1
* Purpose: Add content before adding group to legend submit button
acp_groups_position_teampage_add_button_after
===
* Location: adm/style/acp_groups_position.html
* Since: 3.1.7-RC1
* Purpose: Add content after adding group to teampage submit button
acp_groups_position_teampage_add_button_before
===
* Location: adm/style/acp_groups_position.html
* Since: 3.1.7-RC1
* Purpose: Add content before adding group to teampage submit button
acp_logs_quick_select_forum_button_append
===
* Location: adm/style/acp_logs.html
* Since: 3.1.7-RC1
* Purpose: Add content after the quick forum select form submit button
acp_logs_quick_select_forum_button_prepend
===
* Location: adm/style/acp_logs.html
* Since: 3.1.7-RC1
* Purpose: Add content before the quick forum select form submit button
acp_main_actions_append
===
* Location: adm/style/acp_main.html
@ -125,6 +233,102 @@ acp_overall_header_stylesheets_after
* Purpose: Add assets after stylesheets within the `<head>` tags in the ACP.
Note that INCLUDECSS will not work with this event.
acp_permission_forum_copy_src_forum_append
===
* Location: adm/style/permission_forum_copy.html
* Since: 3.1.7-RC1
* Purpose: Add content after the sourse forum select form
acp_permission_forum_copy_src_forum_prepend
===
* Location: adm/style/permission_forum_copy.html
* Since: 3.1.7-RC1
* Purpose: Add content before the sourse forum select form
acp_permission_forum_copy_dest_forum_append
===
* Location: adm/style/permission_forum_copy.html
* Since: 3.1.7-RC1
* Purpose: Add content after the destiny forum select form
acp_permission_forum_copy_dest_forum_prepend
===
* Location: adm/style/permission_forum_copy.html
* Since: 3.1.7-RC1
* Purpose: Add content before the destiny forum select form
acp_permissions_add_group_options_append
===
* Location: adm/style/acp_permissions.html
* Since: 3.1.7-RC1
* Purpose: Add content after the group multiple select form
acp_permissions_add_group_options_prepend
===
* Location: adm/style/acp_permissions.html
* Since: 3.1.7-RC1
* Purpose: Add content before the group multiple select form
acp_permissions_find_username_append
===
* Location: adm/style/acp_permissions.html
* Since: 3.1.7-RC1
* Purpose: Add content after the find username link
acp_permissions_find_username_prepend
===
* Location: adm/style/acp_permissions.html
* Since: 3.1.7-RC1
* Purpose: Add content before the find username link
acp_permissions_select_forum_append
===
* Location: adm/style/acp_permissions.html
* Since: 3.1.7-RC1
* Purpose: Add content after the forum select form label
acp_permissions_select_forum_prepend
===
* Location: adm/style/acp_permissions.html
* Since: 3.1.7-RC1
* Purpose: Add content before the forum select form label
acp_permissions_select_group_after
===
* Location: adm/style/acp_permissions.html
* Since: 3.1.7-RC1
* Purpose: Add content after the group select form in usergroup view
acp_permissions_select_group_append
===
* Location: adm/style/acp_permissions.html
* Since: 3.1.7-RC1
* Purpose: Add content after the group select form label
acp_permissions_select_group_before
===
* Location: adm/style/acp_permissions.html
* Since: 3.1.7-RC1
* Purpose: Add content before the group select form in usergroup view
acp_permissions_select_group_prepend
===
* Location: adm/style/acp_permissions.html
* Since: 3.1.7-RC1
* Purpose: Add content before the group select form label
acp_permissions_select_multiple_forum_append
===
* Location: adm/style/acp_permissions.html
* Since: 3.1.7-RC1
* Purpose: Add content after the forum multiple select form label
acp_permissions_select_multiple_forum_prepend
===
* Location: adm/style/acp_permissions.html
* Since: 3.1.7-RC1
* Purpose: Add content before the forum multiple select form label
acp_posting_buttons_after
===
* Locations:
@ -146,6 +350,34 @@ acp_profile_contact_before
* Since: 3.1.6-RC1
* Purpose: Add extra options to custom profile field configuration in the ACP
acp_prune_forums_append
===
* Locations:
+ adm/style/acp_prune_forums.html
* Since: 3.1.7-RC1
* Purpose: Add content after the forum select form label
acp_prune_forums_prepend
===
* Locations:
+ adm/style/acp_prune_forums.html
* Since: 3.1.7-RC1
* Purpose: Add content before the forum select form label
acp_prune_users_find_username_append
===
* Locations:
+ adm/style/acp_prune_users.html
* Since: 3.1.7-RC1
* Purpose: Add content after the find username link
acp_prune_users_find_username_prepend
===
* Locations:
+ adm/style/acp_prune_users.html
* Since: 3.1.7-RC1
* Purpose: Add content before the find username link
acp_ranks_edit_after
===
* Locations:
@ -297,6 +529,18 @@ acp_users_prefs_view_prepend
* Since: 3.1.0-b3
* Purpose: Add user options fieldset to the top of ACP users view prefs settings
acp_users_select_group_after
===
* Location: adm/style/acp_users.html
* Since: 3.1.7-RC1
* Purpose: Add content after group select form
acp_users_select_group_before
===
* Location: adm/style/acp_users.html
* Since: 3.1.7-RC1
* Purpose: Add content before group select form
attachment_file_after
===
* Locations: