rename CSS attributes notify => notification

diff --git a/src/Model/Notification.php b/src/Model/Notification.php
index 8b0e0f1a5133921a012ed5d57bea73a72bcd1a0b..408f794972b71471e6c68cc7272630627ddac14c 100644 (file)
--- a/src/Model/Notification.php
+++ b/src/Model/Notification.php
@@ -372,7 +372,7 @@ final class Notification
         */
        public function getNetworkList(bool $seen = false, int $start = 0, int $limit = self::DEFAULT_PAGE_LIMIT)
        {
-               $ident    = self::NETWORK;
+               $ident         = self::NETWORK;
                $notifications = [];
 
                $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)
        {
-               $ident    = self::SYSTEM;
+               $ident         = self::SYSTEM;
                $notifications = [];
 
                $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)
        {
-               $ident    = self::PERSONAL;
+               $ident         = self::PERSONAL;
                $notifications = [];
 
                $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)
        {
-               $ident    = self::HOME;
+               $ident         = self::HOME;
                $notifications = [];
 
                $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)
        {
                /// @todo sanitize wording according to SELF::INTRO
-               $ident     = 'introductions';
-               $notifications  = [];
-               $sql_extra = "";
+               $ident         = 'introductions';
+               $notifications = [];
+               $sql_extra     = "";
 
                if (empty($id)) {
                        if (!$all) {
@@ -623,7 +623,7 @@ final class Notification
 
                                $intro = [
                                        'label'          => 'friend_suggestion',
-                                       'str_type'    => $this->l10n->t('Friend Suggestion'),
+                                       'str_type'       => $this->l10n->t('Friend Suggestion'),
                                        'intro_id'       => $intro['intro_id'],
                                        'madeby'         => $intro['name'],
                                        'madeby_url'     => $intro['url'],
@@ -657,7 +657,7 @@ final class Notification
                                }
                                $intro = [
                                        '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'],
                                        'uid'            => $_SESSION['uid'],
                                        'intro_id'       => $intro['intro_id'],

diff --git a/src/Module/BaseNotifications.php b/src/Module/BaseNotifications.php
index a0c49a06460fdd5fac4e94fcebca6baa44dc8bba..728a9d402d865f5e58d5bd0e834289d611b1d659 100644 (file)
--- a/src/Module/BaseNotifications.php
+++ b/src/Module/BaseNotifications.php
@@ -110,16 +110,16 @@ abstract class BaseNotifications extends BaseModule
        /**
         * Shows the printable result of notifications for a specific tab
         *
-        * @param string $header    The notification header
-        * @param array  $content   The array with the notifications
-        * @param string $noContent The string in case there are no notifications
-        * @param array  $showLink  The possible links at the top
+        * @param string $header        The notification header
+        * @param array  $notifications The array with the notifications
+        * @param string $noContent     The string in case there are no notifications
+        * @param array  $showLink      The possible links at the top
         *
         * @return string The rendered output
         *
         * @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
                $tabs = self::getTabs();
@@ -129,12 +129,12 @@ abstract class BaseNotifications extends BaseModule
 
                $notif_tpl = Renderer::getMarkupTemplate('notifications/notifications.tpl');
                return Renderer::replaceMacros($notif_tpl, [
-                       '$notif_header'    => $header ?? DI::l10n()->t('Notifications'),
-                       '$tabs'            => $tabs,
-                       '$notif_content'   => $content,
-                       '$notif_nocontent' => $noContent,
-                       '$notif_show_lnk'  => $showLink,
-                       '$notif_paginate'  => $pager->renderMinimal(count($content))
+                       '$header'        => $header ?? DI::l10n()->t('Notifications'),
+                       '$tabs'          => $tabs,
+                       '$notifications' => $notifications,
+                       '$noContent'     => $noContent,
+                       '$showLink'      => $showLink,
+                       '$paginate'      => $pager->renderMinimal(count($notifications))
                ]);
        }
 

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

diff --git a/src/Module/Notifications/Notifications.php b/src/Module/Notifications/Notifications.php
index 432ae93aeacb4e1b5eade6a526c7e6b3eae000ab..3dffe90b5bb1cae71bcd37ac95d0c417d619255c 100644 (file)
--- a/src/Module/Notifications/Notifications.php
+++ b/src/Module/Notifications/Notifications.php
@@ -80,15 +80,15 @@ class Notifications extends BaseNotifications
                        // notification and apply the correct template according to the notificationtype (label).
                        foreach ($notifications['notifications'] as $notification) {
                                $notification_templates = [
-                                       'like'        => 'notifications/likes_item.tpl',
-                                       'dislike'     => 'notifications/dislikes_item.tpl',
-                                       'attend'      => 'notifications/attend_item.tpl',
-                                       'attendno'    => 'notifications/attend_item.tpl',
-                                       'attendmaybe' => 'notifications/attend_item.tpl',
-                                       'friend'      => 'notifications/friends_item.tpl',
-                                       'comment'     => 'notifications/comments_item.tpl',
-                                       'post'        => 'notifications/posts_item.tpl',
-                                       'notification'      => 'notifications/notification.tpl',
+                                       'like'         => 'notifications/likes_item.tpl',
+                                       'dislike'      => 'notifications/dislikes_item.tpl',
+                                       'attend'       => 'notifications/attend_item.tpl',
+                                       'attendno'     => 'notifications/attend_item.tpl',
+                                       'attendmaybe'  => 'notifications/attend_item.tpl',
+                                       'friend'       => 'notifications/friends_item.tpl',
+                                       'comment'      => 'notifications/comments_item.tpl',
+                                       'post'         => 'notifications/posts_item.tpl',
+                                       'notification' => 'notifications/notification.tpl',
                                ];
 
                                $notificationTemplate = Renderer::getMarkupTemplate($notification_templates[$notification['label']]);

diff --git a/view/global.css b/view/global.css
index 0eaf4482dccce4f31f0314dbe0ad25a13778d40d..b82ad6e030db687e55ea2ebe5e9fd0d6a914e77b 100644 (file)
--- a/view/global.css
+++ b/view/global.css
@@ -274,7 +274,7 @@ code, key {
 }
 
 /* notifications unseen */
-.notify-unseen { background-color: #cceeFF; }
+.notification-unseen { background-color: #cceeFF; }
 
 /* autocomplete popup */
 ul.acpopup {

diff --git a/view/js/main.js b/view/js/main.js
index c12156e4f8162aadeee3615fc74ff365a8430ad9..b7026690036868a3f9b537c672e37e40f435b553 100644 (file)
--- a/view/js/main.js
+++ b/view/js/main.js
@@ -299,19 +299,19 @@ $(function() {
                        var notification_id = 0;
 
                        // Insert notifs into the notifications-menu
-                       $(data.notifications).each(function(key, notif) {
-                               var text = notif.message.format('<span class="contactname">' + notif.name + '</span>');
-                               var contact = ('<a href="' + notif.url + '"><span class="contactname">' + notif.name + '</span></a>');
-                               var seenclass = (notif.seen == 1) ? "notify-seen" : "notify-unseen";
+                       $(data.notifications).each(function(key, notification) {
+                               var text = notification.message.format('<span class="contactname">' + notification.name + '</span>');
+                               var contact = ('<a href="' + notification.url + '"><span class="contactname">' + notification.name + '</span></a>');
+                               var seenclass = (notification.seen == 1) ? "notification-seen" : "notification-unseen";
                                var html = notifications_tpl.format(
-                                       notif.href,                     // {0}  // link to the source
-                                       notif.photo,                    // {1}  // photo of the contact
+                                       notification.href,                     // {0}  // link to the source
+                                       notification.photo,                    // {1}  // photo of the contact
                                        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
-                                       new Date(notif.timestamp*1000), // {5}  // date of notification
-                                       notif.url,                      // {6}  // profile url of the contact
-                                       notif.message.format(contact),  // {7}  // preformatted html (text including author profile url)
+                                       new Date(notification.timestamp*1000), // {5}  // date of notification
+                                       notification.url,                      // {6}  // profile url of the contact
+                                       notification.message.format(contact),  // {7}  // preformatted html (text including author profile url)
                                        ''                              // {8}  // Deprecated
                                );
                                nnm.append(html);

diff --git a/view/templates/nav.tpl b/view/templates/nav.tpl
index b9c2cf1f12b195193deea4d02a798b33358c692e..f39e58705b95b2858d53f97be7fc39743388c548 100644 (file)
--- a/view/templates/nav.tpl
+++ b/view/templates/nav.tpl
@@ -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>
        {{/if}}
        {{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>
        {{/if}}
        {{if $nav.messages}}
@@ -49,7 +49,7 @@
 
                {{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>
-                               <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">
                                        <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>

diff --git a/view/templates/notifications/notifications.tpl b/view/templates/notifications/notifications.tpl
index 9438db682c40b1cd4337c7ceacdc72d89d3a9a36..da3d15a8c1103a2af9248001e7085469d769b3ff 100644 (file)
--- a/view/templates/notifications/notifications.tpl
+++ b/view/templates/notifications/notifications.tpl
@@ -1,25 +1,25 @@
 
 
-<h1>{{$notif_header}}</h1>
+<h1>{{$header}}</h1>
 
 {{if $tabs }}{{include file="common_tabs.tpl"}}{{/if}}
 
 <div class="notif-network-wrapper">
        {{* 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 *}}
-       {{if $notif_content}}
-       {{foreach $notif_content as $notification}}
+       {{if $notifications}}
+       {{foreach $notifications as $notification}}
                {{$notification nofilter}}
        {{/foreach}}
        {{/if}}
 
        {{* If no notifications messages available *}}
-       {{if $notif_nocontent}}
-               <div class="notif_nocontent">{{$notif_nocontent}}</div>
+       {{if $noContent}}
+               <div class="notification_nocontent">{{$noContent}}</div>
        {{/if}}
 
        {{* The pager *}}
-       {{$notif_paginate nofilter}}
+       {{$paginate nofilter}}
 </div>

diff --git a/view/templates/settings/settings.tpl b/view/templates/settings/settings.tpl
index af1352c4cbeb1b5913bdbd56485f8f8d59b788f8..617baeb91a3729d9f4ac4e2672dfc45bc1218e3b 100644 (file)
--- a/view/templates/settings/settings.tpl
+++ b/view/templates/settings/settings.tpl
@@ -114,7 +114,7 @@
 <div class="settings-content-block">
 <div id="settings-notifications">
 
-<div id="settings-notify-desc">{{$lbl_not}}</div>
+<div id="settings-notification-desc">{{$lbl_not}}</div>
 
 <div class="group">
 {{include file="field_intcheckbox.tpl" field=$notify1}}

diff --git a/view/theme/duepuntozero/deriv/darkzero.css b/view/theme/duepuntozero/deriv/darkzero.css
index dc021a619bc2022876192927c2bbd6c7485048ad..2e236e5df9cd4cb8b99924d22a44bb82723ff474 100644 (file)
--- a/view/theme/duepuntozero/deriv/darkzero.css
+++ b/view/theme/duepuntozero/deriv/darkzero.css
@@ -133,7 +133,7 @@ input#dfrn-url {
   background:#444;
 }
 
-.notify-seen {
+.notification-seen {
   background:#111;
 }
 

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

diff --git a/view/theme/duepuntozero/templates/nav.tpl b/view/theme/duepuntozero/templates/nav.tpl
index 3a0db1264bb3d1c1937fde4759d8b2b30e2cab75..f9e7f0db2f6dbecd36eff2ecaa313f548bdcd83c 100644 (file)
--- a/view/theme/duepuntozero/templates/nav.tpl
+++ b/view/theme/duepuntozero/templates/nav.tpl
@@ -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>
        {{/if}}
        {{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>
        {{/if}}
        {{if $nav.messages}}
@@ -48,7 +48,7 @@
 
                {{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>
-                               <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">
                                        <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>

diff --git a/view/theme/frio/css/style.css b/view/theme/frio/css/style.css
index fd99a75fad7032a4d58153ba0861f11c6cf5a223..b65c7d6e3847bc6219fd69564a8c48a12eb18480 100644 (file)
--- a/view/theme/frio/css/style.css
+++ b/view/theme/frio/css/style.css
@@ -512,7 +512,7 @@ nav.navbar .nav>li>a:focus{
     text-decoration: none;
     text-align: left
 }
-#topbar-first .topbar-nav .nav-segment .nav-notify {
+#topbar-first .topbar-nav .nav-segment .nav-notification {
     position: absolute;
     top: 4px;
     right: -2px;
@@ -640,7 +640,7 @@ nav.navbar a, nav.navbar .btn-link {
     font-size: 12px;
 }
 
-#topbar-first #nav-notifications-menu li.notify-unseen {
+#topbar-first #nav-notifications-menu li.notification-unseen {
     border-left: 3px solid #f3fcfd;
     background-color: #f3fcfd;
 }
@@ -682,7 +682,7 @@ nav.navbar a, nav.navbar .btn-link {
 #topbar-first .account .user-title span {
     color: $nav_icon_color;
 }
-#topbar-first .account #main-menu .nav-notify {
+#topbar-first .account #main-menu .nav-notification {
     position: absolute;
     top: 4px;
     right: -2px;

diff --git a/view/theme/frio/scheme/plusminus.css b/view/theme/frio/scheme/plusminus.css
index 6e76fc85d719f0fdfea8788b9da019c8d6283e7b..1141f43422e57ca86cf184e27254550f6928016f 100644 (file)
--- a/view/theme/frio/scheme/plusminus.css
+++ b/view/theme/frio/scheme/plusminus.css
@@ -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;
 }
 
-#topbar-first #nav-notifications-menu li.notify-unseen {
+#topbar-first #nav-notifications-menu li.notification-unseen {
     border-left: 3px solid #f3fcfd;
     background-color: antiquewhite;
 }

diff --git a/view/theme/frio/templates/nav.tpl b/view/theme/frio/templates/nav.tpl
index a2b5106a61c120039135219e0d032183ef957919..0dedc60819e339c76a32a5ba57612378e6d79aa3 100644 (file)
--- a/view/theme/frio/templates/nav.tpl
+++ b/view/theme/frio/templates/nav.tpl
@@ -40,11 +40,11 @@
                                <ul class="nav navbar-nav navbar-left" role="menubar">
                                        <li id="nav-communication" class="nav-segment" role="presentation">
                                                {{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 $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 $nav.community}}
@@ -54,7 +54,7 @@
 
                                        <li id="nav-personal" class="nav-segment hidden-xs" role="presentation">
                                                {{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 $nav.events}}
@@ -63,7 +63,7 @@
 
                                                {{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>
-                                               <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}}
                                        </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">
                                                                <i class="fa fa-bell fa-lg" aria-hidden="true"></i>
                                                                <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>
 
                                                        {{* 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>
                                                        {{/if}}
                                                        {{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}}
                                                        <li role="presentation" class="divider"></li>
                                                        {{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 $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>

diff --git a/view/theme/frio/templates/notifications/notifications.tpl b/view/theme/frio/templates/notifications/notifications.tpl
index 591d0c3a831816a7b80c6f8c31bbdf030e1ba778..62c0744ae684e713727a355ec089bd308ab71525 100644 (file)
--- a/view/theme/frio/templates/notifications/notifications.tpl
+++ b/view/theme/frio/templates/notifications/notifications.tpl
@@ -2,29 +2,29 @@
 <script type="text/javascript" src="../../js/mod_notifications.js"></script>
 
 <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}}
 
        <div class="notif-network-wrapper">
                {{* 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 *}}
-               {{if $notif_content}}
+               {{if $notifications}}
                <ul class="notif-network-list media-list">
-               {{foreach $notif_content as $notification}}
+               {{foreach $notifications as $notification}}
                        <li>{{$notification nofilter}}</li>
                {{/foreach}}
                </ul>
                {{/if}}
 
                {{* If no notifications messages available *}}
-               {{if $notif_nocontent}}
-               <div class="notif_nocontent">{{$notif_nocontent}}</div>
+               {{if $noContent}}
+               <div class="notification_nocontent">{{$noContent}}</div>
                {{/if}}
        </div>
 
        {{* The pager *}}
-       {{$notif_paginate nofilter}}
+       {{$paginate nofilter}}
 </div>

diff --git a/view/theme/frio/templates/settings/settings.tpl b/view/theme/frio/templates/settings/settings.tpl
index 4ed94b182736603c035b750546abf440867f2952..0a695191f03dd4a87c22cfe89cf653c63bfd6f6e 100644 (file)
--- a/view/theme/frio/templates/settings/settings.tpl
+++ b/view/theme/frio/templates/settings/settings.tpl
@@ -169,7 +169,7 @@
                                        <div class="section-content-tools-wrapper">
                                                <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">
                                                                {{include file="field_intcheckbox.tpl" field=$notify1}}

diff --git a/view/theme/quattro/dark/style.css b/view/theme/quattro/dark/style.css
index 0ce009cdb72cc9a8614bed31c46b6654b312b81e..9baa46ea6345e8c1c51e5f5ccc71fa0c8141b070 100644 (file)
--- a/view/theme/quattro/dark/style.css
+++ b/view/theme/quattro/dark/style.css
@@ -627,7 +627,7 @@ nav .nav-menu-icon img {
   width: 22px;
   height: 22px;
 }
-nav .nav-menu-icon .nav-notify {
+nav .nav-menu-icon .nav-notification {
   top: 3px;
 }
 nav .nav-menu {
@@ -641,7 +641,7 @@ nav .nav-menu {
 nav .nav-menu.selected {
   border-bottom: 3px solid #9eabb0;
 }
-nav .nav-notify {
+nav .nav-notification {
   display: none;
   position: absolute;
   background-color: #19aeff;
@@ -655,7 +655,7 @@ nav .nav-notify {
   min-width: 15px;
   text-align: right;
 }
-nav .nav-notify.show {
+nav .nav-notification.show {
   display: block;
 }
 nav #nav-help-link,

diff --git a/view/theme/quattro/green/style.css b/view/theme/quattro/green/style.css
index c0a1befad9a9995afec2539f40eb2c8259d7749b..2997b537340f5339e2662b50b496597196cbbc5f 100644 (file)
--- a/view/theme/quattro/green/style.css
+++ b/view/theme/quattro/green/style.css
@@ -627,7 +627,7 @@ nav .nav-menu-icon img {
   width: 22px;
   height: 22px;
 }
-nav .nav-menu-icon .nav-notify {
+nav .nav-menu-icon .nav-notification {
   top: 3px;
 }
 nav .nav-menu {
@@ -641,7 +641,7 @@ nav .nav-menu {
 nav .nav-menu.selected {
   border-bottom: 3px solid #9eabb0;
 }
-nav .nav-notify {
+nav .nav-notification {
   display: none;
   position: absolute;
   background-color: #dc0000;
@@ -655,7 +655,7 @@ nav .nav-notify {
   min-width: 15px;
   text-align: right;
 }
-nav .nav-notify.show {
+nav .nav-notification.show {
   display: block;
 }
 nav #nav-help-link,

diff --git a/view/theme/quattro/lilac/style.css b/view/theme/quattro/lilac/style.css
index 05cb05b1869327bb940ec6a8db1853d3ad612227..8ea0e2d55c0f7acb71a48d3b7db7c1ff23f9142d 100644 (file)
--- a/view/theme/quattro/lilac/style.css
+++ b/view/theme/quattro/lilac/style.css
@@ -627,7 +627,7 @@ nav .nav-menu-icon img {
   width: 22px;
   height: 22px;
 }
-nav .nav-menu-icon .nav-notify {
+nav .nav-menu-icon .nav-notification {
   top: 3px;
 }
 nav .nav-menu {
@@ -641,7 +641,7 @@ nav .nav-menu {
 nav .nav-menu.selected {
   border-bottom: 3px solid #9eabb0;
 }
-nav .nav-notify {
+nav .nav-notification {
   display: none;
   position: absolute;
   background-color: #86608e;
@@ -655,7 +655,7 @@ nav .nav-notify {
   min-width: 15px;
   text-align: right;
 }
-nav .nav-notify.show {
+nav .nav-notification.show {
   display: block;
 }
 nav #nav-help-link,

diff --git a/view/theme/quattro/quattro.less b/view/theme/quattro/quattro.less
index 2406fea538a0541f28bf8ff9f144b7e43fa2e021..ae2fef793609e596569b16a61e78a0921ad15c69 100644 (file)
--- a/view/theme/quattro/quattro.less
+++ b/view/theme/quattro/quattro.less
@@ -180,7 +180,7 @@ nav {
                        }
 
                                img { width: 22px; height: 22px; }
-                               .nav-notify { top: 3px; }
+                               .nav-notification { top: 3px; }
                }
 
                .nav-menu {
@@ -196,7 +196,7 @@ nav {
 
                }
 
-               .nav-notify {
+               .nav-notification {
                        display: none;
                        position: absolute;
                        background-color: @NavbarNotifBg;

diff --git a/view/theme/quattro/templates/nav.tpl b/view/theme/quattro/templates/nav.tpl
index c42e570f5dfe08850ce61d6a2f68250f630da248..fe93127d5b8a52274274b9e1b1809905b98878e0 100644 (file)
--- a/view/theme/quattro/templates/nav.tpl
+++ b/view/theme/quattro/templates/nav.tpl
@@ -29,14 +29,14 @@
                {{if $nav.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>
-                               <span id="net-update" class="nav-notify"></span>
+                               <span id="net-update" class="nav-notification"></span>
                        </li>
                {{/if}}
 
                {{if $nav.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>
-                               <span id="home-update" class="nav-notify"></span>
+                               <span id="home-update" class="nav-notification"></span>
                        </li>
                {{/if}}
 
@@ -45,7 +45,7 @@
                                <a class="{{$nav.introductions.2}}" href="{{$nav.introductions.0}}" title="{{$nav.introductions.3}}" >
                                    <span class="icon s22 intro">{{$nav.introductions.1}}</a>
                                </a>
-                               <span id="intro-update" class="nav-notify"></span>
+                               <span id="intro-update" class="nav-notification"></span>
                        </li>
                {{/if}}
 
@@ -54,13 +54,13 @@
                                <a class="{{$nav.messages.2}}" href="{{$nav.messages.0}}" title="{{$nav.messages.3}}" >
                                    <span class="icon s22 mail">{{$nav.messages.1}}</a>
                                </a>
-                               <span id="mail-update" class="nav-notify"></span>
+                               <span id="mail-update" class="nav-notification"></span>
                        </li>
                {{/if}}
 
                {{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>
-                               <span id="notify-update" class="nav-notify"></span>
+                               <span id="notification-update" class="nav-notification"></span>
                                <ul id="nav-notifications-menu" class="menu-popup">
                                        <!-- 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>

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

diff --git a/view/theme/smoothly/templates/nav.tpl b/view/theme/smoothly/templates/nav.tpl
index a5c16d23f365de92386c9af87922402683ee8c4b..0668252e33745bd4693cd4739c63436aa6707c04 100644 (file)
--- a/view/theme/smoothly/templates/nav.tpl
+++ b/view/theme/smoothly/templates/nav.tpl
@@ -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.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.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">
                        <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>
                        {{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.contacts}}<li><a id="nav-contacts-link" class="nav-commlink {{$nav.contacts.2}}" href="{{$nav.contacts.0}}">{{$nav.contacts.1}}</a></li>{{/if}}
                

diff --git a/view/theme/vier/dark.css b/view/theme/vier/dark.css
index f18076b5071f95ed9e647ce10d594e2992fa3b55..ba48bc610654ca2cb2384b1afb597700a4b91f42 100644 (file)
--- a/view/theme/vier/dark.css
+++ b/view/theme/vier/dark.css
@@ -29,7 +29,7 @@ nav {
        background-color: #1C2126 !important; 
 }
 
-nav .nav-notify {
+nav .nav-notification {
        background-color: #2C77AE !important
 }
 
@@ -89,11 +89,11 @@ table.smiley-preview{
 }
 
 /* Notifications */
-li.notify-unseen {
+li.notification-unseen {
        background-color: #252C33;
 }
 
-li.notify-seen {
+li.notification-seen {
        background-color: #1C2126;
 }
 

diff --git a/view/theme/vier/plus.css b/view/theme/vier/plus.css
index 0bf29085315b13f78c6ff553f04655a585070f17..6f57f4fbe47408a55555728b726232cb58f72195 100644 (file)
--- a/view/theme/vier/plus.css
+++ b/view/theme/vier/plus.css
@@ -23,7 +23,7 @@ nav a:hover,
   font: bold 11px/16px Arial;
 }
 
-nav .nav-notify {
+nav .nav-notification {
 /*  background-color: #427FED; */
   background-color: #CB4437;
   top: -3px;
@@ -33,7 +33,7 @@ nav .nav-notify {
   border-radius: 10px;
 }
 
-nav .nav-menu-icon .nav-notify {
+nav .nav-menu-icon .nav-notification {
   top: 0px;
 }
 

diff --git a/view/theme/vier/plusminus.css b/view/theme/vier/plusminus.css
index 2be64ed4225582da73ab0bf3dd743d0f8e5015fc..7d9c09e3eeacdfc169fab5bcf8633c95293c3cb8 100644 (file)
--- a/view/theme/vier/plusminus.css
+++ b/view/theme/vier/plusminus.css
@@ -60,7 +60,7 @@ nav a:hover,
   font: bold 11px/16px Arial;
 }
 
-nav .nav-notify {
+nav .nav-notification {
   background-color: #CB4437;
   top: -3px;
   right: -4px;
@@ -69,7 +69,7 @@ nav .nav-notify {
   border-radius: 10px;
 }
 
-nav .nav-menu-icon .nav-notify {
+nav .nav-menu-icon .nav-notification {
   top: 0px;
 }
 

diff --git a/view/theme/vier/shadow.css b/view/theme/vier/shadow.css
index 918f880a80a235c657820d04b6a0dc52c4c2a58f..7ed15fc890d67580d6103eb65d63cbfde5da0255 100644 (file)
--- a/view/theme/vier/shadow.css
+++ b/view/theme/vier/shadow.css
@@ -17,7 +17,7 @@ nav a:hover,
   color: #fff;
 }
 
-nav .nav-notify {
+nav .nav-notification {
   background-color: #F80;
   top: 0px;
   right: -5px;
@@ -25,7 +25,7 @@ nav .nav-notify {
   border-radius: 5px 5px 5px 5px;
 }
 
-nav .nav-menu-icon .nav-notify {
+nav .nav-menu-icon .nav-notification {
   top: 0px;
 }
 

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

diff --git a/view/theme/vier/templates/nav.tpl b/view/theme/vier/templates/nav.tpl
index a10fd0ab3db22f54387603e6fb066ee858508279..defb7c2e4d12e3ee946656bb6fe187af0e41222e 100644 (file)
--- a/view/theme/vier/templates/nav.tpl
+++ b/view/theme/vier/templates/nav.tpl
@@ -17,7 +17,7 @@
                                <a accesskey="p" class="{{$nav.home.2}}" href="{{$nav.home.0}}" title="{{$nav.home.3}}" >
                                        <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>
-                                       <span id="home-update" class="nav-notify"></span>
+                                       <span id="home-update" class="nav-notification"></span>
                                </a>
                        </li>
                {{/if}}
@@ -26,7 +26,7 @@
                                <a accesskey="n" class="{{$nav.network.2}}" href="{{$nav.network.0}}" title="{{$nav.network.3}}" >
                                        <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>
-                                       <span id="net-update" class="nav-notify"></span>
+                                       <span id="net-update" class="nav-notification"></span>
                                </a>
                        </li>
                {{/if}}
@@ -56,7 +56,7 @@
                        <li role="menu" aria-haspopup="true" id="nav-messages-linkmenu" class="nav-menu-icon">
                                <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 id="mail-update" class="nav-notify"></span>
+                                       <span id="mail-update" class="nav-notification"></span>
                                </a>
                        </li>
                {{/if}}
@@ -66,7 +66,7 @@
                        <li role="menu" aria-haspopup="true" id="nav-notifications-linkmenu" class="nav-menu-icon">
                                <a title="{{$nav.notifications.1}}">
                                        <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>
                                <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>
@@ -78,12 +78,12 @@
 
                {{if $userinfo}}
                        <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">
                                        <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.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.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}}