MrPetovan/friendica
2
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

The manage page now shows the unread notifications

Browse source
This commit is contained in:
Michael Vogel 2015-11-28 22:56:48 +01:00
parent 6e957c6c91
commit 3067663909
4 changed files with 40 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
mod/manage.php
View file

@ -114,6 +114,20 @@ function manage_content(&$a) {
$identities[$key][thumb] = $thumb[0][thumb]; $identities[$key][thumb] = $thumb[0][thumb];
$identities[$key]['selected'] = (($id['nickname'] === $a->user['nickname']) ? true : false); $identities[$key]['selected'] = (($id['nickname'] === $a->user['nickname']) ? true : false);
$notifications = 0;
$r = q("SELECT DISTINCT(`parent`) FROM `notify` WHERE `uid` = %d AND NOT `seen` AND NOT (`type` IN (%d, %d))",
intval($id['uid']), intval(NOTIFY_INTRO), intval(NOTIFY_MAIL));
if ($r)
$notifications = sizeof($r);
$r = q("SELECT DISTINCT(`convid`) FROM `mail` WHERE `uid` = %d AND NOT `seen`",
intval($id['uid']));
if ($r)
$notifications = $notifications + sizeof($r);
$identities[$key]['notifications'] = $notifications;
} }
$o = replace_macros(get_markup_template('manage.tpl'), array( $o = replace_macros(get_markup_template('manage.tpl'), array(

2
view/templates/manage.tpl
View file

@ -11,6 +11,7 @@
<div class="identity-match-photo" id="identity-match-photo-{{$id.uid}}"> <div class="identity-match-photo" id="identity-match-photo-{{$id.uid}}">
<button name="identity" value="{{$id.uid}}" onclick="this.form.submit();" title="{{$id.username}}"> <button name="identity" value="{{$id.uid}}" onclick="this.form.submit();" title="{{$id.username}}">
<img src="{{$id.thumb}}" alt="{{$id.username}}" /> <img src="{{$id.thumb}}" alt="{{$id.username}}" />
{{if $id.notifications}}<span class="manage-notify">{{$id.notifications}}</span>{{/if}}
</button> </button>
</div> </div>
@ -22,7 +23,6 @@
</div> </div>
<div class="identity-match-details" id="identity-match-nick-{{$id.uid}}">({{$id.nickname}})</div> <div class="identity-match-details" id="identity-match-nick-{{$id.uid}}">({{$id.nickname}})</div>
</div> </div>
<div class="identity-match-end"></div> <div class="identity-match-end"></div>
</div> </div>
{{/foreach}} {{/foreach}}

6
view/theme/vier/plus.css
View file

@ -17,6 +17,12 @@ nav a:hover,
color: #000; color: #000;
} }
.manage-notify {
background-color: #CB4437;
border-radius: 10px;
font: bold 11px/16px Arial;
}
nav .nav-notify { nav .nav-notify {
/* background-color: #427FED; */ /* background-color: #427FED; */
background-color: #CB4437; background-color: #CB4437;

19
view/theme/vier/style.css
View file

@ -667,6 +667,7 @@ nav .nav-menu img {
margin-top: -3px; margin-top: -3px;
margin-right: 4px; margin-right: 4px;
} }
nav .nav-menu-icon .nav-notify { nav .nav-menu-icon .nav-notify {
top: 3px; top: 3px;
} }
@ -701,6 +702,23 @@ nav .nav-menu:hover {
/* background: #4c619c; */ /* background: #4c619c; */
text-decoration: none; text-decoration: none;
} }
.manage-notify {
background-color: #F80;
-moz-border-radius: 5px 5px 5px 5px;
-webkit-border-radius: 5px 5px 5px 5px;
border-radius: 5px 5px 5px 5px;
font-size: 10px;
padding: 1px 3px;
top: 0px;
min-width: 15px;
text-align: center;
color: white;
float: right;
margin-top: -14px;
margin-right: -20px;
}
nav .nav-notify { nav .nav-notify {
display: none; display: none;
position: absolute; position: absolute;
@ -720,6 +738,7 @@ nav .nav-notify {
text-align: center; text-align: center;
color: white; color: white;
} }
nav .nav-notify.show { nav .nav-notify.show {
display: block; display: block;
} }