X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=lib%2Fnoticelist.php;h=5877827ff921c966afce682d4170a4c62fc9ae3c;hb=69ac99ff949ab0118ff25a62471980ad0ec7a52b;hp=8b3015cc3ebf1a3325c5326ceffa6461c3c5419b;hpb=24c3a15124ab866bf7e9401f638156e102074608;p=quix0rs-gnu-social.git

diff --git a/lib/noticelist.php b/lib/noticelist.php
index 8b3015cc3e..5877827ff9 100644
--- a/lib/noticelist.php
+++ b/lib/noticelist.php
@@ -199,8 +199,8 @@ class NoticeListItem extends Widget
     {
         $this->out->elementStart('div', 'entry-content');
         $this->showNoticeLink();
-        $this->showNoticeLocation();
         $this->showNoticeSource();
+        $this->showNoticeLocation();
         $this->showContext();
         $this->out->elementEnd('div');
     }
@@ -397,15 +397,25 @@ class NoticeListItem extends Widget
             return;
         }
 
+        $lat = $this->notice->lat;
+        $lon = $this->notice->lon;
+        $latlon = (!empty($lat) && !empty($lon)) ? $lat.';'.$lon : '';
+
         $url  = $location->getUrl();
 
+        $this->out->elementStart('span', array('class' => 'location'));
+        $this->out->text(_('at'));
         if (empty($url)) {
-            $this->out->element('span', array('class' => 'location'), $name);
+            $this->out->element('span', array('class' => 'geo',
+                                              'title' => $latlon),
+                                $name);
         } else {
-            $this->out->element('a', array('class' => 'location',
+            $this->out->element('a', array('class' => 'geo',
+                                           'title' => $latlon,
                                            'href' => $url),
                                 $name);
         }
+        $this->out->elementEnd('span');
     }
 
     /**
@@ -513,7 +523,7 @@ class NoticeListItem extends Widget
         $user = common_current_user();
 
         if (!empty($user) &&
-            ($this->notice->profile_id == $user->id || $user->hasRight(Right::deleteOthersNotice))) {
+            ($this->notice->profile_id == $user->id || $user->hasRight(Right::DELETEOTHERSNOTICE))) {
 
             $deleteurl = common_local_url('deletenotice',
                                           array('notice' => $this->notice->id));