diff options
| author | Marc Alexander <admin@m-a-styles.de> | 2016-09-11 11:08:24 +0200 |
|---|---|---|
| committer | Marc Alexander <admin@m-a-styles.de> | 2016-09-11 11:08:24 +0200 |
| commit | 316b69805b82ae661c8c45b80df883d896b00b42 (patch) | |
| tree | 220ab6ed58763e5a78b96e2ce576110678921fe5 | |
| parent | 14cc4f3ae2b6a5b1000f956599537dd88a0c937d (diff) | |
| parent | 4b8e8df55cce7653132cf67778d18cc66c2f6418 (diff) | |
| download | forums-316b69805b82ae661c8c45b80df883d896b00b42.tar forums-316b69805b82ae661c8c45b80df883d896b00b42.tar.gz forums-316b69805b82ae661c8c45b80df883d896b00b42.tar.bz2 forums-316b69805b82ae661c8c45b80df883d896b00b42.tar.xz forums-316b69805b82ae661c8c45b80df883d896b00b42.zip | |
Merge branch '3.1.x' into 3.2.x
Conflicts:
phpBB/styles/subsilver2/template/posting_body.html
| -rw-r--r-- | phpBB/docs/events.md | 14 | ||||
| -rw-r--r-- | phpBB/styles/prosilver/template/posting_editor.html | 6 |
2 files changed, 19 insertions, 1 deletions
diff --git a/phpBB/docs/events.md b/phpBB/docs/events.md index f2241228fe..60cc4238d5 100644 --- a/phpBB/docs/events.md +++ b/phpBB/docs/events.md @@ -1400,6 +1400,13 @@ posting_editor_subject_after * Since: 3.1.0-a2 * 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 === * Locations: @@ -1407,6 +1414,13 @@ posting_editor_subject_before * Since: 3.1.0-a2 * 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 === * Locations: diff --git a/phpBB/styles/prosilver/template/posting_editor.html b/phpBB/styles/prosilver/template/posting_editor.html index 0d526cd72f..d963c98e08 100644 --- a/phpBB/styles/prosilver/template/posting_editor.html +++ b/phpBB/styles/prosilver/template/posting_editor.html @@ -23,7 +23,11 @@ <!-- IF S_POST_ACTION or S_PRIVMSGS or S_EDIT_DRAFT --> <dl style="clear: left;"> <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> <!-- IF CAPTCHA_TEMPLATE and S_CONFIRM_CODE --> <!-- DEFINE $CAPTCHA_TAB_INDEX = 3 --> |