From 8b21e7c0d9d27f9d1722966bf71e088e232cd4b2 Mon Sep 17 00:00:00 2001
From: alf007 <alf007@free.fr>
Date: Sat, 30 May 2015 18:25:38 +0200
Subject: [PATCH 1/2] [ticket/13843] Add templates events to insert custom
 panel in posting

Events added in events.md
Add in template posting_editor.html for link to custom panel
Add in template posting_layout.html for include of custom panel template body

PHPBB3-13843
---
 phpBB/docs/events.md                           | 18 ++++++++++++++++++
 .../prosilver/template/posting_editor.html     |  1 +
 .../prosilver/template/posting_layout.html     |  2 ++
 3 files changed, 21 insertions(+)

diff --git a/phpBB/docs/events.md b/phpBB/docs/events.md
index f811fae331..63f3c183ad 100644
--- a/phpBB/docs/events.md
+++ b/phpBB/docs/events.md
@@ -926,6 +926,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.5-RC1
+* Purpose: Add custom panel to post editor
+
 posting_editor_bbcode_status_after
 ===
 * Locations:
@@ -1014,6 +1021,17 @@ 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
+<<<<<<< HEAD
+* Since: 3.1.5-RC1
+=======
+* Since: 3.1.5
+>>>>>>> 5e45eb9... [ticket/13843] Add templates events to insert custom panel in posting
+* 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>

From 49bffc1851298e4aadfe2771ed70902cc57d29ec Mon Sep 17 00:00:00 2001
From: Marc Alexander <admin@m-a-styles.de>
Date: Wed, 22 Jul 2015 09:45:55 +0200
Subject: [PATCH 2/2] [ticket/13843] Fix merge issues and update @since version

PHPBB3-13843
---
 phpBB/docs/events.md | 8 ++------
 1 file changed, 2 insertions(+), 6 deletions(-)

diff --git a/phpBB/docs/events.md b/phpBB/docs/events.md
index 63f3c183ad..6235eee3a5 100644
--- a/phpBB/docs/events.md
+++ b/phpBB/docs/events.md
@@ -930,7 +930,7 @@ posting_editor_add_panel_tab
 ===
 * Locations:
     + styles/prosilver/template/posting_editor.html
-* Since: 3.1.5-RC1
+* Since: 3.1.6-RC1
 * Purpose: Add custom panel to post editor
 
 posting_editor_bbcode_status_after
@@ -1025,11 +1025,7 @@ posting_layout_include_panel_body
 ===
 * Locations:
     + styles/prosilver/template/posting_layout.html
-<<<<<<< HEAD
-* Since: 3.1.5-RC1
-=======
-* Since: 3.1.5
->>>>>>> 5e45eb9... [ticket/13843] Add templates events to insert custom panel in posting
+* Since: 3.1.6-RC1
 * Purpose: Add include of custom panel template body in posting editor
 
 posting_pm_header_find_username_after