GNUsocial/gnu-social
4
0
Fork 1
Code Issues Releases Wiki Activity

some UI fixes

Browse Source
This commit is contained in:
Evan Prodromou 2009-09-23 23:04:25 -04:00
parent d86155ad94
commit 543e3e7972
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
plugins/Realtime/RealtimePlugin.php
View File

@ -77,7 +77,7 @@ class RealtimePlugin extends Plugin
} }
$base = $action->selfUrl(); $base = $action->selfUrl();
if (mb_strstr($url, '?')) { if (mb_strstr($base, '?')) {
$url = $base . '&realtime=1'; $url = $base . '&realtime=1';
} else { } else {
$url = $base . '?realtime=1'; $url = $base . '?realtime=1';
@ -97,21 +97,19 @@ class RealtimePlugin extends Plugin
$user_id = 0; $user_id = 0;
} }
// FIXME: Need to check if the current URL is a poped realtime window if ($action->boolean('realtime')) {
if (1==2) {
$realtimeUI = ' RealtimeUpdate.initPopupWindow();'; $realtimeUI = ' RealtimeUpdate.initPopupWindow();';
} }
else { else {
// FIXME: This icon URL is no good if fancy URLs are off. $iconurl = common_path('plugins/Realtime/icon_external.gif');
$iconurl = $base.'plugins/Realtime/icon_external.gif';
$realtimeUI = ' RealtimeUpdate.addPopup("'.$url.'", "'.$timeline.'", "'. $iconurl .'");'; $realtimeUI = ' RealtimeUpdate.addPopup("'.$url.'", "'.$timeline.'", "'. $iconurl .'");';
} }
$action->elementStart('script', array('type' => 'text/javascript')); $action->elementStart('script', array('type' => 'text/javascript'));
$script = ' $(document).ready(function() { '. $script = ' $(document).ready(function() { '.
$this->_updateInitialize($timeline, $user_id).
$realtimeUI. $realtimeUI.
$this->_updateInitialize($timeline, $user_id).
'}); '; '}); ';
$action->raw($script); $action->raw($script);
@ -219,8 +217,10 @@ class RealtimePlugin extends Plugin
: array('id' => $action->trimmed('action'))); : array('id' => $action->trimmed('action')));
$action->elementStart('div', array('id' => 'header')); $action->elementStart('div', array('id' => 'header'));
// XXX hack to deal with JS that tries to get the // XXX hack to deal with JS that tries to get the
// root url from page output // root url from page output
$action->elementStart('address'); $action->elementStart('address');
$action->element('a', array('class' => 'url', $action->element('a', array('class' => 'url',
'href' => common_local_url('public')), 'href' => common_local_url('public')),