From 98a942bd95cc2a03bb47be1e33257a947c080f6f Mon Sep 17 00:00:00 2001
From: jeroenpraat <jeroenpraat@xs4all.nl>
Date: Sun, 4 May 2014 14:26:20 +0000
Subject: [PATCH 1/4] Dark schema: Quick fix for new search dropdown

---
 view/theme/redbasic/css/style.css | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/view/theme/redbasic/css/style.css b/view/theme/redbasic/css/style.css
index bc1dd9c74..a4373ed37 100644
--- a/view/theme/redbasic/css/style.css
+++ b/view/theme/redbasic/css/style.css
@@ -1467,7 +1467,7 @@ div.jGrowl div.jGrowl-notification {
 
 .autocomplete {
 	color: $font_colour;
-	background: #FFF;
+	background: $dropdown_bgcolour;
 	cursor: pointer;
 	text-align: left;
 	max-height: 350px;

From b2e0b6f11d82aa10ef844fc99a6e1946071edd18 Mon Sep 17 00:00:00 2001
From: Christian Vogeley <christian.vogeley@hotmail.de>
Date: Sun, 4 May 2014 17:28:43 +0200
Subject: [PATCH 2/4] system notifications mark seen link

---
 mod/notifications.php      | 1 +
 view/tpl/notifications.tpl | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/mod/notifications.php b/mod/notifications.php
index f327c2fe2..1a4a2b6a9 100644
--- a/mod/notifications.php
+++ b/mod/notifications.php
@@ -95,6 +95,7 @@ function notifications_content(&$a) {
 		
 		$o .= replace_macros($notif_tpl,array(
 			'$notif_header' => t('System Notifications'),
+			'$notif_link_mark_seen' => t('Mark all system notifications seen'),
 			'$notif_content' => $notif_content,
 		));
 
diff --git a/view/tpl/notifications.tpl b/view/tpl/notifications.tpl
index 3015de504..b1b0c8036 100755
--- a/view/tpl/notifications.tpl
+++ b/view/tpl/notifications.tpl
@@ -1,5 +1,5 @@
 <h1>{{$notif_header}}</h1>
-
+<a href="#" onclick="markRead('notify'); return false;">{{$notif_link_mark_seen}}</a>
 <div class="notif-network-wrapper">
 	{{$notif_content}}
 </div>

From f7c77c7821fd11afda7c19b5d21a4d6677fc1aa4 Mon Sep 17 00:00:00 2001
From: Christian Vogeley <christian.vogeley@hotmail.de>
Date: Sun, 4 May 2014 18:17:11 +0200
Subject: [PATCH 3/4] Add link to system notifications page

to mark notifications seen
---
 mod/notifications.php      | 2 ++
 view/tpl/notifications.tpl | 4 +++-
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/mod/notifications.php b/mod/notifications.php
index 1a4a2b6a9..09f89e88a 100644
--- a/mod/notifications.php
+++ b/mod/notifications.php
@@ -81,6 +81,7 @@ function notifications_content(&$a) {
 		);
 		
 		if (count($r) > 0) {
+			$notifications_available =1;
 			foreach ($r as $it) {
 				$notif_content .= replace_macros($not_tpl,array(
 					'$item_link' => $a->get_baseurl(true).'/notify/view/'. $it['id'],
@@ -97,6 +98,7 @@ function notifications_content(&$a) {
 			'$notif_header' => t('System Notifications'),
 			'$notif_link_mark_seen' => t('Mark all system notifications seen'),
 			'$notif_content' => $notif_content,
+			'$notifications_available' => $notifications_available,
 		));
 
 	return $o;
diff --git a/view/tpl/notifications.tpl b/view/tpl/notifications.tpl
index b1b0c8036..ae87c8ec8 100755
--- a/view/tpl/notifications.tpl
+++ b/view/tpl/notifications.tpl
@@ -1,5 +1,7 @@
 <h1>{{$notif_header}}</h1>
-<a href="#" onclick="markRead('notify'); return false;">{{$notif_link_mark_seen}}</a>
+{{if $notifications_available}}
+<a href="#" onclick="markRead('notify');">{{$notif_link_mark_seen}}</a>
+{{/if}}
 <div class="notif-network-wrapper">
 	{{$notif_content}}
 </div>

From b472cc0fd3353eb965ed758d3f7e8ba5641c18c1 Mon Sep 17 00:00:00 2001
From: sasiflo <redmatrixdev@sasiflo.de>
Date: Sun, 4 May 2014 20:42:05 +0200
Subject: [PATCH 4/4] ifpending repaired again. Hope it works as intended now.

---
 mod/connections.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/mod/connections.php b/mod/connections.php
index b9605da01..3c3a704b2 100644
--- a/mod/connections.php
+++ b/mod/connections.php
@@ -213,7 +213,7 @@ function connections_content(&$a) {
 				nav_set_selected('intros');
 				break;
 			case 'ifpending':
-				$r = q("SELECT COUNT(abook.abook_id) AS total FROM abook left join xchan on abook.abook_xchan = xchan.xchan_hash where abook_channel = %d and (abook_flags & %d) and not (abook_flags & %d) and not (xchan_flags & %d )",
+				$r = q("SELECT COUNT(abook.abook_id) AS total FROM abook left join xchan on abook.abook_xchan = xchan.xchan_hash where abook_channel = %d and (abook_flags & %d) and not ((abook_flags & %d) or (xchan_flags & %d))",
 					intval(local_user()),
 					intval(ABOOK_FLAG_PENDING),
 					intval(ABOOK_FLAG_SELF|ABOOK_FLAG_IGNORED),