aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorfriendica <info@friendica.com>2014-05-04 17:11:29 -0700
committerfriendica <info@friendica.com>2014-05-04 17:11:29 -0700
commit3ae67c517ed8791332fb1ace2a0908209a6d0e0d (patch)
tree1fc92fb8399a423a4cc0249b1ad02b4b9310a01f
parentfc550ae330102eed57905b423ff2d8b8a64b48d3 (diff)
parentfc5ae78079e314a49390403943ed301da9a4c2ef (diff)
downloadvolse-hubzilla-3ae67c517ed8791332fb1ace2a0908209a6d0e0d.tar.gz
volse-hubzilla-3ae67c517ed8791332fb1ace2a0908209a6d0e0d.tar.bz2
volse-hubzilla-3ae67c517ed8791332fb1ace2a0908209a6d0e0d.zip
Merge https://github.com/friendica/red into pending_merge
-rw-r--r--mod/connections.php2
-rw-r--r--mod/notifications.php3
-rw-r--r--view/theme/redbasic/css/style.css2
-rwxr-xr-xview/tpl/notifications.tpl4
4 files changed, 8 insertions, 3 deletions
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),
diff --git a/mod/notifications.php b/mod/notifications.php
index f327c2fe2..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'],
@@ -95,7 +96,9 @@ 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,
+ '$notifications_available' => $notifications_available,
));
return $o;
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;
diff --git a/view/tpl/notifications.tpl b/view/tpl/notifications.tpl
index 3015de504..ae87c8ec8 100755
--- a/view/tpl/notifications.tpl
+++ b/view/tpl/notifications.tpl
@@ -1,5 +1,7 @@
<h1>{{$notif_header}}</h1>
-
+{{if $notifications_available}}
+<a href="#" onclick="markRead('notify');">{{$notif_link_mark_seen}}</a>
+{{/if}}
<div class="notif-network-wrapper">
{{$notif_content}}
</div>