Init notice_data-attach UI for form_notice

4 files changed, 23 insertions, 12 deletions

diff --git a/js/util.js b/js/util.js
index bffbf916f..b712ba8e2 100644
--- a/js/util.js
+++ b/js/util.js
@@ -17,17 +17,6 @@
  */
 
 $(document).ready(function(){
-    $('input#notice_data-attach').toggle();
-    $('label[for=notice_data-attach]').text('Upload a file as an attachment?');
-    $('label[for=notice_data-attach]').click(function () {
-        if ('Upload a file as an attachment?' == $(this).text()) {
-            $(this).text('Upload: ');
-            $('input#notice_data-attach').slideDown('fast');
-        } else {
-            $('input#notice_data-attach').slideUp('fast', function() {$('label[for=notice_data-attach]').text('Upload a file as an attachment?');});
-        }
-    });
-
 	// count character on keyup
 	function counter(event){
 		var maxLength = 140;
diff --git a/lib/noticeform.php b/lib/noticeform.php
index 805cd56b1..5a6c7cf38 100644
--- a/lib/noticeform.php
+++ b/lib/noticeform.php
@@ -148,7 +148,6 @@ class NoticeForm extends Form
         $this->out->element('dd', array('id' => 'notice_text-count'),
                             '140');
         $this->out->elementEnd('dl');
-        $this->out->element('br', array('style' => 'clear:both'));
         $this->out->element('label', array('for' => 'notice_data-attach'), _('Attach'));
         $this->out->element('input', array('id' => 'notice_data-attach',
                                            'type' => 'file',
diff --git a/theme/base/css/display.css b/theme/base/css/display.css
index 7d495c539..7eea54eb2 100644
--- a/theme/base/css/display.css
+++ b/theme/base/css/display.css
@@ -452,6 +452,22 @@ float:left;
 font-size:1.3em;
 margin-bottom:7px;
 }
+#form_notice label[for=notice_data-attach] {
+text-indent:-9999px;
+display:block;
+}
+#form_notice label[for=notice_data-attach],
+#form_notice #notice_data-attach {
+position:absolute;
+top:25px;
+right:49px;
+width:16px;
+height:16px;
+cursor:pointer;
+}
+#form_notice #notice_data-attach {
+text-indent:-279px;
+}
 #form_notice #notice_submit label {
 display:none;
 }
diff --git a/theme/identica/css/display.css b/theme/identica/css/display.css
index 1f1298737..8a03a4d77 100644
--- a/theme/identica/css/display.css
+++ b/theme/identica/css/display.css
@@ -82,6 +82,13 @@ color:#333;
 #form_notice.warning #notice_text-count {
 color:#000;
 }
+#form_notice label[for=notice_data-attach] {
+background:transparent url(../../base/images/icons/twotone/green/clip-01.gif) no-repeat 0 45%;
+}
+#form_notice #notice_data-attach {
+opacity:0;
+}
+
 #form_notice.processing #notice_action-submit {
 background:#fff url(../../base/images/icons/icon_processing.gif) no-repeat 47% 47%;
 cursor:wait;