diff options
| author | Marc Alexander <admin@m-a-styles.de> | 2015-07-22 10:14:50 +0200 |
|---|---|---|
| committer | Marc Alexander <admin@m-a-styles.de> | 2015-07-22 10:14:50 +0200 |
| commit | b3974ed0f694603eb59894cfa6a887a61dae4f8d (patch) | |
| tree | 976d3b9b5bf667803e46fb7b564e03c780ddd994 | |
| parent | 69c66db45936efb7c018b22170ca8fc34fbc567e (diff) | |
| parent | d1e6c89b9040b17478bc70f5ca3f3bea9b3b7c42 (diff) | |
| download | forums-b3974ed0f694603eb59894cfa6a887a61dae4f8d.tar forums-b3974ed0f694603eb59894cfa6a887a61dae4f8d.tar.gz forums-b3974ed0f694603eb59894cfa6a887a61dae4f8d.tar.bz2 forums-b3974ed0f694603eb59894cfa6a887a61dae4f8d.tar.xz forums-b3974ed0f694603eb59894cfa6a887a61dae4f8d.zip | |
Merge branch '3.1.x'
| -rw-r--r-- | phpBB/docs/events.md | 14 | ||||
| -rw-r--r-- | phpBB/styles/prosilver/template/posting_editor.html | 1 | ||||
| -rw-r--r-- | phpBB/styles/prosilver/template/posting_layout.html | 2 |
3 files changed, 17 insertions, 0 deletions
diff --git a/phpBB/docs/events.md b/phpBB/docs/events.md index e9a382c6e6..fb7dc3e172 100644 --- a/phpBB/docs/events.md +++ b/phpBB/docs/events.md @@ -854,6 +854,13 @@ overall_header_stylesheets_after * Purpose: Add asset calls after stylesheets within the `</head>` tag. Note that INCLUDECSS will not work with this event. +posting_editor_add_panel_tab +=== +* Locations: + + styles/prosilver/template/posting_editor.html +* Since: 3.1.6-RC1 +* Purpose: Add custom panel to post editor + posting_editor_bbcode_status_after === * Locations: @@ -931,6 +938,13 @@ posting_editor_subject_before * Since: 3.1.0-a2 * Purpose: Add field (e.g. textbox) to the posting screen before the subject +posting_layout_include_panel_body +=== +* Locations: + + styles/prosilver/template/posting_layout.html +* Since: 3.1.6-RC1 +* Purpose: Add include of custom panel template body in posting editor + posting_pm_header_find_username_after === * Locations: diff --git a/phpBB/styles/prosilver/template/posting_editor.html b/phpBB/styles/prosilver/template/posting_editor.html index 5804f95579..1581afdb12 100644 --- a/phpBB/styles/prosilver/template/posting_editor.html +++ b/phpBB/styles/prosilver/template/posting_editor.html @@ -116,6 +116,7 @@ <a href="#tabs" data-subpanel="poll-panel" role="tab" aria-controls="poll-panel">{L_ADD_POLL}</a> </li> <!-- ENDIF --> + <!-- EVENT posting_editor_add_panel_tab --> </ul> </div> <!-- ENDIF --> diff --git a/phpBB/styles/prosilver/template/posting_layout.html b/phpBB/styles/prosilver/template/posting_layout.html index 630afdb832..34f0c63d5c 100644 --- a/phpBB/styles/prosilver/template/posting_layout.html +++ b/phpBB/styles/prosilver/template/posting_layout.html @@ -77,6 +77,8 @@ <!-- IF S_SHOW_POLL_BOX or S_POLL_DELETE --><!-- INCLUDE posting_poll_body.html --><!-- ENDIF --> +<!-- EVENT posting_layout_include_panel_body --> + <!-- IF S_DISPLAY_REVIEW --><!-- INCLUDE posting_topic_review.html --><!-- ENDIF --> </form> |