X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;ds=sidebyside;f=lib%2Fnoticeform.php;h=0c991c9695bc672bc0eebdb93234e5fbdf3be483;hb=45f5094b46d568b787f9251f3e4c36f7e1921511;hp=0e46e0e58fa490fc3e20791b62c83300155f8a66;hpb=4009e4a75dfffa73c727ec18d8dbd27448a4ba13;p=quix0rs-gnu-social.git

diff --git a/lib/noticeform.php b/lib/noticeform.php
index 0e46e0e58f..0c991c9695 100644
--- a/lib/noticeform.php
+++ b/lib/noticeform.php
@@ -63,6 +63,12 @@ class NoticeForm extends Form
 
     var $content = null;
 
+    /**
+     * The current user
+     */
+
+    var $user = null;
+
     /**
      * Constructor
      *
@@ -71,12 +77,19 @@ class NoticeForm extends Form
      * @param string        $content content to pre-fill
      */
 
-    function __construct($out=null, $action=null, $content=null)
+    function __construct($out=null, $action=null, $content=null, $user=null)
     {
         parent::__construct($out);
 
         $this->action  = $action;
         $this->content = $content;
+        
+        if ($user) {
+            $this->user = $user;
+        } else {
+            $this->user = common_current_user();
+        }
+        
     }
 
     /**
@@ -87,7 +100,7 @@ class NoticeForm extends Form
 
     function id()
     {
-        return 'status_form';
+        return 'form_notice';
     }
 
     /**
@@ -101,6 +114,18 @@ class NoticeForm extends Form
         return common_local_url('newnotice');
     }
 
+
+    /**
+     * Legend of the Form
+     *
+     * @return void
+     */
+    function formLegend()
+    {
+        $this->out->element('legend', null, _('Send a notice'));
+    }
+
+
     /**
      * Data elements
      *
@@ -109,23 +134,30 @@ class NoticeForm extends Form
 
     function formData()
     {
-        $user = common_current_user();
 
-        $this->out->element('label', array('for' => 'status_textarea',
-                                           'id' => 'status_label'),
-                            sprintf(_('What\'s up, %s?'), $user->nickname));
+        $this->out->elementStart('ul', 'form_data');
+        $this->out->elementStart('li', array('id' => 'notice_text'));
+        $this->out->element('label', array('for' => 'notice_data-text'),
+                            sprintf(_('What\'s up, %s?'), $this->user->nickname));
         // XXX: vary by defined max size
-        $this->out->element('span', array('id' => 'counter',
-                                          'class' => 'counter'),
-                            '140');
-        $this->out->element('textarea', array('id' => 'status_textarea',
-                                              'cols' => 60,
-                                              'rows' => 3,
+        $this->out->element('textarea', array('id' => 'notice_data-text',
+                                              'cols' => 35,
+                                              'rows' => 4,
                                               'name' => 'status_textarea'),
                             ($this->content) ? $this->content : '');
+        $this->out->elementEnd('li');
+        $this->out->elementEnd('ul');
+
+        $this->out->elementStart('dl', 'form_note');
+        $this->out->element('dt', null, _('Available characters'));
+        $this->out->element('dd', array('id' => 'notice_text-count'),
+                            '140');
+        $this->out->elementEnd('dl');
+
         if ($this->action) {
-            $this->out->hidden('returnto', $this->action);
+            $this->out->hidden('notice_return-to', $this->action, 'returnto');
         }
+        $this->out->hidden('notice_in-reply-to', $this->action, 'inreplyto');
     }
 
     /**
@@ -136,9 +168,14 @@ class NoticeForm extends Form
 
     function formActions()
     {
-        $this->out->element('input', array('id' => 'status_submit',
+        $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' => 'status_submit',
                                            'type' => 'submit',
                                            'value' => _('Send')));
+        $this->out->elementEnd('li');
+        $this->out->elementEnd('ul');
     }
-}
\ No newline at end of file
+}