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

2014-12-09 15:09:19 +01:00
parent 42fc104272
commit 242713ebef
6 changed files with 8 additions and 15 deletions
--- 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)'),