From d1893a1ca90a8d69d35d436cc9633a5cfdf84a96 Mon Sep 17 00:00:00 2001 From: Sarven Capadisli Date: Thu, 19 Nov 2009 14:27:20 +0000 Subject: [PATCH 1/3] Changed notice source and location order --- lib/noticelist.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/noticelist.php b/lib/noticelist.php index bf12bb73c5..0744d71a99 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'); } From ece0675ef8dacb12af1d1a06af851e704ed4cdda Mon Sep 17 00:00:00 2001 From: Sarven Capadisli Date: Thu, 19 Nov 2009 15:14:47 +0000 Subject: [PATCH 2/3] Added @class 'location', 'at' text reference for name, and @class 'geo' --- lib/noticelist.php | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/lib/noticelist.php b/lib/noticelist.php index 0744d71a99..3bad2cf7ca 100644 --- a/lib/noticelist.php +++ b/lib/noticelist.php @@ -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'); } /** From c721884b52b2d0caf34d0e445596362139af4fb1 Mon Sep 17 00:00:00 2001 From: Craig Andrews Date: Thu, 19 Nov 2009 11:08:13 -0500 Subject: [PATCH 3/3] Should be using onHandleQueuedNotice instead of onEndNoticeSave --- plugins/LinkbackPlugin.php | 2 +- plugins/Realtime/RealtimePlugin.php | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/plugins/LinkbackPlugin.php b/plugins/LinkbackPlugin.php index 915d15c075..f220fff8f6 100644 --- a/plugins/LinkbackPlugin.php +++ b/plugins/LinkbackPlugin.php @@ -59,7 +59,7 @@ class LinkbackPlugin extends Plugin parent::__construct(); } - function onEndNoticeSave($notice) + function onHandleQueuedNotice($notice) { if ($notice->is_local == 1) { // Try to avoid actually mucking with the diff --git a/plugins/Realtime/RealtimePlugin.php b/plugins/Realtime/RealtimePlugin.php index 2cff03d6c8..c5fb6de038 100644 --- a/plugins/Realtime/RealtimePlugin.php +++ b/plugins/Realtime/RealtimePlugin.php @@ -125,7 +125,7 @@ class RealtimePlugin extends Plugin return true; } - function onEndNoticeSave($notice) + function onHandleQueuedNotice($notice) { $paths = array();