X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=lib%2Fnoticelist.php;h=5877827ff921c966afce682d4170a4c62fc9ae3c;hb=69ac99ff949ab0118ff25a62471980ad0ec7a52b;hp=4e5623ded60fee5ae43b52866b249af488025cec;hpb=aa0d9a86152d2485de6de5ec572ae87085ebe780;p=quix0rs-gnu-social.git diff --git a/lib/noticelist.php b/lib/noticelist.php index 4e5623ded6..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'); } @@ -347,7 +347,7 @@ class NoticeListItem extends Widget * show the link to the main page for the notice * * Displays a link to the page for a notice, with "relative" time. Tries to - * get remote notice URLs correct, but does not always succeed. + * get remote notice URLs correct, but doesn't always succeed. * * @return void */ @@ -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'); } /** @@ -483,7 +493,7 @@ class NoticeListItem extends Widget * show a link to reply to the current notice * * Should either do the reply in the current notice form (if available), or - * link out to the notice-posting form. A little flakey, does not always work. + * link out to the notice-posting form. A little flakey, doesn't always work. * * @return void */