From 7ad577a86afa379d67812ed184b7a59a32c64e9e Mon Sep 17 00:00:00 2001
From: Nathan Guse <nathaniel.guse@gmail.com>
Date: Fri, 15 Feb 2013 16:02:33 -0600
Subject: [PATCH] [ticket/11103] Add Notification Settings link in flyout menu

PHPBB3-11103
---
 phpBB/includes/functions.php                         | 1 +
 phpBB/styles/prosilver/template/overall_header.html  | 1 +
 phpBB/styles/prosilver/theme/common.css              | 6 ++++++
 phpBB/styles/subsilver2/template/overall_header.html | 1 +
 phpBB/styles/subsilver2/theme/stylesheet.css         | 6 ++++++
 5 files changed, 15 insertions(+)

diff --git a/phpBB/includes/functions.php b/phpBB/includes/functions.php
index 0c514e7205..8ba7b2c24b 100644
--- a/phpBB/includes/functions.php
+++ b/phpBB/includes/functions.php
@@ -5277,6 +5277,7 @@ function page_header($page_title = '', $display_online_list = true, $item_id = 0
 		'UNREAD_NOTIFICATIONS_COUNT'	=> ($notifications !== false) ? $notifications['unread_count'] : '',
 		'NOTIFICATIONS_COUNT'			=> ($notifications !== false) ? $user->lang('NOTIFICATIONS_COUNT', $notifications['unread_count']) : '',
 		'U_VIEW_ALL_NOTIFICATIONS'		=> append_sid("{$phpbb_root_path}ucp.$phpEx", 'i=ucp_notifications'),
+		'U_NOTIFICATION_SETTINGS'		=> append_sid("{$phpbb_root_path}ucp.$phpEx", 'i=ucp_notifications&amp;mode=notification_options'),
 		'S_NOTIFICATIONS_DISPLAY'		=> $config['load_notifications'],
 
 		'S_USER_NEW_PRIVMSG'			=> $user->data['user_new_privmsg'],
diff --git a/phpBB/styles/prosilver/template/overall_header.html b/phpBB/styles/prosilver/template/overall_header.html
index 2bf15754d5..e911007aa6 100644
--- a/phpBB/styles/prosilver/template/overall_header.html
+++ b/phpBB/styles/prosilver/template/overall_header.html
@@ -143,6 +143,7 @@
 						<div class="pointer"><div class="pointer_inner"></div></div>
 						<div class="header">
 							{L_NOTIFICATIONS}
+							<span class="header_settings"><a href="{U_NOTIFICATION_SETTINGS}">{L_SETTINGS}</a></span>
 						</div>
 
 						<ul>
diff --git a/phpBB/styles/prosilver/theme/common.css b/phpBB/styles/prosilver/theme/common.css
index 6c78195457..3eb09492d5 100644
--- a/phpBB/styles/prosilver/theme/common.css
+++ b/phpBB/styles/prosilver/theme/common.css
@@ -713,6 +713,12 @@ p.rules a {
 	border-radius: 5px 5px 0 0;
 }
 
+#notification_list > .header > .header_settings {
+	float: right;
+	font-weight: normal;
+	text-transform: none;
+}
+
 #notification_list > .footer {
 	text-align: center;
 	font-size: 1.2em;
diff --git a/phpBB/styles/subsilver2/template/overall_header.html b/phpBB/styles/subsilver2/template/overall_header.html
index 071b588fe5..0a2c5aed96 100644
--- a/phpBB/styles/subsilver2/template/overall_header.html
+++ b/phpBB/styles/subsilver2/template/overall_header.html
@@ -157,6 +157,7 @@ function marklist(id, name, state)
 					<div id="notification_list" class="notification_list">
 						<div class="row1 header">
 							{L_NOTIFICATIONS}
+							<span class="header_settings"><a href="{U_NOTIFICATION_SETTINGS}">{L_SETTINGS}</a></span>
 						</div>
 
 						<div class="notification_scroll">
diff --git a/phpBB/styles/subsilver2/theme/stylesheet.css b/phpBB/styles/subsilver2/theme/stylesheet.css
index 0f8f9f0367..a78a84ab63 100644
--- a/phpBB/styles/subsilver2/theme/stylesheet.css
+++ b/phpBB/styles/subsilver2/theme/stylesheet.css
@@ -1167,6 +1167,12 @@ a.imageset {
 	border-bottom: 0;
 }
 
+#notification_list > .header > .header_settings {
+	float: right;
+	font-weight: normal;
+	text-transform: none;
+}
+
 #notification_list .footer {
 	width: 300px;
 	text-align: center;