Direct message markup and style

2 files changed, 43 insertions, 10 deletions

diff --git a/lib/messageform.php b/lib/messageform.php
index eca39cc06..61d3d75af 100644
--- a/lib/messageform.php
+++ b/lib/messageform.php
@@ -85,7 +85,7 @@ class MessageForm extends Form
 
     function id()
     {
-        return 'message_form';
+        return 'form_notice';
     }
 
     /**
@@ -99,6 +99,18 @@ class MessageForm extends Form
         return common_local_url('newmessage');
     }
 
+
+    /**
+     * Legend of the Form
+     *
+     * @return void
+     */
+    function formLegend()
+    {
+        $this->out->element('legend', null, _('Send a direct notice'));
+    }
+
+
     /**
      * Data elements
      *
@@ -122,18 +134,20 @@ class MessageForm extends Form
         $mutual_users->free();
         unset($mutual_users);
 
+        $this->out->elementStart('ul', 'form_data');
+        $this->out->elementStart('li', array('id' => 'notice_to'));
         $this->out->dropdown('to', _('To'), $mutual, null, false,
                              $this->to->id);
+        $this->out->elementEnd('li');
 
-        $this->out->elementStart('p');
-
-        $this->out->element('textarea', array('id' => 'message_content',
-                                              'cols' => 60,
-                                              'rows' => 3,
+        $this->out->elementStart('li', array('id' => 'notice_text'));
+        $this->out->element('textarea', array('id' => 'notice_data-text',
+                                              'cols' => 35,
+                                              'rows' => 4,
                                               'name' => 'content'),
                             ($this->content) ? $this->content : '');
-
-        $this->out->elementEnd('p');
+        $this->out->elementEnd('li');
+        $this->out->elementEnd('ul');
     }
 
     /**
@@ -144,9 +158,14 @@ class MessageForm extends Form
 
     function formActions()
     {
-        $this->out->element('input', array('id' => 'message_send',
+        $this->out->elementStart('ul', 'form_actions');
+        $this->out->elementStart('li', array('id' => 'notice_submit'));
+        $this->out->element('input', array('id' => 'notice_action-submit',
+                                           'class' => 'submit',
                                            'name' => 'message_send',
                                            'type' => 'submit',
                                            'value' => _('Send')));
+        $this->out->elementEnd('li');
+        $this->out->elementEnd('ul');
     }
-}
\ No newline at end of file
+}
diff --git a/theme/base/css/display.css b/theme/base/css/display.css
index d2480be14..5b17fa53a 100644
--- a/theme/base/css/display.css
+++ b/theme/base/css/display.css
@@ -482,6 +482,20 @@ padding:8px;
 #form_notice li {
 margin-bottom:0;
 }
+
+#form_notice #notice_to {
+margin-bottom:7px;
+}
+
+#notice_to label {
+float:left;
+margin-right:18px;
+margin-top:11px;
+}
+#notice_to select {
+float:left;
+}
+
 /*end FORM NOTICE*/