Merge branch '0.9.x' into mapstraction

1 files changed, 8 insertions, 3 deletions

diff --git a/lib/noticelist.php b/lib/noticelist.php
index bf12bb73c..3bad2cf7c 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');
     }
@@ -399,13 +399,18 @@ class NoticeListItem extends Widget
 
         $url  = $location->getUrl();
 
+        // TODO: Output @title lat and lon on element @class geo
+        // e.g., class="geo" title="45.5088375;-73.587809"
+        $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'), $name);
         } else {
-            $this->out->element('a', array('class' => 'location',
+            $this->out->element('a', array('class' => 'geo',
                                            'href' => $url),
                                 $name);
         }
+        $this->out->elementEnd('span');
     }
 
     /**