Merge branch 'jqueryui' into 1.0.x

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

diff --git a/lib/noticeform.php b/lib/noticeform.php
index 271d3607075aaf03ba84d84ba8a64c6b5bd2fbcd..3909b088d0120d93cbb5c620447ca7e64b4e3bc8 100644 (file)
--- a/lib/noticeform.php
+++ b/lib/noticeform.php
@@ -48,31 +48,26 @@ require_once INSTALLDIR.'/lib/form.php';
  *
  * @see      HTMLOutputter
  */
-
 class NoticeForm extends Form
 {
     /**
      * Current action, used for returning to this page.
      */
-
     var $action = null;
 
     /**
      * Pre-filled content of the form
      */
-
     var $content = null;
 
     /**
      * The current user
      */
-
     var $user = null;
 
     /**
      * The notice being replied to
      */
-
     var $inreplyto = null;
 
     /**
@@ -91,9 +86,10 @@ class NoticeForm extends Form
      * @param string        $action  action to return to, if any
      * @param string        $content content to pre-fill
      */
-
     function __construct($out=null, $action=null, $content=null, $user=null, $inreplyto=null, $lat=null, $lon=null, $location_id=null, $location_ns=null)
     {
+        $this->id_suffix = time();
+
         parent::__construct($out);
 
         $this->action  = $action;
@@ -125,7 +121,7 @@ class NoticeForm extends Form
 
     function id()
     {
-        return 'form_notice';
+        return 'form_notice_' . $this->id_suffix;
     }
 
    /**
@@ -136,7 +132,7 @@ class NoticeForm extends Form
 
     function formClass()
     {
-        return 'form_notice';
+        return 'form_notice ajax-notice';
     }
 
     /**
@@ -157,6 +153,7 @@ class NoticeForm extends Form
      */
     function formLegend()
     {
+        // TRANS: Form legend for notice form.
         $this->out->element('legend', null, _('Send a notice'));
     }
 
@@ -165,15 +162,15 @@ class NoticeForm extends Form
      *
      * @return void
      */
-
     function formData()
     {
         if (Event::handle('StartShowNoticeFormData', array($this))) {
             $this->out->element('label', array('for' => 'notice_data-text',
                                                'id' => 'notice_data-text-label'),
+                                // TRANS: Title for notice label. %s is the user's nickname.
                                 sprintf(_('What\'s up, %s?'), $this->user->nickname));
             // XXX: vary by defined max size
-            $this->out->element('textarea', array('id' => 'notice_data-text',
+            $this->out->element('textarea', array('class' => 'notice_data-text',
                                                   'cols' => 35,
                                                   'rows' => 4,
                                                   'name' => 'status_textarea'),
@@ -182,20 +179,22 @@ 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('class' => 'count'),
                                     $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',
+                $this->out->elementStart('label', array('class' => 'notice_data-attach'));
+                // TRANS: Input label in notice form for adding an attachment.
+                $this->out->text(_('Attach'));
+                $this->out->element('input', array('class' => 'notice_data-attach',
                                                    'type' => 'file',
                                                    'name' => 'attach',
-                                                   'title' => _('Attach a file')));
+                                                   // TRANS: Title for input field to attach a file to a notice.
+                                                   'title' => _('Attach a file.')));
+                $this->out->elementEnd('label');
             }
             if ($this->action) {
                 $this->out->hidden('notice_return-to', $this->action, 'returnto');
@@ -208,13 +207,32 @@ class NoticeForm extends Form
                 $this->out->hidden('notice_data-location_id', empty($this->location_id) ? (empty($this->profile->location_id) ? null : $this->profile->location_id) : $this->location_id, 'location_id');
                 $this->out->hidden('notice_data-location_ns', empty($this->location_ns) ? (empty($this->profile->location_ns) ? null : $this->profile->location_ns) : $this->location_ns, 'location_ns');
 
-                $this->out->elementStart('div', array('id' => 'notice_data-geo_wrap',
-                                                      'title' => common_local_url('geocode')));
-                $this->out->checkbox('notice_data-geo', _('Share my location'), true);
+                $this->out->elementStart('div', array('class' => 'notice_data-geo_wrap',
+                                                      'data-api' => common_local_url('geocode')));
+
+                // @fixme checkbox method allows no way to change the id without changing the name
+                //$this->out->checkbox('notice_data-geo', _('Share my location'), true);
+                $this->out->elementStart('label', 'notice_data-geo');
+                $this->out->element('input', array(
+                    'name' => 'notice_data-geo',
+                    'type' => 'checkbox',
+                    'class' => 'checkbox',
+                    'id' => $this->id() . '-notice_data-geo',
+                    'checked' => true, // ?
+                ));
+                $this->out->text(' ');
+                // TRANS: Field label to add location to a notice.
+                $this->out->text(_('Share my location'));
+                $this->out->elementEnd('label');
+                               
                 $this->out->elementEnd('div');
+                // TRANS: Text to not share location for a notice in notice form.
+                $share_disable_text = _('Do not share my location');
+                // TRANS: Timeout error text for location retrieval in notice form.
+                $error_timeout_text = _('Sorry, retrieving your geo location is taking longer than expected, please try again later');
                 $this->out->inlineScript(' var NoticeDataGeo_text = {'.
-                    'ShareDisable: ' .json_encode(_('Do not share my location')).','.
-                    'ErrorTimeout: ' .json_encode(_('Sorry, retrieving your geo location is taking longer than expected, please try again later')).
+                    'ShareDisable: ' .json_encode($share_disable_text).','.
+                    'ErrorTimeout: ' .json_encode($error_timeout_text).
                     '}');
             }
 
@@ -234,6 +252,7 @@ class NoticeForm extends Form
                                            'class' => 'submit',
                                            'name' => 'status_submit',
                                            'type' => 'submit',
-                                           'value' => _m('Send button for sending notice', 'Send')));
+                                           // TRANS: Button text for sending notice.
+                                           'value' => _m('BUTTON', 'Send')));
     }
 }