harukin/core
Archived
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

show clear browser location button only if use browser location option is set and minor css fixes

Browse Source
This commit is contained in:
marijus 2014-12-09 15:09:19 +01:00
parent 42fc104272
commit 242713ebef
6 changed files with 8 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
include/conversation.php
View File

@ -1128,7 +1128,7 @@ function status_editor($a,$x,$popup=false) {
'$shortaudio' => t('audio link'), '$shortaudio' => t('audio link'),
'$setloc' => t('Set your location'), '$setloc' => t('Set your location'),
'$shortsetloc' => t('set 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'), '$shortnoloc' => t('clear location'),
'$title' => ((x($x,'title')) ? htmlspecialchars($x['title'], ENT_COMPAT,'UTF-8') : ''), '$title' => ((x($x,'title')) ? htmlspecialchars($x['title'], ENT_COMPAT,'UTF-8') : ''),
'$placeholdertitle' => t('Title (optional)'), '$placeholdertitle' => t('Title (optional)'),

6
view/css/bootstrap-red.css vendored
View File

@ -1,11 +1,5 @@
/* override some bootstrap settings */ /* override some bootstrap settings */
/* this might be a bug in bootstrap */
.input-group-addon,
.input-group-btn {
width: unset;
}
/* nav overrides */ /* nav overrides */
nav .badge { nav .badge {

4
view/css/default.css
View File

@ -23,10 +23,6 @@ aside#region_1 {
padding: 65px 7px 0px 7px; padding: 65px 7px 0px 7px;
} }
aside input[type='text'] {
width: 100%;
}
section { section {
width: 100%; width: 100%;
display: table-cell; display: table-cell;

1
view/css/widgets.css
View File

@ -13,6 +13,7 @@
} }
.widget-input { .widget-input {
width: 100%;
border-top-right-radius: 0px; border-top-right-radius: 0px;
border-bottom-right-radius: 0px; border-bottom-right-radius: 0px;
} }

2
view/tpl/jot-header.tpl
View File

@ -309,7 +309,7 @@ function enableOnUser(){
function jotClearLocation() { function jotClearLocation() {
$('#jot-coord').val(''); $('#jot-coord').val('');
$('#profile-nolocation-wrapper').hide(); $('#profile-nolocation-wrapper').attr('disabled', true);
} }

8
view/tpl/jot.tpl
View File

@ -56,12 +56,14 @@
</button> </button>
</div> </div>
<div class='btn-group'> <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;"> <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> <i id="profile-location" class="icon-globe jot-icons"></i>
</button> </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}} {{else}}
<div class='btn-group'> <div class='btn-group'>
{{/if}} {{/if}}