From 7e2509c6afbaf2a89d8df747c8e9ad0f48172221 Mon Sep 17 00:00:00 2001
From: Steffen Ritter
Date: Tue, 6 Feb 2018 16:16:20 +0100
Subject: [locationinfo] Fix styling of tooltip btns also made the style of two
 close btns consistent to the rest

---
 modules-available/locationinfo/style.css           | 10 ++++
 .../templates/ajax-config-location.html            | 14 +++---
 .../locationinfo/templates/ajax-config-server.html | 10 ++--
 .../templates/page-config-panel-default.html       | 54 +++++++++++-----------
 .../templates/page-config-panel-summary.html       | 14 +++---
 .../templates/page-config-panel-url.html           | 18 ++++----
 .../locationinfo/templates/page-locations.html     |  4 +-
 .../locationinfo/templates/page-servers.html       |  2 +-
 .../locationinfo/templates/server-prop-bool.html   |  6 +--
 .../templates/server-prop-dropdown.html            |  6 +--
 .../templates/server-prop-generic.html             |  6 +--
 11 files changed, 78 insertions(+), 66 deletions(-)
 create mode 100644 modules-available/locationinfo/style.css

(limited to 'modules-available/locationinfo')

diff --git a/modules-available/locationinfo/style.css b/modules-available/locationinfo/style.css
new file mode 100644
index 00000000..b5fffe75
--- /dev/null
+++ b/modules-available/locationinfo/style.css
@@ -0,0 +1,10 @@
+.btn-static {
+  background-color: white;
+  border: 1px solid lightgrey;
+  cursor: default;
+}
+.btn-static:active{
+  -moz-box-shadow:    inset 0 0 0px white;
+  -webkit-box-shadow: inset 0 0 0px white;
+  box-shadow:         inset 0 0 0px white;
+}
diff --git a/modules-available/locationinfo/templates/ajax-config-location.html b/modules-available/locationinfo/templates/ajax-config-location.html
index b42ff98d..102a6ea4 100644
--- a/modules-available/locationinfo/templates/ajax-config-location.html
+++ b/modules-available/locationinfo/templates/ajax-config-location.html
@@ -110,9 +110,9 @@
 		</select>
 	</div>
 	<div class="col-sm-2">
-		<a class="btn btn-default helptext" title="{{lang_serverTooltip}}">
+		<p class="btn btn-static helptext" title="{{lang_serverTooltip}}">
 			<span class="glyphicon glyphicon-question-sign"></span>
-		</a>
+		</p>
 	</div>
 </div>
 <div class="row">
@@ -124,9 +124,9 @@
 		</div>
 	</div>
 	<div class="col-sm-2">
-		<a class="btn btn-default helptext" title="{{lang_recursiveSetTooltip}}">
+		<p class="btn btn-static helptext" title="{{lang_recursiveSetTooltip}}">
 			<span class="glyphicon glyphicon-question-sign"></span>
-		</a>
+		</p>
 	</div>
 </div>
 <div class="row">
@@ -137,9 +137,9 @@
 		<input class="form-control" name="serverlocationid" id="serverlocationid" value="{{serverlocationid}}">
 	</div>
 	<div class="col-sm-2">
-		<a class="btn btn-default helptext" title="{{lang_roomIdTooltip}}">
+		<p class="btn btn-static helptext" title="{{lang_roomIdTooltip}}">
 			<span class="glyphicon glyphicon-question-sign"></span>
-		</a>
+		</p>
 	</div>
 </div>
 
@@ -170,7 +170,7 @@
 
 		setTimepicker($('#settings-outer').find('.timepicker2'));
 
-		$('a.helptext').tooltip();
+		$('p.helptext').tooltip();
 
 		$('#new-openingtime').click(function (e) {
 			e.preventDefault();
diff --git a/modules-available/locationinfo/templates/ajax-config-server.html b/modules-available/locationinfo/templates/ajax-config-server.html
index 940bc55a..8c2cb3ba 100644
--- a/modules-available/locationinfo/templates/ajax-config-server.html
+++ b/modules-available/locationinfo/templates/ajax-config-server.html
@@ -12,9 +12,9 @@
 								 form="form-{{currentbackend}}">
 					</div>
 					<div class="col-md-2">
-						<a class="btn btn-default" title="{{lang_nameTooltip}}">
+						<p class="btn btn-static" title="{{lang_nameTooltip}}">
 							<span class="glyphicon glyphicon-question-sign"></span>
-						</a>
+						</p>
 					</div>
 				</div>
 			</div>
@@ -34,9 +34,9 @@
 						</select>
 					</div>
 					<div class="col-md-2">
-						<a class="btn btn-default" id="help-type" title="{{lang_typeTooltip}}">
+						<p class="btn btn-static" id="help-type" title="{{lang_typeTooltip}}">
 							<span class="glyphicon glyphicon-question-sign"></span>
-						</a>
+						</p>
 					</div>
 				</div>
 			</div>
@@ -92,7 +92,7 @@
 		currentBackend = value;
 	}
 
-	$('a.btn[title]').tooltip();
+	$('p.btn[title]').tooltip();
 	$('#myModalSubmitButton').attr('form', 'form-' + currentBackend);
 	$('.settings-bs-switch').bootstrapSwitch({size:'small'});
 
diff --git a/modules-available/locationinfo/templates/page-config-panel-default.html b/modules-available/locationinfo/templates/page-config-panel-default.html
index b55e3d4d..41a8fd00 100644
--- a/modules-available/locationinfo/templates/page-config-panel-default.html
+++ b/modules-available/locationinfo/templates/page-config-panel-default.html
@@ -28,9 +28,9 @@
 									<input class="form-control" name="name" id="panel-title" type="text" value="{{panelname}}">
 								</div>
 								<div class="col-sm-2">
-									<a class="btn btn-default helptext" title="{{lang_displayNameTooltip}}">
+									<p class="btn btn-static helptext" title="{{lang_displayNameTooltip}}">
 										<span class="glyphicon glyphicon-question-sign"></span>
-									</a>
+									</p>
 								</div>
 							</div>
 						</div>
@@ -48,9 +48,9 @@
 									</select>
 								</div>
 								<div class="col-sm-2">
-									<a class="btn btn-default helptext" title="{{lang_languageTooltip}}">
+									<p class="btn btn-static helptext" title="{{lang_languageTooltip}}">
 										<span class="glyphicon glyphicon-question-sign"></span>
-									</a>
+									</p>
 								</div>
 							</div>
 						</div>
@@ -69,9 +69,9 @@
 									</select>
 								</div>
 								<div class="col-sm-2">
-									<a class="btn btn-default helptext" title="{{lang_modeTooltip}}">
+									<p class="btn btn-static helptext" title="{{lang_modeTooltip}}">
 										<span class="glyphicon glyphicon-question-sign"></span>
-									</a>
+									</p>
 								</div>
 							</div>
 						</div>
@@ -85,9 +85,9 @@
 									<input id="input-eco" type="checkbox" name="eco" {{eco_checked}}>
 								</div>
 								<div class="col-sm-2">
-									<a class="btn btn-default helptext" title="{{lang_ecoTooltip}}">
+									<p class="btn btn-static helptext" title="{{lang_ecoTooltip}}">
 										<span class="glyphicon glyphicon-question-sign"></span>
-									</a>
+									</p>
 								</div>
 							</div>
 						</div>
@@ -101,9 +101,9 @@
 									<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}}">
+									<p class="btn btn-static helptext" title="{{lang_prettytimeTooltip}}">
 										<span class="glyphicon glyphicon-question-sign"></span>
-									</a>
+									</p>
 								</div>
 							</div>
 						</div>
@@ -128,9 +128,9 @@
 											 max="1440" value="{{calupdate}}" required>
 								</div>
 								<div class="col-sm-2">
-									<a class="btn btn-default helptext" title="{{lang_calupdateTooltip}}">
+									<p class="btn btn-static helptext" title="{{lang_calupdateTooltip}}">
 										<span class="glyphicon glyphicon-question-sign"></span>
-									</a>
+									</p>
 								</div>
 							</div>
 						</div>
@@ -145,9 +145,9 @@
 											 max="86400" value="{{roomupdate}}" required>
 								</div>
 								<div class="col-sm-2">
-									<a class="btn btn-default helptext" title="{{lang_roomupdateTooltip}}">
+									<p class="btn btn-static helptext" title="{{lang_roomupdateTooltip}}">
 										<span class="glyphicon glyphicon-question-sign"></span>
-									</a>
+									</p>
 								</div>
 							</div>
 						</div>
@@ -177,9 +177,9 @@
 										<input id="input-vertical" type="checkbox" name="vertical" {{vertical_checked}}>
 									</div>
 									<div class="col-sm-2">
-										<a class="btn btn-default helptext" title="{{lang_verticalTooltip}}">
+										<p class="btn btn-static helptext" title="{{lang_verticalTooltip}}">
 											<span class="glyphicon glyphicon-question-sign"></span>
-										</a>
+										</p>
 									</div>
 								</div>
 							</div>
@@ -193,9 +193,9 @@
 										<input id="scaledaysauto" type="checkbox" name="scaledaysauto" {{scaledaysauto_checked}}>
 									</div>
 									<div class="col-sm-2">
-										<a class="btn btn-default helptext" title="{{lang_autoscaleTooltip}}">
+										<p class="btn btn-static helptext" title="{{lang_autoscaleTooltip}}">
 											<span class="glyphicon glyphicon-question-sign"></span>
-										</a>
+										</p>
 									</div>
 								</div>
 							</div>
@@ -217,9 +217,9 @@
 										</select>
 									</div>
 									<div class="col-sm-2">
-										<a class="btn btn-default helptext" title="{{lang_daysToShowTooltip}}">
+										<p class="btn btn-static helptext" title="{{lang_daysToShowTooltip}}">
 											<span class="glyphicon glyphicon-question-sign"></span>
-										</a>
+										</p>
 									</div>
 								</div>
 							</div>
@@ -238,9 +238,9 @@
 										</select>
 									</div>
 									<div class="col-sm-2">
-										<a class="btn btn-default helptext" title="{{lang_rotationTooltip}}">
+										<p class="btn btn-static helptext" title="{{lang_rotationTooltip}}">
 											<span class="glyphicon glyphicon-question-sign"></span>
-										</a>
+										</p>
 									</div>
 								</div>
 							</div>
@@ -255,9 +255,9 @@
 										<input id="input-scale" name="scale" type="range" step="1" min="10" max="90" value="{{scale}}">
 									</div>
 									<div class="col-sm-2">
-										<a class="btn btn-default helptext" title="{{lang_scaleTooltip}}">
+										<p class="btn btn-static helptext" title="{{lang_scaleTooltip}}">
 											<span class="glyphicon glyphicon-question-sign"></span>
-										</a>
+										</p>
 									</div>
 								</div>
 							</div>
@@ -272,9 +272,9 @@
 										<input id="input-switchtime" name="switchtime" type="range" step="1" min="1" max="120" value="{{switchtime}}">
 									</div>
 									<div class="col-sm-2">
-										<a class="btn btn-default helptext" title="{{lang_switchTimeTooltip}}">
+										<p class="btn btn-static helptext" title="{{lang_switchTimeTooltip}}">
 											<span class="glyphicon glyphicon-question-sign"></span>
-										</a>
+										</p>
 									</div>
 								</div>
 							</div>
@@ -338,7 +338,7 @@ document.addEventListener("DOMContentLoaded", function () {
 	var $locInput = $('#locationids');
 
 	// Initialize fancy tooltips
-	$('a.helptext').tooltip();
+	$('p.helptext').tooltip();
 	// Add listener to range sliders so their label can be updated
 	$('input[type="range"]').change(function () {
 		$(this).siblings().find('.range-display').text($(this).val());
diff --git a/modules-available/locationinfo/templates/page-config-panel-summary.html b/modules-available/locationinfo/templates/page-config-panel-summary.html
index 2a968fc2..3dc93680 100644
--- a/modules-available/locationinfo/templates/page-config-panel-summary.html
+++ b/modules-available/locationinfo/templates/page-config-panel-summary.html
@@ -28,9 +28,9 @@
 									<input class="form-control" name="name" id="panel-title" type="text" value="{{panelname}}">
 								</div>
 								<div class="col-sm-2">
-									<a class="btn btn-default helptext" title="{{lang_displayNameTooltip}}">
+									<p class="btn btn-static helptext" title="{{lang_displayNameTooltip}}">
 										<span class="glyphicon glyphicon-question-sign"></span>
-									</a>
+									</p>
 								</div>
 							</div>
 						</div>
@@ -48,9 +48,9 @@
 									</select>
 								</div>
 								<div class="col-sm-2">
-									<a class="btn btn-default helptext" title="{{lang_languageTooltip}}">
+									<p class="btn btn-static helptext" title="{{lang_languageTooltip}}">
 										<span class="glyphicon glyphicon-question-sign"></span>
-									</a>
+									</p>
 								</div>
 							</div>
 						</div>
@@ -64,9 +64,9 @@
 									<input id="input-eco" type="checkbox" name="eco" {{eco_checked}}>
 								</div>
 								<div class="col-sm-2">
-									<a class="btn btn-default helptext" title="{{lang_ecoTooltip}}">
+									<p class="btn btn-static helptext" title="{{lang_ecoTooltip}}">
 										<span class="glyphicon glyphicon-question-sign"></span>
-									</a>
+									</p>
 								</div>
 							</div>
 						</div>
@@ -151,7 +151,7 @@ document.addEventListener("DOMContentLoaded", function () {
 	var $locInput = $('#locationids');
 
 	// Initialize fancy tooltips
-	$('a.helptext').tooltip();
+	$('p.helptext').tooltip();
 	// Add listener to range sliders so their label can be updated
 	$('input[type="range"]').change(function () {
 		$(this).siblings().find('.range-display').text($(this).val());
diff --git a/modules-available/locationinfo/templates/page-config-panel-url.html b/modules-available/locationinfo/templates/page-config-panel-url.html
index cca81509..798ff55d 100644
--- a/modules-available/locationinfo/templates/page-config-panel-url.html
+++ b/modules-available/locationinfo/templates/page-config-panel-url.html
@@ -25,9 +25,9 @@
 							<input class="form-control" name="name" id="panel-title" type="text" value="{{panelname}}">
 						</div>
 						<div class="col-sm-2">
-							<a class="btn btn-default helptext" title="{{lang_displayNameTooltip}}">
+							<p class="btn btn-static helptext" title="{{lang_displayNameTooltip}}">
 								<span class="glyphicon glyphicon-question-sign"></span>
-							</a>
+							</p>
 						</div>
 					</div>
 				</div>
@@ -42,9 +42,9 @@
 									 placeholder="http://www.bwlehrpool.de/" pattern=".*://.*" required>
 						</div>
 						<div class="col-sm-2">
-							<a class="btn btn-default helptext" title="{{lang_urlTooltip}}">
+							<p class="btn btn-static helptext" title="{{lang_urlTooltip}}">
 								<span class="glyphicon glyphicon-question-sign"></span>
-							</a>
+							</p>
 						</div>
 					</div>
 				</div>
@@ -61,9 +61,9 @@
 							</div>
 						</div>
 						<div class="col-sm-2">
-							<a class="btn btn-default helptext" title="{{lang_ignoreSslTooltip}}">
+							<p class="btn btn-static helptext" title="{{lang_ignoreSslTooltip}}">
 								<span class="glyphicon glyphicon-question-sign"></span>
-							</a>
+							</p>
 						</div>
 					</div>
 				</div>
@@ -77,9 +77,9 @@
 							<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">
-							<a class="btn btn-default helptext" title="{{lang_reloadIntervalTooltip}}">
+							<p class="btn btn-static helptext" title="{{lang_reloadIntervalTooltip}}">
 								<span class="glyphicon glyphicon-question-sign"></span>
-							</a>
+							</p>
 						</div>
 					</div>
 				</div>
@@ -95,6 +95,8 @@
 <script type="text/javascript"><!--
 
 document.addEventListener("DOMContentLoaded", function () {
+	// Initialize fancy tooltips
+        $('p.helptext').tooltip();
 
 });
 
diff --git a/modules-available/locationinfo/templates/page-locations.html b/modules-available/locationinfo/templates/page-locations.html
index b30ef2ed..37d8dd96 100644
--- a/modules-available/locationinfo/templates/page-locations.html
+++ b/modules-available/locationinfo/templates/page-locations.html
@@ -50,7 +50,7 @@
 				<div class="modal-body"></div>
 				<div class="modal-footer">
 					<button type="submit" class="btn btn-primary">{{lang_save}}</button>
-					<a class="btn btn-primary" data-dismiss="modal">{{lang_close}}</a>
+					<a class="btn btn-default" data-dismiss="modal">{{lang_close}}</a>
 				</div>
 			</form>
 		</div>
@@ -103,4 +103,4 @@ document.addEventListener("DOMContentLoaded", function () {
 	$('#settings-form').submit(submitLocationSettings);
 });
 
-//--></script>
\ No newline at end of file
+//--></script>
diff --git a/modules-available/locationinfo/templates/page-servers.html b/modules-available/locationinfo/templates/page-servers.html
index eefb1ed5..dbf18b5f 100644
--- a/modules-available/locationinfo/templates/page-servers.html
+++ b/modules-available/locationinfo/templates/page-servers.html
@@ -60,7 +60,7 @@
 			<div class="modal-footer">
 				<button type="submit" id="myModalSubmitButton" class="btn btn-primary" form="">{{lang_save}}</button>
 
-				<a class="btn btn-primary" data-dismiss="modal">{{lang_close}}</a>
+				<a class="btn btn-default" data-dismiss="modal">{{lang_close}}</a>
 			</div>
 		</div>
 
diff --git a/modules-available/locationinfo/templates/server-prop-bool.html b/modules-available/locationinfo/templates/server-prop-bool.html
index f430d02c..bd9dcc64 100644
--- a/modules-available/locationinfo/templates/server-prop-bool.html
+++ b/modules-available/locationinfo/templates/server-prop-bool.html
@@ -7,10 +7,10 @@
 		</div>
 		<div class="col-md-2">
 			{{#helptext}}
-				<a class="btn btn-default" title="{{helptext}}">
+				<p class="btn btn-static" title="{{helptext}}">
 					<span class="glyphicon glyphicon-question-sign"></span>
-				</a>
+				</p>
 			{{/helptext}}
 		</div>
 	</div>
-</div>
\ No newline at end of file
+</div>
diff --git a/modules-available/locationinfo/templates/server-prop-dropdown.html b/modules-available/locationinfo/templates/server-prop-dropdown.html
index 80667766..d1351551 100644
--- a/modules-available/locationinfo/templates/server-prop-dropdown.html
+++ b/modules-available/locationinfo/templates/server-prop-dropdown.html
@@ -10,10 +10,10 @@
 		</div>
 		<div class="col-md-2">
 			{{#helptext}}
-				<a class="btn btn-default" title="{{helptext}}">
+				<p class="btn btn-static" title="{{helptext}}">
 					<span class="glyphicon glyphicon-question-sign"></span>
-				</a>
+				</p>
 			{{/helptext}}
 		</div>
 	</div>
-</div>
\ No newline at end of file
+</div>
diff --git a/modules-available/locationinfo/templates/server-prop-generic.html b/modules-available/locationinfo/templates/server-prop-generic.html
index 9e94c23d..23ff1e4e 100644
--- a/modules-available/locationinfo/templates/server-prop-generic.html
+++ b/modules-available/locationinfo/templates/server-prop-generic.html
@@ -7,10 +7,10 @@
 		</div>
 		<div class="col-md-2">
 			{{#helptext}}
-				<a class="btn btn-default" title="{{helptext}}">
+				<p class="btn btn-static" title="{{helptext}}">
 					<span class="glyphicon glyphicon-question-sign"></span>
-				</a>
+				</p>
 			{{/helptext}}
 		</div>
 	</div>
-</div>
\ No newline at end of file
+</div>
-- 
cgit v1.2.3-55-g7522