From 600ab46a93396b101b4b98ac2b24017e61460dd6 Mon Sep 17 00:00:00 2001
From: Crizzo <mail@crizzo.de>
Date: Tue, 22 Apr 2014 22:06:31 +0200
Subject: [PATCH] [ticket/12404] Changes append/prepend to after/before

PHPBB3-12404
---
 phpBB/docs/events.md                               | 12 ++++++------
 phpBB/styles/prosilver/template/navbar_footer.html |  8 ++++----
 phpBB/styles/subsilver2/template/breadcrumbs.html  |  4 ++--
 phpBB/styles/subsilver2/template/index_body.html   |  2 +-
 4 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/phpBB/docs/events.md b/phpBB/docs/events.md
index 2b87d0a4aa..788e14a16b 100644
--- a/phpBB/docs/events.md
+++ b/phpBB/docs/events.md
@@ -275,7 +275,7 @@ overall_footer_page_body_after
 * Since: 3.1.0-b3
 * Purpose: Add content after the page-body, but before the footer
 
-overall_footer_teamlink_append
+overall_footer_teamlink_after
 ===
 * Locations:
     + styles/prosilver/template/navbar_footer.html
@@ -283,7 +283,7 @@ overall_footer_teamlink_append
 * Since: 3.1.0-b3
 * Purpose: Add contents after the team-link in the footer
 
-overall_footer_teamlink_prepend
+overall_footer_teamlink_before
 ===
 * Locations:
     + styles/prosilver/template/navbar_footer.html
@@ -291,21 +291,21 @@ overall_footer_teamlink_prepend
 * Since: 3.1.0-b3
 * Purpose: Add contents before the team-link in the footer
 
-overall_footer_timezone_append
+overall_footer_timezone_after
 ===
 * Locations:
     + styles/prosilver/template/navbar_footer.html
     + styles/subsilver2/template/breadcrumbs.html
 * Since: 3.1.0-b3
-* Purpose: Add content (must be inner <li>) to the navbar in the page footer, after "Timezone"
+* Purpose: Add content to the navbar in the page footer, after "Timezone"
 
-overall_footer_timezone_prepend
+overall_footer_timezone_before
 ===
 * Locations:
     + styles/prosilver/template/navbar_footer.html
     + styles/subsilver2/template/breadcrumbs.html
 * Since: 3.1.0-b3
-* Purpose: Add content(must be inner <li>) to the navbar in the page footer, before "Timezone"
+* Purpose: Add content to the navbar in the page footer, before "Timezone"
 
 overall_header_body_before
 ===
diff --git a/phpBB/styles/prosilver/template/navbar_footer.html b/phpBB/styles/prosilver/template/navbar_footer.html
index 127c41558e..03d9f70924 100644
--- a/phpBB/styles/prosilver/template/navbar_footer.html
+++ b/phpBB/styles/prosilver/template/navbar_footer.html
@@ -8,13 +8,13 @@
 		<!-- IF not S_IS_BOT -->
 			<!-- IF U_WATCH_FORUM_LINK --><li class="small-icon icon-<!-- IF S_WATCHING_FORUM -->unsubscribe<!-- ELSE -->subscribe<!-- ENDIF -->"><a href="{U_WATCH_FORUM_LINK}" title="{S_WATCH_FORUM_TITLE}" data-ajax="toggle_link" data-toggle-class="small-icon icon-<!-- IF not S_WATCHING_FORUM -->unsubscribe<!-- ELSE -->subscribe<!-- ENDIF -->" data-toggle-text="{S_WATCH_FORUM_TOGGLE}" data-toggle-url="{U_WATCH_FORUM_TOGGLE}">{S_WATCH_FORUM_TITLE}</a></li><!-- ENDIF -->
 		<!-- ENDIF -->
-		<!-- EVENT overall_footer_timezone_prepend -->
+		<!-- EVENT overall_footer_timezone_before -->
 		<li class="rightside">{S_TIMEZONE}</li>
-		<!-- EVENT overall_footer_timezone_append -->
+		<!-- EVENT overall_footer_timezone_after -->
 		<!-- IF not S_IS_BOT --><li class="rightside"><a href="{U_DELETE_COOKIES}" data-ajax="true" data-refresh="true">{L_DELETE_COOKIES}</a></li><!-- ENDIF -->
-		<!-- EVENT overall_footer_teamlink_prepend -->
+		<!-- EVENT overall_footer_teamlink_before -->
 		<!-- IF U_TEAM --><li class="rightside"><a href="{U_TEAM}">{L_THE_TEAM}</a></li><!-- ENDIF -->
-		<!-- EVENT overall_footer_teamlink_append -->
+		<!-- EVENT overall_footer_teamlink_after -->
 	</ul>
 
 	</div>
diff --git a/phpBB/styles/subsilver2/template/breadcrumbs.html b/phpBB/styles/subsilver2/template/breadcrumbs.html
index 55f8c70a9c..47cb82c790 100644
--- a/phpBB/styles/subsilver2/template/breadcrumbs.html
+++ b/phpBB/styles/subsilver2/template/breadcrumbs.html
@@ -4,9 +4,9 @@
 		<td class="row1">
 			<p class="breadcrumbs"><!-- IF U_SITE_HOME --><a href="{U_SITE_HOME}"{$MICRODATA}>{L_SITE_HOME}</a> <strong>&#187;</strong> <!-- ENDIF --><a href="{U_INDEX}"{$MICRODATA}>{L_INDEX}</a><!-- BEGIN navlinks --> &#187; <a href="{navlinks.U_VIEW_FORUM}"{$MICRODATA}>{navlinks.FORUM_NAME}</a><!-- END navlinks -->
 			<!-- EVENT overall_header_breadcrumb_append --></p>
-			<!-- EVENT overall_footer_timezone_prepend -->
+			<!-- EVENT overall_footer_timezone_before -->
 			<p class="datetime">{S_TIMEZONE}</p>
-			<!-- EVENT overall_footer_timezone_append -->
+			<!-- EVENT overall_footer_timezone_after -->
 		</td>
 	</tr>
 	</table>
diff --git a/phpBB/styles/subsilver2/template/index_body.html b/phpBB/styles/subsilver2/template/index_body.html
index cfce7d60a6..a6310f4758 100644
--- a/phpBB/styles/subsilver2/template/index_body.html
+++ b/phpBB/styles/subsilver2/template/index_body.html
@@ -15,7 +15,7 @@
 <!-- INCLUDE forumlist_body.html -->
 
 <!-- IF not S_IS_BOT or U_TEAM -->
-<span class="gensmall"><!-- IF not S_IS_BOT --><a href="{U_DELETE_COOKIES}">{L_DELETE_COOKIES}</a><!-- ENDIF --><!-- IF not S_IS_BOT and U_TEAM --> | <!-- ENDIF --><!-- EVENT overall_footer_teamlink_prepend --><!-- IF U_TEAM --><a href="{U_TEAM}">{L_THE_TEAM}</a><!-- ENDIF --><!-- EVENT overall_footer_teamlink_append --></span><br />
+<span class="gensmall"><!-- IF not S_IS_BOT --><a href="{U_DELETE_COOKIES}">{L_DELETE_COOKIES}</a><!-- ENDIF --><!-- IF not S_IS_BOT and U_TEAM --> | <!-- ENDIF --><!-- EVENT overall_footer_teamlink_before --><!-- IF U_TEAM --><a href="{U_TEAM}">{L_THE_TEAM}</a><!-- ENDIF --><!-- EVENT overall_footer_teamlink_after --></span><br />
 <!-- ENDIF -->
 
 <br clear="all" />