Merge branch '0.9.x' into 1.0.x

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

diff --git a/lib/noticeform.php b/lib/noticeform.php
index f45e6629bdcbd3d1bf269ad80c11d3a35080f09a..a55839de0ba8c6f1e22f5f28cae60cd594bac7b2 100644 (file)
--- a/lib/noticeform.php
+++ b/lib/noticeform.php
@@ -189,10 +189,14 @@ class NoticeForm extends Form
             }
 
             if (common_config('attachments', 'uploads')) {
-                $this->out->element('label', array('for' => 'notice_data-attach'),_('Attach'));
+                $this->out->element('label', array('id' => 'notice_data-attach-label',
+                                                   'class' => 'attach-label',
+                                                   'for' => 'notice_data-attach'),
+                                                   _('Attach'));
                 $this->out->element('input', array('id' => 'notice_data-attach',
+                                                   'class' => 'attach',
                                                    'type' => 'file',
-                                                   'name' => 'attach',
+                                                   'name' => 'attach0',
                                                    'title' => _('Attach a file')));
                 $this->out->hidden('MAX_FILE_SIZE', common_config('attachments', 'file_quota'));
             }
@@ -202,15 +206,21 @@ class NoticeForm extends Form
             $this->out->hidden('notice_in-reply-to', $this->inreplyto, 'inreplyto');
 
             if ($this->user->shareLocation()) {
-                $this->out->hidden('notice_data-lat', empty($this->profile->lat) ? null : $this->profile->lat, 'lat');
-                $this->out->hidden('notice_data-lon', empty($this->profile->lon) ? null : $this->profile->lon, 'lon');
-                $this->out->hidden('notice_data-location_id', empty($this->profile->location_id) ? null : $this->profile->location_id, 'location_id');
-                $this->out->hidden('notice_data-location_ns', empty($this->profile->location_ns) ? null : $this->profile->location_ns, 'location_ns');
-
-                $this->out->elementStart('div',array('id' => 'notice_data-location_enabled_container', 'data-geocode-url' => common_local_url('geocode')));
-                $this->out->checkbox('notice_data-location_enabled', _('Share your location'), true);
-                $this->out->element('a', array('style' => 'display: none', 'target' => '_blank', 'id' => 'notice_data-location_name'), _('Finding your location...'));
+                $this->out->hidden('notice_data-lat', empty($this->lat) ? (empty($this->profile->lat) ? null : $this->profile->lat) : $this->lat, 'lat');
+                $this->out->hidden('notice_data-lon', empty($this->lon) ? (empty($this->profile->lon) ? null : $this->profile->lon) : $this->lon, 'lon');
+                $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->elementEnd('div');
+                $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')).
+                    '} ; var NoticeAttachment_text = {'.
+                    'AttachFile: ' . json_encode(_('Attach a file')) .
+                    '}');
             }
 
             Event::handle('EndShowNoticeFormData', array($this));
@@ -229,6 +239,6 @@ class NoticeForm extends Form
                                            'class' => 'submit',
                                            'name' => 'status_submit',
                                            'type' => 'submit',
-                                           'value' => _('Send')));
+                                           'value' => _m('Send button for sending notice', 'Send')));
     }
 }