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 'develop-ascraeus' into develop

Browse source
This commit is contained in:
Joas Schilling 2014-11-21 20:09:27 +01:00
commit 73f1cfd583
2 changed files with 50 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
phpBB/adm/style/acp_forums.html
View file

@ -111,6 +111,7 @@
<fieldset> <fieldset>
<legend>{L_FORUM_SETTINGS}</legend> <legend>{L_FORUM_SETTINGS}</legend>
<!-- EVENT acp_forums_main_settings_prepend -->
<dl> <dl>
<dt><label for="forum_type">{L_FORUM_TYPE}{L_COLON}</label></dt> <dt><label for="forum_type">{L_FORUM_TYPE}{L_COLON}</label></dt>
<dd><select id="forum_type" name="forum_type" onchange="display_options(this.options[this.selectedIndex].value);">{S_FORUM_TYPE_OPTIONS}</select></dd> <dd><select id="forum_type" name="forum_type" onchange="display_options(this.options[this.selectedIndex].value);">{S_FORUM_TYPE_OPTIONS}</select></dd>
@ -182,6 +183,7 @@
<dt><label for="forum_style">{L_FORUM_STYLE}{L_COLON}</label></dt> <dt><label for="forum_style">{L_FORUM_STYLE}{L_COLON}</label></dt>
<dd><select id="forum_style" name="forum_style"><option value="0">{L_DEFAULT_STYLE}</option>{S_STYLES_OPTIONS}</select></dd> <dd><select id="forum_style" name="forum_style"><option value="0">{L_DEFAULT_STYLE}</option>{S_STYLES_OPTIONS}</select></dd>
</dl> </dl>
<!-- EVENT acp_forums_main_settings_append -->
</fieldset> </fieldset>
<div id="forum_cat_options"> <div id="forum_cat_options">
@ -198,6 +200,7 @@
<div id="forum_post_options"> <div id="forum_post_options">
<fieldset> <fieldset>
<legend>{L_GENERAL_FORUM_SETTINGS}</legend> <legend>{L_GENERAL_FORUM_SETTINGS}</legend>
<!-- EVENT acp_forums_normal_settings_prepend -->
<dl> <dl>
<dt><label for="forum_status">{L_FORUM_STATUS}{L_COLON}</label></dt> <dt><label for="forum_status">{L_FORUM_STATUS}{L_COLON}</label></dt>
<dd><select id="forum_status" name="forum_status">{S_STATUS_OPTIONS}</select></dd> <dd><select id="forum_status" name="forum_status">{S_STATUS_OPTIONS}</select></dd>
@ -246,6 +249,7 @@
<fieldset> <fieldset>
<legend>{L_FORUM_PRUNE_SETTINGS}</legend> <legend>{L_FORUM_PRUNE_SETTINGS}</legend>
<!-- EVENT acp_forums_prune_settings_prepend -->
<dl> <dl>
<dt><label for="enable_prune">{L_FORUM_AUTO_PRUNE}{L_COLON}</label><br /><span>{L_FORUM_AUTO_PRUNE_EXPLAIN}</span></dt> <dt><label for="enable_prune">{L_FORUM_AUTO_PRUNE}{L_COLON}</label><br /><span>{L_FORUM_AUTO_PRUNE_EXPLAIN}</span></dt>
<dd><label><input type="radio" class="radio" name="enable_prune" value="1"<!-- IF S_PRUNE_ENABLE --> id="enable_prune" checked="checked"<!-- ENDIF --> /> {L_YES}</label> <dd><label><input type="radio" class="radio" name="enable_prune" value="1"<!-- IF S_PRUNE_ENABLE --> id="enable_prune" checked="checked"<!-- ENDIF --> /> {L_YES}</label>
@ -291,6 +295,7 @@
<dt><label for="prune_shadow_days">{L_AUTO_PRUNE_SHADOW_DAYS}{L_COLON}</label><br /><span>{L_AUTO_PRUNE_SHADOW_DAYS_EXPLAIN}</span></dt> <dt><label for="prune_shadow_days">{L_AUTO_PRUNE_SHADOW_DAYS}{L_COLON}</label><br /><span>{L_AUTO_PRUNE_SHADOW_DAYS_EXPLAIN}</span></dt>
<dd><input type="number" id="prune_shadow_days" name="prune_shadow_days" value="{PRUNE_SHADOW_DAYS}" maxlength="4" size="4" min="0" max="9999" /> {L_DAYS}</dd> <dd><input type="number" id="prune_shadow_days" name="prune_shadow_days" value="{PRUNE_SHADOW_DAYS}" maxlength="4" size="4" min="0" max="9999" /> {L_DAYS}</dd>
</dl> </dl>
<!-- EVENT acp_forums_prune_settings_append -->
</fieldset> </fieldset>
</div> </div>
@ -317,6 +322,7 @@
<div id="forum_rules_options"> <div id="forum_rules_options">
<fieldset> <fieldset>
<legend>{L_FORUM_RULES}</legend> <legend>{L_FORUM_RULES}</legend>
<!-- EVENT acp_forums_rules_settings_prepend -->
<dl> <dl>
<dt><label for="forum_rules_link">{L_FORUM_RULES_LINK}{L_COLON}</label><br /><span>{L_FORUM_RULES_LINK_EXPLAIN}</span></dt> <dt><label for="forum_rules_link">{L_FORUM_RULES_LINK}{L_COLON}</label><br /><span>{L_FORUM_RULES_LINK_EXPLAIN}</span></dt>
<dd><input class="text medium" type="text" id="forum_rules_link" name="forum_rules_link" value="{FORUM_RULES_LINK}" maxlength="255" /></dd> <dd><input class="text medium" type="text" id="forum_rules_link" name="forum_rules_link" value="{FORUM_RULES_LINK}" maxlength="255" /></dd>
@ -334,6 +340,7 @@
<label><input type="checkbox" class="radio" name="rules_parse_smilies"<!-- IF S_SMILIES_CHECKED --> checked="checked"<!-- ENDIF --> /> {L_PARSE_SMILIES}</label> <label><input type="checkbox" class="radio" name="rules_parse_smilies"<!-- IF S_SMILIES_CHECKED --> checked="checked"<!-- ENDIF --> /> {L_PARSE_SMILIES}</label>
<label><input type="checkbox" class="radio" name="rules_parse_urls"<!-- IF S_URLS_CHECKED --> checked="checked"<!-- ENDIF --> /> {L_PARSE_URLS}</label></dd> <label><input type="checkbox" class="radio" name="rules_parse_urls"<!-- IF S_URLS_CHECKED --> checked="checked"<!-- ENDIF --> /> {L_PARSE_URLS}</label></dd>
</dl> </dl>
<!-- EVENT acp_forums_rules_settings_append -->
</fieldset> </fieldset>
</div> </div>

44
phpBB/docs/events.md
View file

@ -22,11 +22,53 @@ acp_email_options_after
* Since: 3.1.2-RC1 * Since: 3.1.2-RC1
* Purpose: Add settings to mass email form * Purpose: Add settings to mass email form
acp_forums_main_settings_append
===
* Location: adm/style/acp_forums.html
* Since: 3.1.2-RC1
* Purpose: Add settings to forums at end of main settings section
acp_forums_main_settings_prepend
===
* Location: adm/style/acp_forums.html
* Since: 3.1.2-RC1
* Purpose: Add settings to forums before main settings section
acp_forums_normal_settings_append acp_forums_normal_settings_append
=== ===
* Location: adm/style/acp_forums.html * Location: adm/style/acp_forums.html
* Since: 3.1.0-a1 * Since: 3.1.0-a1
* Purpose: Add settings to forums * Purpose: Add settings to forums at end of normal settings section
acp_forums_normal_settings_prepend
===
* Location: adm/style/acp_forums.html
* Since: 3.1.2-RC1
* Purpose: Add settings to forums before normal settings section
acp_forums_prune_settings_append
===
* Location: adm/style/acp_forums.html
* Since: 3.1.2-RC1
* Purpose: Add settings to forums at end of prune settings section
acp_forums_prune_settings_prepend
===
* Location: adm/style/acp_forums.html
* Since: 3.1.2-RC1
* Purpose: Add settings to forums before prune settings section
acp_forums_rules_settings_append
===
* Location: adm/style/acp_forums.html
* Since: 3.1.2-RC1
* Purpose: Add settings to forums at end of rules settings section
acp_forums_rules_settings_prepend
===
* Location: adm/style/acp_forums.html
* Since: 3.1.2-RC1
* Purpose: Add settings to forums before rules settings section
acp_group_options_before acp_group_options_before
=== ===