Merge branch 'admin-sections/4' into 0.9.x

[quix0rs-gnu-social.git] / lib / noticelist.php

diff --git a/lib/noticelist.php b/lib/noticelist.php
index bf12bb73c5dfd4df71e48bee9503a08dc89b6d0a..5877827ff921c966afce682d4170a4c62fc9ae3c 100644 (file)
--- 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');
     }
 
     /**