frio: add profile link to the notifications url

diff --git a/include/NotificationsManager.php b/include/NotificationsManager.php
index 2adab59721e4cd48d88c482eea03f9ad3681997d..610acb93d58a09108fca6e9f65489f895da2ddc0 100644 (file)
--- a/include/NotificationsManager.php
+++ b/include/NotificationsManager.php
@@ -198,6 +198,7 @@ class NotificationsManager {
         *      string 'label' => The type of the notification
         *      string 'link' => URL to the source
         *      string 'image' => The avatar image
+        * *    string 'url' => The profile url of the contact
         *      string 'text' => The notification text
         *      string 'when' => Relative date of the notification
         *      bool 'seen' => Is the notification marked as "seen"
@@ -223,6 +224,7 @@ class NotificationsManager {
                                                $default_item_label = 'notify';
                                                $default_item_link = $this->a->get_baseurl(true).'/notify/view/'. $it['id'];
                                                $default_item_image = proxy_url($it['photo'], false, PROXY_SIZE_MICRO);
+                                               $default_item_url = $it['url'];
                                                $default_item_text = strip_tags(bbcode($it['msg']));
                                                $default_item_when = relative_date($it['date']);
                                                break;
@@ -231,6 +233,7 @@ class NotificationsManager {
                                                $default_item_label = 'comment';
                                                $default_item_link = $this->a->get_baseurl(true).'/display/'.$it['pguid'];
                                                $default_item_image = proxy_url($it['author-avatar'], false, PROXY_SIZE_MICRO);
+                                               $default_item_url = $it['author-link'];
                                                $default_item_text = sprintf(t("%s commented on %s's post"), $it['author-name'], $it['pname']);
                                                $default_item_when = relative_date($it['created']);
                                                break;
@@ -239,6 +242,7 @@ class NotificationsManager {
                                                $default_item_label = (($it['id'] == $it['parent']) ? 'post' : 'comment');
                                                $default_item_link = $this->a->get_baseurl(true).'/display/'.$it['pguid'];
                                                $default_item_image = proxy_url($it['author-avatar'], false, PROXY_SIZE_MICRO);
+                                               $default_item_url = $it['author-link'];
                                                $default_item_text = (($it['id'] == $it['parent'])
                                                                        ? sprintf(t("%s created a new post"), $it['author-name'])
                                                                        : sprintf(t("%s commented on %s's post"), $it['author-name'], $it['pname']));
@@ -253,6 +257,7 @@ class NotificationsManager {
                                                        'label' => 'like',
                                                        'link' => $this->a->get_baseurl(true).'/display/'.$it['pguid'],
                                                        'image' => proxy_url($it['author-avatar'], false, PROXY_SIZE_MICRO),
+                                                       'url' => $it['author-link'],
                                                        'text' => sprintf(t("%s liked %s's post"), $it['author-name'], $it['pname']),
                                                        'when' => relative_date($it['created']),
                                                        'seen' => $it['seen']
@@ -264,6 +269,7 @@ class NotificationsManager {
                                                        'label' => 'dislike',
                                                        'link' => $this->a->get_baseurl(true).'/display/'.$it['pguid'],
                                                        'image' => proxy_url($it['author-avatar'], false, PROXY_SIZE_MICRO),
+                                                       'url' => $it['author-link'],
                                                        'text' => sprintf(t("%s disliked %s's post"), $it['author-name'], $it['pname']),
                                                        'when' => relative_date($it['created']),
                                                        'seen' => $it['seen']
@@ -275,6 +281,7 @@ class NotificationsManager {
                                                        'label' => 'attend',
                                                        'link' => $this->a->get_baseurl(true).'/display/'.$it['pguid'],
                                                        'image' => proxy_url($it['author-avatar'], false, PROXY_SIZE_MICRO),
+                                                       'url' => $it['author-link'],
                                                        'text' => sprintf(t("%s is attending %s's event"), $it['author-name'], $it['pname']),
                                                        'when' => relative_date($it['created']),
                                                        'seen' => $it['seen']
@@ -286,6 +293,7 @@ class NotificationsManager {
                                                        'label' => 'attendno',
                                                        'link' => $this->a->get_baseurl(true).'/display/'.$it['pguid'],
                                                        'image' => proxy_url($it['author-avatar'], false, PROXY_SIZE_MICRO),
+                                                       'url' => $it['author-link'],
                                                        'text' => sprintf( t("%s is not attending %s's event"), $it['author-name'], $it['pname']),
                                                        'when' => relative_date($it['created']),
                                                        'seen' => $it['seen']
@@ -297,6 +305,7 @@ class NotificationsManager {
                                                        'label' => 'attendmaybe',
                                                        'link' => $this->a->get_baseurl(true).'/display/'.$it['pguid'],
                                                        'image' => proxy_url($it['author-avatar'], false, PROXY_SIZE_MICRO),
+                                                       'url' => $it['author-link'],
                                                        'text' => sprintf(t("%s may attend %s's event"), $it['author-name'], $it['pname']),
                                                        'when' => relative_date($it['created']),
                                                        'seen' => $it['seen']
@@ -312,6 +321,7 @@ class NotificationsManager {
                                                        'label' => 'friend',
                                                        'link' => $this->a->get_baseurl(true).'/display/'.$it['pguid'],
                                                        'image' => proxy_url($it['author-avatar'], false, PROXY_SIZE_MICRO),
+                                                       'url' => $it['author-link'],
                                                        'text' => sprintf(t("%s is now friends with %s"), $it['author-name'], $it['fname']),
                                                        'when' => relative_date($it['created']),
                                                        'seen' => $it['seen']
@@ -323,6 +333,7 @@ class NotificationsManager {
                                                        'label' => $default_item_label,
                                                        'link' => $default_item_link,
                                                        'image' => $default_item_image,
+                                                       'url' => $default_item_url,
                                                        'text' => $default_item_text,
                                                        'when' => $default_item_when,
                                                        'seen' => $it['seen']
@@ -459,7 +470,7 @@ class NotificationsManager {
                if($seen === 0)
                        $sql_seen = " AND `seen` = 0 ";
 
-               $r = q("SELECT `id`, `photo`, `msg`, `date`, `seen` FROM `notify`
+               $r = q("SELECT `id`, `url`, `photo`, `msg`, `date`, `seen` FROM `notify`
                                WHERE `uid` = %d $sql_seen ORDER BY `date` DESC LIMIT %d, %d ",
                        intval(local_user()),
                        intval($start),
@@ -626,9 +637,9 @@ class NotificationsManager {
                        $sql_seen = " AND `item`.`unseen` = 1 ";
 
                $r = q("SELECT `item`.`id`,`item`.`parent`, `item`.`verb`, `item`.`author-name`, `item`.`unseen`,
-                               `item`.`author-link`, `item`.`author-avatar`, `item`.`created`, `item`.`object` as `object`,
-                               `pitem`.`author-name` as `pname`, `pitem`.`author-link` as `plink`, `pitem`.`guid` as `pguid`
-                       FROM `item` INNER JOIN `item` as `pitem` ON `pitem`.`id`=`item`.`parent`
+                               `item`.`author-link`, `item`.`author-avatar`, `item`.`created`, `item`.`object` AS `object`,
+                               `pitem`.`author-name` AS `pname`, `pitem`.`author-link` AS `plink`, `pitem`.`guid` AS `pguid`
+                       FROM `item` INNER JOIN `item` AS `pitem` ON `pitem`.`id`=`item`.`parent`
                        WHERE `item`.`visible` = 1 AND
                                 `item`.`deleted` = 0 AND `item`.`uid` = %d AND `item`.`wall` = 1
                                $sql_seen

diff --git a/mod/notifications.php b/mod/notifications.php
index 3e0bd9cc47d715e79adefe574436f97ff5465238..97c009b19f69833eea24860de3b1748c7f21be7c 100644 (file)
--- a/mod/notifications.php
+++ b/mod/notifications.php
@@ -285,6 +285,7 @@ function notifications_content(&$a) {
                                '$item_label' => $it['label'],
                                '$item_link' => $it['link'],
                                '$item_image' => $it['image'],
+                               '$item_url' => $it['url'],
                                '$item_text' => htmlentities($it['text']),
                                '$item_when' => $it['when'],
                                '$item_seen' => $it['seen'],

diff --git a/view/theme/frio/css/style.css b/view/theme/frio/css/style.css
index efff14a4eafd89e4daf038975204cc1a77042b5b..5b8b2d9fdab90165b066b4d9705b5338d266d140 100644 (file)
--- a/view/theme/frio/css/style.css
+++ b/view/theme/frio/css/style.css
@@ -2220,10 +2220,6 @@ ul.notif-network-list > li {
     padding-left: 15px;
     padding-right: 15px;
 }
-ul.notif-network-list li.unseen {
-    border-left: 3px solid #f3fcfd;
-    background-color: #f3fcfd;
-}
 .intro-wrapper.media {
     overflow: visible;
     word-wrap: break-word;
@@ -2283,6 +2279,9 @@ ul.notif-network-list > li:hover .intro-action-buttons {
 }
 
 /* Notifications Page */
+ul.notif-network-list li.unseen {
+    background-color: #f3fcfd;
+}
 .notif-item img.notif-image {
     height: 48px;
     width: 48px;

diff --git a/view/theme/frio/templates/notify.tpl b/view/theme/frio/templates/notify.tpl
index 382ddebe0160da6e72a9c463e3c00ca9cd524af2..86633bbecc0aca0b3df5a2872588829320fe2a26 100644 (file)
--- a/view/theme/frio/templates/notify.tpl
+++ b/view/theme/frio/templates/notify.tpl
@@ -1,7 +1,7 @@
 
 <div class="notif-item {{if !$item_seen}}unseen{{/if}} {{$item_label}} media">
        <div class="notif-photo-wrapper media-object pull-left">
-               <img src="{{$item_image}}" class="notif-image">
+               <a class="userinfo" href="{{$item_url}}"><img src="{{$item_image}}" class="notif-image"></a>
        </div>
        <div class="notif-desc-wrapper media-body">
                <a href="{{$item_link}}">