From 0458b9c2dffa1293897991ad19fcef4cf6c16b49 Mon Sep 17 00:00:00 2001 From: nupplaPhil Date: Fri, 24 Jan 2020 19:08:03 +0100 Subject: [PATCH] rename notify => notification once more :-) --- src/Model/Notification.php | 18 +++++++++--------- view/js/main.js | 2 +- view/templates/nav.tpl | 2 +- view/theme/duepuntozero/templates/nav.tpl | 2 +- view/theme/frio/templates/nav.tpl | 2 +- view/theme/quattro/templates/nav.tpl | 2 +- view/theme/smoothly/templates/nav.tpl | 2 +- view/theme/vier/templates/nav.tpl | 2 +- 8 files changed, 16 insertions(+), 16 deletions(-) diff --git a/src/Model/Notification.php b/src/Model/Notification.php index 408f794972..e184866700 100644 --- 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 b702669003..6ca0fabb86 100644 --- 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 f39e58705b..07e9469a8c 100644 --- a/view/templates/nav.tpl +++ b/view/templates/nav.tpl @@ -52,7 +52,7 @@ {{/if}} diff --git a/view/theme/duepuntozero/templates/nav.tpl b/view/theme/duepuntozero/templates/nav.tpl index f9e7f0db2f..bde59784b8 100644 --- a/view/theme/duepuntozero/templates/nav.tpl +++ b/view/theme/duepuntozero/templates/nav.tpl @@ -51,7 +51,7 @@ {{/if}} diff --git a/view/theme/frio/templates/nav.tpl b/view/theme/frio/templates/nav.tpl index 0dedc60819..3f13bd355d 100644 --- a/view/theme/frio/templates/nav.tpl +++ b/view/theme/frio/templates/nav.tpl @@ -84,7 +84,7 @@
{{$nav.notifications.1}}
- +
diff --git a/view/theme/quattro/templates/nav.tpl b/view/theme/quattro/templates/nav.tpl index fe93127d5b..13b3aa1d30 100644 --- a/view/theme/quattro/templates/nav.tpl +++ b/view/theme/quattro/templates/nav.tpl @@ -63,7 +63,7 @@ diff --git a/view/theme/smoothly/templates/nav.tpl b/view/theme/smoothly/templates/nav.tpl index 0668252e33..5ce1eb3bb7 100644 --- a/view/theme/smoothly/templates/nav.tpl +++ b/view/theme/smoothly/templates/nav.tpl @@ -11,7 +11,7 @@ {{if $nav.notifications}}{{/if}} diff --git a/view/theme/vier/templates/nav.tpl b/view/theme/vier/templates/nav.tpl index defb7c2e4d..7982d5efa4 100644 --- a/view/theme/vier/templates/nav.tpl +++ b/view/theme/vier/templates/nav.tpl @@ -69,7 +69,7 @@