rename notify => notification once more :-)
This commit is contained in:
parent
b229939c3d
commit
0458b9c2df
|
@ -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;
|
||||
|
|
|
@ -948,7 +948,7 @@ function checkboxhighlight(box) {
|
|||
}
|
||||
}
|
||||
|
||||
function notifyMarkAll() {
|
||||
function notificationMarkAll() {
|
||||
$.get('notification/mark/all', function(data) {
|
||||
if (timer) {
|
||||
clearTimeout(timer);
|
||||
|
|
|
@ -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}}
|
||||
|
|
|
@ -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}}
|
||||
|
|
|
@ -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>
|
||||
|
|
|
@ -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>
|
||||
|
|
|
@ -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>
|
||||
|
|
|
@ -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>
|
||||
|
|
Loading…
Reference in a new issue