diff --git a/mod/manage.php b/mod/manage.php index c0eedc2ba..adcc3d787 100644 --- a/mod/manage.php +++ b/mod/manage.php @@ -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( diff --git a/view/templates/manage.tpl b/view/templates/manage.tpl index e23c40275..dd27092e9 100644 --- a/view/templates/manage.tpl +++ b/view/templates/manage.tpl @@ -11,6 +11,7 @@
@@ -22,7 +23,6 @@
({{$id.nickname}})
-
{{/foreach}} diff --git a/view/theme/duepuntozero/style.css b/view/theme/duepuntozero/style.css index 598d121ad..903846e69 100644 --- a/view/theme/duepuntozero/style.css +++ b/view/theme/duepuntozero/style.css @@ -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; diff --git a/view/theme/frost/style.css b/view/theme/frost/style.css index fc1553e27..7b2b1358c 100644 --- a/view/theme/frost/style.css +++ b/view/theme/frost/style.css @@ -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; diff --git a/view/theme/smoothly/style.css b/view/theme/smoothly/style.css index cf2e0a8e4..45d2629da 100644 --- a/view/theme/smoothly/style.css +++ b/view/theme/smoothly/style.css @@ -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; diff --git a/view/theme/vier/plus.css b/view/theme/vier/plus.css index 5faf069c2..8e1865a86 100644 --- a/view/theme/vier/plus.css +++ b/view/theme/vier/plus.css @@ -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; diff --git a/view/theme/vier/style.css b/view/theme/vier/style.css index 35e958c45..2892862da 100644 --- a/view/theme/vier/style.css +++ b/view/theme/vier/style.css @@ -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; }