Merge branch '0.8.x' of git@gitorious.org:laconica/dev into 0.8.x

diff --git a/lib/noticeform.php b/lib/noticeform.php
index 3212f382ad56e1a33d53263d3c8783df52e34456..0ad36585662c3f9bf83baf730231b14b16150031 100644 (file)
--- a/lib/noticeform.php
+++ b/lib/noticeform.php
@@ -148,12 +148,12 @@ class NoticeForm extends Form
         $this->out->element('dd', array('id' => 'notice_text-count'),
                             '140');
         $this->out->elementEnd('dl');
-        $this->out->hidden('MAX_FILE_SIZE', common_config('attachments', 'file_quota'));
-        $this->out->element('label', array('for' => 'notice_data-attach'), _('Attach'));
+        $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');
         }

diff --git a/theme/base/css/display.css b/theme/base/css/display.css
index dc275e19f71df226e2917aad3c299ae6e0eee272..060fdfd0df5aebfb62d9152004cb962b1f31a8c1 100644 (file)
--- a/theme/base/css/display.css
+++ b/theme/base/css/display.css
@@ -445,6 +445,8 @@ width:80.789%;
 height:67px;
 line-height:1.5;
 padding:7px 7px 16px 7px;
+position:relative;
+z-index:2;
 }
 #form_notice label {
 display:block;
@@ -452,23 +454,23 @@ float:left;
 font-size:1.3em;
 margin-bottom:7px;
 }
-#form_notice label[for=notice_data-attach] {
-text-indent:-9999px;
-}
 #form_notice label[for=notice_data-attach],
 #form_notice #notice_data-attach {
 position:absolute;
 top:25px;
-right:49px;
+cursor:pointer;
+}
+#form_notice label[for=notice_data-attach] {
+text-indent:-9999px;
+left:394px;
 width:16px;
 height:16px;
-cursor:pointer;
 }
 #form_notice #notice_data-attach {
-text-indent:-279px;
-}
-#form_notice #notice_submit label {
-display:none;
+left:183px;
+padding:0;
+
+height:16px;
 }
 #form_notice .form_note {
 position:absolute;

diff --git a/theme/base/css/ie.css b/theme/base/css/ie.css
index 8183fee67974d1ea71418ad3914da768ebd23397..d1b0558ec80344016b04b260c88f3c115a1776c5 100644 (file)
--- a/theme/base/css/ie.css
+++ b/theme/base/css/ie.css
@@ -8,6 +8,15 @@ top:0;
 #form_notice textarea {
 width:78%;
 }
+#form_notice .form_note + label {
+position:absolute;
+top:25px;
+left:380px;
+text-indent:-9999px;
+height:16px;
+width:16px;
+display:block;
+}
 #form_notice #notice_action-submit {
 width:17%;
 max-width:17%;

diff --git a/theme/default/css/ie.css b/theme/default/css/ie.css
index 2b06768ea4687c35baf04dd3b8e7b086f0dfe7a7..6501f4e48e9451d6ca5cac962a2a0fc6b4af6372 100644 (file)
--- a/theme/default/css/ie.css
+++ b/theme/default/css/ie.css
@@ -3,7 +3,12 @@
 .notice-options input.submit {
 color:#fff;
 }
-
 #site_nav_local_views a {
 background-color:#ACCCDA;
 }
+#form_notice .form_note + label {
+background:transparent url(../../base/images/icons/twotone/green/clip-01.gif) no-repeat 0 45%;
+}
+#form_notice #notice_data-attach {
+filter: alpha(opacity=0);
+}
\ No newline at end of file

diff --git a/theme/identica/css/ie.css b/theme/identica/css/ie.css
index 2f463bb44dfee9a14fd382a3b745bfe2a274429f..69db16aad080bb1a0dc37386e1f184a6ec68c32b 100644 (file)
--- a/theme/identica/css/ie.css
+++ b/theme/identica/css/ie.css
@@ -3,7 +3,12 @@
 .notice-options input.submit {
 color:#fff;
 }
-
 #site_nav_local_views a {
 background-color:#D0DFE7;
 }
+#form_notice .form_note + label {
+background:transparent url(../../base/images/icons/twotone/green/clip-01.gif) no-repeat 0 45%;
+}
+#form_notice #notice_data-attach {
+filter: alpha(opacity=0);
+}
\ No newline at end of file