rename notify => notification once more :-)

diff --git a/src/Model/Notification.php b/src/Model/Notification.php
index 408f794972b71471e6c68cc7272630627ddac14c..e1848667006ecd5cdd2136b4e3223bddb11b7fe9 100644 (file)
--- a/src/Model/Notification.php
+++ b/src/Model/Notification.php
@@ -240,7 +240,7 @@ final class Notification
                        // Transform the different types of notification in an usable array
                        switch ($notification['verb']) {
                                case Activity::LIKE:
-                                       $formattedNotify = [
+                                       $formattedNotification = [
                                                'label' => 'like',
                                                'link'  => $this->baseUrl->get(true) . '/display/' . $notification['parent-guid'],
                                                'image' => ProxyUtils::proxifyUrl($notification['author-avatar'], false, ProxyUtils::SIZE_MICRO),
@@ -253,7 +253,7 @@ final class Notification
                                        break;
 
                                case Activity::DISLIKE:
-                                       $formattedNotify = [
+                                       $formattedNotification = [
                                                'label' => 'dislike',
                                                'link'  => $this->baseUrl->get(true) . '/display/' . $notification['parent-guid'],
                                                'image' => ProxyUtils::proxifyUrl($notification['author-avatar'], false, ProxyUtils::SIZE_MICRO),
@@ -266,7 +266,7 @@ final class Notification
                                        break;
 
                                case Activity::ATTEND:
-                                       $formattedNotify = [
+                                       $formattedNotification = [
                                                'label' => 'attend',
                                                'link'  => $this->baseUrl->get(true) . '/display/' . $notification['parent-guid'],
                                                'image' => ProxyUtils::proxifyUrl($notification['author-avatar'], false, ProxyUtils::SIZE_MICRO),
@@ -279,7 +279,7 @@ final class Notification
                                        break;
 
                                case Activity::ATTENDNO:
-                                       $formattedNotify = [
+                                       $formattedNotification = [
                                                'label' => 'attendno',
                                                'link'  => $this->baseUrl->get(true) . '/display/' . $notification['parent-guid'],
                                                'image' => ProxyUtils::proxifyUrl($notification['author-avatar'], false, ProxyUtils::SIZE_MICRO),
@@ -292,7 +292,7 @@ final class Notification
                                        break;
 
                                case Activity::ATTENDMAYBE:
-                                       $formattedNotify = [
+                                       $formattedNotification = [
                                                'label' => 'attendmaybe',
                                                'link'  => $this->baseUrl->get(true) . '/display/' . $notification['parent-guid'],
                                                'image' => ProxyUtils::proxifyUrl($notification['author-avatar'], false, ProxyUtils::SIZE_MICRO),
@@ -306,7 +306,7 @@ final class Notification
 
                                case Activity::FRIEND:
                                        if (!isset($notification['object'])) {
-                                               $formattedNotify = [
+                                               $formattedNotification = [
                                                        'label' => 'friend',
                                                        'link'  => $default_item_link,
                                                        'image' => $default_item_image,
@@ -325,7 +325,7 @@ final class Notification
                                        $obj                   = XML::parseString($xmlHead . $notification['object']);
                                        $notification['fname'] = $obj->title;
 
-                                       $formattedNotify = [
+                                       $formattedNotification = [
                                                'label' => 'friend',
                                                'link'  => $this->baseUrl->get(true) . '/display/' . $notification['parent-guid'],
                                                'image' => ProxyUtils::proxifyUrl($notification['author-avatar'], false, ProxyUtils::SIZE_MICRO),
@@ -338,7 +338,7 @@ final class Notification
                                        break;
 
                                default:
-                                       $formattedNotify = [
+                                       $formattedNotification = [
                                                'label' => $default_item_label,
                                                'link'  => $default_item_link,
                                                'image' => $default_item_image,
@@ -350,7 +350,7 @@ final class Notification
                                        ];
                        }
 
-                       $formattedNotifications[] = $formattedNotify;
+                       $formattedNotifications[] = $formattedNotification;
                }
 
                return $formattedNotifications;

diff --git a/view/js/main.js b/view/js/main.js
index b7026690036868a3f9b537c672e37e40f435b553..6ca0fabb86b0b34b1c8935783a86a7e6ef482f94 100644 (file)
--- a/view/js/main.js
+++ b/view/js/main.js
@@ -948,7 +948,7 @@ function checkboxhighlight(box) {
        }
 }
 
-function notifyMarkAll() {
+function notificationMarkAll() {
        $.get('notification/mark/all', function(data) {
                if (timer) {
                        clearTimeout(timer);

diff --git a/view/templates/nav.tpl b/view/templates/nav.tpl
index f39e58705b95b2858d53f97be7fc39743388c548..07e9469a8c6bea32fafcba8887363f78a2269c54 100644 (file)
--- a/view/templates/nav.tpl
+++ b/view/templates/nav.tpl
@@ -52,7 +52,7 @@
                                <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>
+                                       <li id="nav-notifications-mark-all"><a href="#" onclick="notificationMarkAll(); return false;">{{$nav.notifications.mark.3}}</a></li>
                                        <li class="empty">{{$emptynotifications}}</li>
                                </ul>
                {{/if}}         

diff --git a/view/theme/duepuntozero/templates/nav.tpl b/view/theme/duepuntozero/templates/nav.tpl
index f9e7f0db2f6dbecd36eff2ecaa313f548bdcd83c..bde59784b816b4bcf056632f98c885555016e4bd 100644 (file)
--- a/view/theme/duepuntozero/templates/nav.tpl
+++ b/view/theme/duepuntozero/templates/nav.tpl
@@ -51,7 +51,7 @@
                                <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>
+                                       <li id="nav-notifications-mark-all"><a href="#" onclick="notificationMarkAll(); return false;">{{$nav.notifications.mark.3}}</a></li>
                                        <li class="empty">{{$emptynotifications}}</li>
                                </ul>
                {{/if}}         

diff --git a/view/theme/frio/templates/nav.tpl b/view/theme/frio/templates/nav.tpl
index 0dedc60819e339c76a32a5ba57612378e6d79aa3..3f13bd355d344e0a70cb0a580d31dc744d951580 100644 (file)
--- a/view/theme/frio/templates/nav.tpl
+++ b/view/theme/frio/templates/nav.tpl
@@ -84,7 +84,7 @@
                                                                        <div class="arrow"></div>
                                                                        {{$nav.notifications.1}}
                                                                        <div class="dropdown-header-link">
-                                                                               <button role="menuitem" type="button" class="btn-link" onclick="notifyMarkAll();" data-toggle="tooltip" aria-label="{{$nav.notifications.mark.3}}" title="{{$nav.notifications.mark.3}}">{{$nav.notifications.mark.1}}</button>
+                                                                               <button role="menuitem" type="button" class="btn-link" onclick="notificationMarkAll();" data-toggle="tooltip" aria-label="{{$nav.notifications.mark.3}}" title="{{$nav.notifications.mark.3}}">{{$nav.notifications.mark.1}}</button>
                                                                        </div>
 
                                                                </li>

diff --git a/view/theme/quattro/templates/nav.tpl b/view/theme/quattro/templates/nav.tpl
index fe93127d5b8a52274274b9e1b1809905b98878e0..13b3aa1d30087b09003fc082cf985e3316e9b30c 100644 (file)
--- a/view/theme/quattro/templates/nav.tpl
+++ b/view/theme/quattro/templates/nav.tpl
@@ -63,7 +63,7 @@
                                <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>
+                                       <li id="nav-notifications-mark-all" class="toolbar"><a href="#" onclick="notificationMarkAll(); 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 class="empty">{{$emptynotifications}}</li>
                                </ul>
                        </li>

diff --git a/view/theme/smoothly/templates/nav.tpl b/view/theme/smoothly/templates/nav.tpl
index 0668252e33745bd4693cd4739c63436aa6707c04..5ce1eb3bb757384c5535d817f29f93a6612c25bd 100644 (file)
--- a/view/theme/smoothly/templates/nav.tpl
+++ b/view/theme/smoothly/templates/nav.tpl
@@ -11,7 +11,7 @@
                {{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>
+                       <li id="nav-notifications-mark-all"><a href="#" onclick="notificationMarkAll(); return false;">{{$nav.notifications.mark.3}}</a></li>
                        <li id="nav-notifications-see-all"><a href="{{$nav.notifications.all.0}}">{{$nav.notifications.all.1}}</a></li>
                        <li class="empty">{{$emptynotifications}}</li>
                </ul>

diff --git a/view/theme/vier/templates/nav.tpl b/view/theme/vier/templates/nav.tpl
index defb7c2e4d12e3ee946656bb6fe187af0e41222e..7982d5efa4da29e41cb3392d70e1b5b8e0ffa621 100644 (file)
--- a/view/theme/vier/templates/nav.tpl
+++ b/view/theme/vier/templates/nav.tpl
@@ -69,7 +69,7 @@
                                        <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>
+                                       <li role="menuitem" id="nav-notifications-mark-all"><a onclick="notificationMarkAll(); return false;">{{$nav.notifications.mark.1}}</a></li>
                                        <li role="menuitem" id="nav-notifications-see-all"><a href="{{$nav.notifications.all.0}}">{{$nav.notifications.all.1}}</a></li>
                                        <li role="menuitem" class="empty">{{$emptynotifications}}</li>
                                </ul>