move some stuff around for realtime

diff --git a/plugins/Realtime/RealtimePlugin.php b/plugins/Realtime/RealtimePlugin.php
index c41c9ce4ac08918d02d286963409d496e572008a..fde30602166e7b859c85abd4a459a9f7354e7a14 100644 (file)
--- a/plugins/Realtime/RealtimePlugin.php
+++ b/plugins/Realtime/RealtimePlugin.php
@@ -76,6 +76,15 @@ class RealtimePlugin extends Plugin
             return true;
         }
 
+        $base = $action->selfUrl();
+        if (mb_strstr($url, '?')) {
+            $url = $base . '&realtime=1';
+        } else {
+            $url = $base . '?realtime=1';
+        }
+
+        $title = $action->title();
+
         $scripts = $this->_getScripts();
 
         foreach ($scripts as $script) {
@@ -94,6 +103,7 @@ class RealtimePlugin extends Plugin
 
         $script = ' $(document).ready(function() { '.
           $this->_updateInitialize($timeline, $user_id).
+          ' RealtimeUpdate.addPopup("'.$url.'", "'.$title.'"); '.
           '}); ';
 
         $action->raw($script);
@@ -189,28 +199,6 @@ class RealtimePlugin extends Plugin
         return true;
     }
 
-    function onStartShowPageNotice($action)
-    {
-        $timeline = $this->_getTimeline($action);
-        if (!empty($timeline)) {
-            $base = $action->selfUrl();
-            if (mb_strstr($url, '?')) {
-                $url = $base . '&realtime=1';
-            } else {
-                $url = $base . '?realtime=1';
-            }
-            $title = $action->title();
-            $code = "window.open('$url', '$title', 'toolbar=no,resizable=yes,scrollbars=yes,status=yes,height=640,width=575');";
-            $action->element('a', array('href' => $base,
-                                        'onclick' => $code,
-                                        'id' => 'realtime_timeline',
-                                        'title' => _('Pop up')),
-                             'Pop up');
-
-        }
-        return true;
-    }
-
     function onStartShowBody($action)
     {
         $realtime = $action->boolean('realtime');

diff --git a/plugins/Realtime/realtimeupdate.js b/plugins/Realtime/realtimeupdate.js
index 3293ef6e9f1c99c771de7220e6855ee9ec2d548d..04e07956d5def8a98996f6f016edab7f3f2f818d 100644 (file)
--- a/plugins/Realtime/realtimeupdate.js
+++ b/plugins/Realtime/realtimeupdate.js
@@ -109,6 +109,11 @@ RealtimeUpdate = {
           dl = "<a class=\"notice_delete\" href=\""+delurl+"\" title=\"Delete this notice\">Delete</a>";
 
           return dl;
+     },
+
+     addPopup: function(url, title)
+     {
+          // FIXME: need to add the realtime popup button here
      }
 }