[locationinfo] remove tooltip buttons and use direct text

4 files changed, 128 insertions, 189 deletions

diff --git a/modules-available/locationinfo/style.css b/modules-available/locationinfo/style.css
index b5fffe75..ec6b3dd0 100644
--- a/modules-available/locationinfo/style.css
+++ b/modules-available/locationinfo/style.css
@@ -8,3 +8,7 @@
   -webkit-box-shadow: inset 0 0 0px white;
   box-shadow:         inset 0 0 0px white;
 }
+.spacebottop {
+  margin-bottom: 0.3em;
+  margin-top: 0.5em;
+}
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 () {
diff --git a/modules-available/locationinfo/templates/page-config-panel-summary.html b/modules-available/locationinfo/templates/page-config-panel-summary.html
index 2dc556ce..2d26ad39 100644
--- a/modules-available/locationinfo/templates/page-config-panel-summary.html
+++ b/modules-available/locationinfo/templates/page-config-panel-summary.html
@@ -21,87 +21,77 @@
 
 						<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-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">
 							<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">
-									<a class="btn btn-default helptext" title="{{lang_prettytimeTooltip}}">
-										<span class="glyphicon glyphicon-question-sign"></span>
-									</a>
+								<div class="col-sm-12 small text-muted spacebottop">
+									{{lang_prettytimeTooltip}}
 								</div>
 							</div>
 						</div>
@@ -119,17 +109,15 @@
 
 						<div class="list-group-item">
 							<div class="row">
-								<div class="col-sm-3">
+								<div class="col-sm-4">
 									<label for="form-panelupdate">{{lang_panel}}</label>
 								</div>
-								<div class="col-sm-7">
+								<div class="col-sm-8">
 									<input class="form-control" name="panelupdate" type="number" min="15" id="form-panelupdate"
 											 max="86400" value="{{panelupdate}}" required>
 								</div>
-								<div class="col-sm-2">
-									<p class="btn btn-static helptext" title="{{lang_summaryUpdateIntervalTooltip}}">
-										<span class="glyphicon glyphicon-question-sign"></span>
-									</p>
+								<div class="col-sm-12 small text-muted spacebottop">
+									{{lang_summaryUpdateIntervalTooltip}}
 								</div>
 							</div>
 						</div>
diff --git a/modules-available/locationinfo/templates/page-config-panel-url.html b/modules-available/locationinfo/templates/page-config-panel-url.html
index eb84b2d3..0282826e 100644
--- a/modules-available/locationinfo/templates/page-config-panel-url.html
+++ b/modules-available/locationinfo/templates/page-config-panel-url.html
@@ -18,62 +18,56 @@
 
 				<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="panel-url">{{lang_url}}</label>
 						</div>
-						<div class="col-sm-7">
+						<div class="col-sm-8">
 							<input class="form-control" name="url" id="panel-url" type="text" value="{{url}}"
 									 placeholder="http://www.bwlehrpool.de/" pattern=".*://.*" required>
 						</div>
-						<div class="col-sm-2">
-							<p class="btn btn-static helptext" title="{{lang_urlTooltip}}">
-								<span class="glyphicon glyphicon-question-sign"></span>
-							</p>
+						<div class="col-sm-12 small text-muted spacebottop">
+							{{lang_urlTooltip}}
 						</div>
 					</div>
 				</div>
 
 				<div class="list-group-item">
 					<div class="row">
-						<div class="col-sm-3">
+						<div class="col-sm-4">
 							<label for="input-ssl">{{lang_insecureSsl}}</label>
 						</div>
-						<div class="col-sm-7">
+						<div class="col-sm-8">
 							<div class="checkbox">
 								<input id="input-ssl" type="checkbox" name="insecure-ssl" {{ssl_checked}} value="1">
 								<label></label>
 							</div>
 						</div>
-						<div class="col-sm-2">
-							<p class="btn btn-static helptext" title="{{lang_ignoreSslTooltip}}">
-								<span class="glyphicon glyphicon-question-sign"></span>
-							</p>
+						<div class="col-sm-12 small text-muted spacebottop">
+							{{lang_ignoreSslTooltip}}
 						</div>
 					</div>
 				</div>
 
 				<div class="list-group-item">
 					<div class="row">
-						<div class="col-sm-3">
+						<div class="col-sm-4">
 							<label>{{lang_allowTtySwitch}}</label>
 						</div>
-						<div class="col-sm-7">
+						<div class="col-sm-8">
 							<div class="radio">
 								<input id="tty1" type="radio" name="allow-tty" {{allow-tty__checked}} value="">
 								<label for="tty1">{{lang_useDefault}}</label>
@@ -87,26 +81,22 @@
 								<label for="tty3">{{lang_no}}</label>
 							</div>
 						</div>
-						<div class="col-sm-2">
-							<p class="btn btn-static helptext" title="{{lang_allowTtySwitchTooltip}}">
-								<span class="glyphicon glyphicon-question-sign"></span>
-							</p>
+						<div class="col-sm-12 small text-muted spacebottop">
+							{{lang_allowTtySwitchTooltip}}
 						</div>
 					</div>
 				</div>
 
 				<div class="list-group-item">
 					<div class="row">
-						<div class="col-sm-3">
+						<div class="col-sm-4">
 							<label for="input-reload">{{lang_reloadIntervalMins}}</label>
 						</div>
-						<div class="col-sm-7">
+						<div class="col-sm-8">
 							<input class="form-control" id="input-reload" type="number" min="0" max="999" name="reloadminutes" pattern="\d*" value="{{reloadminutes}}">
 						</div>
-						<div class="col-sm-2">
-							<p class="btn btn-static helptext" title="{{lang_reloadIntervalTooltip}}">
-								<span class="glyphicon glyphicon-question-sign"></span>
-							</p>
+						<div class="col-sm-12 small text-muted spacebottop">
+							{{lang_reloadIntervalTooltip}}
 						</div>
 					</div>
 				</div>
@@ -129,75 +119,67 @@
 
 				<div class="list-group-item">
 					<div class="row">
-						<div class="col-sm-3">
+						<div class="col-sm-4">
 							<label for="split-login">{{lang_splitlogin}}</label>
 						</div>
-						<div class="col-sm-7">
+						<div class="col-sm-8">
 							<div class="checkbox">
 								<input id="split-login" type="checkbox" name="split-login" {{split-login_checked}} value="1">
 								<label></label>
 							</div>
 						</div>
-						<div class="col-sm-2">
-							<p class="btn btn-static helptext" title="{{lang_splitloginTooltip}}">
-								<span class="glyphicon glyphicon-question-sign"></span>
-							</p>
+						<div class="col-sm-12 small text-muted spacebottop">
+							{{lang_splitloginTooltip}}
 						</div>
 					</div>
 				</div>
 
 				<div class="list-group-item">
 					<div class="row">
-						<div class="col-sm-3">
+						<div class="col-sm-4">
 							<label for="browser">{{lang_browser}}</label>
 						</div>
-						<div class="col-sm-7">
+						<div class="col-sm-8">
 							<select class="form-control" name="browser" id="browser" onchange="browserChange()">
 								<option value="slx-browser" id="slx">{{lang_slxbrowser}}</option>
 								<option value="chromium" id="chrome">{{lang_chromium}}</option>
 							</select>
 						</div>
-						<div class="col-sm-2">
-							<p class="btn btn-static helptext" title="{{lang_browserTooltip}}">
-								<span class="glyphicon glyphicon-question-sign"></span>
-							</p>
+						<div class="col-sm-12 small text-muted spacebottop">
+							{{lang_browserTooltip}}
 						</div>
 					</div>
 				</div>
 
 				<div class="list-group-item b0-h">
 					<div class="row">
-						<div class="col-sm-3">
+						<div class="col-sm-4">
 							<label for="interactive">{{lang_interactive}}</label>
 						</div>
-						<div class="col-sm-7">
+						<div class="col-sm-8">
 							<div class="checkbox">
 								<input id="interactive" type="checkbox" name="interactive" {{interactive_checked}} value="1">
 								<label></label>
 							</div>
 						</div>
-						<div class="col-sm-2">
-							<p class="btn btn-static helptext" title="{{lang_interactiveTooltip}}">
-								<span class="glyphicon glyphicon-question-sign"></span>
-							</p>
+						<div class="col-sm-12 small text-muted spacebottop">
+							{{lang_interactiveTooltip}}
 						</div>
 					</div>
 				</div>
 
 				<div class="list-group-item b0-h" id="bookmarks">
 					<div class="row">
-						<div class="col-sm-3">
+						<div class="col-sm-4">
 							<label for="bookmarks">{{lang_bookmarks}}</label>
 						</div>
-						<div class="col-sm-7">
+						<div class="col-sm-8">
 							<button type="button" class="btn btn-success" onclick="addBookmark()">
 								<span class="glyphicon glyphicon-plus"></span>
 							</button>
 						</div>
-						<div class="col-sm-2">
-							<p class="btn btn-static helptext" title="{{lang_bookmarksTooltip}}">
-								<span class="glyphicon glyphicon-question-sign"></span>
-							</p>
+						<div class="col-sm-12 small text-muted spacebottop">
+							{{lang_bookmarksTooltip}}
 						</div>
 					</div>
 					<div class="row" style="margin-top: 1em;" id="bookmarkRow" hidden>