From 534c12e540f57846af82758678a0e8064ac49f5b Mon Sep 17 00:00:00 2001 From: Sarven Capadisli Date: Wed, 31 Mar 2010 10:57:20 +0200 Subject: Revert "Multiple file upload handling." This reverts commit 260f00d60bc83ac641d6fbe465e70aec33ccd9be. As mentioned in http://gitorious.org/statusnet/mainline/commit/260f00d60bc83ac641d6fbe465e70aec33ccd9be#comment_8367 Reverting this merge until the bugs are fixed and there is a general agreement on the need for this enhancement. --- lib/noticeform.php | 14 ++++---------- 1 file changed, 4 insertions(+), 10 deletions(-) (limited to 'lib') diff --git a/lib/noticeform.php b/lib/noticeform.php index a55839de0..7278c41a9 100644 --- a/lib/noticeform.php +++ b/lib/noticeform.php @@ -189,14 +189,10 @@ class NoticeForm extends Form } if (common_config('attachments', 'uploads')) { - $this->out->element('label', array('id' => 'notice_data-attach-label', - 'class' => 'attach-label', - 'for' => 'notice_data-attach'), - _('Attach')); + $this->out->element('label', array('for' => 'notice_data-attach'),_('Attach')); $this->out->element('input', array('id' => 'notice_data-attach', - 'class' => 'attach', 'type' => 'file', - 'name' => 'attach0', + 'name' => 'attach', 'title' => _('Attach a file'))); $this->out->hidden('MAX_FILE_SIZE', common_config('attachments', 'file_quota')); } @@ -216,10 +212,8 @@ class NoticeForm extends Form $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')) . + 'ShareDisable: "'._('Do not share my location').'",'. + 'ErrorTimeout: "'._('Sorry, retrieving your geo location is taking longer than expected, please try again later').'"'. '}'); } -- cgit v1.2.3-54-g00ecf