From 9dbc9b0cc23ac0cde7ca0001331ec384ac2b70d3 Mon Sep 17 00:00:00 2001
From: PayBas <contact@paybas.com>
Date: Wed, 9 Apr 2014 17:45:56 +0200
Subject: [ticket/12377] Renamed template files to navbar_xxx

PHPBB3-12377
---
 phpBB/docs/events.md                               |  8 ++--
 phpBB/styles/prosilver/template/navbar_footer.html | 17 +++++++
 phpBB/styles/prosilver/template/navbar_header.html | 55 ++++++++++++++++++++++
 .../prosilver/template/overall_footer_navbar.html  | 17 -------
 .../prosilver/template/overall_header_navbar.html  | 55 ----------------------
 5 files changed, 76 insertions(+), 76 deletions(-)
 create mode 100644 phpBB/styles/prosilver/template/navbar_footer.html
 create mode 100644 phpBB/styles/prosilver/template/navbar_header.html
 delete mode 100644 phpBB/styles/prosilver/template/overall_footer_navbar.html
 delete mode 100644 phpBB/styles/prosilver/template/overall_header_navbar.html

diff --git a/phpBB/docs/events.md b/phpBB/docs/events.md
index a13258f2ad..6897c3f22e 100644
--- a/phpBB/docs/events.md
+++ b/phpBB/docs/events.md
@@ -239,7 +239,7 @@ overall_footer_after
 overall_footer_breadcrumb_append
 ===
 * Locations:
-    + styles/prosilver/template/overall_footer_navbar.html
+    + styles/prosilver/template/navbar_footer.html
 * Since: 3.1.0-a1
 * Purpose: Add links to the list of breadcrumbs in the footer
 
@@ -286,7 +286,7 @@ overall_header_body_before
 overall_header_breadcrumb_append
 ===
 * Locations:
-    + styles/prosilver/template/overall_header.html
+    + styles/prosilver/template/navbar_header.html
     + styles/subsilver2/template/breadcrumbs.html
 * Since: 3.1.0-a1
 * Purpose: Add links to the list of breadcrumbs in the header
@@ -310,7 +310,7 @@ overall_header_head_append
 overall_header_navigation_append
 ===
 * Locations:
-    + styles/prosilver/template/overall_header_navbar.html
+    + styles/prosilver/template/navbar_header.html
     + styles/subsilver2/template/overall_header.html
 * Since: 3.1.0-a1
 * Purpose: Add links after the navigation links in the header
@@ -318,7 +318,7 @@ overall_header_navigation_append
 overall_header_navigation_prepend
 ===
 * Locations:
-    + styles/prosilver/template/overall_header_navbar.html
+    + styles/prosilver/template/navbar_header.html
     + styles/subsilver2/template/overall_header.html
 * Since: 3.1.0-a1
 * Purpose: Add links before the navigation links in the header
diff --git a/phpBB/styles/prosilver/template/navbar_footer.html b/phpBB/styles/prosilver/template/navbar_footer.html
new file mode 100644
index 0000000000..32cbecdf8c
--- /dev/null
+++ b/phpBB/styles/prosilver/template/navbar_footer.html
@@ -0,0 +1,17 @@
+<div class="navbar">
+	<div class="inner">
+
+	<ul class="linklist bulletin">
+		<li class="small-icon icon-home breadcrumbs"><!-- IF U_SITE_HOME --><span class="crumb"><a href="{U_SITE_HOME}">{L_SITE_HOME}</a> <strong>&#8249;</strong></span> <!-- ENDIF --><span class="crumb"><a href="{U_INDEX}">{L_INDEX}</a></span>
+			<!-- EVENT overall_footer_breadcrumb_append -->
+		</li>
+		<!-- 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 -->
+		<li class="rightside">{S_TIMEZONE}</li>
+		<!-- 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 -->
+		<!-- IF U_TEAM --><li class="rightside"><a href="{U_TEAM}">{L_THE_TEAM}</a><!-- ENDIF -->
+	</ul>
+
+	</div>
+</div>
diff --git a/phpBB/styles/prosilver/template/navbar_header.html b/phpBB/styles/prosilver/template/navbar_header.html
new file mode 100644
index 0000000000..259aec75ed
--- /dev/null
+++ b/phpBB/styles/prosilver/template/navbar_header.html
@@ -0,0 +1,55 @@
+<div class="navbar">
+	<div class="inner">
+
+	<ul class="linklist navlinks">
+		<!-- DEFINE $MICRODATA = ' itemtype="http://data-vocabulary.org/Breadcrumb" itemscope=""' -->
+		<li class="small-icon icon-home breadcrumbs"><!-- IF U_SITE_HOME --><span class="crumb"><a href="{U_SITE_HOME}"{$MICRODATA}>{L_SITE_HOME}</a> <strong>&#8249;</strong></span> <!-- ENDIF -->
+			<span class="crumb"><a href="{U_INDEX}" accesskey="h"{$MICRODATA}>{L_INDEX}</a></span> 
+			<!-- BEGIN navlinks --> <span class="crumb"><strong>&#8249;</strong> <a href="{navlinks.U_VIEW_FORUM}"{$MICRODATA}>{navlinks.FORUM_NAME}</a></span><!-- END navlinks -->
+			<!-- EVENT overall_header_breadcrumb_append -->
+		</li>
+
+		<!-- IF S_REGISTERED_USER --><li id="username_logged_in" class="rightside"><!-- IF CURRENT_USER_AVATAR --><a href="{U_USER_PROFILE}" class="header-avatar">{CURRENT_USER_AVATAR}</a> <!-- ENDIF -->{USERNAME_FULL}</li><!-- ENDIF -->
+		<!-- IF U_EMAIL_TOPIC --><li class="rightside"><a href="{U_EMAIL_TOPIC}" title="{L_EMAIL_TOPIC}" class="sendemail">{L_EMAIL_TOPIC}</a></li><!-- ENDIF -->
+		<!-- IF U_EMAIL_PM --><li class="rightside"><a href="{U_EMAIL_PM}" title="{L_EMAIL_PM}" class="sendemail">{L_EMAIL_PM}</a></li><!-- ENDIF -->
+		<!-- IF U_PRINT_TOPIC --><li class="rightside"><a href="{U_PRINT_TOPIC}" title="{L_PRINT_TOPIC}" accesskey="p" class="print">{L_PRINT_TOPIC}</a></li><!-- ENDIF -->
+		<!-- IF U_PRINT_PM --><li class="rightside"><a href="{U_PRINT_PM}" title="{L_PRINT_PM}" accesskey="p" class="print">{L_PRINT_PM}</a></li><!-- ENDIF -->
+		<!-- IF S_DISPLAY_SEARCH and not S_IN_SEARCH --><li class="responsive-search rightside" style="display: none;"><a href="{U_SEARCH}" title="{L_SEARCH_ADV_EXPLAIN}">{L_SEARCH}</a></li><!-- ENDIF -->
+	</ul>
+
+	<ul class="linklist bulletin">
+	<!-- IF not S_IS_BOT and S_USER_LOGGED_IN -->
+		<!-- IF S_NOTIFICATIONS_DISPLAY -->
+		<li class="small-icon icon-notification" data-skip-responsive="true">
+			<a href="{U_VIEW_ALL_NOTIFICATIONS}" id="notification_list_button"><span>{L_NOTIFICATIONS} [</span><strong>{NOTIFICATIONS_COUNT}</strong><span>]</span></a>
+			<!-- INCLUDE notification_dropdown.html -->
+		</li>
+		<!-- ENDIF -->
+		<!-- IF S_DISPLAY_PM -->
+			<li class="small-icon icon-pm">
+				<a href="{U_PRIVATEMSGS}"><span>{L_PRIVATE_MESSAGES} [</span><strong>{PRIVATE_MESSAGE_COUNT}</strong><span>]</span></a>
+			</li>
+		<!-- ENDIF -->
+		<li class="small-icon icon-ucp">
+			<a href="{U_PROFILE}" title="{L_PROFILE}" accesskey="e">{L_PROFILE}</a>
+		</li>
+		<!-- IF S_DISPLAY_SEARCH -->
+			<li class="icon-search-self"><a href="{U_SEARCH_SELF}">{L_SEARCH_SELF}</a></li>
+		<!-- ENDIF -->
+		<!-- IF U_RESTORE_PERMISSIONS -->
+			<li class="icon-restore-permissions"><a href="{U_RESTORE_PERMISSIONS}">{L_RESTORE_PERMISSIONS}</a></li>
+		<!-- ENDIF -->
+	<!-- ENDIF -->
+
+		<!-- EVENT overall_header_navigation_append -->
+		<!-- IF not S_IS_BOT -->
+			<li class="small-icon icon-logout rightside no-bulletin"><a href="{U_LOGIN_LOGOUT}" title="{L_LOGIN_LOGOUT}" accesskey="x">{L_LOGIN_LOGOUT}</a></li>
+			<!-- IF not S_USER_LOGGED_IN and S_REGISTER_ENABLED and not (S_SHOW_COPPA or S_REGISTRATION) --><li class="small-icon icon-register rightside no-bulletin"><a href="{U_REGISTER}">{L_REGISTER}</a></li><!-- ENDIF -->
+			<!-- IF S_DISPLAY_MEMBERLIST --><li class="small-icon icon-members rightside no-bulletin"><a href="{U_MEMBERLIST}" title="{L_MEMBERLIST_EXPLAIN}">{L_MEMBERLIST}</a></li><!-- ENDIF -->
+		<!-- ENDIF -->
+		<li class="small-icon icon-faq rightside no-bulletin"><a href="{U_FAQ}" title="{L_FAQ_EXPLAIN}">{L_FAQ}</a></li>
+		<!-- EVENT overall_header_navigation_prepend -->
+	</ul>
+
+	</div>
+</div>
diff --git a/phpBB/styles/prosilver/template/overall_footer_navbar.html b/phpBB/styles/prosilver/template/overall_footer_navbar.html
deleted file mode 100644
index 32cbecdf8c..0000000000
--- a/phpBB/styles/prosilver/template/overall_footer_navbar.html
+++ /dev/null
@@ -1,17 +0,0 @@
-<div class="navbar">
-	<div class="inner">
-
-	<ul class="linklist bulletin">
-		<li class="small-icon icon-home breadcrumbs"><!-- IF U_SITE_HOME --><span class="crumb"><a href="{U_SITE_HOME}">{L_SITE_HOME}</a> <strong>&#8249;</strong></span> <!-- ENDIF --><span class="crumb"><a href="{U_INDEX}">{L_INDEX}</a></span>
-			<!-- EVENT overall_footer_breadcrumb_append -->
-		</li>
-		<!-- 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 -->
-		<li class="rightside">{S_TIMEZONE}</li>
-		<!-- 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 -->
-		<!-- IF U_TEAM --><li class="rightside"><a href="{U_TEAM}">{L_THE_TEAM}</a><!-- ENDIF -->
-	</ul>
-
-	</div>
-</div>
diff --git a/phpBB/styles/prosilver/template/overall_header_navbar.html b/phpBB/styles/prosilver/template/overall_header_navbar.html
deleted file mode 100644
index 259aec75ed..0000000000
--- a/phpBB/styles/prosilver/template/overall_header_navbar.html
+++ /dev/null
@@ -1,55 +0,0 @@
-<div class="navbar">
-	<div class="inner">
-
-	<ul class="linklist navlinks">
-		<!-- DEFINE $MICRODATA = ' itemtype="http://data-vocabulary.org/Breadcrumb" itemscope=""' -->
-		<li class="small-icon icon-home breadcrumbs"><!-- IF U_SITE_HOME --><span class="crumb"><a href="{U_SITE_HOME}"{$MICRODATA}>{L_SITE_HOME}</a> <strong>&#8249;</strong></span> <!-- ENDIF -->
-			<span class="crumb"><a href="{U_INDEX}" accesskey="h"{$MICRODATA}>{L_INDEX}</a></span> 
-			<!-- BEGIN navlinks --> <span class="crumb"><strong>&#8249;</strong> <a href="{navlinks.U_VIEW_FORUM}"{$MICRODATA}>{navlinks.FORUM_NAME}</a></span><!-- END navlinks -->
-			<!-- EVENT overall_header_breadcrumb_append -->
-		</li>
-
-		<!-- IF S_REGISTERED_USER --><li id="username_logged_in" class="rightside"><!-- IF CURRENT_USER_AVATAR --><a href="{U_USER_PROFILE}" class="header-avatar">{CURRENT_USER_AVATAR}</a> <!-- ENDIF -->{USERNAME_FULL}</li><!-- ENDIF -->
-		<!-- IF U_EMAIL_TOPIC --><li class="rightside"><a href="{U_EMAIL_TOPIC}" title="{L_EMAIL_TOPIC}" class="sendemail">{L_EMAIL_TOPIC}</a></li><!-- ENDIF -->
-		<!-- IF U_EMAIL_PM --><li class="rightside"><a href="{U_EMAIL_PM}" title="{L_EMAIL_PM}" class="sendemail">{L_EMAIL_PM}</a></li><!-- ENDIF -->
-		<!-- IF U_PRINT_TOPIC --><li class="rightside"><a href="{U_PRINT_TOPIC}" title="{L_PRINT_TOPIC}" accesskey="p" class="print">{L_PRINT_TOPIC}</a></li><!-- ENDIF -->
-		<!-- IF U_PRINT_PM --><li class="rightside"><a href="{U_PRINT_PM}" title="{L_PRINT_PM}" accesskey="p" class="print">{L_PRINT_PM}</a></li><!-- ENDIF -->
-		<!-- IF S_DISPLAY_SEARCH and not S_IN_SEARCH --><li class="responsive-search rightside" style="display: none;"><a href="{U_SEARCH}" title="{L_SEARCH_ADV_EXPLAIN}">{L_SEARCH}</a></li><!-- ENDIF -->
-	</ul>
-
-	<ul class="linklist bulletin">
-	<!-- IF not S_IS_BOT and S_USER_LOGGED_IN -->
-		<!-- IF S_NOTIFICATIONS_DISPLAY -->
-		<li class="small-icon icon-notification" data-skip-responsive="true">
-			<a href="{U_VIEW_ALL_NOTIFICATIONS}" id="notification_list_button"><span>{L_NOTIFICATIONS} [</span><strong>{NOTIFICATIONS_COUNT}</strong><span>]</span></a>
-			<!-- INCLUDE notification_dropdown.html -->
-		</li>
-		<!-- ENDIF -->
-		<!-- IF S_DISPLAY_PM -->
-			<li class="small-icon icon-pm">
-				<a href="{U_PRIVATEMSGS}"><span>{L_PRIVATE_MESSAGES} [</span><strong>{PRIVATE_MESSAGE_COUNT}</strong><span>]</span></a>
-			</li>
-		<!-- ENDIF -->
-		<li class="small-icon icon-ucp">
-			<a href="{U_PROFILE}" title="{L_PROFILE}" accesskey="e">{L_PROFILE}</a>
-		</li>
-		<!-- IF S_DISPLAY_SEARCH -->
-			<li class="icon-search-self"><a href="{U_SEARCH_SELF}">{L_SEARCH_SELF}</a></li>
-		<!-- ENDIF -->
-		<!-- IF U_RESTORE_PERMISSIONS -->
-			<li class="icon-restore-permissions"><a href="{U_RESTORE_PERMISSIONS}">{L_RESTORE_PERMISSIONS}</a></li>
-		<!-- ENDIF -->
-	<!-- ENDIF -->
-
-		<!-- EVENT overall_header_navigation_append -->
-		<!-- IF not S_IS_BOT -->
-			<li class="small-icon icon-logout rightside no-bulletin"><a href="{U_LOGIN_LOGOUT}" title="{L_LOGIN_LOGOUT}" accesskey="x">{L_LOGIN_LOGOUT}</a></li>
-			<!-- IF not S_USER_LOGGED_IN and S_REGISTER_ENABLED and not (S_SHOW_COPPA or S_REGISTRATION) --><li class="small-icon icon-register rightside no-bulletin"><a href="{U_REGISTER}">{L_REGISTER}</a></li><!-- ENDIF -->
-			<!-- IF S_DISPLAY_MEMBERLIST --><li class="small-icon icon-members rightside no-bulletin"><a href="{U_MEMBERLIST}" title="{L_MEMBERLIST_EXPLAIN}">{L_MEMBERLIST}</a></li><!-- ENDIF -->
-		<!-- ENDIF -->
-		<li class="small-icon icon-faq rightside no-bulletin"><a href="{U_FAQ}" title="{L_FAQ_EXPLAIN}">{L_FAQ}</a></li>
-		<!-- EVENT overall_header_navigation_prepend -->
-	</ul>
-
-	</div>
-</div>
-- 
cgit v1.2.1