mirror of
https://github.com/phpbb/phpbb.git
synced 2025-06-08 04:18:52 +00:00
Merge branch '3.2.x' into 3.3.x
This commit is contained in:
commit
cb0583df1d
2 changed files with 51 additions and 0 deletions
|
@ -21,8 +21,11 @@
|
||||||
|
|
||||||
<!-- IF S_STEP_ONE -->
|
<!-- IF S_STEP_ONE -->
|
||||||
|
|
||||||
|
{% EVENT acp_profile_options_before %}
|
||||||
|
|
||||||
<fieldset>
|
<fieldset>
|
||||||
<legend>{L_TITLE}</legend>
|
<legend>{L_TITLE}</legend>
|
||||||
|
{% EVENT acp_profile_basic_options_before %}
|
||||||
<dl>
|
<dl>
|
||||||
<dt><label>{L_FIELD_TYPE}{L_COLON}</label><br /><span>{L_FIELD_TYPE_EXPLAIN}</span></dt>
|
<dt><label>{L_FIELD_TYPE}{L_COLON}</label><br /><span>{L_FIELD_TYPE_EXPLAIN}</span></dt>
|
||||||
<dd><strong>{FIELD_TYPE}</strong></dd>
|
<dd><strong>{FIELD_TYPE}</strong></dd>
|
||||||
|
@ -43,8 +46,11 @@
|
||||||
<dd><label><input type="radio" class="radio" id="field_no_view" name="field_no_view" value="0"<!-- IF not S_FIELD_NO_VIEW --> checked="checked"<!-- ENDIF --> /> {L_YES}</label>
|
<dd><label><input type="radio" class="radio" id="field_no_view" name="field_no_view" value="0"<!-- IF not S_FIELD_NO_VIEW --> checked="checked"<!-- ENDIF --> /> {L_YES}</label>
|
||||||
<label><input type="radio" class="radio" name="field_no_view" value="1"<!-- IF S_FIELD_NO_VIEW --> checked="checked"<!-- ENDIF --> /> {L_NO}</label></dd>
|
<label><input type="radio" class="radio" name="field_no_view" value="1"<!-- IF S_FIELD_NO_VIEW --> checked="checked"<!-- ENDIF --> /> {L_NO}</label></dd>
|
||||||
</dl>
|
</dl>
|
||||||
|
{% EVENT acp_profile_basic_options_after %}
|
||||||
</fieldset>
|
</fieldset>
|
||||||
|
|
||||||
|
{% EVENT acp_profile_visibility_options_before %}
|
||||||
|
|
||||||
<fieldset>
|
<fieldset>
|
||||||
<legend>{L_VISIBILITY_OPTION}</legend>
|
<legend>{L_VISIBILITY_OPTION}</legend>
|
||||||
<dl>
|
<dl>
|
||||||
|
@ -87,8 +93,11 @@
|
||||||
<dd><input class="text medium" type="text" name="field_contact_url" id="field_contact_url" value="{FIELD_CONTACT_URL}" /> <label for="field_contact_url">{L_FIELD_CONTACT_URL}</label></dd>
|
<dd><input class="text medium" type="text" name="field_contact_url" id="field_contact_url" value="{FIELD_CONTACT_URL}" /> <label for="field_contact_url">{L_FIELD_CONTACT_URL}</label></dd>
|
||||||
<!-- EVENT acp_profile_contact_last -->
|
<!-- EVENT acp_profile_contact_last -->
|
||||||
</dl>
|
</dl>
|
||||||
|
{% EVENT acp_profile_contact_after %}
|
||||||
</fieldset>
|
</fieldset>
|
||||||
|
|
||||||
|
{% EVENT acp_profile_visibility_options_after %}
|
||||||
|
|
||||||
<!-- IF S_EDIT_MODE -->
|
<!-- IF S_EDIT_MODE -->
|
||||||
<fieldset class="quick">
|
<fieldset class="quick">
|
||||||
<input class="button1" type="submit" name="save" value="{L_SAVE}" />
|
<input class="button1" type="submit" name="save" value="{L_SAVE}" />
|
||||||
|
|
|
@ -410,6 +410,27 @@ acp_posting_buttons_custom_tags_before
|
||||||
* Since: 3.1.10-RC1
|
* Since: 3.1.10-RC1
|
||||||
* Purpose: Add content before the custom BBCodes in the ACP
|
* Purpose: Add content before the custom BBCodes in the ACP
|
||||||
|
|
||||||
|
acp_profile_basic_options_after
|
||||||
|
===
|
||||||
|
* Locations:
|
||||||
|
+ adm/style/acp_profile.html
|
||||||
|
* Since: 3.2.10-RC1
|
||||||
|
* Purpose: Add content after custom profile field basic options in the ACP
|
||||||
|
|
||||||
|
acp_profile_basic_options_before
|
||||||
|
===
|
||||||
|
* Locations:
|
||||||
|
+ adm/style/acp_profile.html
|
||||||
|
* Since: 3.2.10-RC1
|
||||||
|
* Purpose: Add content before custom profile field basic options in the ACP
|
||||||
|
|
||||||
|
acp_profile_contact_after
|
||||||
|
===
|
||||||
|
* Locations:
|
||||||
|
+ adm/style/acp_profile.html
|
||||||
|
* Since: 3.2.10-RC1
|
||||||
|
* Purpose: Add content after contact specific custom profile field option in the ACP
|
||||||
|
|
||||||
acp_profile_contact_before
|
acp_profile_contact_before
|
||||||
===
|
===
|
||||||
* Locations:
|
* Locations:
|
||||||
|
@ -424,6 +445,13 @@ acp_profile_contact_last
|
||||||
* Since: 3.1.11-RC1
|
* Since: 3.1.11-RC1
|
||||||
* Purpose: Add contact specific options to custom profile fields in the ACP
|
* Purpose: Add contact specific options to custom profile fields in the ACP
|
||||||
|
|
||||||
|
acp_profile_options_before
|
||||||
|
===
|
||||||
|
* Locations:
|
||||||
|
+ adm/style/acp_profile.html
|
||||||
|
* Since: 3.2.10-RC1
|
||||||
|
* Purpose: Add content before custom profile field options in the ACP
|
||||||
|
|
||||||
acp_profile_step_one_lang_after
|
acp_profile_step_one_lang_after
|
||||||
===
|
===
|
||||||
* Locations:
|
* Locations:
|
||||||
|
@ -431,6 +459,20 @@ acp_profile_step_one_lang_after
|
||||||
* Since: 3.1.11-RC1
|
* Since: 3.1.11-RC1
|
||||||
* Purpose: Add extra lang specific options to custom profile field step one configuration in the ACP
|
* Purpose: Add extra lang specific options to custom profile field step one configuration in the ACP
|
||||||
|
|
||||||
|
acp_profile_visibility_options_after
|
||||||
|
===
|
||||||
|
* Locations:
|
||||||
|
+ adm/style/acp_profile.html
|
||||||
|
* Since: 3.2.10-RC1
|
||||||
|
* Purpose: Add content after custom profile field visibility options in the ACP
|
||||||
|
|
||||||
|
acp_profile_visibility_options_before
|
||||||
|
===
|
||||||
|
* Locations:
|
||||||
|
+ adm/style/acp_profile.html
|
||||||
|
* Since: 3.2.10-RC1
|
||||||
|
* Purpose: Add content before custom profile field visibility options in the ACP
|
||||||
|
|
||||||
acp_prune_forums_append
|
acp_prune_forums_append
|
||||||
===
|
===
|
||||||
* Locations:
|
* Locations:
|
||||||
|
|
Loading…
Add table
Reference in a new issue