From ba1ada28809fdef593c8849dad0e3e01a261bbaf Mon Sep 17 00:00:00 2001
From: Brion Vibber <brion@pobox.com>
Date: Tue, 8 Mar 2011 12:01:12 -0800
Subject: [PATCH] de-IDifying labels in notice form to fix issue with geo pin
 activating the wrong place when cloning the form

Note that changes to the attachment from <label for/><input id/> to <label><input></label> affect some of the existing styles which attempt to place them both in the same place based on having a common parent. Only 'neo' has been fully tested and fixed for this case, as the others all fail due to the new layout anyway. :)
---
 lib/noticeform.php                   | 16 +++++++++-------
 plugins/MobileProfile/mp-screen.css  |  2 +-
 plugins/Realtime/realtimeupdate.css  |  6 +++---
 theme/base/css/display.css           |  8 ++++----
 theme/biz/css/base.css               |  8 ++++----
 theme/biz/css/display.css            |  6 +++---
 theme/clean/css/display.css          |  4 ++--
 theme/clean/css/ie.css               |  2 +-
 theme/clean/css/mp-screen.css        |  2 +-
 theme/cleaner/css/display.css        |  6 +++---
 theme/cleaner/css/ie.css             |  2 +-
 theme/cleaner/css/mp-screen.css      |  2 +-
 theme/cloudy/css/display.css         | 14 +++++++-------
 theme/cloudy/css/ie.css              |  2 +-
 theme/default/css/display.css        |  6 +++---
 theme/default/css/ie.css             |  2 +-
 theme/identica/css/display.css       |  6 +++---
 theme/identica/css/ie.css            |  2 +-
 theme/mnml/css/display.css           | 12 ++++++------
 theme/mnml/css/ie.css                |  2 +-
 theme/mnml/css/mp-screen.css         |  2 +-
 theme/neo/css/display.css            | 21 ++++++++++-----------
 theme/neo/css/ie.css                 |  6 +++---
 theme/neo/css/mp-screen.css          |  2 +-
 theme/pigeonthoughts/css/base.css    | 15 ++++++++++-----
 theme/pigeonthoughts/css/display.css |  6 +++---
 theme/rebase/css/display.css         | 25 ++++++++++++++++---------
 theme/rebase/css/ie.css              |  2 +-
 theme/shiny/css/display.css          |  4 ++--
 theme/shiny/css/ie.css               |  2 +-
 theme/shiny/css/mp-screen.css        |  2 +-
 theme/victorian/css/display.css      |  6 +++---
 theme/victorian/css/ie.css           |  2 +-
 theme/victorian/css/mp-screen.css    |  2 +-
 34 files changed, 110 insertions(+), 97 deletions(-)

diff --git a/lib/noticeform.php b/lib/noticeform.php
index ace8e5582b..271a37449c 100644
--- a/lib/noticeform.php
+++ b/lib/noticeform.php
@@ -187,12 +187,14 @@ class NoticeForm extends Form
             if (common_config('attachments', 'uploads')) {
                 $this->out->hidden('MAX_FILE_SIZE', common_config('attachments', 'file_quota'));
                 // TRANS: Input label in notice form for adding an attachment.
-                $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'));
+                $this->out->text(_('Attach'));
+                $this->out->element('input', array('class' => 'notice_data-attach',
                                                    'type' => 'file',
                                                    'name' => 'attach',
                                                    // 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');
@@ -210,6 +212,7 @@ class NoticeForm extends Form
 
                 // @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',
@@ -218,11 +221,10 @@ class NoticeForm extends Form
                     'checked' => true, // ?
                 ));
                 $this->out->text(' ');
-                $this->out->element('label', array('class' => 'notice_data-geo',
-                                              'for' => $this->id() . '-notice_data-geo'),
-                               // TRANS: Field label to add location to a notice.
-                               _('Share my location'));
-
+                // 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');
diff --git a/plugins/MobileProfile/mp-screen.css b/plugins/MobileProfile/mp-screen.css
index fcd88277e5..d82486182a 100644
--- a/plugins/MobileProfile/mp-screen.css
+++ b/plugins/MobileProfile/mp-screen.css
@@ -108,7 +108,7 @@ iPhone/iPod Touch, Android, Opera Mini Simulator
 #form_notice label[for="notice_data-attach"] {
 display:none;
 }
-#form_notice #notice_data-attach {
+#form_notice input.notice_data-attach {
 position:static;
 clear:both;
 width:65%;
diff --git a/plugins/Realtime/realtimeupdate.css b/plugins/Realtime/realtimeupdate.css
index 7fd7fd5ed3..3295fe4a31 100644
--- a/plugins/Realtime/realtimeupdate.css
+++ b/plugins/Realtime/realtimeupdate.css
@@ -17,13 +17,13 @@ max-width:451px;
 display:none;
 }
 
-.realtime-popup #form_notice label[for=notice_data-attach],
-.realtime-popup #form_notice #notice_data-attach,
+.realtime-popup #form_notice label.notice_data-attach,
+.realtime-popup #form_notice input.notice_data-attach,
 .realtime-popup #form_notice label.notice_data-geo {
 top:0;
 }
 
-.realtime-popup #form_notice #notice_data-attach {
+.realtime-popup #form_notice input.notice_data-attach {
 left:auto;
 right:0;
 }
diff --git a/theme/base/css/display.css b/theme/base/css/display.css
index 16c2b6dce6..85ec1286b9 100644
--- a/theme/base/css/display.css
+++ b/theme/base/css/display.css
@@ -597,19 +597,19 @@ float:left;
 font-size:1.3em;
 margin-bottom:7px;
 }
-.form_notice label[for=notice_data-attach],
-.form_notice #notice_data-attach {
+.form_notice label.notice_data-attach,
+.form_notice input.notice_data-attach {
 position:absolute;
 top:25px;
 right:10.5%;
 cursor:pointer;
 }
-.form_notice label[for=notice_data-attach] {
+.form_notice label.notice_data-attach {
 text-indent:-9999px;
 width:16px;
 height:16px;
 }
-.form_notice #notice_data-attach {
+.form_notice input.notice_data-attach {
 padding:0;
 height:16px;
 }
diff --git a/theme/biz/css/base.css b/theme/biz/css/base.css
index 53aca59009..3a20871de9 100644
--- a/theme/biz/css/base.css
+++ b/theme/biz/css/base.css
@@ -462,11 +462,11 @@ float:left;
 font-size:1.3em;
 margin-bottom:7px;
 }
-#form_notice label[for=notice_data-attach] {
+#form_notice label.notice_data-attach {
 text-indent:-9999px;
 }
-#form_notice label[for=notice_data-attach],
-#form_notice #notice_data-attach {
+#form_notice label.notice_data-attach,
+#form_notice input.notice_data-attach {
 position:absolute;
 top:25px;
 right:49px;
@@ -474,7 +474,7 @@ width:16px;
 height:16px;
 cursor:pointer;
 }
-#form_notice #notice_data-attach {
+#form_notice input.notice_data-attach {
 text-indent:-279px;
 }
 #form_notice #notice_submit label {
diff --git a/theme/biz/css/display.css b/theme/biz/css/display.css
index 0bb53f74a8..2e96d99d1a 100644
--- a/theme/biz/css/display.css
+++ b/theme/biz/css/display.css
@@ -172,14 +172,14 @@ color:#333333;
 #form_notice.warning .count {
 color:#000000;
 }
-.form_notice label[for=notice_data-attach] {
+.form_notice label.notice_data-attach {
 background-position:0 -328px;
 }
-.form_notice #notice_data-attach {
+.form_notice input.notice_data-attach {
 opacity:0;
 }
 
-.form_notice label[for=notice_data-attach],
+.form_notice label.notice_data-attach,
 #export_data li a.rss,
 #export_data li a.atom,
 #export_data li a.foaf,
diff --git a/theme/clean/css/display.css b/theme/clean/css/display.css
index 96a5c02a56..ea2d62020e 100644
--- a/theme/clean/css/display.css
+++ b/theme/clean/css/display.css
@@ -114,8 +114,8 @@ address {
     height: 54px;
 }
 
-.form_notice label[for=notice_data-attach],
-.form_notice #notice_data-attach {
+.form_notice label.notice_data-attach,
+.form_notice input.notice_data-attach {
     top: 27px;
 }
 
diff --git a/theme/clean/css/ie.css b/theme/clean/css/ie.css
index 994c1297d3..272a5bbcae 100644
--- a/theme/clean/css/ie.css
+++ b/theme/clean/css/ie.css
@@ -61,7 +61,7 @@ line-height:auto;
     color:#FFFFFF;
 }
 
-.form_notice #notice_data-attach {
+.form_notice input.notice_data-attach {
     filter: alpha(opacity=0);
 }
 
diff --git a/theme/clean/css/mp-screen.css b/theme/clean/css/mp-screen.css
index 35d8326a41..8d9489b0b1 100644
--- a/theme/clean/css/mp-screen.css
+++ b/theme/clean/css/mp-screen.css
@@ -94,7 +94,7 @@ iPhone/iPod Touch, Android, Opera Mini Simulator
 .form_notice label[for="notice_data-attach"] {
 display:none;
 }
-.form_notice #notice_data-attach {
+.form_notice input.notice_data-attach {
 position:static;
 clear:both;
 width:65%;
diff --git a/theme/cleaner/css/display.css b/theme/cleaner/css/display.css
index 214c821e59..98d4560d2a 100644
--- a/theme/cleaner/css/display.css
+++ b/theme/cleaner/css/display.css
@@ -161,8 +161,8 @@ address {
     border-radius: 6px;
 }
 
-.form_notice label[for=notice_data-attach],
-.form_notice #notice_data-attach {
+.form_notice label.notice_data-attach,
+.form_notice input.notice_data-attach {
     top: 27px;
     right: 86px;
 }
@@ -594,7 +594,7 @@ padding-right:0;
     right: 6px !important;
 }
 
-.realtime-popup .form_notice label[for=notice_data-attach], .realtime-popup .form_notice #notice_data-attach {
+.realtime-popup .form_notice label.notice_data-attach, .realtime-popup .form_notice input.notice_data-attach {
     right: 74px;
     top: 3px !important;
 }
diff --git a/theme/cleaner/css/ie.css b/theme/cleaner/css/ie.css
index dbc72b1c22..7bd48790bf 100644
--- a/theme/cleaner/css/ie.css
+++ b/theme/cleaner/css/ie.css
@@ -65,7 +65,7 @@ line-height:auto;
     color:#FFFFFF;
 }
 
-.form_notice #notice_data-attach {
+.form_notice input.notice_data-attach {
     filter: alpha(opacity=0);
 }
 
diff --git a/theme/cleaner/css/mp-screen.css b/theme/cleaner/css/mp-screen.css
index 8b55e596fe..cb3c6d06b6 100644
--- a/theme/cleaner/css/mp-screen.css
+++ b/theme/cleaner/css/mp-screen.css
@@ -99,7 +99,7 @@ iPhone/iPod Touch, Android, Opera Mini Simulator
 .form_notice label[for="notice_data-attach"] {
 display:none;
 }
-.form_notice #notice_data-attach {
+.form_notice input.notice_data-attach {
 position:static;
 clear:both;
 width:65%;
diff --git a/theme/cloudy/css/display.css b/theme/cloudy/css/display.css
index a5eabac4ad..5bc8ab0c1e 100644
--- a/theme/cloudy/css/display.css
+++ b/theme/cloudy/css/display.css
@@ -493,19 +493,19 @@ float:left;
 font-size:1.3em;
 margin-bottom:7px;
 }
-.form_notice label[for=notice_data-attach],
-.form_notice #notice_data-attach {
+.form_notice label.notice_data-attach,
+.form_notice input.notice_data-attach {
 position:absolute;
 top:25px;
 right:10.5%;
 cursor:pointer;
 }
-.form_notice label[for=notice_data-attach] {
+.form_notice label.notice_data-attach {
 text-indent:-9999px;
 width:16px;
 height:16px;
 }
-.form_notice #notice_data-attach {
+.form_notice input.notice_data-attach {
 padding:0;
 height:16px;
 }
@@ -1602,7 +1602,7 @@ background:none;
 }
 
 
-.form_notice label[for=notice_data-attach],
+.form_notice label.notice_data-attach,
 #export_data li a.rss,
 #export_data li a.atom,
 #export_data li a.foaf,
@@ -1787,10 +1787,10 @@ color:#000000;
 #form_notice.warning .count {
 color:#000000;
 }
-#form_notice label[for=notice_data-attach] {
+#form_notice label.notice_data-attach {
 background:transparent url(../../base/images/icons/twotone/green/clip-01.gif) no-repeat 0 45%;
 }
-#form_notice #notice_data-attach {
+#form_notice input.notice_data-attach {
 opacity:0;
 }
 
diff --git a/theme/cloudy/css/ie.css b/theme/cloudy/css/ie.css
index edddc16d88..013bdf9d16 100644
--- a/theme/cloudy/css/ie.css
+++ b/theme/cloudy/css/ie.css
@@ -34,7 +34,7 @@ height:16px;
 width:16px;
 display:block;
 }
-#form_notice #notice_data-attach {
+#form_notice input.notice_data-attach {
 filter: alpha(opacity = 0);
 left:33.5%;
 }
diff --git a/theme/default/css/display.css b/theme/default/css/display.css
index fbd3afb12c..3e3bfdfa86 100644
--- a/theme/default/css/display.css
+++ b/theme/default/css/display.css
@@ -152,14 +152,14 @@ color:#333333;
 .entity_actions .dialogbox input {
 color:#000000;
 }
-.form_notice label[for=notice_data-attach] {
+.form_notice label.notice_data-attach {
 background-position:0 -328px;
 }
-.form_notice #notice_data-attach {
+.form_notice input.notice_data-attach {
 opacity:0;
 }
 
-.form_notice label[for=notice_data-attach],
+.form_notice label.notice_data-attach,
 #export_data li a.rss,
 #export_data li a.atom,
 #export_data li a.foaf,
diff --git a/theme/default/css/ie.css b/theme/default/css/ie.css
index 2bbeb7ffa4..3100821688 100644
--- a/theme/default/css/ie.css
+++ b/theme/default/css/ie.css
@@ -16,7 +16,7 @@ background-color:#C8D1D5;
 .form_notice .count + label {
 background:transparent url(../../base/images/icons/icons-01.gif) no-repeat 0 -328px;
 }
-.form_notice #notice_data-attach {
+.form_notice input.notice_data-attach {
 filter: alpha(opacity=0);
 }
 .notice-options form.form_favor input.submit {
diff --git a/theme/identica/css/display.css b/theme/identica/css/display.css
index fba72a09d6..fe7ffa9f7d 100644
--- a/theme/identica/css/display.css
+++ b/theme/identica/css/display.css
@@ -153,14 +153,14 @@ color:#333333;
 .entity_actions .dialogbox input {
 color:#000000;
 }
-.form_notice label[for=notice_data-attach] {
+.form_notice label.notice_data-attach {
 background-position:0 -328px;
 }
-.form_notice #notice_data-attach {
+.form_notice input.notice_data-attach {
 opacity:0;
 }
 
-.form_notice label[for=notice_data-attach],
+.form_notice label.notice_data-attach,
 #export_data li a.rss,
 #export_data li a.atom,
 #export_data li a.foaf,
diff --git a/theme/identica/css/ie.css b/theme/identica/css/ie.css
index 888c486f40..858cf3e181 100644
--- a/theme/identica/css/ie.css
+++ b/theme/identica/css/ie.css
@@ -16,7 +16,7 @@ background-color:#D9DADB;
 .form_notice .count + label {
 background:transparent url(../../base/images/icons/icons-01.gif) no-repeat 0 -328px;
 }
-.form_notice #notice_data-attach {
+.form_notice input.notice_data-attach {
 filter: alpha(opacity=0);
 }
 .notice-options form.form_favor input.submit {
diff --git a/theme/mnml/css/display.css b/theme/mnml/css/display.css
index 57ad426c55..e7bce84439 100644
--- a/theme/mnml/css/display.css
+++ b/theme/mnml/css/display.css
@@ -234,7 +234,7 @@ p.instructions {
 
 /*-- FORMS --*/
 
-.form_notice label[for=notice_data-attach],
+.form_notice label.notice_data-attach,
 #export_data li a.rss,
 #export_data li a.atom,
 #export_data li a.foaf,
@@ -292,7 +292,7 @@ button.minimize,
 .form_notice label.notice_data-geo.checked {
     background-position:0 -1846px;
 }
-.form_notice label[for=notice_data-attach] {
+.form_notice label.notice_data-attach {
     background-position:0 -328px;
 }
 button.close {
@@ -937,19 +937,19 @@ z-index:2;
 .form_notice label {
 float:left;
 }
-.form_notice label[for=notice_data-attach],
-.form_notice #notice_data-attach {
+.form_notice label.notice_data-attach,
+.form_notice input.notice_data-attach {
 position:absolute;
 top:2em;
 right: 3em;
 cursor:pointer;
 }
-.form_notice label[for=notice_data-attach] {
+.form_notice label.notice_data-attach {
 text-indent:-9999px;
 width:16px;
 height:16px;
 }
-.form_notice #notice_data-attach {
+.form_notice input.notice_data-attach {
 opacity: 0;
 padding:0;
 height:1.6em;
diff --git a/theme/mnml/css/ie.css b/theme/mnml/css/ie.css
index fed65f8b9a..839855aa6f 100644
--- a/theme/mnml/css/ie.css
+++ b/theme/mnml/css/ie.css
@@ -45,7 +45,7 @@ padding:0 4px;
     background:transparent url(../images/icons/icons-01.png) no-repeat 0 -328px;
 }
 
-.form_notice #notice_data-attach {
+.form_notice input.notice_data-attach {
     filter: alpha(opacity=0);
 }
 .form_notice .notice_data-geo_wrap label {
diff --git a/theme/mnml/css/mp-screen.css b/theme/mnml/css/mp-screen.css
index fdee4cdef3..47fdbf5e3b 100644
--- a/theme/mnml/css/mp-screen.css
+++ b/theme/mnml/css/mp-screen.css
@@ -114,7 +114,7 @@ iPhone/iPod Touch, Android, Opera Mini Simulator
 #form_notice label[for="notice_data-attach"] {
 display:none;
 }
-#form_notice #notice_data-attach {
+#form_notice input.notice_data-attach {
 position:static;
 clear:both;
 width:65%;
diff --git a/theme/neo/css/display.css b/theme/neo/css/display.css
index a542ed7609..3d98b09f02 100644
--- a/theme/neo/css/display.css
+++ b/theme/neo/css/display.css
@@ -160,8 +160,7 @@ address {
     border-radius: 6px;
 }
 
-.form_notice label[for=notice_data-attach],
-.form_notice #notice_data-attach {
+.form_notice label.notice_data-attach {
     top: 27px;
     right: 86px;
 }
@@ -434,8 +433,8 @@ td.entity_profile { /* cf directory table */
 
 #entity_remote_subscribe .dialogbox {
     border: 1px solid #7B4E82;
-    border-radius: 8px;
-	-moz-border-radius: 8px;
+    border-radius: 8px;
+	-moz-border-radius: 8px;
 	-webkit-border-radius: 8px;
 }
 
@@ -612,7 +611,7 @@ padding-right:0;
     right: 6px !important;
 }
 
-.realtime-popup .form_notice label[for=notice_data-attach], .realtime-popup .form_notice #notice_data-attach {
+.realtime-popup .form_notice label.notice_data-attach, .realtime-popup .form_notice input.notice_data-attach {
     right: 74px;
     top: 3px !important;
 }
@@ -637,8 +636,8 @@ padding-right:0;
 }
 
 .bookmark-notice-count {
-    border-radius: 4px;
-	-moz-border-radius: 4px;
+    border-radius: 4px;
+	-moz-border-radius: 4px;
 	-webkit-border-radius: 4px;
     padding: 1px 6px;
     font-size: 1.2em;
@@ -676,8 +675,8 @@ padding-right:0;
 }
 
 ul.bookmark-tags a {
-    border-radius: 4px;
-	-moz-border-radius: 4px;
+    border-radius: 4px;
+	-moz-border-radius: 4px;
 	-webkit-border-radius: 4px;
     padding: 1px 6px;
     background: #f2f2f2;
@@ -761,8 +760,8 @@ ul.bookmark-tags a:hover {
 /* Onboard specific styles */
 
 .onboard-flash {
-    border-radius: 6px;
- 	-moz-border-radius: 6px;
+    border-radius: 6px;
+ 	-moz-border-radius: 6px;
    	-webkit-border-radius: 6px;
     font-size: 1.1em;
     box-shadow: 0px 0px 12px rgba(0, 0, 0, 0.5);
diff --git a/theme/neo/css/ie.css b/theme/neo/css/ie.css
index 41f7dc9f88..81d13f443e 100644
--- a/theme/neo/css/ie.css
+++ b/theme/neo/css/ie.css
@@ -22,11 +22,11 @@ display:block;
     width: 106px;
     max-width: 106px;
 }
-.form_notice #notice_data-attach_selected,
+.form_notice input.notice_data-attach_selected,
 .form_notice #notice_data-geo_selected {
 width:78.75%;
 }
-.form_notice #notice_data-attach_selected button,
+.form_notice input.notice_data-attach_selected button,
 .form_notice #notice_data-geo_selected button {
 padding:0 4px;
 }
@@ -65,7 +65,7 @@ line-height:auto;
     color:#FFFFFF;
 }
 
-.form_notice #notice_data-attach {
+.form_notice input.notice_data-attach {
     filter: alpha(opacity=0);
 }
 
diff --git a/theme/neo/css/mp-screen.css b/theme/neo/css/mp-screen.css
index d3f95db9b6..1b7480ecaf 100644
--- a/theme/neo/css/mp-screen.css
+++ b/theme/neo/css/mp-screen.css
@@ -99,7 +99,7 @@ iPhone/iPod Touch, Android, Opera Mini Simulator
 .form_notice label[for="notice_data-attach"] {
 display:none;
 }
-.form_notice #notice_data-attach {
+.form_notice input.notice_data-attach {
 position:static;
 clear:both;
 width:65%;
diff --git a/theme/pigeonthoughts/css/base.css b/theme/pigeonthoughts/css/base.css
index 59cba446ac..2eade7a451 100644
--- a/theme/pigeonthoughts/css/base.css
+++ b/theme/pigeonthoughts/css/base.css
@@ -450,19 +450,24 @@ float:left;
 font-size:1.3em;
 margin-bottom:7px;
 }
-#form_notice label[for=notice_data-attach],
-#form_notice #notice_data-attach {
+#form_notice label.notice_data-attach,
+#form_notice input.notice_data-attach {
 position:absolute;
-top:25px;
 cursor:pointer;
 }
-#form_notice label[for=notice_data-attach] {
+#form_notice label.notice_data-attach {
+top:25px;
+}
+#form_notice input.notice_data-attach {
+top:0;
+}
+#form_notice label.notice_data-attach {
 text-indent:-9999px;
 left:394px;
 width:16px;
 height:16px;
 }
-#form_notice #notice_data-attach {
+#form_notice input.notice_data-attach {
 left:183px;
 padding:0;
 height:16px;
diff --git a/theme/pigeonthoughts/css/display.css b/theme/pigeonthoughts/css/display.css
index b4f2f297b0..3ac0f0bce7 100644
--- a/theme/pigeonthoughts/css/display.css
+++ b/theme/pigeonthoughts/css/display.css
@@ -192,14 +192,14 @@ color:#333333;
 #form_notice.warning .count {
 color:#000000;
 }
-#form_notice label[for=notice_data-attach] {
+#form_notice label.notice_data-attach {
 background-position:0 -328px;
 }
-#form_notice #notice_data-attach {
+#form_notice input.notice_data-attach {
 opacity:0;
 }
 
-.form_notice label[for=notice_data-attach],
+.form_notice label.notice_data-attach,
 #export_data li a.rss,
 #export_data li a.atom,
 #export_data li a.foaf,
diff --git a/theme/rebase/css/display.css b/theme/rebase/css/display.css
index f569131213..810dd70bc1 100644
--- a/theme/rebase/css/display.css
+++ b/theme/rebase/css/display.css
@@ -226,21 +226,28 @@ address .poweredby {
     color: #333 !important;
 }
 
-.form_notice label[for=notice_data-attach],
-.form_notice #notice_data-attach {
+.form_notice label.notice_data-attach,
+.form_notice input.notice_data-attach {
     position:absolute;
+    cursor:pointer;
+}
+.form_notice label.notice_data-attach {
     top: 31px;
     right: 88px;
-    cursor:pointer;
+}
+.form_notice input.notice_data-attach {
+    /* Positioned inside the label */
+    top: 0;
+    right: 0;
 }
 
-.form_notice label[for=notice_data-attach] {
+.form_notice label.notice_data-attach {
     text-indent:-9999px;
     width:16px;
     height:16px;
 }
 
-.form_notice #notice_data-attach {
+.form_notice input.notice_data-attach {
     padding:0;
     height:16px;
 }
@@ -348,7 +355,7 @@ address .poweredby {
     opacity: 1;
 }
 
-.form_notice #notice_data-attach {
+.form_notice input.notice_data-attach {
     opacity:0;
 }
 
@@ -1724,7 +1731,7 @@ body.realtime-popup {
     width: 86px;
 }
 
-.realtime-popup .form_notice label[for=notice_data-attach], .form_notice #notice_data-attach {
+.realtime-popup .form_notice label.notice_data-attach {
     right: 70px;
 }
 
@@ -1734,7 +1741,7 @@ body.realtime-popup {
 
 /* icons */
 
-.form_notice label[for=notice_data-attach],
+.form_notice label.notice_data-attach,
 #export_data li a.rss,
 #export_data li a.atom,
 #export_data li a.foaf,
@@ -1921,7 +1928,7 @@ background-position:0 -1648px;
 #new_group a {
 background-position:0 -1054px;
 }
-.form_notice label[for=notice_data-attach] {
+.form_notice label.notice_data-attach {
     background-position: 0 -328px;
 }
 .form_notice label.notice_data-geo {
diff --git a/theme/rebase/css/ie.css b/theme/rebase/css/ie.css
index 20e038998b..9dfb176698 100644
--- a/theme/rebase/css/ie.css
+++ b/theme/rebase/css/ie.css
@@ -61,7 +61,7 @@ line-height:auto;
     color:#FFFFFF;
 }
 
-.form_notice #notice_data-attach {
+.form_notice input.notice_data-attach {
     filter: alpha(opacity=0);
 }
 
diff --git a/theme/shiny/css/display.css b/theme/shiny/css/display.css
index e027153dd7..32a0a7e255 100644
--- a/theme/shiny/css/display.css
+++ b/theme/shiny/css/display.css
@@ -230,8 +230,8 @@ h6 {font-size: 1em;}
     border: 1px solid #9495b7;
 }
 
-.form_notice label[for=notice_data-attach],
-.form_notice #notice_data-attach {
+.form_notice label.notice_data-attach,
+.form_notice input.notice_data-attach {
     top: 27px;
     right: 86px;
 }
diff --git a/theme/shiny/css/ie.css b/theme/shiny/css/ie.css
index 8145073db5..e916b1e4cc 100644
--- a/theme/shiny/css/ie.css
+++ b/theme/shiny/css/ie.css
@@ -63,7 +63,7 @@ line-height:auto;
     color:#FFFFFF;
 }
 
-.form_notice #notice_data-attach {
+.form_notice input.notice_data-attach {
     filter: alpha(opacity=0);
 }
 
diff --git a/theme/shiny/css/mp-screen.css b/theme/shiny/css/mp-screen.css
index cb899b3557..c23a24b3c9 100644
--- a/theme/shiny/css/mp-screen.css
+++ b/theme/shiny/css/mp-screen.css
@@ -99,7 +99,7 @@ iPhone/iPod Touch, Android, Opera Mini Simulator
 .form_notice label[for="notice_data-attach"] {
 display:none;
 }
-.form_notice #notice_data-attach {
+.form_notice input.notice_data-attach {
 position:static;
 clear:both;
 width:65%;
diff --git a/theme/victorian/css/display.css b/theme/victorian/css/display.css
index 6252fdf908..65d73e96fc 100644
--- a/theme/victorian/css/display.css
+++ b/theme/victorian/css/display.css
@@ -328,15 +328,15 @@ a,
     color:#000000;
 }
 
-.form_notice label[for=notice_data-attach] {
+.form_notice label.notice_data-attach {
     background-position:0 -328px;
 }
 
-.form_notice #notice_data-attach {
+.form_notice input.notice_data-attach {
     opacity:0;
 }
 
-.form_notice label[for=notice_data-attach],
+.form_notice label.notice_data-attach,
 #export_data li a.rss,
 #export_data li a.atom,
 #export_data li a.foaf,
diff --git a/theme/victorian/css/ie.css b/theme/victorian/css/ie.css
index 038195faaf..2befa9cc48 100644
--- a/theme/victorian/css/ie.css
+++ b/theme/victorian/css/ie.css
@@ -9,7 +9,7 @@ background-color:#C8D1D5;
 .form_notice .count + label {
 background:transparent url(../../base/images/icons/icons-01.gif) no-repeat 0 -328px;
 }
-.form_notice #notice_data-attach {
+.form_notice input.notice_data-attach {
 filter: alpha(opacity=0);
 }
 .notice-options form.form_favor input.submit {
diff --git a/theme/victorian/css/mp-screen.css b/theme/victorian/css/mp-screen.css
index 94a534912f..584bfc7c10 100644
--- a/theme/victorian/css/mp-screen.css
+++ b/theme/victorian/css/mp-screen.css
@@ -109,7 +109,7 @@ iPhone/iPod Touch, Android, Opera Mini Simulator
 #form_notice label[for="notice_data-attach"] {
 display:none;
 }
-#form_notice #notice_data-attach {
+#form_notice input.notice_data-attach {
 position:static;
 clear:both;
 width:65%;
-- 
2.39.2