eliseuamaro/gnu-social
1
0
Fork 0
forked from GNUsocial/gnu-social
Code Issues Pull Requests Releases Wiki Activity

Revert "Use the geo microformat as documented at http://microformats.org/wiki/geo"

Browse Source 
This reverts commit 67add64291.
This commit is contained in:
Craig Andrews 2009-11-20 17:33:22 -05:00
parent 953f3a6e4f
commit 38f8d3d11b
1 changed files with 15 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
lib/noticelist.php
View File

@ -392,6 +392,11 @@ class NoticeListItem extends Widget
$name = $location->getName(); $name = $location->getName();
if (empty($name)) {
// XXX: Could be a translation issue. Fall back to... something?
return;
}
$lat = $this->notice->lat; $lat = $this->notice->lat;
$lon = $this->notice->lon; $lon = $this->notice->lon;
$latlon = (!empty($lat) && !empty($lon)) ? $lat.';'.$lon : ''; $latlon = (!empty($lat) && !empty($lon)) ? $lat.';'.$lon : '';
@ -400,17 +405,16 @@ class NoticeListItem extends Widget
$this->out->elementStart('span', array('class' => 'location')); $this->out->elementStart('span', array('class' => 'location'));
$this->out->text(_('at')); $this->out->text(_('at'));
if (empty($url)) {
$this->out->elementStart('a', array('class' => 'geo', 'href' => $url)); $this->out->element('span', array('class' => 'geo',
$this->out->elementStart('abbr', array('class' => 'latitude', 'title' => $lat, 'style' => empty($name)?null:'display: none')); 'title' => $latlon),
$this->out->text($lat); //TODO translate to a prettier format, like "S 37.2 deg" instead of "-37.2" $name);
$this->out->elementEnd('abbr'); } else {
$this->out->elementStart('abbr', array('class' => 'longitude', 'title' => $lon, 'style' => empty($name)?null:'display: none')); $this->out->element('a', array('class' => 'geo',
$this->out->text($lon); 'title' => $latlon,
$this->out->elementEnd('abbr'); 'href' => $url),
$this->out->text($name); $name);
$this->out->elementEnd('a'); }
$this->out->elementEnd('span'); $this->out->elementEnd('span');
} }