aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--include/conversation.php2
-rw-r--r--view/css/bootstrap-red.css6
-rw-r--r--view/css/default.css4
-rw-r--r--view/css/widgets.css1
-rwxr-xr-xview/tpl/jot-header.tpl2
-rwxr-xr-xview/tpl/jot.tpl8
6 files changed, 8 insertions, 15 deletions
diff --git a/include/conversation.php b/include/conversation.php
index c8336900f..d0cd81c4a 100644
--- a/include/conversation.php
+++ b/include/conversation.php
@@ -1128,7 +1128,7 @@ function status_editor($a,$x,$popup=false) {
'$shortaudio' => t('audio link'),
'$setloc' => t('Set your location'),
'$shortsetloc' => t('set location'),
- '$noloc' => t('Clear browser location'),
+ '$noloc' => ((get_pconfig($x['profile_uid'],'system','use_browser_location')) ? t('Clear browser location') : ''),
'$shortnoloc' => t('clear location'),
'$title' => ((x($x,'title')) ? htmlspecialchars($x['title'], ENT_COMPAT,'UTF-8') : ''),
'$placeholdertitle' => t('Title (optional)'),
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}}