[locationinfo] remove tooltip buttons and use direct text

1 files changed, 64 insertions, 99 deletions

diff --git a/modules-available/locationinfo/templates/page-config-panel-default.html b/modules-available/locationinfo/templates/page-config-panel-default.html
index 76e1f4a7..29fd0f16 100644
--- a/modules-available/locationinfo/templates/page-config-panel-default.html
+++ b/modules-available/locationinfo/templates/page-config-panel-default.html
@@ -25,102 +25,90 @@
 
 							<div class="list-group-item">
 								<div class="row">
-									<div class="col-sm-3">
+									<div class="col-sm-4">
 										<label for="panel-title">{{lang_displayName}}</label>
 									</div>
-									<div class="col-sm-7">
+									<div class="col-sm-8">
 										<input class="form-control" name="name" id="panel-title" type="text" value="{{panelname}}">
 									</div>
-									<div class="col-sm-2">
-										<p class="btn btn-static helptext" title="{{lang_displayNameTooltip}}">
-											<span class="glyphicon glyphicon-question-sign"></span>
-										</p>
+									<div class="col-sm-12 small text-muted spacebottop">
+										{{lang_displayNameTooltip}}
 									</div>
 								</div>
 							</div>
 
 							<div class="list-group-item">
 								<div class="row">
-									<div class="col-sm-3">
+									<div class="col-sm-4">
 										<label for="language">{{lang_language}}</label>
 									</div>
-									<div class="col-sm-7">
+									<div class="col-sm-8">
 										<select class="form-control" name="language" id="language">
 											{{#languages}}
 											<option value="{{cc}}" id="lang-{{cc}}" {{selected}}>{{name}}</option>
 											{{/languages}}
 										</select>
 									</div>
-									<div class="col-sm-2">
-										<p class="btn btn-static helptext" title="{{lang_languageTooltip}}">
-											<span class="glyphicon glyphicon-question-sign"></span>
-										</p>
+									<div class="col-sm-12 small text-muted spacebottop">
+										{{lang_languageTooltip}}
 									</div>
 								</div>
 							</div>
 
 							<div class="list-group-item">
 								<div class="row">
-									<div class="col-sm-3">
+									<div class="col-sm-4">
 										<label for="input-eco">{{lang_ecoMode}}</label>
 									</div>
-									<div class="col-sm-7">
+									<div class="col-sm-8">
 										<input id="input-eco" type="checkbox" name="eco" {{eco_checked}}>
 									</div>
-									<div class="col-sm-2">
-										<p class="btn btn-static helptext" title="{{lang_ecoTooltip}}">
-											<span class="glyphicon glyphicon-question-sign"></span>
-										</p>
+									<div class="col-sm-12 small text-muted spacebottop">
+										{{lang_ecoTooltip}}
 									</div>
 								</div>
 							</div>
 
 							<div class="list-group-item">
 								<div class="row">
-									<div class="col-sm-3">
+									<div class="col-sm-4">
 										<label for="input-prettytime">{{lang_prettytime}}</label>
 									</div>
-									<div class="col-sm-7">
+									<div class="col-sm-8">
 										<input id="input-prettytime" type="checkbox" name="prettytime" {{prettytime_checked}}>
 									</div>
-									<div class="col-sm-2">
-										<p class="btn btn-static helptext" title="{{lang_prettytimeTooltip}}">
-											<span class="glyphicon glyphicon-question-sign"></span>
-										</p>
+									<div class="col-sm-12 small text-muted spacebottop">
+										{{lang_prettytimeTooltip}}
 									</div>
 								</div>
 							</div>
 
 							<div class="list-group-item">
 								<div class="row">
-									<div class="col-sm-3">
+									<div class="col-sm-4">
 										<label for="input-calupdate">{{lang_calendarUpdate}}</label>
 									</div>
-									<div class="col-sm-7">
+									<div class="col-sm-8">
 										<input class="form-control" name="calupdate" type="number" min="30" id="input-calupdate"
 												 max="1440" value="{{calupdate}}" required>
 									</div>
-									<div class="col-sm-2">
-										<p class="btn btn-static helptext" title="{{lang_calupdateTooltip}}">
-											<span class="glyphicon glyphicon-question-sign"></span>
-										</p>
+									<div class="col-sm-12 small text-muted spacebottop">
+										{{lang_calupdateTooltip}}
 									</div>
 								</div>
 							</div>
 
 							<div class="list-group-item">
 								<div class="row">
-									<div class="col-sm-3">
+									<div class="col-sm-4">
 										<label for="form-roomupdate">{{lang_roomUpdate}}</label>
 									</div>
-									<div class="col-sm-7">
+									<div class="col-sm-8">
 										<input class="form-control" name="roomupdate" type="number" min="15" id="form-roomupdate"
 												 max="86400" value="{{roomupdate}}" required>
 									</div>
-									<div class="col-sm-2">
-										<p class="btn btn-static helptext" title="{{lang_roomupdateTooltip}}">
-											<span class="glyphicon glyphicon-question-sign"></span>
-										</p>
+									<div class="col-sm-12 small text-muted spacebottop">
+										{{lang_roomupdateTooltip}}
 									</div>
 								</div>
 							</div>
@@ -136,10 +124,10 @@
 						<div class="list-group" id="overridableConfigs">
 							<div class="list-group-item">
 								<div class="row">
-									<div class="col-sm-3">
+									<div class="col-sm-4">
 										<label for="mode">{{lang_mode}}</label>
 									</div>
-									<div class="col-sm-7">
+									<div class="col-sm-8">
 										<select class="form-control" name="mode" id="mode" onchange="modeChange(id)">
 											<option value="1" id="mode1">{{lang_mode1}}</option>
 											<option value="2" id="mode2">{{lang_mode2}}</option>
@@ -147,55 +135,49 @@
 											<option value="4" id="mode4">{{lang_mode4}}</option>
 										</select>
 									</div>
-									<div class="col-sm-2">
-										<p class="btn btn-static helptext" title="{{lang_modeTooltip}}">
-											<span class="glyphicon glyphicon-question-sign"></span>
-										</p>
+									<div class="col-sm-12 small text-muted spacebottop">
+										{{lang_modeTooltip}}
 									</div>
 								</div>
 							</div>
 
 							<div class="list-group-item">
 								<div class="row">
-									<div class="col-sm-3">
+									<div class="col-sm-4">
 										<label for="input-roomplanner">{{lang_useRoomplanner}}</label>
 									</div>
-									<div class="col-sm-7">
+									<div class="col-sm-8">
 										<select class="form-control" name="roomplanner" id="input-roomplanner">
 											<option value="0" id="roomplanner0">{{lang_countIp}}</option>
 											<option value="1" id="roomplanner1">{{lang_countRoomplan}}</option>
 										</select>
 									</div>
-									<div class="col-sm-2">
-										<p class="btn btn-static helptext" title="{{lang_roomplannerTooltip}}">
-											<span class="glyphicon glyphicon-question-sign"></span>
-										</p>
+									<div class="col-sm-12 small text-muted spacebottop">
+										{{lang_roomplannerTooltip}}
 									</div>
 								</div>
 							</div>
 
 							<div class="list-group-item m1-s m2-h m3-h m4-h">
 								<div class="row">
-									<div class="col-sm-3">
+									<div class="col-sm-4">
 										<label for="input-vertical">{{lang_vertical}}</label>
 									</div>
-									<div class="col-sm-7">
+									<div class="col-sm-8">
 										<input id="input-vertical" class="btstrpCheckbox" type="checkbox" name="vertical" {{vertical_checked}}>
 									</div>
-									<div class="col-sm-2">
-										<p class="btn btn-static helptext" title="{{lang_verticalTooltip}}">
-											<span class="glyphicon glyphicon-question-sign"></span>
-										</p>
+									<div class="col-sm-12 small text-muted spacebottop">
+										{{lang_verticalTooltip}}
 									</div>
 								</div>
 							</div>
 
 							<div class="list-group-item m1-s m2-s m3-h m4-s">
 								<div class="row">
-									<div class="col-sm-3">
+									<div class="col-sm-4">
 										<label for="startday">{{lang_startDay}}</label>
 									</div>
-									<div class="col-sm-7">
+									<div class="col-sm-8">
 										<select class="form-control" id="startday" name="startday">
 											<option value="0">{{lang_currentDay}}</option>
 											<option value="1">{{lang_monday}}</option>
@@ -207,36 +189,32 @@
 											<option value="7">{{lang_sunday}}</option>
 										</select>
 									</div>
-									<div class="col-sm-2">
-										<p class="btn btn-static helptext" title="{{lang_startDayTooltip}}">
-											<span class="glyphicon glyphicon-question-sign"></span>
-										</p>
+									<div class="col-sm-12 small text-muted spacebottop">
+										{{lang_startDayTooltip}}
 									</div>
 								</div>
 							</div>
 
 							<div class="list-group-item m1-s m2-s m3-h m4-s">
 								<div class="row">
-									<div class="col-sm-3">
+									<div class="col-sm-4">
 										<label for="scaledaysauto">{{lang_autoScale}}</label>
 									</div>
-									<div class="col-sm-7">
+									<div class="col-sm-8">
 										<input id="scaledaysauto" class="btstrpCheckbox" type="checkbox" name="scaledaysauto" {{scaledaysauto_checked}}>
 									</div>
-									<div class="col-sm-2">
-										<p class="btn btn-static helptext" title="{{lang_autoscaleTooltip}}">
-											<span class="glyphicon glyphicon-question-sign"></span>
-										</p>
+									<div class="col-sm-12 small text-muted spacebottop">
+										{{lang_autoscaleTooltip}}
 									</div>
 								</div>
 							</div>
 
 							<div class="list-group-item m1-s m2-s m3-h m4-s">
 								<div class="row">
-									<div class="col-sm-3">
+									<div class="col-sm-4">
 										<label for="daystoshow">{{lang_daysToShow}}</label>
 									</div>
-									<div class="col-sm-7">
+									<div class="col-sm-8">
 										<select class="form-control" id="daystoshow" name="daystoshow">
 											<option value="1">1</option>
 											<option value="2">2</option>
@@ -247,20 +225,18 @@
 											<option value="7">7</option>
 										</select>
 									</div>
-									<div class="col-sm-2">
-										<p class="btn btn-static helptext" title="{{lang_daysToShowTooltip}}">
-											<span class="glyphicon glyphicon-question-sign"></span>
-										</p>
+									<div class="col-sm-12 small text-muted spacebottop">
+										{{lang_daysToShowTooltip}}
 									</div>
 								</div>
 							</div>
 
 							<div class="list-group-item m1-s m2-h m3-s m4-s">
 								<div class="row">
-									<div class="col-sm-3">
+									<div class="col-sm-4">
 										<label for="rotation">{{lang_rotation}}</label>
 									</div>
-									<div class="col-sm-7">
+									<div class="col-sm-8">
 										<select class="form-control" id="rotation" name="rotation">
 											<option value="0">{{lang_rotation0}}</option>
 											<option value="3">{{lang_rotation3}}</option>
@@ -268,60 +244,52 @@
 											<option value="1">{{lang_rotation1}}</option>
 										</select>
 									</div>
-									<div class="col-sm-2">
-										<p class="btn btn-static helptext" title="{{lang_rotationTooltip}}">
-											<span class="glyphicon glyphicon-question-sign"></span>
-										</p>
+									<div class="col-sm-12 small text-muted spacebottop">
+										{{lang_rotationTooltip}}
 									</div>
 								</div>
 							</div>
 
 							<div class="list-group-item m1-s m2-h m3-s m4-s">
 								<div class="row">
-									<div class="col-sm-3">
+									<div class="col-sm-4">
 										<label for="show-hostname">{{lang_showHostname}}</label>
 									</div>
-									<div class="col-sm-7">
+									<div class="col-sm-8">
 										<input id="show-hostname" class="btstrpCheckbox" type="checkbox" name="hostname" {{hostname_checked}}>
 									</div>
-									<div class="col-sm-2">
-										<p class="btn btn-static helptext" title="{{lang_hostnameTooltip}}">
-											<span class="glyphicon glyphicon-question-sign"></span>
-										</p>
+									<div class="col-sm-12 small text-muted spacebottop">
+										{{lang_hostnameTooltip}}
 									</div>
 								</div>
 							</div>
 
 							<div class="list-group-item m1-s m2-h m3-h m4-h">
 								<div class="row">
-									<div class="col-sm-3">
+									<div class="col-sm-4">
 										<label for="input-scale">{{lang_scale}}</label>
 									</div>
-									<div class="col-sm-7">
+									<div class="col-sm-8">
 										<span><span class="range-display"></span>&thinsp;%</span>
 										<input id="input-scale" name="scale" type="range" step="1" min="10" max="90" value="{{scale}}">
 									</div>
-									<div class="col-sm-2">
-										<p class="btn btn-static helptext" title="{{lang_scaleTooltip}}">
-											<span class="glyphicon glyphicon-question-sign"></span>
-										</p>
+									<div class="col-sm-12 small text-muted spacebottop">
+										{{lang_scaleTooltip}}
 									</div>
 								</div>
 							</div>
 
 							<div class="list-group-item m1-h m2-h m3-h m4-s">
 								<div class="row">
-									<div class="col-sm-3">
+									<div class="col-sm-4">
 										<label for="input-switchtime">{{lang_switchTime}}</label>
 									</div>
-									<div class="col-sm-7">
+									<div class="col-sm-8">
 										<span><span class="range-display"></span>&thinsp;{{lang_sec}}</span>
 										<input id="input-switchtime" name="switchtime" type="range" step="1" min="1" max="120" value="{{switchtime}}">
 									</div>
-									<div class="col-sm-2">
-										<p class="btn btn-static helptext" title="{{lang_switchTimeTooltip}}">
-											<span class="glyphicon glyphicon-question-sign"></span>
-										</p>
+									<div class="col-sm-12 small text-muted spacebottop">
+										{{lang_switchTimeTooltip}}
 									</div>
 								</div>
 							</div>
@@ -400,9 +368,6 @@ document.addEventListener("DOMContentLoaded", function () {
 	var $owPanels = $('#overrideRoomConfigs');
 	var overrides = {{{overrides}}}
 
-	// Initialize fancy tooltips
-	$('p.helptext').tooltip();
-
 	// Add listener to range sliders so their label can be updated
 	var $range = $('input[type="range"]');
 	$range.change(function () {