friendica
/
friendica
mirror of https://github.com/friendica/friendica
6
0
Fork 1
Code Issues Packages Projects Releases 1 Wiki Activity

rename CSS attributes notify => notification

This commit is contained in:
Philipp Holzer 2020-01-24 18:56:34 +01:00
parent b016e420fe
commit b229939c3d
No known key found for this signature in database
GPG Key ID: D8365C3D36B77D90
30 changed files with 177 additions and 177 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
src/Model/Notification.php
View File

@ -372,7 +372,7 @@ final class Notification
*/ */
public function getNetworkList(bool $seen = false, int $start = 0, int $limit = self::DEFAULT_PAGE_LIMIT) public function getNetworkList(bool $seen = false, int $start = 0, int $limit = self::DEFAULT_PAGE_LIMIT)
{ {
$ident = self::NETWORK; $ident = self::NETWORK;
$notifications = []; $notifications = [];
$condition = ['wall' => false, 'uid' => local_user()]; $condition = ['wall' => false, 'uid' => local_user()];
@ -415,7 +415,7 @@ final class Notification
*/ */
public function getSystemList(bool $seen = false, int $start = 0, int $limit = self::DEFAULT_PAGE_LIMIT) public function getSystemList(bool $seen = false, int $start = 0, int $limit = self::DEFAULT_PAGE_LIMIT)
{ {
$ident = self::SYSTEM; $ident = self::SYSTEM;
$notifications = []; $notifications = [];
$filter = ['uid' => local_user()]; $filter = ['uid' => local_user()];
@ -460,7 +460,7 @@ final class Notification
*/ */
public function getPersonalList(bool $seen = false, int $start = 0, int $limit = self::DEFAULT_PAGE_LIMIT) public function getPersonalList(bool $seen = false, int $start = 0, int $limit = self::DEFAULT_PAGE_LIMIT)
{ {
$ident = self::PERSONAL; $ident = self::PERSONAL;
$notifications = []; $notifications = [];
$myurl = str_replace('http://', '', DI::app()->contact['nurl']); $myurl = str_replace('http://', '', DI::app()->contact['nurl']);
@ -507,7 +507,7 @@ final class Notification
*/ */
public function getHomeList(bool $seen = false, int $start = 0, int $limit = self::DEFAULT_PAGE_LIMIT) public function getHomeList(bool $seen = false, int $start = 0, int $limit = self::DEFAULT_PAGE_LIMIT)
{ {
$ident = self::HOME; $ident = self::HOME;
$notifications = []; $notifications = [];
$condition = ['wall' => true, 'uid' => local_user()]; $condition = ['wall' => true, 'uid' => local_user()];
@ -553,9 +553,9 @@ final class Notification
public function getIntroList(bool $all = false, int $start = 0, int $limit = self::DEFAULT_PAGE_LIMIT, int $id = 0) public function getIntroList(bool $all = false, int $start = 0, int $limit = self::DEFAULT_PAGE_LIMIT, int $id = 0)
{ {
/// @todo sanitize wording according to SELF::INTRO /// @todo sanitize wording according to SELF::INTRO
$ident = 'introductions'; $ident = 'introductions';
$notifications = []; $notifications = [];
$sql_extra = ""; $sql_extra = "";
if (empty($id)) { if (empty($id)) {
if (!$all) { if (!$all) {
@ -623,7 +623,7 @@ final class Notification
$intro = [ $intro = [
'label' => 'friend_suggestion', 'label' => 'friend_suggestion',
'str_type' => $this->l10n->t('Friend Suggestion'), 'str_type' => $this->l10n->t('Friend Suggestion'),
'intro_id' => $intro['intro_id'], 'intro_id' => $intro['intro_id'],
'madeby' => $intro['name'], 'madeby' => $intro['name'],
'madeby_url' => $intro['url'], 'madeby_url' => $intro['url'],
@ -657,7 +657,7 @@ final class Notification
} }
$intro = [ $intro = [
'label' => (($intro['network'] !== Protocol::OSTATUS) ? 'friend_request' : 'follower'), 'label' => (($intro['network'] !== Protocol::OSTATUS) ? 'friend_request' : 'follower'),
'str_type' => (($intro['network'] !== Protocol::OSTATUS) ? $this->l10n->t('Friend/Connect Request') : $this->l10n->t('New Follower')), 'str_type' => (($intro['network'] !== Protocol::OSTATUS) ? $this->l10n->t('Friend/Connect Request') : $this->l10n->t('New Follower')),
'dfrn_id' => $intro['issued-id'], 'dfrn_id' => $intro['issued-id'],
'uid' => $_SESSION['uid'], 'uid' => $_SESSION['uid'],
'intro_id' => $intro['intro_id'], 'intro_id' => $intro['intro_id'],

22
src/Module/BaseNotifications.php
View File

@ -110,16 +110,16 @@ abstract class BaseNotifications extends BaseModule
/** /**
* Shows the printable result of notifications for a specific tab * Shows the printable result of notifications for a specific tab
* *
* @param string $header The notification header * @param string $header The notification header
* @param array $content The array with the notifications * @param array $notifications The array with the notifications
* @param string $noContent The string in case there are no notifications * @param string $noContent The string in case there are no notifications
* @param array $showLink The possible links at the top * @param array $showLink The possible links at the top
* *
* @return string The rendered output * @return string The rendered output
* *
* @throws \Friendica\Network\HTTPException\InternalServerErrorException * @throws \Friendica\Network\HTTPException\InternalServerErrorException
*/ */
protected static function printContent(string $header, array $content, string $noContent, array $showLink) protected static function printContent(string $header, array $notifications, string $noContent, array $showLink)
{ {
// Get the nav tabs for the notification pages // Get the nav tabs for the notification pages
$tabs = self::getTabs(); $tabs = self::getTabs();
@ -129,12 +129,12 @@ abstract class BaseNotifications extends BaseModule
$notif_tpl = Renderer::getMarkupTemplate('notifications/notifications.tpl'); $notif_tpl = Renderer::getMarkupTemplate('notifications/notifications.tpl');
return Renderer::replaceMacros($notif_tpl, [ return Renderer::replaceMacros($notif_tpl, [
'$notif_header' => $header ?? DI::l10n()->t('Notifications'), '$header' => $header ?? DI::l10n()->t('Notifications'),
'$tabs' => $tabs, '$tabs' => $tabs,
'$notif_content' => $content, '$notifications' => $notifications,
'$notif_nocontent' => $noContent, '$noContent' => $noContent,
'$notif_show_lnk' => $showLink, '$showLink' => $showLink,
'$notif_paginate' => $pager->renderMinimal(count($content)) '$paginate' => $pager->renderMinimal(count($notifications))
]); ]);
} }

108
src/Module/Notifications/Introductions.php
View File

@ -62,29 +62,29 @@ class Introductions extends BaseNotifications
switch ($notification['label']) { switch ($notification['label']) {
case 'friend_suggestion': case 'friend_suggestion':
$notificationContent[] = Renderer::replaceMacros($notificationSuggestions, [ $notificationContent[] = Renderer::replaceMacros($notificationSuggestions, [
'$type' => $notification['label'], '$type' => $notification['label'],
'str_notification_type' => DI::l10n()->t('Notification type:'), 'str_notification_type' => DI::l10n()->t('Notification type:'),
'str_type' => $notification['str_type'], 'str_type' => $notification['str_type'],
'$intro_id' => $notification['intro_id'], '$intro_id' => $notification['intro_id'],
'$lbl_madeby' => DI::l10n()->t('Suggested by:'), '$lbl_madeby' => DI::l10n()->t('Suggested by:'),
'$madeby' => $notification['madeby'], '$madeby' => $notification['madeby'],
'$madeby_url' => $notification['madeby_url'], '$madeby_url' => $notification['madeby_url'],
'$madeby_zrl' => $notification['madeby_zrl'], '$madeby_zrl' => $notification['madeby_zrl'],
'$madeby_addr' => $notification['madeby_addr'], '$madeby_addr' => $notification['madeby_addr'],
'$contact_id' => $notification['contact_id'], '$contact_id' => $notification['contact_id'],
'$photo' => $notification['photo'], '$photo' => $notification['photo'],
'$fullname' => $notification['name'], '$fullname' => $notification['name'],
'$url' => $notification['url'], '$url' => $notification['url'],
'$zrl' => $notification['zrl'], '$zrl' => $notification['zrl'],
'$lbl_url' => DI::l10n()->t('Profile URL'), '$lbl_url' => DI::l10n()->t('Profile URL'),
'$addr' => $notification['addr'], '$addr' => $notification['addr'],
'$hidden' => ['hidden', DI::l10n()->t('Hide this contact from others'), ($notification['hidden'] == 1), ''], '$hidden' => ['hidden', DI::l10n()->t('Hide this contact from others'), ($notification['hidden'] == 1), ''],
'$knowyou' => $notification['knowyou'], '$knowyou' => $notification['knowyou'],
'$approve' => DI::l10n()->t('Approve'), '$approve' => DI::l10n()->t('Approve'),
'$note' => $notification['note'], '$note' => $notification['note'],
'$request' => $notification['request'], '$request' => $notification['request'],
'$ignore' => DI::l10n()->t('Ignore'), '$ignore' => DI::l10n()->t('Ignore'),
'$discard' => DI::l10n()->t('Discard'), '$discard' => DI::l10n()->t('Discard'),
]); ]);
break; break;
@ -146,39 +146,39 @@ class Introductions extends BaseNotifications
} }
$notificationContent[] = Renderer::replaceMacros($notificationTemplate, [ $notificationContent[] = Renderer::replaceMacros($notificationTemplate, [
'$type' => $notification['label'], '$type' => $notification['label'],
'$header' => $header, '$header' => $header,
'str_notification_type' => DI::l10n()->t('Notification type:'), 'str_notification_type' => DI::l10n()->t('Notification type:'),
'str_type' => $notification['notifytype'], 'str_type' => $notification['notifytype'],
'$dfrn_text' => $dfrn_text, '$dfrn_text' => $dfrn_text,
'$dfrn_id' => $notification['dfrn_id'], '$dfrn_id' => $notification['dfrn_id'],
'$uid' => $notification['uid'], '$uid' => $notification['uid'],
'$intro_id' => $notification['intro_id'], '$intro_id' => $notification['intro_id'],
'$contact_id' => $notification['contact_id'], '$contact_id' => $notification['contact_id'],
'$photo' => $notification['photo'], '$photo' => $notification['photo'],
'$fullname' => $notification['name'], '$fullname' => $notification['name'],
'$location' => $notification['location'], '$location' => $notification['location'],
'$lbl_location' => DI::l10n()->t('Location:'), '$lbl_location' => DI::l10n()->t('Location:'),
'$about' => $notification['about'], '$about' => $notification['about'],
'$lbl_about' => DI::l10n()->t('About:'), '$lbl_about' => DI::l10n()->t('About:'),
'$keywords' => $notification['keywords'], '$keywords' => $notification['keywords'],
'$lbl_keywords' => DI::l10n()->t('Tags:'), '$lbl_keywords' => DI::l10n()->t('Tags:'),
'$gender' => $notification['gender'], '$gender' => $notification['gender'],
'$lbl_gender' => DI::l10n()->t('Gender:'), '$lbl_gender' => DI::l10n()->t('Gender:'),
'$hidden' => ['hidden', DI::l10n()->t('Hide this contact from others'), ($notification['hidden'] == 1), ''], '$hidden' => ['hidden', DI::l10n()->t('Hide this contact from others'), ($notification['hidden'] == 1), ''],
'$url' => $notification['url'], '$url' => $notification['url'],
'$zrl' => $notification['zrl'], '$zrl' => $notification['zrl'],
'$lbl_url' => DI::l10n()->t('Profile URL'), '$lbl_url' => DI::l10n()->t('Profile URL'),
'$addr' => $notification['addr'], '$addr' => $notification['addr'],
'$lbl_knowyou' => $lbl_knowyou, '$lbl_knowyou' => $lbl_knowyou,
'$lbl_network' => DI::l10n()->t('Network:'), '$lbl_network' => DI::l10n()->t('Network:'),
'$network' => ContactSelector::networkToName($notification['network'], $notification['url']), '$network' => ContactSelector::networkToName($notification['network'], $notification['url']),
'$knowyou' => $knowyou, '$knowyou' => $knowyou,
'$approve' => DI::l10n()->t('Approve'), '$approve' => DI::l10n()->t('Approve'),
'$note' => $notification['note'], '$note' => $notification['note'],
'$ignore' => DI::l10n()->t('Ignore'), '$ignore' => DI::l10n()->t('Ignore'),
'$discard' => $discard, '$discard' => $discard,
'$action' => $action, '$action' => $action,
]); ]);
break; break;
} }

18
src/Module/Notifications/Notifications.php
View File

@ -80,15 +80,15 @@ class Notifications extends BaseNotifications
// notification and apply the correct template according to the notificationtype (label). // notification and apply the correct template according to the notificationtype (label).
foreach ($notifications['notifications'] as $notification) { foreach ($notifications['notifications'] as $notification) {
$notification_templates = [ $notification_templates = [
'like' => 'notifications/likes_item.tpl', 'like' => 'notifications/likes_item.tpl',
'dislike' => 'notifications/dislikes_item.tpl', 'dislike' => 'notifications/dislikes_item.tpl',
'attend' => 'notifications/attend_item.tpl', 'attend' => 'notifications/attend_item.tpl',
'attendno' => 'notifications/attend_item.tpl', 'attendno' => 'notifications/attend_item.tpl',
'attendmaybe' => 'notifications/attend_item.tpl', 'attendmaybe' => 'notifications/attend_item.tpl',
'friend' => 'notifications/friends_item.tpl', 'friend' => 'notifications/friends_item.tpl',
'comment' => 'notifications/comments_item.tpl', 'comment' => 'notifications/comments_item.tpl',
'post' => 'notifications/posts_item.tpl', 'post' => 'notifications/posts_item.tpl',
'notification' => 'notifications/notification.tpl', 'notification' => 'notifications/notification.tpl',
]; ];
$notificationTemplate = Renderer::getMarkupTemplate($notification_templates[$notification['label']]); $notificationTemplate = Renderer::getMarkupTemplate($notification_templates[$notification['label']]);

2
view/global.css
View File

@ -274,7 +274,7 @@ code, key {
} }
/* notifications unseen */ /* notifications unseen */
.notify-unseen { background-color: #cceeFF; } .notification-unseen { background-color: #cceeFF; }
/* autocomplete popup */ /* autocomplete popup */
ul.acpopup { ul.acpopup {

20
view/js/main.js
View File

@ -299,19 +299,19 @@ $(function() {
var notification_id = 0; var notification_id = 0;
// Insert notifs into the notifications-menu // Insert notifs into the notifications-menu
$(data.notifications).each(function(key, notif) { $(data.notifications).each(function(key, notification) {
var text = notif.message.format('<span class="contactname">' + notif.name + '</span>'); var text = notification.message.format('<span class="contactname">' + notification.name + '</span>');
var contact = ('<a href="' + notif.url + '"><span class="contactname">' + notif.name + '</span></a>'); var contact = ('<a href="' + notification.url + '"><span class="contactname">' + notification.name + '</span></a>');
var seenclass = (notif.seen == 1) ? "notify-seen" : "notify-unseen"; var seenclass = (notification.seen == 1) ? "notification-seen" : "notification-unseen";
var html = notifications_tpl.format( var html = notifications_tpl.format(
notif.href, // {0} // link to the source notification.href, // {0} // link to the source
notif.photo, // {1} // photo of the contact notification.photo, // {1} // photo of the contact
text, // {2} // preformatted text (autor + text) text, // {2} // preformatted text (autor + text)
notif.date, // {3} // date of notification (time ago) notification.date, // {3} // date of notification (time ago)
seenclass, // {4} // visited status of the notification seenclass, // {4} // visited status of the notification
new Date(notif.timestamp*1000), // {5} // date of notification new Date(notification.timestamp*1000), // {5} // date of notification
notif.url, // {6} // profile url of the contact notification.url, // {6} // profile url of the contact
notif.message.format(contact), // {7} // preformatted html (text including author profile url) notification.message.format(contact), // {7} // preformatted html (text including author profile url)
'' // {8} // Deprecated '' // {8} // Deprecated
); );
nnm.append(html); nnm.append(html);

4
view/templates/nav.tpl
View File

@ -34,7 +34,7 @@
<a accesskey="c" id="nav-community-link" class="nav-commlink {{$nav.community.2}} {{$sel.community}}" href="{{$nav.community.0}}" title="{{$nav.community.3}}" >{{$nav.community.1}}</a> <a accesskey="c" id="nav-community-link" class="nav-commlink {{$nav.community.2}} {{$sel.community}}" href="{{$nav.community.0}}" title="{{$nav.community.3}}" >{{$nav.community.1}}</a>
{{/if}} {{/if}}
{{if $nav.introductions}} {{if $nav.introductions}}
<a id="nav-notify-link" class="nav-commlink {{$nav.introductions.2}} {{$sel.introductions}}" href="{{$nav.introductions.0}}" title="{{$nav.introductions.3}}" >{{$nav.introductions.1}}</a> <a id="nav-notification-link" class="nav-commlink {{$nav.introductions.2}} {{$sel.introductions}}" href="{{$nav.introductions.0}}" title="{{$nav.introductions.3}}" >{{$nav.introductions.1}}</a>
<span id="intro-update" class="nav-ajax-left"></span> <span id="intro-update" class="nav-ajax-left"></span>
{{/if}} {{/if}}
{{if $nav.messages}} {{if $nav.messages}}
@ -49,7 +49,7 @@
{{if $nav.notifications}} {{if $nav.notifications}}
<a accesskey="f" id="nav-notifications-linkmenu" class="nav-commlink" href="{{$nav.notifications.0}}" rel="#nav-notifications-menu" title="{{$nav.notifications.1}}">{{$nav.notifications.1}}</a> <a accesskey="f" id="nav-notifications-linkmenu" class="nav-commlink" href="{{$nav.notifications.0}}" rel="#nav-notifications-menu" title="{{$nav.notifications.1}}">{{$nav.notifications.1}}</a>
<span id="notify-update" class="nav-ajax-left"></span> <span id="notification-update" class="nav-ajax-left"></span>
<ul id="nav-notifications-menu" class="menu-popup"> <ul id="nav-notifications-menu" class="menu-popup">
<li id="nav-notifications-see-all"><a href="{{$nav.notifications.all.0}}">{{$nav.notifications.all.1}}</a></li> <li id="nav-notifications-see-all"><a href="{{$nav.notifications.all.0}}">{{$nav.notifications.all.1}}</a></li>
<li id="nav-notifications-mark-all"><a href="#" onclick="notifyMarkAll(); return false;">{{$nav.notifications.mark.3}}</a></li> <li id="nav-notifications-mark-all"><a href="#" onclick="notifyMarkAll(); return false;">{{$nav.notifications.mark.3}}</a></li>

14
view/templates/notifications/notifications.tpl
View File

@ -1,25 +1,25 @@
<h1>{{$notif_header}}</h1> <h1>{{$header}}</h1>
{{if $tabs }}{{include file="common_tabs.tpl"}}{{/if}} {{if $tabs }}{{include file="common_tabs.tpl"}}{{/if}}
<div class="notif-network-wrapper"> <div class="notif-network-wrapper">
{{* The "show ignored" link *}} {{* The "show ignored" link *}}
{{if $notif_show_lnk}}<a href="{{$notif_show_lnk.href}}" id="notifications-show-hide-link">{{$notif_show_lnk.text}}</a>{{/if}} {{if $showLink}}<a href="{{$showLink.href}}" id="notifications-show-hide-link">{{$showLink.text}}</a>{{/if}}
{{* The notifications *}} {{* The notifications *}}
{{if $notif_content}} {{if $notifications}}
{{foreach $notif_content as $notification}} {{foreach $notifications as $notification}}
{{$notification nofilter}} {{$notification nofilter}}
{{/foreach}} {{/foreach}}
{{/if}} {{/if}}
{{* If no notifications messages available *}} {{* If no notifications messages available *}}
{{if $notif_nocontent}} {{if $noContent}}
<div class="notif_nocontent">{{$notif_nocontent}}</div> <div class="notification_nocontent">{{$noContent}}</div>
{{/if}} {{/if}}
{{* The pager *}} {{* The pager *}}
{{$notif_paginate nofilter}} {{$paginate nofilter}}
</div> </div>

2
view/templates/settings/settings.tpl
View File

@ -114,7 +114,7 @@
<div class="settings-content-block"> <div class="settings-content-block">
<div id="settings-notifications"> <div id="settings-notifications">
<div id="settings-notify-desc">{{$lbl_not}}</div> <div id="settings-notification-desc">{{$lbl_not}}</div>
<div class="group"> <div class="group">
{{include file="field_intcheckbox.tpl" field=$notify1}} {{include file="field_intcheckbox.tpl" field=$notify1}}

2
view/theme/duepuntozero/deriv/darkzero.css
View File

@ -133,7 +133,7 @@ input#dfrn-url {
background:#444; background:#444;
} }
.notify-seen { .notification-seen {
background:#111; background:#111;
} }

10
view/theme/duepuntozero/style.css
View File

@ -784,7 +784,7 @@ input#dfrn-url {
#settings-notifications label { #settings-notifications label {
margin-left: 20px; margin-left: 20px;
} }
#settings-notify-desc, #settings-activity-desc { #settings-notification-desc, #settings-activity-desc {
font-weight: bold; font-weight: bold;
margin-bottom: 15px; margin-bottom: 15px;
} }
@ -2781,7 +2781,7 @@ aside input[type='text'] {
#crepair-url-label, #crepair-url-label,
#crepair-request-label, #crepair-request-label,
#crepair-confirm-label, #crepair-confirm-label,
#crepair-notify-label, #crepair-notification-label,
#crepair-photo-label, #crepair-photo-label,
#crepair-poll-label { #crepair-poll-label {
float: left; float: left;
@ -3316,7 +3316,7 @@ div.jGrowl div.info {
margin-right: -20px; margin-right: -20px;
} }
.nav-notify { .nav-notification {
display: none; display: none;
position: absolute; position: absolute;
font-size: 10px; font-size: 10px;
@ -3326,7 +3326,7 @@ div.jGrowl div.info {
min-width: 15px; min-width: 15px;
text-align: right; text-align: right;
} }
.nav-notify.show { .nav-notification.show {
display: block; display: block;
} }
#nav-notifications-menu { #nav-notifications-menu {
@ -3372,7 +3372,7 @@ div.jGrowl div.info {
padding: 7px 7px 0px 0px; padding: 7px 7px 0px 0px;
} }
.notify-seen { .notification-seen {
background: #DDDDDD; background: #DDDDDD;
} }

4
view/theme/duepuntozero/templates/nav.tpl
View File

@ -34,7 +34,7 @@
<a accesskey="c" id="nav-community-link" class="nav-commlink {{$nav.community.2}} {{$sel.community}}" href="{{$nav.community.0}}" title="{{$nav.community.3}}" >{{$nav.community.1}}</a> <a accesskey="c" id="nav-community-link" class="nav-commlink {{$nav.community.2}} {{$sel.community}}" href="{{$nav.community.0}}" title="{{$nav.community.3}}" >{{$nav.community.1}}</a>
{{/if}} {{/if}}
{{if $nav.introductions}} {{if $nav.introductions}}
<a id="nav-notify-link" class="nav-commlink {{$nav.introductions.2}} {{$sel.introductions}}" href="{{$nav.introductions.0}}" title="{{$nav.introductions.3}}" >{{$nav.introductions.1}}</a> <a id="nav-notification-link" class="nav-commlink {{$nav.introductions.2}} {{$sel.introductions}}" href="{{$nav.introductions.0}}" title="{{$nav.introductions.3}}" >{{$nav.introductions.1}}</a>
<span id="intro-update" class="nav-ajax-left"></span> <span id="intro-update" class="nav-ajax-left"></span>
{{/if}} {{/if}}
{{if $nav.messages}} {{if $nav.messages}}
@ -48,7 +48,7 @@
{{if $nav.notifications}} {{if $nav.notifications}}
<a accesskey="f" id="nav-notifications-linkmenu" class="nav-commlink" href="{{$nav.notifications.0}}" rel="#nav-notifications-menu" title="{{$nav.notifications.1}}">{{$nav.notifications.1}}</a> <a accesskey="f" id="nav-notifications-linkmenu" class="nav-commlink" href="{{$nav.notifications.0}}" rel="#nav-notifications-menu" title="{{$nav.notifications.1}}">{{$nav.notifications.1}}</a>
<span id="notify-update" class="nav-ajax-left"></span> <span id="notification-update" class="nav-ajax-left"></span>
<ul id="nav-notifications-menu" class="menu-popup"> <ul id="nav-notifications-menu" class="menu-popup">
<li id="nav-notifications-see-all"><a href="{{$nav.notifications.all.0}}">{{$nav.notifications.all.1}}</a></li> <li id="nav-notifications-see-all"><a href="{{$nav.notifications.all.0}}">{{$nav.notifications.all.1}}</a></li>
<li id="nav-notifications-mark-all"><a href="#" onclick="notifyMarkAll(); return false;">{{$nav.notifications.mark.3}}</a></li> <li id="nav-notifications-mark-all"><a href="#" onclick="notifyMarkAll(); return false;">{{$nav.notifications.mark.3}}</a></li>

6
view/theme/frio/css/style.css
View File

@ -512,7 +512,7 @@ nav.navbar .nav>li>a:focus{
text-decoration: none; text-decoration: none;
text-align: left text-align: left
} }
#topbar-first .topbar-nav .nav-segment .nav-notify { #topbar-first .topbar-nav .nav-segment .nav-notification {
position: absolute; position: absolute;
top: 4px; top: 4px;
right: -2px; right: -2px;
@ -640,7 +640,7 @@ nav.navbar a, nav.navbar .btn-link {
font-size: 12px; font-size: 12px;
} }
#topbar-first #nav-notifications-menu li.notify-unseen { #topbar-first #nav-notifications-menu li.notification-unseen {
border-left: 3px solid #f3fcfd; border-left: 3px solid #f3fcfd;
background-color: #f3fcfd; background-color: #f3fcfd;
} }
@ -682,7 +682,7 @@ nav.navbar a, nav.navbar .btn-link {
#topbar-first .account .user-title span { #topbar-first .account .user-title span {
color: $nav_icon_color; color: $nav_icon_color;
} }
#topbar-first .account #main-menu .nav-notify { #topbar-first .account #main-menu .nav-notification {
position: absolute; position: absolute;
top: 4px; top: 4px;
right: -2px; right: -2px;

2
view/theme/frio/scheme/plusminus.css
View File

@ -25,7 +25,7 @@ aside .widget, .form-control, .panel, .nav-container, .wall-item-content, .e-con
font-family: ".SFNSText-Regular","San Francisco","Roboto","Segoe UI","Helvetica Neue","Lucida Grande",Helvetica,Arial,sans-serif; font-family: ".SFNSText-Regular","San Francisco","Roboto","Segoe UI","Helvetica Neue","Lucida Grande",Helvetica,Arial,sans-serif;
} }
#topbar-first #nav-notifications-menu li.notify-unseen { #topbar-first #nav-notifications-menu li.notification-unseen {
border-left: 3px solid #f3fcfd; border-left: 3px solid #f3fcfd;
background-color: antiquewhite; background-color: antiquewhite;
} }

14
view/theme/frio/templates/nav.tpl
View File

@ -40,11 +40,11 @@
<ul class="nav navbar-nav navbar-left" role="menubar"> <ul class="nav navbar-nav navbar-left" role="menubar">
<li id="nav-communication" class="nav-segment" role="presentation"> <li id="nav-communication" class="nav-segment" role="presentation">
{{if $nav.network}} {{if $nav.network}}
<a accesskey="n" role="menuitem" class="nav-menu {{$sel.network}}" href="{{$nav.network.0}}" data-toggle="tooltip" aria-label="{{$nav.network.3}}" title="{{$nav.network.3}}"><i class="fa fa-lg fa-th" aria-hidden="true"></i><span id="net-update" class="nav-network-badge badge nav-notify"></span></a> <a accesskey="n" role="menuitem" class="nav-menu {{$sel.network}}" href="{{$nav.network.0}}" data-toggle="tooltip" aria-label="{{$nav.network.3}}" title="{{$nav.network.3}}"><i class="fa fa-lg fa-th" aria-hidden="true"></i><span id="net-update" class="nav-network-badge badge nav-notification"></span></a>
{{/if}} {{/if}}
{{if $nav.home}} {{if $nav.home}}
<a accesskey="p" role="menuitem" class="nav-menu {{$sel.home}}" href="{{$nav.home.0}}" data-toggle="tooltip" aria-label="{{$nav.home.3}}" title="{{$nav.home.3}}"><i class="fa fa-lg fa-home" aria-hidden="true"></i><span id="home-update" class="nav-home-badge badge nav-notify"></span></a> <a accesskey="p" role="menuitem" class="nav-menu {{$sel.home}}" href="{{$nav.home.0}}" data-toggle="tooltip" aria-label="{{$nav.home.3}}" title="{{$nav.home.3}}"><i class="fa fa-lg fa-home" aria-hidden="true"></i><span id="home-update" class="nav-home-badge badge nav-notification"></span></a>
{{/if}} {{/if}}
{{if $nav.community}} {{if $nav.community}}
@ -54,7 +54,7 @@
<li id="nav-personal" class="nav-segment hidden-xs" role="presentation"> <li id="nav-personal" class="nav-segment hidden-xs" role="presentation">
{{if $nav.messages}} {{if $nav.messages}}
<a role="menuitem" id="nav-messages-link" href="{{$nav.messages.0}}" data-toggle="tooltip" aria-label="{{$nav.messages.1}}" title="{{$nav.messages.1}}" class="nav-menu {{$sel.messages}}"><i class="fa fa-envelope fa-lg" aria-hidden="true"></i><span id="mail-update" class="nav-mail-badge badge nav-notify"></span></a> <a role="menuitem" id="nav-messages-link" href="{{$nav.messages.0}}" data-toggle="tooltip" aria-label="{{$nav.messages.1}}" title="{{$nav.messages.1}}" class="nav-menu {{$sel.messages}}"><i class="fa fa-envelope fa-lg" aria-hidden="true"></i><span id="mail-update" class="nav-mail-badge badge nav-notification"></span></a>
{{/if}} {{/if}}
{{if $nav.events}} {{if $nav.events}}
@ -63,7 +63,7 @@
{{if $nav.contacts}} {{if $nav.contacts}}
<a role="menuitem" id="nav-contacts-link" class="nav-menu {{$sel.contacts}} {{$nav.contacts.2}}" href="{{$nav.contacts.0}}" data-toggle="tooltip" aria-label="{{$nav.contacts.1}}" title="{{$nav.contacts.1}}" ><i class="fa fa-users fa-lg" aria-hidden="true"></i></a> <a role="menuitem" id="nav-contacts-link" class="nav-menu {{$sel.contacts}} {{$nav.contacts.2}}" href="{{$nav.contacts.0}}" data-toggle="tooltip" aria-label="{{$nav.contacts.1}}" title="{{$nav.contacts.1}}" ><i class="fa fa-users fa-lg" aria-hidden="true"></i></a>
<span id="intro-update" class="nav-intro-badge badge nav-notify" onclick="window.location.href = '{{$nav.introductions.0}}' " data-toggle="tooltip" aria-label="{{$nav.introductions.3}}" title="{{$nav.introductions.3}}"></span> <span id="intro-update" class="nav-intro-badge badge nav-notification" onclick="window.location.href = '{{$nav.introductions.0}}' " data-toggle="tooltip" aria-label="{{$nav.introductions.3}}" title="{{$nav.introductions.3}}"></span>
{{/if}} {{/if}}
</li> </li>
@ -73,7 +73,7 @@
<a href="{{$nav.notifications.0}}" rel="#nav-notifications-menu" data-toggle="tooltip" aria-label="{{$nav.notifications.1}}" title="{{$nav.notifications.1}}" role="button" id="dropdownMenu1" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false" aria-controls="nav-notifications-menu"> <a href="{{$nav.notifications.0}}" rel="#nav-notifications-menu" data-toggle="tooltip" aria-label="{{$nav.notifications.1}}" title="{{$nav.notifications.1}}" role="button" id="dropdownMenu1" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false" aria-controls="nav-notifications-menu">
<i class="fa fa-bell fa-lg" aria-hidden="true"></i> <i class="fa fa-bell fa-lg" aria-hidden="true"></i>
<span role="menuitem" class="sr-only">{{$nav.notifications.1}}</span> <span role="menuitem" class="sr-only">{{$nav.notifications.1}}</span>
<span id="notify-update" class="nav-notify-badge badge nav-notify dropdown" data-toggle="dropdown"></span> <span id="notification-update" class="nav-notification-badge badge nav-notification dropdown" data-toggle="dropdown"></span>
</a> </a>
{{* The notifications dropdown menu. There are two parts of menu. The second is at the bottom of this file. It is loaded via js. Look at nav-notifications-template *}} {{* The notifications dropdown menu. There are two parts of menu. The second is at the bottom of this file. It is loaded via js. Look at nav-notifications-template *}}
@ -143,11 +143,11 @@
<li role="presentation"><a role="menuitem" href="{{$nav.notifications.all.0}}" title="{{$nav.notifications.1}}"><i class="fa fa-bell fa-fw" aria-hidden="true"></i> {{$nav.notifications.1}}</a></li> <li role="presentation"><a role="menuitem" href="{{$nav.notifications.all.0}}" title="{{$nav.notifications.1}}"><i class="fa fa-bell fa-fw" aria-hidden="true"></i> {{$nav.notifications.1}}</a></li>
{{/if}} {{/if}}
{{if $nav.messages}} {{if $nav.messages}}
<li role="presentation"><a role="menuitem" class="nav-commlink {{$nav.messages.2}} {{$sel.messages}}" href="{{$nav.messages.0}}" title="{{$nav.messages.3}}" ><i class="fa fa-envelope fa-fw" aria-hidden="true"></i> {{$nav.messages.1}} <span id="mail-update-li" class="nav-mail-badge badge nav-notify"></span></a></li> <li role="presentation"><a role="menuitem" class="nav-commlink {{$nav.messages.2}} {{$sel.messages}}" href="{{$nav.messages.0}}" title="{{$nav.messages.3}}" ><i class="fa fa-envelope fa-fw" aria-hidden="true"></i> {{$nav.messages.1}} <span id="mail-update-li" class="nav-mail-badge badge nav-notification"></span></a></li>
{{/if}} {{/if}}
<li role="presentation" class="divider"></li> <li role="presentation" class="divider"></li>
{{if $nav.contacts}} {{if $nav.contacts}}
<li role="presentation"><a role="menuitem" id="nav-menu-contacts-link" class="nav-link {{$nav.contacts.2}}" href="{{$nav.contacts.0}}" title="{{$nav.contacts.3}}"><i class="fa fa-users fa-fw" aria-hidden="true"></i> {{$nav.contacts.1}}</a><span id="intro-update-li" class="nav-intro-badge badge nav-notify"></span></li> <li role="presentation"><a role="menuitem" id="nav-menu-contacts-link" class="nav-link {{$nav.contacts.2}}" href="{{$nav.contacts.0}}" title="{{$nav.contacts.3}}"><i class="fa fa-users fa-fw" aria-hidden="true"></i> {{$nav.contacts.1}}</a><span id="intro-update-li" class="nav-intro-badge badge nav-notification"></span></li>
{{/if}} {{/if}}
{{if $nav.delegation}} {{if $nav.delegation}}
<li role="presentation"><a role="menuitem" id="nav-delegation-link" class="nav-commlink {{$nav.delegation.2}} {{$sel.delegation}}" href="{{$nav.delegation.0}}" title="{{$nav.delegation.3}}"><i class="fa fa-flag fa-fw" aria-hidden="true"></i> {{$nav.delegation.1}}</a></li> <li role="presentation"><a role="menuitem" id="nav-delegation-link" class="nav-commlink {{$nav.delegation.2}} {{$sel.delegation}}" href="{{$nav.delegation.0}}" title="{{$nav.delegation.3}}"><i class="fa fa-flag fa-fw" aria-hidden="true"></i> {{$nav.delegation.1}}</a></li>

14
view/theme/frio/templates/notifications/notifications.tpl
View File

@ -2,29 +2,29 @@
<script type="text/javascript" src="../../js/mod_notifications.js"></script> <script type="text/javascript" src="../../js/mod_notifications.js"></script>
<div class="generic-page-wrapper"> <div class="generic-page-wrapper">
{{include file="section_title.tpl" title=$notif_header}} {{include file="section_title.tpl" title=$header}}
{{if $tabs }}{{include file="common_tabs.tpl"}}{{/if}} {{if $tabs }}{{include file="common_tabs.tpl"}}{{/if}}
<div class="notif-network-wrapper"> <div class="notif-network-wrapper">
{{* The "show ignored" link *}} {{* The "show ignored" link *}}
{{if $notif_show_lnk}}<a href="{{$notif_show_lnk.href}}" id="notifications-show-hide-link">{{$notif_show_lnk.text}}</a>{{/if}} {{if $showLink}}<a href="{{$showLink.href}}" id="notifications-show-hide-link">{{$showLink.text}}</a>{{/if}}
{{* The notifications *}} {{* The notifications *}}
{{if $notif_content}} {{if $notifications}}
<ul class="notif-network-list media-list"> <ul class="notif-network-list media-list">
{{foreach $notif_content as $notification}} {{foreach $notifications as $notification}}
<li>{{$notification nofilter}}</li> <li>{{$notification nofilter}}</li>
{{/foreach}} {{/foreach}}
</ul> </ul>
{{/if}} {{/if}}
{{* If no notifications messages available *}} {{* If no notifications messages available *}}
{{if $notif_nocontent}} {{if $noContent}}
<div class="notif_nocontent">{{$notif_nocontent}}</div> <div class="notification_nocontent">{{$noContent}}</div>
{{/if}} {{/if}}
</div> </div>
{{* The pager *}} {{* The pager *}}
{{$notif_paginate nofilter}} {{$paginate nofilter}}
</div> </div>

2
view/theme/frio/templates/settings/settings.tpl
View File

@ -169,7 +169,7 @@
<div class="section-content-tools-wrapper"> <div class="section-content-tools-wrapper">
<div id="settings-notifications"> <div id="settings-notifications">
<div id="settings-notify-desc"><h4>{{$lbl_not}}</h4></div> <div id="settings-notification-desc"><h4>{{$lbl_not}}</h4></div>
<div class="group"> <div class="group">
{{include file="field_intcheckbox.tpl" field=$notify1}} {{include file="field_intcheckbox.tpl" field=$notify1}}

6
view/theme/quattro/dark/style.css
View File

@ -627,7 +627,7 @@ nav .nav-menu-icon img {
width: 22px; width: 22px;
height: 22px; height: 22px;
} }
nav .nav-menu-icon .nav-notify { nav .nav-menu-icon .nav-notification {
top: 3px; top: 3px;
} }
nav .nav-menu { nav .nav-menu {
@ -641,7 +641,7 @@ nav .nav-menu {
nav .nav-menu.selected { nav .nav-menu.selected {
border-bottom: 3px solid #9eabb0; border-bottom: 3px solid #9eabb0;
} }
nav .nav-notify { nav .nav-notification {
display: none; display: none;
position: absolute; position: absolute;
background-color: #19aeff; background-color: #19aeff;
@ -655,7 +655,7 @@ nav .nav-notify {
min-width: 15px; min-width: 15px;
text-align: right; text-align: right;
} }
nav .nav-notify.show { nav .nav-notification.show {
display: block; display: block;
} }
nav #nav-help-link, nav #nav-help-link,

6
view/theme/quattro/green/style.css
View File

@ -627,7 +627,7 @@ nav .nav-menu-icon img {
width: 22px; width: 22px;
height: 22px; height: 22px;
} }
nav .nav-menu-icon .nav-notify { nav .nav-menu-icon .nav-notification {
top: 3px; top: 3px;
} }
nav .nav-menu { nav .nav-menu {
@ -641,7 +641,7 @@ nav .nav-menu {
nav .nav-menu.selected { nav .nav-menu.selected {
border-bottom: 3px solid #9eabb0; border-bottom: 3px solid #9eabb0;
} }
nav .nav-notify { nav .nav-notification {
display: none; display: none;
position: absolute; position: absolute;
background-color: #dc0000; background-color: #dc0000;
@ -655,7 +655,7 @@ nav .nav-notify {
min-width: 15px; min-width: 15px;
text-align: right; text-align: right;
} }
nav .nav-notify.show { nav .nav-notification.show {
display: block; display: block;
} }
nav #nav-help-link, nav #nav-help-link,

6
view/theme/quattro/lilac/style.css
View File

@ -627,7 +627,7 @@ nav .nav-menu-icon img {
width: 22px; width: 22px;
height: 22px; height: 22px;
} }
nav .nav-menu-icon .nav-notify { nav .nav-menu-icon .nav-notification {
top: 3px; top: 3px;
} }
nav .nav-menu { nav .nav-menu {
@ -641,7 +641,7 @@ nav .nav-menu {
nav .nav-menu.selected { nav .nav-menu.selected {
border-bottom: 3px solid #9eabb0; border-bottom: 3px solid #9eabb0;
} }
nav .nav-notify { nav .nav-notification {
display: none; display: none;
position: absolute; position: absolute;
background-color: #86608e; background-color: #86608e;
@ -655,7 +655,7 @@ nav .nav-notify {
min-width: 15px; min-width: 15px;
text-align: right; text-align: right;
} }
nav .nav-notify.show { nav .nav-notification.show {
display: block; display: block;
} }
nav #nav-help-link, nav #nav-help-link,

4
view/theme/quattro/quattro.less
View File

@ -180,7 +180,7 @@ nav {
} }
img { width: 22px; height: 22px; } img { width: 22px; height: 22px; }
.nav-notify { top: 3px; } .nav-notification { top: 3px; }
} }
.nav-menu { .nav-menu {
@ -196,7 +196,7 @@ nav {
} }
.nav-notify { .nav-notification {
display: none; display: none;
position: absolute; position: absolute;
background-color: @NavbarNotifBg; background-color: @NavbarNotifBg;

10
view/theme/quattro/templates/nav.tpl
View File

@ -29,14 +29,14 @@
{{if $nav.network}} {{if $nav.network}}
<li id="nav-network-link" class="nav-menu {{$sel.network}}"> <li id="nav-network-link" class="nav-menu {{$sel.network}}">
<a accesskey="n" class="{{$nav.network.2}}" href="{{$nav.network.0}}" title="{{$nav.network.3}}" >{{$nav.network.1}}</a> <a accesskey="n" class="{{$nav.network.2}}" href="{{$nav.network.0}}" title="{{$nav.network.3}}" >{{$nav.network.1}}</a>
<span id="net-update" class="nav-notify"></span> <span id="net-update" class="nav-notification"></span>
</li> </li>
{{/if}} {{/if}}
{{if $nav.home}} {{if $nav.home}}
<li id="nav-home-link" class="nav-menu {{$sel.home}}"> <li id="nav-home-link" class="nav-menu {{$sel.home}}">
<a accesskey="p" class="{{$nav.home.2}}" href="{{$nav.home.0}}" title="{{$nav.home.3}}" >{{$nav.home.1}}</a> <a accesskey="p" class="{{$nav.home.2}}" href="{{$nav.home.0}}" title="{{$nav.home.3}}" >{{$nav.home.1}}</a>
<span id="home-update" class="nav-notify"></span> <span id="home-update" class="nav-notification"></span>
</li> </li>
{{/if}} {{/if}}
@ -45,7 +45,7 @@
<a class="{{$nav.introductions.2}}" href="{{$nav.introductions.0}}" title="{{$nav.introductions.3}}" > <a class="{{$nav.introductions.2}}" href="{{$nav.introductions.0}}" title="{{$nav.introductions.3}}" >
<span class="icon s22 intro">{{$nav.introductions.1}}</a> <span class="icon s22 intro">{{$nav.introductions.1}}</a>
</a> </a>
<span id="intro-update" class="nav-notify"></span> <span id="intro-update" class="nav-notification"></span>
</li> </li>
{{/if}} {{/if}}
@ -54,13 +54,13 @@
<a class="{{$nav.messages.2}}" href="{{$nav.messages.0}}" title="{{$nav.messages.3}}" > <a class="{{$nav.messages.2}}" href="{{$nav.messages.0}}" title="{{$nav.messages.3}}" >
<span class="icon s22 mail">{{$nav.messages.1}}</a> <span class="icon s22 mail">{{$nav.messages.1}}</a>
</a> </a>
<span id="mail-update" class="nav-notify"></span> <span id="mail-update" class="nav-notification"></span>
</li> </li>
{{/if}} {{/if}}
{{if $nav.notifications}} {{if $nav.notifications}}
<li id="nav-notifications-linkmenu" class="nav-menu-icon"><a accesskey="f" href="{{$nav.notifications.0}}" rel="#nav-notifications-menu" title="{{$nav.notifications.1}}"><span class="icon s22 notify">{{$nav.notifications.1}}</span></a> <li id="nav-notifications-linkmenu" class="nav-menu-icon"><a accesskey="f" href="{{$nav.notifications.0}}" rel="#nav-notifications-menu" title="{{$nav.notifications.1}}"><span class="icon s22 notify">{{$nav.notifications.1}}</span></a>
<span id="notify-update" class="nav-notify"></span> <span id="notification-update" class="nav-notification"></span>
<ul id="nav-notifications-menu" class="menu-popup"> <ul id="nav-notifications-menu" class="menu-popup">
<!-- TODO: better icons! --> <!-- TODO: better icons! -->
<li id="nav-notifications-mark-all" class="toolbar"><a href="#" onclick="notifyMarkAll(); return false;" title="{{$nav.notifications.mark.3}}"><span class="icon s10 edit"></span></a></a><a href="{{$nav.notifications.all.0}}" title="{{$nav.notifications.all.1}}"><span class="icon s10 plugin"></span></a></li> <li id="nav-notifications-mark-all" class="toolbar"><a href="#" onclick="notifyMarkAll(); return false;" title="{{$nav.notifications.mark.3}}"><span class="icon s10 edit"></span></a></a><a href="{{$nav.notifications.all.0}}" title="{{$nav.notifications.all.1}}"><span class="icon s10 plugin"></span></a></li>

12
view/theme/smoothly/style.css
View File

@ -616,7 +616,7 @@ ul#user-menu-popup li a.nav-sep {
padding-left: 11px; padding-left: 11px;
} }
#notify-update { #notification-update {
background-position: 0px -168px; background-position: 0px -168px;
} }
@ -4211,7 +4211,7 @@ a.active {
margin-right: -20px; margin-right: -20px;
} }
.nav-notify { .nav-notification {
display: none; display: none;
position: absolute; position: absolute;
font-size: 10px; font-size: 10px;
@ -4221,7 +4221,7 @@ a.active {
min-width: 15px; min-width: 15px;
text-align: right; text-align: right;
} }
.nav-notify.show { .nav-notification.show {
display: block; display: block;
} }
#nav-notifications-menu { #nav-notifications-menu {
@ -4353,11 +4353,11 @@ a.active {
filter: alpha(opacity=100); filter: alpha(opacity=100);
} }
.notify-seen { .notification-seen {
background: #000000; background: #000000;
} }
.notify-seen a { .notification-seen a {
color: #efefef !important; color: #efefef !important;
} }
@ -4604,7 +4604,7 @@ div #datebrowse-sidebar.widget {
} }
#settings-activity-desc, #settings-activity-desc,
#settings-notify-desc { #settings-notification-desc {
margin: 10px 10px 10px 0; margin: 10px 10px 10px 0;
font-weight: bold; font-weight: bold;
} }

4
view/theme/smoothly/templates/nav.tpl
View File

@ -8,7 +8,7 @@
<!-- {{if $nav.notifications}}<a id="intro-update" class="nav-ajax-update" href="{{$nav.notifications.0}}" title="{{$nav.notifications.1}}"></a>{{/if}} --> <!-- {{if $nav.notifications}}<a id="intro-update" class="nav-ajax-update" href="{{$nav.notifications.0}}" title="{{$nav.notifications.1}}"></a>{{/if}} -->
{{if $nav.introductions}}<a id="intro-update" class="nav-ajax-update" href="{{$nav.introductions.0}}" title="{{$nav.introductions.1}}"></a>{{/if}} {{if $nav.introductions}}<a id="intro-update" class="nav-ajax-update" href="{{$nav.introductions.0}}" title="{{$nav.introductions.1}}"></a>{{/if}}
{{if $nav.messages}}<a id="mail-update" class="nav-ajax-update" href="{{$nav.messages.0}}" title="{{$nav.messages.1}}"></a>{{/if}} {{if $nav.messages}}<a id="mail-update" class="nav-ajax-update" href="{{$nav.messages.0}}" title="{{$nav.messages.1}}"></a>{{/if}}
{{if $nav.notifications}}<a rel="#nav-notifications-menu" id="notify-update" class="nav-ajax-update" href="{{$nav.notifications.0}}" title="{{$nav.notifications.1}}"></a>{{/if}} {{if $nav.notifications}}<a rel="#nav-notifications-menu" id="notification-update" class="nav-ajax-update" href="{{$nav.notifications.0}}" title="{{$nav.notifications.1}}"></a>{{/if}}
<ul id="nav-notifications-menu" class="menu-popup"> <ul id="nav-notifications-menu" class="menu-popup">
<li id="nav-notifications-mark-all"><a href="#" onclick="notifyMarkAll(); return false;">{{$nav.notifications.mark.3}}</a></li> <li id="nav-notifications-mark-all"><a href="#" onclick="notifyMarkAll(); return false;">{{$nav.notifications.mark.3}}</a></li>
@ -38,7 +38,7 @@
<li><a id="nav-directory-link" class="nav-link {{$nav.directory.2}}" href="{{$nav.directory.0}}">{{$nav.directory.1}}</a></li> <li><a id="nav-directory-link" class="nav-link {{$nav.directory.2}}" href="{{$nav.directory.0}}">{{$nav.directory.1}}</a></li>
{{if $nav.apps}}<li><a id="nav-apps-link" class="nav-link {{$nav.apps.2}}" href="{{$nav.apps.0}}">{{$nav.apps.1}}</a></li>{{/if}} {{if $nav.apps}}<li><a id="nav-apps-link" class="nav-link {{$nav.apps.2}}" href="{{$nav.apps.0}}">{{$nav.apps.1}}</a></li>{{/if}}
{{if $nav.notifications}}<li><a id="nav-notify-link" class="nav-commlink nav-sep {{$nav.notifications.2}}" href="{{$nav.notifications.0}}">{{$nav.notifications.1}}</a></li>{{/if}} {{if $nav.notifications}}<li><a id="nav-notification-link" class="nav-commlink nav-sep {{$nav.notifications.2}}" href="{{$nav.notifications.0}}">{{$nav.notifications.1}}</a></li>{{/if}}
{{if $nav.messages}}<li><a id="nav-messages-link" class="nav-commlink {{$nav.messages.2}}" href="{{$nav.messages.0}}">{{$nav.messages.1}}</a></li>{{/if}} {{if $nav.messages}}<li><a id="nav-messages-link" class="nav-commlink {{$nav.messages.2}}" href="{{$nav.messages.0}}">{{$nav.messages.1}}</a></li>{{/if}}
{{if $nav.contacts}}<li><a id="nav-contacts-link" class="nav-commlink {{$nav.contacts.2}}" href="{{$nav.contacts.0}}">{{$nav.contacts.1}}</a></li>{{/if}} {{if $nav.contacts}}<li><a id="nav-contacts-link" class="nav-commlink {{$nav.contacts.2}}" href="{{$nav.contacts.0}}">{{$nav.contacts.1}}</a></li>{{/if}}

6
view/theme/vier/dark.css
View File

@ -29,7 +29,7 @@ nav {
background-color: #1C2126 !important; background-color: #1C2126 !important;
} }
nav .nav-notify { nav .nav-notification {
background-color: #2C77AE !important background-color: #2C77AE !important
} }
@ -89,11 +89,11 @@ table.smiley-preview{
} }
/* Notifications */ /* Notifications */
li.notify-unseen { li.notification-unseen {
background-color: #252C33; background-color: #252C33;
} }
li.notify-seen { li.notification-seen {
background-color: #1C2126; background-color: #1C2126;
} }

4
view/theme/vier/plus.css
View File

@ -23,7 +23,7 @@ nav a:hover,
font: bold 11px/16px Arial; font: bold 11px/16px Arial;
} }
nav .nav-notify { nav .nav-notification {
/* background-color: #427FED; */ /* background-color: #427FED; */
background-color: #CB4437; background-color: #CB4437;
top: -3px; top: -3px;
@ -33,7 +33,7 @@ nav .nav-notify {
border-radius: 10px; border-radius: 10px;
} }
nav .nav-menu-icon .nav-notify { nav .nav-menu-icon .nav-notification {
top: 0px; top: 0px;
} }

4
view/theme/vier/plusminus.css
View File

@ -60,7 +60,7 @@ nav a:hover,
font: bold 11px/16px Arial; font: bold 11px/16px Arial;
} }
nav .nav-notify { nav .nav-notification {
background-color: #CB4437; background-color: #CB4437;
top: -3px; top: -3px;
right: -4px; right: -4px;
@ -69,7 +69,7 @@ nav .nav-notify {
border-radius: 10px; border-radius: 10px;
} }
nav .nav-menu-icon .nav-notify { nav .nav-menu-icon .nav-notification {
top: 0px; top: 0px;
} }

4
view/theme/vier/shadow.css
View File

@ -17,7 +17,7 @@ nav a:hover,
color: #fff; color: #fff;
} }
nav .nav-notify { nav .nav-notification {
background-color: #F80; background-color: #F80;
top: 0px; top: 0px;
right: -5px; right: -5px;
@ -25,7 +25,7 @@ nav .nav-notify {
border-radius: 5px 5px 5px 5px; border-radius: 5px 5px 5px 5px;
} }
nav .nav-menu-icon .nav-notify { nav .nav-menu-icon .nav-notification {
top: 0px; top: 0px;
} }

12
view/theme/vier/style.css
View File

@ -687,8 +687,8 @@ nav .nav-menu img {
margin-right: 4px; margin-right: 4px;
} }
nav .nav-menu > a > .nav-notify, nav .nav-menu > a > .nav-notification,
nav .nav-menu-icon > a > .nav-notify { nav .nav-menu-icon > a > .nav-notification {
position: absolute; position: absolute;
top: 3px; top: 3px;
right: -5px; right: -5px;
@ -741,7 +741,7 @@ nav .nav-menu:hover {
margin-right: -20px; margin-right: -20px;
} }
nav .nav-notify { nav .nav-notification {
display: none; display: none;
background-color: #F80; background-color: #F80;
-moz-border-radius: 5px 5px 5px 5px; -moz-border-radius: 5px 5px 5px 5px;
@ -753,7 +753,7 @@ nav .nav-notify {
text-align: center; text-align: center;
color: white; color: white;
} }
nav .nav-notify.show { nav .nav-notification.show {
display: inline-block; display: inline-block;
} }
@ -845,9 +845,9 @@ nav #nav-user-linkmenu {
padding: 5px 10px; */ padding: 5px 10px; */
} }
.notify-unseen {background-color: #FFF; } .notification-unseen {background-color: #FFF; }
.notify-seen { .notification-seen {
background: none repeat scroll 0 0 #EEE; background: none repeat scroll 0 0 #EEE;
} }

14
view/theme/vier/templates/nav.tpl
View File

@ -17,7 +17,7 @@
<a accesskey="p" class="{{$nav.home.2}}" href="{{$nav.home.0}}" title="{{$nav.home.3}}" > <a accesskey="p" class="{{$nav.home.2}}" href="{{$nav.home.0}}" title="{{$nav.home.3}}" >
<span class="desktop-view">{{$nav.home.1}}</span> <span class="desktop-view">{{$nav.home.1}}</span>
<i class="icon s22 icon-home mobile-view"><span class="sr-only">{{$nav.home.1}}</span></i> <i class="icon s22 icon-home mobile-view"><span class="sr-only">{{$nav.home.1}}</span></i>
<span id="home-update" class="nav-notify"></span> <span id="home-update" class="nav-notification"></span>
</a> </a>
</li> </li>
{{/if}} {{/if}}
@ -26,7 +26,7 @@
<a accesskey="n" class="{{$nav.network.2}}" href="{{$nav.network.0}}" title="{{$nav.network.3}}" > <a accesskey="n" class="{{$nav.network.2}}" href="{{$nav.network.0}}" title="{{$nav.network.3}}" >
<span class="desktop-view">{{$nav.network.1}}</span> <span class="desktop-view">{{$nav.network.1}}</span>
<i class="icon s22 icon-th mobile-view"><span class="sr-only">{{$nav.network.1}}</span></i> <i class="icon s22 icon-th mobile-view"><span class="sr-only">{{$nav.network.1}}</span></i>
<span id="net-update" class="nav-notify"></span> <span id="net-update" class="nav-notification"></span>
</a> </a>
</li> </li>
{{/if}} {{/if}}
@ -56,7 +56,7 @@
<li role="menu" aria-haspopup="true" id="nav-messages-linkmenu" class="nav-menu-icon"> <li role="menu" aria-haspopup="true" id="nav-messages-linkmenu" class="nav-menu-icon">
<a href="{{$nav.messages.0}}" title="{{$nav.messages.1}}"> <a href="{{$nav.messages.0}}" title="{{$nav.messages.1}}">
<span class="icon s22 icon-envelope"><span class="sr-only">{{$nav.messages.1}}</span></span> <span class="icon s22 icon-envelope"><span class="sr-only">{{$nav.messages.1}}</span></span>
<span id="mail-update" class="nav-notify"></span> <span id="mail-update" class="nav-notification"></span>
</a> </a>
</li> </li>
{{/if}} {{/if}}
@ -66,7 +66,7 @@
<li role="menu" aria-haspopup="true" id="nav-notifications-linkmenu" class="nav-menu-icon"> <li role="menu" aria-haspopup="true" id="nav-notifications-linkmenu" class="nav-menu-icon">
<a title="{{$nav.notifications.1}}"> <a title="{{$nav.notifications.1}}">
<span class="icon s22 icon-bell tilted-icon"><span class="sr-only">{{$nav.notifications.1}}</span></span> <span class="icon s22 icon-bell tilted-icon"><span class="sr-only">{{$nav.notifications.1}}</span></span>
<span id="notify-update" class="nav-notify"></span> <span id="notification-update" class="nav-notification"></span>
</a> </a>
<ul id="nav-notifications-menu" class="menu-popup"> <ul id="nav-notifications-menu" class="menu-popup">
<li role="menuitem" id="nav-notifications-mark-all"><a onclick="notifyMarkAll(); return false;">{{$nav.notifications.mark.1}}</a></li> <li role="menuitem" id="nav-notifications-mark-all"><a onclick="notifyMarkAll(); return false;">{{$nav.notifications.mark.1}}</a></li>
@ -78,12 +78,12 @@
{{if $userinfo}} {{if $userinfo}}
<li role="menu" aria-haspopup="true" id="nav-user-linkmenu" class="nav-menu"> <li role="menu" aria-haspopup="true" id="nav-user-linkmenu" class="nav-menu">
<a accesskey="u" title="{{$sitelocation}}"><img src="{{$userinfo.icon}}" alt="{{$userinfo.name}}"><span id="nav-user-linklabel">{{$userinfo.name}}</span><span id="intro-update" class="nav-notify"></span></a> <a accesskey="u" title="{{$sitelocation}}"><img src="{{$userinfo.icon}}" alt="{{$userinfo.name}}"><span id="nav-user-linklabel">{{$userinfo.name}}</span><span id="intro-update" class="nav-notification"></span></a>
<ul id="nav-user-menu" class="menu-popup"> <ul id="nav-user-menu" class="menu-popup">
<li role="menuitem"> <a class="{{$nav.search.2}}" href="{{$nav.search.0}}" title="{{$nav.search.3}}" >{{$nav.search.1}}</a> </li> <li role="menuitem"> <a class="{{$nav.search.2}}" href="{{$nav.search.0}}" title="{{$nav.search.3}}" >{{$nav.search.1}}</a> </li>
{{if $nav.introductions}}<li role="menuitem"><a class="{{$nav.introductions.2}}" href="{{$nav.introductions.0}}" title="{{$nav.introductions.3}}" >{{$nav.introductions.1}}</a><span id="intro-update-li" class="nav-notify"></span></li>{{/if}} {{if $nav.introductions}}<li role="menuitem"><a class="{{$nav.introductions.2}}" href="{{$nav.introductions.0}}" title="{{$nav.introductions.3}}" >{{$nav.introductions.1}}</a><span id="intro-update-li" class="nav-notification"></span></li>{{/if}}
{{if $nav.contacts}}<li role="menuitem"><a class="{{$nav.contacts.2}}" href="{{$nav.contacts.0}}" title="{{$nav.contacts.3}}" >{{$nav.contacts.1}}</a></li>{{/if}} {{if $nav.contacts}}<li role="menuitem"><a class="{{$nav.contacts.2}}" href="{{$nav.contacts.0}}" title="{{$nav.contacts.3}}" >{{$nav.contacts.1}}</a></li>{{/if}}
{{if $nav.messages}}<li role="menuitem"><a class="{{$nav.messages.2}}" href="{{$nav.messages.0}}" title="{{$nav.messages.3}}" >{{$nav.messages.1}} <span id="mail-update-li" class="nav-notify"></span></a></li>{{/if}} {{if $nav.messages}}<li role="menuitem"><a class="{{$nav.messages.2}}" href="{{$nav.messages.0}}" title="{{$nav.messages.3}}" >{{$nav.messages.1}} <span id="mail-update-li" class="nav-notification"></span></a></li>{{/if}}
{{if $nav.delegation}}<li role="menuitem"><a class="{{$nav.delegation.2}}" href="{{$nav.delegation.0}}" title="{{$nav.delegation.3}}">{{$nav.delegation.1}}</a></li>{{/if}} {{if $nav.delegation}}<li role="menuitem"><a class="{{$nav.delegation.2}}" href="{{$nav.delegation.0}}" title="{{$nav.delegation.3}}">{{$nav.delegation.1}}</a></li>{{/if}}
{{if $nav.usermenu.1}}<li role="menuitem"><a class="{{$nav.usermenu.1.2}}" href="{{$nav.usermenu.1.0}}" title="{{$nav.usermenu.1.3}}">{{$nav.usermenu.1.1}}</a></li>{{/if}} {{if $nav.usermenu.1}}<li role="menuitem"><a class="{{$nav.usermenu.1.2}}" href="{{$nav.usermenu.1.0}}" title="{{$nav.usermenu.1.3}}">{{$nav.usermenu.1.1}}</a></li>{{/if}}
{{if $nav.settings}}<li role="menuitem"><a class="{{$nav.settings.2}}" href="{{$nav.settings.0}}" title="{{$nav.settings.3}}">{{$nav.settings.1}}</a></li>{{/if}} {{if $nav.settings}}<li role="menuitem"><a class="{{$nav.settings.2}}" href="{{$nav.settings.0}}" title="{{$nav.settings.3}}">{{$nav.settings.1}}</a></li>{{/if}}