From 01dbee2ba5280d97ddd0bb82217e8b3e7680e67b Mon Sep 17 00:00:00 2001
From: Sarven Capadisli <csarven@status.net>
Date: Thu, 31 Dec 2009 18:41:10 +0000
Subject: Initial UI for geo location share option in notice form

---
 js/util.js                     |  2 +-
 lib/noticeform.php             |  1 +
 theme/base/css/display.css     | 15 +++++++++++++++
 theme/identica/css/display.css |  4 ++++
 4 files changed, 21 insertions(+), 1 deletion(-)

diff --git a/js/util.js b/js/util.js
index 0969ba5e2..dd7a74a7a 100644
--- 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 7ed880442..d35655a0b 100644
--- 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 29c7ee963..d6a50ac60 100644
--- 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 e86ee2437..78a0707ce 100644
--- 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,
-- 
cgit v1.2.3-54-g00ecf