Browse Source

Merge pull request #2113 from annando/1511-manage-notifications

The manage page now shows the notifications
tags/3.4.3
fabrixxm 4 years ago
parent
commit
a60b702df1
7 changed files with 83 additions and 1 deletions
  1. +19
    -0
      mod/manage.php
  2. +1
    -1
      view/templates/manage.tpl
  3. +11
    -0
      view/theme/duepuntozero/style.css
  4. +16
    -0
      view/theme/frost/style.css
  5. +11
    -0
      view/theme/smoothly/style.css
  6. +6
    -0
      view/theme/vier/plus.css
  7. +19
    -0
      view/theme/vier/style.css

+ 19
- 0
mod/manage.php View File

@@ -114,6 +114,25 @@ function manage_content(&$a) {
$identities[$key][thumb] = $thumb[0][thumb];

$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);

$r = q("SELECT COUNT(*) AS `introductions` FROM `intro` WHERE NOT `blocked` AND NOT `ignore` AND `uid` = %d",
intval($id['uid']));
if ($r)
$notifications = $notifications + $r[0]["introductions"];

$identities[$key]['notifications'] = $notifications;
}

$o = replace_macros(get_markup_template('manage.tpl'), array(

+ 1
- 1
view/templates/manage.tpl View File

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

@@ -22,7 +23,6 @@
</div>
<div class="identity-match-details" id="identity-match-nick-{{$id.uid}}">({{$id.nickname}})</div>
</div>

<div class="identity-match-end"></div>
</div>
{{/foreach}}

+ 11
- 0
view/theme/duepuntozero/style.css View File

@@ -3338,6 +3338,17 @@ div.jGrowl div.info {
}

/* notifications popup menu */
.manage-notify {
font-size: 10px;
padding: 1px 3px;
top: 0px;
min-width: 15px;
text-align: center;
float: right;
margin-top: -14px;
margin-right: -20px;
}

.nav-notify {
display: none;
position: absolute;

+ 16
- 0
view/theme/frost/style.css View File

@@ -4062,6 +4062,22 @@ div.jGrowl-notification {
}

/* notifications popup menu */
.manage-notify {
padding: 1px 3px;
top: 0px;
min-width: 15px;
text-align: center;
float: right;
margin-top: -14px;
margin-right: -20px;

font-size: 0.8em;
border-radius: 4px;
-moz-border-radius: 4px;
-webkit-border-radius: 4px;
background-color: gold !important;
}

.nav-notify {
display: none;
position: absolute;

+ 11
- 0
view/theme/smoothly/style.css View File

@@ -4243,6 +4243,17 @@ a.active {
}

/* notifications popup menu */
.manage-notify {
font-size: 10px;
padding: 1px 3px;
top: 0px;
min-width: 15px;
text-align: center;
float: right;
margin-top: -14px;
margin-right: -20px;
}

.nav-notify {
display: none;
position: absolute;

+ 6
- 0
view/theme/vier/plus.css View File

@@ -17,6 +17,12 @@ nav a:hover,
color: #000;
}

.manage-notify {
background-color: #CB4437;
border-radius: 10px;
font: bold 11px/16px Arial;
}

nav .nav-notify {
/* background-color: #427FED; */
background-color: #CB4437;

+ 19
- 0
view/theme/vier/style.css View File

@@ -667,6 +667,7 @@ nav .nav-menu img {
margin-top: -3px;
margin-right: 4px;
}

nav .nav-menu-icon .nav-notify {
top: 3px;
}
@@ -701,6 +702,23 @@ nav .nav-menu:hover {
/* background: #4c619c; */
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 {
display: none;
position: absolute;
@@ -720,6 +738,7 @@ nav .nav-notify {
text-align: center;
color: white;
}

nav .nav-notify.show {
display: block;
}

Loading…
Cancel
Save