aboutsummaryrefslogtreecommitdiffstats
path: root/Zotlabs
diff options
context:
space:
mode:
authorMario Vavti <mario@mariovavti.com>2017-10-08 22:21:19 +0200
committerMario Vavti <mario@mariovavti.com>2017-10-08 22:21:19 +0200
commitbcf4cb519ae6c7d590db6a8023b7f24332ea9160 (patch)
tree6acccef70860ef0d2082bb61deebf89d2679d063 /Zotlabs
parent991db280be4c3cbbff4fb1e4dae8f303a487ed3f (diff)
downloadvolse-hubzilla-bcf4cb519ae6c7d590db6a8023b7f24332ea9160.tar.gz
volse-hubzilla-bcf4cb519ae6c7d590db6a8023b7f24332ea9160.tar.bz2
volse-hubzilla-bcf4cb519ae6c7d590db6a8023b7f24332ea9160.zip
new notification fixes
Diffstat (limited to 'Zotlabs')
-rw-r--r--Zotlabs/Module/Ping.php2
-rw-r--r--Zotlabs/Widget/Notifications.php26
2 files changed, 14 insertions, 14 deletions
diff --git a/Zotlabs/Module/Ping.php b/Zotlabs/Module/Ping.php
index e3f430861..5f44b3c20 100644
--- a/Zotlabs/Module/Ping.php
+++ b/Zotlabs/Module/Ping.php
@@ -297,7 +297,7 @@ class Ping extends \Zotlabs\Web\Controller {
killme();
}
- if(argc() > 1 && argv(1) === 'messages') {
+ if(argc() > 1 && argv(1) === 'mail') {
$channel = \App::get_channel();
$t = q("select mail.*, xchan.* from mail left join xchan on xchan_hash = from_xchan
where channel_id = %d and mail_seen = 0 and mail_deleted = 0
diff --git a/Zotlabs/Widget/Notifications.php b/Zotlabs/Widget/Notifications.php
index 85e8e6cac..c6bf22a19 100644
--- a/Zotlabs/Widget/Notifications.php
+++ b/Zotlabs/Widget/Notifications.php
@@ -16,15 +16,15 @@ class Notifications {
'type' => 'network',
'icon' => 'th',
'severity' => 'secondary',
- 'label' => t('Activity'),
- 'title' => t('Network Activity Notifications'),
+ 'label' => t('New Activity'),
+ 'title' => t('New Activity Notifications'),
'viewall' => [
'url' => 'network',
'label' => t('View your network activity')
],
'markall' => [
'url' => '#',
- 'label' => t('Mark all notifications seen')
+ 'label' => t('Mark all notifications read')
]
];
@@ -32,8 +32,8 @@ class Notifications {
'type' => 'home',
'icon' => 'home',
'severity' => 'danger',
- 'label' => t('Home'),
- 'title' => t('Channel Home Notifications'),
+ 'label' => t('New Home Activity'),
+ 'title' => t('New Home Activity Notifications'),
'viewall' => [
'url' => 'channel/' . $channel['channel_address'],
'label' => t('View your home activity')
@@ -45,11 +45,11 @@ class Notifications {
];
$notifications[] = [
- 'type' => 'messages',
+ 'type' => 'mail',
'icon' => 'envelope',
'severity' => 'danger',
- 'label' => t('Mail'),
- 'title' => t('Private mail'),
+ 'label' => t('New Mails'),
+ 'title' => t('New Mails Notifications'),
'viewall' => [
'url' => 'mail/combined',
'label' => t('View your private mails')
@@ -64,8 +64,8 @@ class Notifications {
'type' => 'all_events',
'icon' => 'calendar',
'severity' => 'secondary',
- 'label' => t('Events'),
- 'title' => t('Event Calendar'),
+ 'label' => t('New Events'),
+ 'title' => t('New Events Notifications'),
'viewall' => [
'url' => 'mail/combined',
'label' => t('View events')
@@ -81,7 +81,7 @@ class Notifications {
'icon' => 'users',
'severity' => 'danger',
'label' => t('New Connections'),
- 'title' => t('New Connections'),
+ 'title' => t('New Connections Notifications'),
'viewall' => [
'url' => 'connections',
'label' => t('View all connections')
@@ -93,7 +93,7 @@ class Notifications {
'icon' => 'folder',
'severity' => 'danger',
'label' => t('New Files'),
- 'title' => t('New files shared with me'),
+ 'title' => t('New Files Notifications'),
];
$notifications[] = [
@@ -119,7 +119,7 @@ class Notifications {
'icon' => 'user-o',
'severity' => 'danger',
'label' => t('New Registrations'),
- 'title' => t('New Registrations'),
+ 'title' => t('New Registrations Notifications'),
];
}