harukin/core
Archived
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge https://github.com/friendica/red into pending_merge

Browse Source
This commit is contained in:
friendica 2014-05-04 17:11:29 -07:00
commit 3ae67c517e
4 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
mod/connections.php
View File

@ -213,7 +213,7 @@ function connections_content(&$a) {
nav_set_selected('intros'); nav_set_selected('intros');
break; break;
case 'ifpending': 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(local_user()),
intval(ABOOK_FLAG_PENDING), intval(ABOOK_FLAG_PENDING),
intval(ABOOK_FLAG_SELF|ABOOK_FLAG_IGNORED), intval(ABOOK_FLAG_SELF|ABOOK_FLAG_IGNORED),

3
mod/notifications.php
View File

@ -81,6 +81,7 @@ function notifications_content(&$a) {
); );
if (count($r) > 0) { if (count($r) > 0) {
$notifications_available =1;
foreach ($r as $it) { foreach ($r as $it) {
$notif_content .= replace_macros($not_tpl,array( $notif_content .= replace_macros($not_tpl,array(
'$item_link' => $a->get_baseurl(true).'/notify/view/'. $it['id'], '$item_link' => $a->get_baseurl(true).'/notify/view/'. $it['id'],
@ -95,7 +96,9 @@ function notifications_content(&$a) {
$o .= replace_macros($notif_tpl,array( $o .= replace_macros($notif_tpl,array(
'$notif_header' => t('System Notifications'), '$notif_header' => t('System Notifications'),
'$notif_link_mark_seen' => t('Mark all system notifications seen'),
'$notif_content' => $notif_content, '$notif_content' => $notif_content,
'$notifications_available' => $notifications_available,
)); ));
return $o; return $o;

2
view/theme/redbasic/css/style.css
View File

@ -1467,7 +1467,7 @@ div.jGrowl div.jGrowl-notification {
.autocomplete { .autocomplete {
color: $font_colour; color: $font_colour;
background: #FFF; background: $dropdown_bgcolour;
cursor: pointer; cursor: pointer;
text-align: left; text-align: left;
max-height: 350px; max-height: 350px;

4
view/tpl/notifications.tpl
View File

@ -1,5 +1,7 @@
<h1>{{$notif_header}}</h1> <h1>{{$notif_header}}</h1>
{{if $notifications_available}}
<a href="#" onclick="markRead('notify');">{{$notif_link_mark_seen}}</a>
{{/if}}
<div class="notif-network-wrapper"> <div class="notif-network-wrapper">
{{$notif_content}} {{$notif_content}}
</div> </div>