From 61ba0aefc424c503877ef2574b1dec822d3ecea9 Mon Sep 17 00:00:00 2001 From: Simon Rettberg Date: Tue, 3 Nov 2020 09:09:22 +0100 Subject: [locationinfo] Clean up styling a bit more --- .../locationinfo/lang/de/template-tags.json | 1 + .../locationinfo/lang/en/template-tags.json | 1 + modules-available/locationinfo/style.css | 12 +- .../templates/ajax-config-location.html | 37 +- .../locationinfo/templates/ajax-config-server.html | 77 ++-- .../templates/page-config-panel-default.html | 442 ++++++++++----------- .../templates/page-config-panel-summary.html | 160 ++++---- .../templates/page-config-panel-url.html | 328 ++++++++------- .../locationinfo/templates/page-locations.html | 4 +- .../locationinfo/templates/page-servers.html | 5 +- .../locationinfo/templates/server-prop-bool.html | 12 +- .../templates/server-prop-dropdown.html | 12 +- .../templates/server-prop-generic.html | 12 +- 13 files changed, 527 insertions(+), 576 deletions(-) diff --git a/modules-available/locationinfo/lang/de/template-tags.json b/modules-available/locationinfo/lang/de/template-tags.json index c9cbe6c8..b376b905 100644 --- a/modules-available/locationinfo/lang/de/template-tags.json +++ b/modules-available/locationinfo/lang/de/template-tags.json @@ -5,6 +5,7 @@ "lang_autoScale": "Auto Tage", "lang_autoscaleTooltip": "Berechnet anhand der Bildschirmbreite die optimale Anzahl an Tagen, die der Kalender anzeigt", "lang_backend": "Backend", + "lang_backendSettings": "Backend konfigurieren", "lang_backends": "Backends", "lang_blacklist": "Blacklist", "lang_bookmarks": "Lesezeichen", diff --git a/modules-available/locationinfo/lang/en/template-tags.json b/modules-available/locationinfo/lang/en/template-tags.json index b4d2a516..27315bea 100644 --- a/modules-available/locationinfo/lang/en/template-tags.json +++ b/modules-available/locationinfo/lang/en/template-tags.json @@ -5,6 +5,7 @@ "lang_autoScale": "Auto Days", "lang_autoscaleTooltip": "Calculates the optimum amount of days to show from the display width", "lang_backend": "Backend", + "lang_backendSettings": "Configure backend", "lang_backends": "Backends", "lang_blacklist": "Blacklist", "lang_bookmarks": "Bookmarks", diff --git a/modules-available/locationinfo/style.css b/modules-available/locationinfo/style.css index ec6b3dd0..dce47c42 100644 --- a/modules-available/locationinfo/style.css +++ b/modules-available/locationinfo/style.css @@ -1,14 +1,4 @@ -.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; -} .spacebottop { - margin-bottom: 0.3em; + margin-bottom: 0; margin-top: 0.5em; } diff --git a/modules-available/locationinfo/templates/ajax-config-location.html b/modules-available/locationinfo/templates/ajax-config-location.html index 2ae049d1..530207f6 100644 --- a/modules-available/locationinfo/templates/ajax-config-location.html +++ b/modules-available/locationinfo/templates/ajax-config-location.html @@ -87,9 +87,8 @@
- - {{lang_goToLocation}} - + {{lang_goToLocation}} +
@@ -97,10 +96,10 @@

{{lang_remoteSchedule}}

-
+
-
+
-
-

- -

+
+ {{lang_serverTooltip}}
-
-
+
+
-
-

- -

+
+ {{lang_recursiveSetTooltip}}
-
+
-
+
-
-

- -

+
+ {{lang_roomIdTooltip}}
@@ -196,8 +189,6 @@ setTimepicker($('#settings-outer').find('.timepicker2')); - $('p.helptext').tooltip(); - $('#new-openingtime').click(function (e) { e.preventDefault(); setTimepicker(newOpeningTime({}).find('.timepicker2')); diff --git a/modules-available/locationinfo/templates/ajax-config-server.html b/modules-available/locationinfo/templates/ajax-config-server.html index 8c2cb3ba..c61927c0 100644 --- a/modules-available/locationinfo/templates/ajax-config-server.html +++ b/modules-available/locationinfo/templates/ajax-config-server.html @@ -1,43 +1,37 @@
{{lang_general}}
-
-
-
-
-
- -
-
- -
-
-

- -

-
+
+
+
+
+ +
+
+ +
+
+ {{lang_nameTooltip}}
-
-
-
- -
-
- -
-
-

- -

-
+
+
+
+
+ +
+
+ +
+
+ {{lang_typeTooltip}}
@@ -57,12 +51,10 @@
{{lang_credentials}}
-
-
- {{#credentials}} - {{{credentialsHtml}}} - {{/credentials}} -
+
+ {{#credentials}} + {{{credentialsHtml}}} + {{/credentials}}
@@ -92,7 +84,6 @@ currentBackend = value; } - $('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 29fd0f16..1ffef408 100644 --- a/modules-available/locationinfo/templates/page-config-panel-default.html +++ b/modules-available/locationinfo/templates/page-config-panel-default.html @@ -20,96 +20,94 @@
{{lang_generalSettings}}
-
-
- -
-
-
- -
-
- -
-
- {{lang_displayNameTooltip}} -
+
+ +
+
+
+ +
+
+ +
+
+ {{lang_displayNameTooltip}}
+
-
-
-
- -
-
- -
-
- {{lang_languageTooltip}} -
+
+
+
+ +
+
+ +
+
+ {{lang_languageTooltip}}
+
-
-
-
- -
-
- -
-
- {{lang_ecoTooltip}} -
+
+
+
+ +
+
+ +
+
+ {{lang_ecoTooltip}}
+
-
-
-
- -
-
- -
-
- {{lang_prettytimeTooltip}} -
+
+
+
+ +
+
+ +
+
+ {{lang_prettytimeTooltip}}
+
-
-
-
- -
-
- -
-
- {{lang_calupdateTooltip}} -
+
+
+
+ +
+
+ +
+
+ {{lang_calupdateTooltip}}
+
-
-
-
- -
-
- -
-
- {{lang_roomupdateTooltip}} -
+
+
+
+ +
+
+ +
+
+ {{lang_roomupdateTooltip}}
@@ -120,177 +118,175 @@
{{lang_mode}}
-
-
-
-
-
- -
-
- -
-
- {{lang_modeTooltip}} -
+
+
+
+
+ +
+
+ +
+
+ {{lang_modeTooltip}}
+
-
-
-
- -
-
- -
-
- {{lang_roomplannerTooltip}} -
+
+
+
+ +
+
+ +
+
+ {{lang_roomplannerTooltip}}
+
-
-
-
- -
-
- -
-
- {{lang_verticalTooltip}} -
+
+
+
+ +
+
+ +
+
+ {{lang_verticalTooltip}}
+
-
-
-
- -
-
- -
-
- {{lang_startDayTooltip}} -
+
+
+
+ +
+
+ +
+
+ {{lang_startDayTooltip}}
+
-
-
-
- -
-
- -
-
- {{lang_autoscaleTooltip}} -
+
+
+
+ +
+
+ +
+
+ {{lang_autoscaleTooltip}}
+
-
-
-
- -
-
- -
-
- {{lang_daysToShowTooltip}} -
+
+
+
+ +
+
+ +
+
+ {{lang_daysToShowTooltip}}
+
-
-
-
- -
-
- -
-
- {{lang_rotationTooltip}} -
+
+
+
+ +
+
+ +
+
+ {{lang_rotationTooltip}}
+
-
-
-
- -
-
- -
-
- {{lang_hostnameTooltip}} -
+
+
+
+ +
+
+ +
+
+ {{lang_hostnameTooltip}}
+
-
-
-
- -
-
-  % - -
-
- {{lang_scaleTooltip}} -
+
+
+
+ +
+
+  % + +
+
+ {{lang_scaleTooltip}}
+
-
-
-
- -
-
-  {{lang_sec}} - -
-
- {{lang_switchTimeTooltip}} -
+
+
+
+ +
+
+  {{lang_sec}} + +
+
+ {{lang_switchTimeTooltip}}
@@ -435,12 +431,12 @@ document.addEventListener("DOMContentLoaded", function () { // Add Panel for overwriting room specific config $owPanels.find('#overrideRoom' + id).remove(); $owPanels.append('
' + - '
' + + '
' + '
' + name + ' {{lang_configOverride}}' + '
' + '' + - '
'); + '
'); // Load content into panel @@ -514,7 +510,7 @@ document.addEventListener("DOMContentLoaded", function () { }); // Append copied content to location specific
- var $panelBody = $('#overrideRoom' + locId).find('div.panel-body'); + var $panelBody = $('#overrideRoom' + locId).find('div.body-dest'); $panelBody.append($contentCopy); // Specific extra stuff needed @@ -534,7 +530,7 @@ document.addEventListener("DOMContentLoaded", function () { } function unloadOverrideContent(id) { - var $panelBody = $('#overrideRoom' + id).find('div.panel-body'); + var $panelBody = $('#overrideRoom' + id).find('div.body-dest'); $panelBody.find('div.list-group').remove(); if (overrides !== null && overrides[id] !== undefined) delete overrides[id] } diff --git a/modules-available/locationinfo/templates/page-config-panel-summary.html b/modules-available/locationinfo/templates/page-config-panel-summary.html index 6af20351..b909f873 100644 --- a/modules-available/locationinfo/templates/page-config-panel-summary.html +++ b/modules-available/locationinfo/templates/page-config-panel-summary.html @@ -16,87 +16,85 @@
{{lang_display}}
-
-
- -
-
-
- -
-
- -
-
- {{lang_displayNameTooltip}} -
+
+ +
+
+
+ +
+
+ +
+
+ {{lang_displayNameTooltip}}
+
-
-
-
- -
-
- -
-
- {{lang_languageTooltip}} -
+
+
+
+ +
+
+ +
+
+ {{lang_languageTooltip}}
+
-
-
-
- -
-
- -
-
- {{lang_ecoTooltip}} -
+
+
+
+ +
+
+ +
+
+ {{lang_ecoTooltip}}
+
-
-
-
- -
-
- -
-
- {{lang_roomplannerTooltip}} -
+
+
+
+ +
+
+ +
+
+ {{lang_roomplannerTooltip}}
+
+-->
@@ -104,25 +102,23 @@
{{lang_updateRates}}
-
-
- -
-
-
- -
-
- -
-
- {{lang_summaryUpdateIntervalTooltip}} -
+
+ +
+
+
+ +
+
+ +
+
+ {{lang_summaryUpdateIntervalTooltip}}
-
+
diff --git a/modules-available/locationinfo/templates/page-config-panel-url.html b/modules-available/locationinfo/templates/page-config-panel-url.html index b17347ad..365e15db 100644 --- a/modules-available/locationinfo/templates/page-config-panel-url.html +++ b/modules-available/locationinfo/templates/page-config-panel-url.html @@ -13,211 +13,209 @@
{{lang_display}}
-
-
+
-
-
-
- -
-
- -
-
- {{lang_displayNameTooltip}} -
+
+
+
+ +
+
+ +
+
+ {{lang_displayNameTooltip}}
+
-
-
-
- -
-
- -
-
- {{lang_urlTooltip}} -
+
+
+
+ +
+
+ +
+
+ {{lang_urlTooltip}}
+
-
-
-
- -
-
-
- - -
-
-
- {{lang_ignoreSslTooltip}} +
+
+
+ +
+
+
+ +
+
+ {{lang_ignoreSslTooltip}} +
+
-
-
-
- +
+
+
+ +
+
+
+ +
-
-
- - -
-
- - -
-
- - -
+
+ +
-
- {{lang_allowTtySwitchTooltip}} +
+ +
+
+ {{lang_allowTtySwitchTooltip}} +
+
-
-
-
- -
-
- -
-
- {{lang_reloadIntervalTooltip}} -
+
+
+
+ +
+
+ +
+
+ {{lang_reloadIntervalTooltip}}
+
-
-
-
- - -
-
- - -
-
-

{{lang_urlListHelp}}

-
+
+
+
+ + +
+
+ + +
+
+ {{lang_urlListHelp}}
+
-
-
-
- -
-
-
- - -
-
-
- {{lang_splitloginTooltip}} +
+
+
+ +
+
+
+ +
+
+ {{lang_splitloginTooltip}} +
+
-
-
-
- -
-
- -
-
- {{lang_browserTooltip}} -
+
+
+
+ +
+
+ +
+
+ {{lang_browserTooltip}}
+
-
-
-
- -
-
-
- - -
-
-
- {{lang_interactiveTooltip}} +
+
+
+ +
+
+
+ +
+
+ {{lang_interactiveTooltip}} +
+
-
-
-
- -
-
- -
-
- {{lang_bookmarksTooltip}} -
+
+
+
+
- +
diff --git a/modules-available/locationinfo/templates/page-locations.html b/modules-available/locationinfo/templates/page-locations.html index 26f0b621..553df648 100644 --- a/modules-available/locationinfo/templates/page-locations.html +++ b/modules-available/locationinfo/templates/page-locations.html @@ -50,7 +50,7 @@ -

+

{{lang_close}} @@ -76,7 +76,7 @@ document.addEventListener("DOMContentLoaded", function () { var locationId = $(this).data('locationid'); var locationName = $(this).text(); $('#location-modal-header').text("[" + locationId + "] " + locationName); - $('#location-modal').modal('show').find('.modal-body').load("?do=locationinfo&action=config-location&id=" + locationId); + $('#location-modal').modal('show').find('.modal-body').text('...').load("?do=locationinfo&action=config-location&id=" + locationId); }); }); diff --git a/modules-available/locationinfo/templates/page-servers.html b/modules-available/locationinfo/templates/page-servers.html index 2f692078..86adecca 100644 --- a/modules-available/locationinfo/templates/page-servers.html +++ b/modules-available/locationinfo/templates/page-servers.html @@ -66,7 +66,7 @@