From 242713ebef71e0e2b6b1666f7c2400b26772ba2d Mon Sep 17 00:00:00 2001
From: marijus <mario@mariovavti.com>
Date: Tue, 9 Dec 2014 15:09:19 +0100
Subject: show clear browser location button only if use browser location
 option is set and minor css fixes

---
 view/css/bootstrap-red.css | 6 ------
 view/css/default.css       | 4 ----
 view/css/widgets.css       | 1 +
 view/tpl/jot-header.tpl    | 2 +-
 view/tpl/jot.tpl           | 8 +++++---
 5 files changed, 7 insertions(+), 14 deletions(-)

(limited to 'view')

diff --git a/view/css/bootstrap-red.css b/view/css/bootstrap-red.css
index 9f93395c9..587ea7b8f 100644
--- a/view/css/bootstrap-red.css
+++ b/view/css/bootstrap-red.css
@@ -1,11 +1,5 @@
 /* override some bootstrap settings */
 
-/* this might be a bug in bootstrap */
-.input-group-addon,
-.input-group-btn {
-	width: unset;
-}
-
 /* nav overrides */
 
 nav .badge {
diff --git a/view/css/default.css b/view/css/default.css
index 40d5cfc59..56173f932 100644
--- a/view/css/default.css
+++ b/view/css/default.css
@@ -23,10 +23,6 @@ aside#region_1 {
 	padding: 65px 7px 0px 7px;
 }
 
-aside input[type='text'] {
-	width: 100%;
-}
-
 section {
 	width: 100%;
 	display: table-cell;
diff --git a/view/css/widgets.css b/view/css/widgets.css
index a24f5fb29..4db87e633 100644
--- a/view/css/widgets.css
+++ b/view/css/widgets.css
@@ -13,6 +13,7 @@
 }
 
 .widget-input {
+	width: 100%;
 	border-top-right-radius: 0px;
 	border-bottom-right-radius: 0px;
 }
diff --git a/view/tpl/jot-header.tpl b/view/tpl/jot-header.tpl
index abf446ba9..bdbb7d09c 100755
--- a/view/tpl/jot-header.tpl
+++ b/view/tpl/jot-header.tpl
@@ -309,7 +309,7 @@ function enableOnUser(){
 
 	function jotClearLocation() {
 		$('#jot-coord').val('');
-		$('#profile-nolocation-wrapper').hide();
+		$('#profile-nolocation-wrapper').attr('disabled', true);
 	}
 
 
diff --git a/view/tpl/jot.tpl b/view/tpl/jot.tpl
index 826a3dd38..8d6b5ff91 100755
--- a/view/tpl/jot.tpl
+++ b/view/tpl/jot.tpl
@@ -56,12 +56,14 @@
 					</button>
 				</div>
 				<div class='btn-group'>
-					<button id="profile-nolocation-wrapper" class="btn btn-default btn-sm" style="display: none;" title="{{$noloc}}" onclick="jotClearLocation();return false;">
-						<i id="profile-nolocation" class="icon-circle-blank jot-icons"></i>
-					</button>
 					<button id="profile-location-wrapper" class="btn btn-default btn-sm" title="{{$setloc}}" onclick="jotGetLocation();return false;">
 						<i id="profile-location" class="icon-globe jot-icons"></i>
 					</button>
+					{{if $noloc}}
+					<button id="profile-nolocation-wrapper" class="btn btn-default btn-sm" style="display: none;" title="{{$noloc}}" onclick="jotClearLocation();return false;">
+						<i id="profile-nolocation" class="icon-circle-blank jot-icons"></i>
+					</button>
+					{{/if}}
 				{{else}}
 				<div class='btn-group'>
 				{{/if}}
-- 
cgit v1.2.3