Explictly unbinding is unnecessary as jQuery's remove() takes care of it

[quix0rs-gnu-social.git] / plugins / UserFlag / UserFlagPlugin.php

diff --git a/plugins/UserFlag/UserFlagPlugin.php b/plugins/UserFlag/UserFlagPlugin.php
index 2376bb8594f7b5f6c33267f7f52b335acc24e108..1c58a6916ea5dc3a8a86639c08021970428ffa5b 100644 (file)
--- a/plugins/UserFlag/UserFlagPlugin.php
+++ b/plugins/UserFlag/UserFlagPlugin.php
@@ -102,8 +102,7 @@ class UserFlagPlugin extends Plugin
             $action->elementStart('li', 'entity_flag');
 
             if (User_flag_profile::exists($profile->id, $user->id)) {
-                $action->element('p', array(),
-                                 _('Flagged for review'));
+                $action->element('p', 'flagged', _('Flagged'));
             } else {
                 $form = new FlagProfileForm($action, $profile,
                                         array('action' => 'showstream',
@@ -123,9 +122,15 @@ class UserFlagPlugin extends Plugin
 
         if (!empty($user)) {
 
-            $form = new FlagProfileForm($item->action, $item->profile);
+            list($action, $args) = $item->action->returnToArgs();
 
+            $args['action'] = $action;
+
+            $form = new FlagProfileForm($item->action, $item->profile, $args);
+
+            $item->action->elementStart('li', 'entity_flag');
             $form->show();
+            $item->action->elementEnd('li');
         }
 
         return true;
@@ -133,12 +138,16 @@ class UserFlagPlugin extends Plugin
 
     function onEndShowStatusNetStyles($action)
     {
-        $action->elementStart('style', array('type' => 'text/css'));
-        $action->raw('.entity_flag input, .entity_flag p {'.
-            ' background:url('.common_path('plugins/UserFlag/flag.gif').') 5px 5px no-repeat;'.
-            ' }');
-        $action->elementEnd('style');
+        $action->cssLink(common_path('plugins/UserFlag/userflag.css'), 
+                         null, 'screen, projection, tv');
+        return true;
+    }
 
+    function onEndShowScripts($action)
+    {
+        $action->elementStart('script', array('type' => 'text/javascript'));
+        $action->raw('/*<![CDATA[*/ SN.U.FormXHR($(".form_entity_flag")); /*]]>*/');
+        $action->elementEnd('script');
         return true;
     }
 }