From c7be452861de7a62959d36d9212d4ebe72c8c688 Mon Sep 17 00:00:00 2001
From: PayBas <contact@paybas.com>
Date: Wed, 16 Jul 2014 10:01:53 +0200
Subject: [PATCH 1/4] [ticket/12857] Add template events
 breadcrumbs_before/after

PHPBB3-12857
---
 phpBB/docs/events.md                             | 16 ++++++++++++++++
 .../styles/prosilver/template/navbar_header.html |  2 ++
 .../styles/subsilver2/template/breadcrumbs.html  |  2 ++
 3 files changed, 20 insertions(+)

diff --git a/phpBB/docs/events.md b/phpBB/docs/events.md
index 2fd97986f7..389ab13ef0 100644
--- a/phpBB/docs/events.md
+++ b/phpBB/docs/events.md
@@ -488,6 +488,22 @@ overall_header_breadcrumb_append
 * Since: 3.1.0-a1
 * Purpose: Add links to the list of breadcrumbs in the header
 
+overall_header_breadcrumbs_after
+===
+* Locations:
+    + styles/prosilver/template/navbar_header.html
+    + styles/subsilver2/template/breadcrumbs.html
+* Since: 3.1.0-RC3
+* Purpose: Add content after the breadcrumbs (outside of the breadcrumbs container)
+
+overall_header_breadcrumbs_before
+===
+* Locations:
+    + styles/prosilver/template/navbar_header.html
+    + styles/subsilver2/template/breadcrumbs.html
+* Since: 3.1.0-RC3
+* Purpose: Add content before the breadcrumbs (outside of the breadcrumbs container)
+
 overall_header_content_before
 ===
 * Locations:
diff --git a/phpBB/styles/prosilver/template/navbar_header.html b/phpBB/styles/prosilver/template/navbar_header.html
index a83cd5b0a2..b7332ff7e8 100644
--- a/phpBB/styles/prosilver/template/navbar_header.html
+++ b/phpBB/styles/prosilver/template/navbar_header.html
@@ -83,6 +83,7 @@
 
 	<ul id="nav-breadcrumbs" class="linklist navlinks" role="menubar">
 		<!-- DEFINE $MICRODATA = ' itemtype="http://data-vocabulary.org/Breadcrumb" itemscope=""' -->
+		<!-- EVENT overall_header_breadcrumbs_before -->
 		<li class="small-icon icon-home breadcrumbs">
 			<!-- IF U_SITE_HOME --><span class="crumb"><a href="{U_SITE_HOME}"{$MICRODATA} data-navbar-reference="home">{L_SITE_HOME}</a></span><!-- ENDIF -->
 			<span class="crumb"><a href="{U_INDEX}" accesskey="h"{$MICRODATA} data-navbar-reference="index">{L_INDEX}</a></span>
@@ -93,6 +94,7 @@
 			<!-- END navlinks -->
 			<!-- EVENT overall_header_breadcrumb_append -->
 		</li>
+		<!-- EVENT overall_header_breadcrumbs_after -->
 
 		<!-- IF S_DISPLAY_SEARCH and not S_IN_SEARCH -->
 			<li class="rightside responsive-search" style="display: none;"><a href="{U_SEARCH}" title="{L_SEARCH_ADV_EXPLAIN}" role="menuitem">{L_SEARCH}</a></li>
diff --git a/phpBB/styles/subsilver2/template/breadcrumbs.html b/phpBB/styles/subsilver2/template/breadcrumbs.html
index 3aa05bc0eb..cc00a58d6d 100644
--- a/phpBB/styles/subsilver2/template/breadcrumbs.html
+++ b/phpBB/styles/subsilver2/template/breadcrumbs.html
@@ -2,8 +2,10 @@
 	<table class="tablebg" width="100%" cellspacing="1" cellpadding="0" style="margin-top: 5px;">
 	<tr>
 		<td class="row1">
+			<!-- EVENT overall_header_breadcrumbs_before -->
 			<p class="breadcrumbs"><!-- IF U_SITE_HOME --><a href="{U_SITE_HOME}"{$MICRODATA} data-navbar-reference="home">{L_SITE_HOME}</a> <strong>&#187;</strong> <!-- ENDIF --><a href="{U_INDEX}"{$MICRODATA} data-navbar-reference="index">{L_INDEX}</a><!-- BEGIN navlinks --><!-- EVENT overall_header_navlink_prepend --> &#187; <a href="{navlinks.U_VIEW_FORUM}"{$MICRODATA}<!-- IF navlinks.MICRODATA --> {navlinks.MICRODATA}<!-- ENDIF -->>{navlinks.FORUM_NAME}</a><!-- EVENT overall_header_navlink_append --><!-- END navlinks -->
 			<!-- EVENT overall_header_breadcrumb_append --></p>
+			<!-- EVENT overall_header_breadcrumbs_after -->
 			<!-- EVENT overall_footer_timezone_before -->
 			<p class="datetime">{S_TIMEZONE}</p>
 			<!-- EVENT overall_footer_timezone_after -->

From 2913b440804de641f618a8b5c2934651263bb66a Mon Sep 17 00:00:00 2001
From: PayBas <contact@paybas.com>
Date: Wed, 16 Jul 2014 13:36:22 +0200
Subject: [PATCH 2/4] [ticket/12857] Add missing template events
 breadcrumb_prepend

To insert links after site-home

PHPBB3-12857
---
 phpBB/docs/events.md                              | 15 +++++++++++++++
 .../styles/prosilver/template/navbar_footer.html  |  1 +
 .../styles/prosilver/template/navbar_header.html  |  1 +
 phpBB/styles/subsilver2/template/breadcrumbs.html |  2 +-
 4 files changed, 18 insertions(+), 1 deletion(-)

diff --git a/phpBB/docs/events.md b/phpBB/docs/events.md
index 389ab13ef0..5b5675d620 100644
--- a/phpBB/docs/events.md
+++ b/phpBB/docs/events.md
@@ -408,6 +408,13 @@ overall_footer_breadcrumb_append
 * Since: 3.1.0-a1
 * Purpose: Add links to the list of breadcrumbs in the footer
 
+overall_footer_breadcrumb_prepend
+===
+* Locations:
+    + styles/prosilver/template/navbar_footer.html
+* Since: 3.1.0-RC3
+* Purpose: Add links to the list of breadcrumbs in the footer (after site-home, but before board-index)
+
 overall_footer_content_after
 ===
 * Locations:
@@ -488,6 +495,14 @@ overall_header_breadcrumb_append
 * Since: 3.1.0-a1
 * Purpose: Add links to the list of breadcrumbs in the header
 
+overall_header_breadcrumb_prepend
+===
+* Locations:
+    + styles/prosilver/template/navbar_header.html
+    + styles/subsilver2/template/breadcrumbs.html
+* Since: 3.1.0-RC3
+* Purpose: Add links to the list of breadcrumbs in the header (after site-home, but before board-index)
+
 overall_header_breadcrumbs_after
 ===
 * Locations:
diff --git a/phpBB/styles/prosilver/template/navbar_footer.html b/phpBB/styles/prosilver/template/navbar_footer.html
index f8ca83163b..4a9275c898 100644
--- a/phpBB/styles/prosilver/template/navbar_footer.html
+++ b/phpBB/styles/prosilver/template/navbar_footer.html
@@ -4,6 +4,7 @@
 	<ul id="nav-footer" class="linklist bulletin" role="menubar">
 		<li class="small-icon icon-home breadcrumbs">
 			<!-- IF U_SITE_HOME --><span class="crumb"><a href="{U_SITE_HOME}" data-navbar-reference="home">{L_SITE_HOME}</a></span><!-- ENDIF -->
+			<!-- EVENT overall_footer_breadcrumb_prepend -->
 			<span class="crumb"><a href="{U_INDEX}" data-navbar-reference="index">{L_INDEX}</a></span>
 			<!-- EVENT overall_footer_breadcrumb_append -->
 		</li>
diff --git a/phpBB/styles/prosilver/template/navbar_header.html b/phpBB/styles/prosilver/template/navbar_header.html
index b7332ff7e8..ed34089550 100644
--- a/phpBB/styles/prosilver/template/navbar_header.html
+++ b/phpBB/styles/prosilver/template/navbar_header.html
@@ -86,6 +86,7 @@
 		<!-- EVENT overall_header_breadcrumbs_before -->
 		<li class="small-icon icon-home breadcrumbs">
 			<!-- IF U_SITE_HOME --><span class="crumb"><a href="{U_SITE_HOME}"{$MICRODATA} data-navbar-reference="home">{L_SITE_HOME}</a></span><!-- ENDIF -->
+			<!-- EVENT overall_header_breadcrumb_prepend -->
 			<span class="crumb"><a href="{U_INDEX}" accesskey="h"{$MICRODATA} data-navbar-reference="index">{L_INDEX}</a></span>
 			<!-- BEGIN navlinks -->
 				<!-- EVENT overall_header_navlink_prepend -->
diff --git a/phpBB/styles/subsilver2/template/breadcrumbs.html b/phpBB/styles/subsilver2/template/breadcrumbs.html
index cc00a58d6d..fb44c6de63 100644
--- a/phpBB/styles/subsilver2/template/breadcrumbs.html
+++ b/phpBB/styles/subsilver2/template/breadcrumbs.html
@@ -3,7 +3,7 @@
 	<tr>
 		<td class="row1">
 			<!-- EVENT overall_header_breadcrumbs_before -->
-			<p class="breadcrumbs"><!-- IF U_SITE_HOME --><a href="{U_SITE_HOME}"{$MICRODATA} data-navbar-reference="home">{L_SITE_HOME}</a> <strong>&#187;</strong> <!-- ENDIF --><a href="{U_INDEX}"{$MICRODATA} data-navbar-reference="index">{L_INDEX}</a><!-- BEGIN navlinks --><!-- EVENT overall_header_navlink_prepend --> &#187; <a href="{navlinks.U_VIEW_FORUM}"{$MICRODATA}<!-- IF navlinks.MICRODATA --> {navlinks.MICRODATA}<!-- ENDIF -->>{navlinks.FORUM_NAME}</a><!-- EVENT overall_header_navlink_append --><!-- END navlinks -->
+			<p class="breadcrumbs"><!-- IF U_SITE_HOME --><a href="{U_SITE_HOME}"{$MICRODATA} data-navbar-reference="home">{L_SITE_HOME}</a> <strong>&#187;</strong> <!-- ENDIF --><!-- EVENT overall_header_breadcrumb_prepend --><a href="{U_INDEX}"{$MICRODATA} data-navbar-reference="index">{L_INDEX}</a><!-- BEGIN navlinks --><!-- EVENT overall_header_navlink_prepend --> &#187; <a href="{navlinks.U_VIEW_FORUM}"{$MICRODATA}<!-- IF navlinks.MICRODATA --> {navlinks.MICRODATA}<!-- ENDIF -->>{navlinks.FORUM_NAME}</a><!-- EVENT overall_header_navlink_append --><!-- END navlinks -->
 			<!-- EVENT overall_header_breadcrumb_append --></p>
 			<!-- EVENT overall_header_breadcrumbs_after -->
 			<!-- EVENT overall_footer_timezone_before -->

From 5507c503b4b99c0bd8955566da352ea840382911 Mon Sep 17 00:00:00 2001
From: PayBas <contact@paybas.com>
Date: Wed, 23 Jul 2014 10:37:44 +0200
Subject: [PATCH 3/4] [ticket/12857] Clarify events.md on difference between PS
 and SS2 breadcrumbs

PHPBB3-12857
---
 phpBB/docs/events.md | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/phpBB/docs/events.md b/phpBB/docs/events.md
index 5b5675d620..afd3d27c9a 100644
--- a/phpBB/docs/events.md
+++ b/phpBB/docs/events.md
@@ -406,14 +406,17 @@ overall_footer_breadcrumb_append
 * Locations:
     + styles/prosilver/template/navbar_footer.html
 * Since: 3.1.0-a1
-* Purpose: Add links to the list of breadcrumbs in the footer
+* Purpose: Add links to the list of breadcrumbs in the footer. Note that utilizing this event requires
+a different solution for subsilver2, since it only supports the overall_header_breadcrumb versions.
 
 overall_footer_breadcrumb_prepend
 ===
 * Locations:
     + styles/prosilver/template/navbar_footer.html
 * Since: 3.1.0-RC3
-* Purpose: Add links to the list of breadcrumbs in the footer (after site-home, but before board-index)
+* Purpose: Add links to the list of breadcrumbs in the footer (after site-home, but before board-index).
+Note that utilizing this event requires a different solution for subsilver2, since it only supports the 
+overall_header_breadcrumb versions.
 
 overall_footer_content_after
 ===

From 1bd5edacb6ba3bba71806e8281d624656997f360 Mon Sep 17 00:00:00 2001
From: PayBas <contact@paybas.com>
Date: Wed, 23 Jul 2014 16:06:37 +0200
Subject: [PATCH 4/4] [ticket/12857] Add header/footer distinction for
 subsilver2 events

PHPBB3-12857
---
 phpBB/docs/events.md                                 | 9 ++++-----
 phpBB/styles/subsilver2/template/breadcrumbs.html    | 4 ++--
 phpBB/styles/subsilver2/template/overall_header.html | 2 ++
 3 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/phpBB/docs/events.md b/phpBB/docs/events.md
index afd3d27c9a..2c84ceea3f 100644
--- a/phpBB/docs/events.md
+++ b/phpBB/docs/events.md
@@ -405,18 +405,17 @@ overall_footer_breadcrumb_append
 ===
 * Locations:
     + styles/prosilver/template/navbar_footer.html
+    + styles/subsilver2/template/breadcrumbs.html
 * Since: 3.1.0-a1
-* Purpose: Add links to the list of breadcrumbs in the footer. Note that utilizing this event requires
-a different solution for subsilver2, since it only supports the overall_header_breadcrumb versions.
+* Purpose: Add links to the list of breadcrumbs in the footer
 
 overall_footer_breadcrumb_prepend
 ===
 * Locations:
     + styles/prosilver/template/navbar_footer.html
+    + styles/subsilver2/template/breadcrumbs.html
 * Since: 3.1.0-RC3
-* Purpose: Add links to the list of breadcrumbs in the footer (after site-home, but before board-index).
-Note that utilizing this event requires a different solution for subsilver2, since it only supports the 
-overall_header_breadcrumb versions.
+* Purpose: Add links to the list of breadcrumbs in the footer (after site-home, but before board-index)
 
 overall_footer_content_after
 ===
diff --git a/phpBB/styles/subsilver2/template/breadcrumbs.html b/phpBB/styles/subsilver2/template/breadcrumbs.html
index fb44c6de63..25387da832 100644
--- a/phpBB/styles/subsilver2/template/breadcrumbs.html
+++ b/phpBB/styles/subsilver2/template/breadcrumbs.html
@@ -3,8 +3,8 @@
 	<tr>
 		<td class="row1">
 			<!-- EVENT overall_header_breadcrumbs_before -->
-			<p class="breadcrumbs"><!-- IF U_SITE_HOME --><a href="{U_SITE_HOME}"{$MICRODATA} data-navbar-reference="home">{L_SITE_HOME}</a> <strong>&#187;</strong> <!-- ENDIF --><!-- EVENT overall_header_breadcrumb_prepend --><a href="{U_INDEX}"{$MICRODATA} data-navbar-reference="index">{L_INDEX}</a><!-- BEGIN navlinks --><!-- EVENT overall_header_navlink_prepend --> &#187; <a href="{navlinks.U_VIEW_FORUM}"{$MICRODATA}<!-- IF navlinks.MICRODATA --> {navlinks.MICRODATA}<!-- ENDIF -->>{navlinks.FORUM_NAME}</a><!-- EVENT overall_header_navlink_append --><!-- END navlinks -->
-			<!-- EVENT overall_header_breadcrumb_append --></p>
+			<p class="breadcrumbs"><!-- IF U_SITE_HOME --><a href="{U_SITE_HOME}"{$MICRODATA} data-navbar-reference="home">{L_SITE_HOME}</a> <strong>&#187;</strong> <!-- ENDIF --><!-- IF $OVERALL_HEADER_BREADCRUMBS --><!-- EVENT overall_header_breadcrumb_prepend --><!-- ELSE --><!-- EVENT overall_footer_breadcrumb_prepend --><!-- ENDIF --><a href="{U_INDEX}"{$MICRODATA} data-navbar-reference="index">{L_INDEX}</a><!-- BEGIN navlinks --><!-- EVENT overall_header_navlink_prepend --> &#187; <a href="{navlinks.U_VIEW_FORUM}"{$MICRODATA}<!-- IF navlinks.MICRODATA --> {navlinks.MICRODATA}<!-- ENDIF -->>{navlinks.FORUM_NAME}</a><!-- EVENT overall_header_navlink_append --><!-- END navlinks -->
+			<!-- IF $OVERALL_HEADER_BREADCRUMBS --><!-- EVENT overall_header_breadcrumb_append --><!-- ELSE --><!-- EVENT overall_footer_breadcrumb_append --><!-- ENDIF --></p>
 			<!-- EVENT overall_header_breadcrumbs_after -->
 			<!-- EVENT overall_footer_timezone_before -->
 			<p class="datetime">{S_TIMEZONE}</p>
diff --git a/phpBB/styles/subsilver2/template/overall_header.html b/phpBB/styles/subsilver2/template/overall_header.html
index 711ce66362..cb9a3a2a36 100644
--- a/phpBB/styles/subsilver2/template/overall_header.html
+++ b/phpBB/styles/subsilver2/template/overall_header.html
@@ -251,7 +251,9 @@ function marklist(id, name, state)
 	<br style="clear: both;" />
 
 	<!-- DEFINE $S_MICRODATA = 1 -->
+	<!-- DEFINE $OVERALL_HEADER_BREADCRUMBS = 1 -->
 	<!-- INCLUDE breadcrumbs.html -->
+	<!-- UNDEFINE $OVERALL_HEADER_BREADCRUMBS -->
 	<!-- DEFINE $S_MICRODATA = 0 -->
 
 	<br />