Initial UI for geo location share option in notice form

diff --git a/js/util.js b/js/util.js
index 0969ba5e2ec9bcfecfdb916e4acdd85be3818a31..dd7a74a7a03d9776b9e1d71ba645bbb45d974c9f 100644 (file)
--- a/js/util.js
+++ b/js/util.js
@@ -455,7 +455,7 @@ var SN = { // StatusNet
                             NLN.remove();
                         }
 
-                        NLE.append('<span id="'+SN.C.S.NoticeLocationName+'">Geo</span>');
+                        NLE.prepend('<span id="'+SN.C.S.NoticeLocationName+'">Geo</span>');
                         NLN = $('#'+SN.C.S.NoticeLocationName);
 
                         if ($('#notice_data-location_enabled').attr('checked') === true) {

diff --git a/lib/noticeform.php b/lib/noticeform.php
index 7ed880442f17b0725648ba1292d82c2a41ae7103..d35655a0b25a63b5534cc68aeffc2f7cd860730e 100644 (file)
--- a/lib/noticeform.php
+++ b/lib/noticeform.php
@@ -208,6 +208,7 @@ class NoticeForm extends Form
                 $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-location_wrap',
+                                                      'class' => 'success',
                                                       'title' => common_local_url('geocode')));
                 $this->out->checkbox('notice_data-location_enabled', _('Share your location'), true);
                 $this->out->elementEnd('div');

diff --git a/theme/base/css/display.css b/theme/base/css/display.css
index 29c7ee963f8a85577e982d7022ebbeb6d74968a3..d6a50ac60f2a7f5fabbc8c35182098cd2f1d575f 100644 (file)
--- a/theme/base/css/display.css
+++ b/theme/base/css/display.css
@@ -566,6 +566,21 @@ overflow:auto;
 float:right;
 font-size:0.8em;
 }
+.form_notice #notice_data-location_wrap input {
+margin-right:7px;
+float:left;
+}
+.form_notice #notice_data-location_wrap label {
+font-weight:normal;
+font-size:1em;
+}
+.form_notice #notice_data-location_name {
+display:block;
+line-height:1.6;
+}
+.form_notice span#notice_data-location_name {
+padding-left:18px;
+}
 
 button.close {
 width:16px;

diff --git a/theme/identica/css/display.css b/theme/identica/css/display.css
index e86ee2437f08e137daff31349d050b7def853fe1..78a0707cee2fdce4da13cc373fc049ef669a22b3 100644 (file)
--- a/theme/identica/css/display.css
+++ b/theme/identica/css/display.css
@@ -111,6 +111,10 @@ box-shadow:3px 3px 3px rgba(194, 194, 194, 0.1);
 text-shadow:none;
 }
 
+.form_notice #notice_data-location_name {
+background-position:0 47%;
+}
+
 a,
 .form_settings input.form_action-primary,
 .notice-options input,