Merge branch '3.2.x'

This commit is contained in:
Marc Alexander 2016-09-11 11:08:41 +02:00
commit 6f31d334e0
2 changed files with 19 additions and 1 deletions

View file

@ -1400,6 +1400,13 @@ posting_editor_subject_after
* Since: 3.1.0-a2 * Since: 3.1.0-a2
* Purpose: Add field (e.g. textbox) to the posting screen after the subject * Purpose: Add field (e.g. textbox) to the posting screen after the subject
posting_editor_subject_append
===
* Locations:
+ styles/prosilver/template/posting_editor.html
* Since: 3.1.10-RC1
* Purpose: Add field, text, etc. to the posting after the subject text box
posting_editor_subject_before posting_editor_subject_before
=== ===
* Locations: * Locations:
@ -1407,6 +1414,13 @@ posting_editor_subject_before
* Since: 3.1.0-a2 * Since: 3.1.0-a2
* Purpose: Add field (e.g. textbox) to the posting screen before the subject * Purpose: Add field (e.g. textbox) to the posting screen before the subject
posting_editor_subject_prepend
===
* Locations:
+ styles/prosilver/template/posting_editor.html
* Since: 3.1.10-RC1
* Purpose: Add field, text, etc. to the posting before the subject text box
posting_editor_submit_buttons posting_editor_submit_buttons
=== ===
* Locations: * Locations:

View file

@ -23,7 +23,11 @@
<!-- IF S_POST_ACTION or S_PRIVMSGS or S_EDIT_DRAFT --> <!-- IF S_POST_ACTION or S_PRIVMSGS or S_EDIT_DRAFT -->
<dl style="clear: left;"> <dl style="clear: left;">
<dt><label for="subject">{L_SUBJECT}{L_COLON}</label></dt> <dt><label for="subject">{L_SUBJECT}{L_COLON}</label></dt>
<dd><input type="text" name="subject" id="subject" size="45" maxlength="<!-- IF S_NEW_MESSAGE -->120<!-- ELSE -->124<!-- ENDIF -->" tabindex="2" value="{SUBJECT}{DRAFT_SUBJECT}" class="inputbox autowidth" /></dd> <dd>
<!-- EVENT posting_editor_subject_prepend -->
<input type="text" name="subject" id="subject" size="45" maxlength="<!-- IF S_NEW_MESSAGE -->120<!-- ELSE -->124<!-- ENDIF -->" tabindex="2" value="{SUBJECT}{DRAFT_SUBJECT}" class="inputbox autowidth" />
<!-- EVENT posting_editor_subject_append -->
</dd>
</dl> </dl>
<!-- IF CAPTCHA_TEMPLATE and S_CONFIRM_CODE --> <!-- IF CAPTCHA_TEMPLATE and S_CONFIRM_CODE -->
<!-- DEFINE $CAPTCHA_TAB_INDEX = 3 --> <!-- DEFINE $CAPTCHA_TAB_INDEX = 3 -->