Merge branch '1.0.x' of gitorious.org:statusnet/mainline into 1.0.x

* '1.0.x' of gitorious.org:statusnet/mainline:
  Show both empty and full notice search results inside event wrapper
  More interesting test notices in createsim.php

diff --git a/actions/newnotice.php b/actions/newnotice.php
index a8a5fa932fd0305e652343ce1bd3cbe273847a79..fe8d8e5c5b2f2bab6e4999c588c781aaa58c9ce1 100644 (file)
--- a/actions/newnotice.php
+++ b/actions/newnotice.php
@@ -352,10 +352,27 @@ class NewnoticeAction extends Action
             $inreplyto = null;
         }
 
-        $notice_form = new NoticeForm($this, array('content' => $content, 
-                                                   'inreplyto' => $inreplyto));
+        $this->elementStart('div', 'input_forms');
+        $this->elementStart(
+            'div',
+            array(
+                'id'    => 'input_form_status',
+                'class' => 'input_form current'
+            )
+        );
+
+        $notice_form = new NoticeForm(
+            $this,
+            array(
+                'content' => $content,
+                'inreplyto' => $inreplyto
+            )
+        );
 
         $notice_form->show();
+
+        $this->elementEnd('div');
+        $this->elementEnd('div');
     }
 
     /**

diff --git a/lib/messageform.php b/lib/messageform.php
index bd46d7389df4d824b51cf74bf389060626a5e5de..8676f76b063902bb235107fc6ded8a7126d7db0c 100644 (file)
--- a/lib/messageform.php
+++ b/lib/messageform.php
@@ -178,4 +178,32 @@ class MessageForm extends Form
                                            // TRANS: Button text for sending a direct notice.
                                            'value' => _m('Send button for sending notice', 'Send')));
     }
+
+
+    /**
+     * Show the form
+     *
+     * Uses a recipe to output the form.
+     *
+     * @return void
+     * @see Widget::show()
+     */
+
+    function show()
+    {
+        $this->elementStart('div', 'input_forms');
+        $this->elementStart(
+            'div',
+            array(
+                'id'    => 'input_form_direct',
+                'class' => 'input_form current'
+            )
+        );
+
+        parent::show();
+
+        $this->elementEnd('div');
+        $this->elementEnd('div');
+
+    }
 }