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

[quix0rs-gnu-social.git] / lib / noticeform.php

diff --git a/lib/noticeform.php b/lib/noticeform.php
index 84c20a5b3ff1ed13d49695113b661f74fd67f0ec..4e8b84207884136fa5c054f35850d0d48abef999 100644 (file)
--- a/lib/noticeform.php
+++ b/lib/noticeform.php
@@ -169,7 +169,8 @@ class NoticeForm extends Form
     function formData()
     {
         if (Event::handle('StartShowNoticeFormData', array($this))) {
-            $this->out->element('label', array('for' => 'notice_data-text'),
+            $this->out->element('label', array('for' => 'notice_data-text',
+                                               'id' => 'notice_data-text-label'),
                                 sprintf(_('What\'s up, %s?'), $this->user->nickname));
             // XXX: vary by defined max size
             $this->out->element('textarea', array('id' => 'notice_data-text',
@@ -181,20 +182,19 @@ class NoticeForm extends Form
             $contentLimit = Notice::maxContent();
 
             if ($contentLimit > 0) {
-                $this->out->elementStart('dl', 'form_note');
-                $this->out->element('dt', null, _('Available characters'));
-                $this->out->element('dd', array('id' => 'notice_text-count'),
+                $this->out->element('span', 
+                                    array('id' => 'notice_text-count',
+                                          'class' => 'form_note'),
                                     $contentLimit);
-                $this->out->elementEnd('dl');
             }
 
             if (common_config('attachments', 'uploads')) {
+                $this->out->hidden('MAX_FILE_SIZE', common_config('attachments', 'file_quota'));
                 $this->out->element('label', array('for' => 'notice_data-attach'),_('Attach'));
                 $this->out->element('input', array('id' => 'notice_data-attach',
                                                    'type' => 'file',
                                                    'name' => 'attach',
                                                    'title' => _('Attach a file')));
-                $this->out->hidden('MAX_FILE_SIZE', common_config('attachments', 'file_quota'));
             }
             if ($this->action) {
                 $this->out->hidden('notice_return-to', $this->action, 'returnto');