From 5fa61b2f1fbb280651acfc9a716d6a19c5369d65 Mon Sep 17 00:00:00 2001 From: "matthias@klein0r.de" Date: Fri, 9 Aug 2019 13:52:33 +0200 Subject: [PATCH] Floorplans --- sass/_base.scss | 1 - ...hausautomatisierung_comfloorplanstyle.scss | 30 ++++++++++--------- www/pgm2/hausautomatisierung_com.js | 16 ++++++---- .../hausautomatisierung_comfloorplanstyle.css | 9 +++--- www/pgm2/hausautomatisierung_comstyle.css | 2 +- 5 files changed, 32 insertions(+), 26 deletions(-) diff --git a/sass/_base.scss b/sass/_base.scss index d01e4cc..2b93bcf 100644 --- a/sass/_base.scss +++ b/sass/_base.scss @@ -8,7 +8,6 @@ body { margin: 0 auto; padding: 0; tab-size: 4; - background-size: cover; } div { diff --git a/sass/hausautomatisierung_comfloorplanstyle.scss b/sass/hausautomatisierung_comfloorplanstyle.scss index 8afd543..90047a7 100644 --- a/sass/hausautomatisierung_comfloorplanstyle.scss +++ b/sass/hausautomatisierung_comfloorplanstyle.scss @@ -6,6 +6,7 @@ @import 'vars'; #logo { + color: $primary-color; background: url(../hausautomatisierung-com/images/haus_automatisierung.png) no-repeat; height: 120px; margin-left: 40px; @@ -14,19 +15,28 @@ width: 220px; top: 0; left: 0; - - &:after { - color: $primary-color; - content: $version; + + .theme-version { + opacity: 0.7; + font-weight: bold; + } + + #clock { opacity: 0.7; + position: absolute; + font-weight: bold; + right: 0; + top: 0; } } body { background: #354d69 url(../hausautomatisierung-com/images/bg_wrapper.jpg) no-repeat center 0 fixed; + background-size: cover; + background-position: top center; color: #fff; font-family: 'Open Sans', sans-serif; - font-size: 14px; + font-size: $default-fontsize; margin: 0 auto; padding: 0; tab-size: 4; @@ -124,18 +134,10 @@ img { table { -moz-border-radius: 8px; border-radius: 8px; - + &.dummy { min-width: 100px; } - - a:hover { - font-weight: bold; - } - - &#floorplans tr:nth-child(1) { - display: none; - } } .devicename { diff --git a/www/pgm2/hausautomatisierung_com.js b/www/pgm2/hausautomatisierung_com.js index 80e3dac..7ec0600 100644 --- a/www/pgm2/hausautomatisierung_com.js +++ b/www/pgm2/hausautomatisierung_com.js @@ -65,7 +65,7 @@ jQuery(document).ready(function ($) { ).append( $('') ); - + // Add clock window.addEventListener('load', getClock, false); @@ -165,13 +165,15 @@ jQuery(document).ready(function ($) { elHaToolbar.html("AttrVal('" + deviceName + "', '" + rowVal + "', '');").show(); }); - + + // Group attributes var attrSelect = $('select.attr'); var attrList = new Object(); - attrList['general'] = ['userReadings', 'userattr', 'verbose', 'disable']; + attrList['general'] = ['userattr', 'verbose', 'disable', 'useSetExtensions', 'setList', 'disabledForIntervals', 'showtime']; + attrList['readings'] = ['userReadings', 'oldreadings', 'suppressReading', 'readingList']; attrList['msg'] = ['msgContactAudio', 'msgContactLight', 'msgContactMail', 'msgContactPush', 'msgContactScreen', 'msgParams', 'msgPriority', 'msgRecipient', 'msgRecipientAudio', 'msgRecipientLight', 'msgRecipientMail', 'msgRecipientPush', 'msgRecipientScreen', 'msgRecipientText', 'msgTitle', 'msgTitleShrt', 'msgType']; - attrList['events'] = ['event-aggregator', 'event-min-interval', 'event-on-change-reading', 'event-on-update-reading', 'eventMap']; - attrList['fhemweb'] = ['alias', 'comment', 'devStateIcon', 'devStateStyle', 'group', 'icon', 'room', 'sortby', 'stateFormat', 'webCmd', 'webCmdLabel', 'widgetOverride']; + attrList['events'] = ['event-aggregator', 'event-min-interval', 'event-on-change-reading', 'event-on-update-reading', 'eventMap', 'timestamp-on-change-reading', 'setExtensionsEvent']; + attrList['fhemweb'] = ['alias', 'comment', 'cmdIcon', 'devStateIcon', 'devStateStyle', 'group', 'icon', 'room', 'sortby', 'stateFormat', 'webCmd', 'webCmdLabel', 'widgetOverride']; attrList['floorplan'] = ['fp_arrange', 'fp_backgroundimg', 'fp_default', 'fp_noMenu', 'fp_roomIcons', 'fp_setbutton', 'fp_viewport']; attrList['database'] = ['DbLogExclude', 'DbLogInclude']; @@ -184,6 +186,7 @@ jQuery(document).ready(function ($) { if (attrSelect) { // clear the original list var attributeOptionList = attrSelect.children(); + var selectedItem = attrSelect.find('option:selected'); attrSelect.empty(); // add attributes to predefined optgroups @@ -207,6 +210,9 @@ jQuery(document).ready(function ($) { attrSelect.append(optGroups[optGroup]); } }; + + // select previously selected item + selectedItem.prop('selected', true); } (function($, window, document, undefined) { diff --git a/www/pgm2/hausautomatisierung_comfloorplanstyle.css b/www/pgm2/hausautomatisierung_comfloorplanstyle.css index 52a2874..6a75b86 100644 --- a/www/pgm2/hausautomatisierung_comfloorplanstyle.css +++ b/www/pgm2/hausautomatisierung_comfloorplanstyle.css @@ -17,10 +17,11 @@ a img { border: none; } article, aside, details, figcaption, figure, footer, header, hgroup, main, menu, nav, section, summary { display: block; } -#logo { background: url(../hausautomatisierung-com/images/haus_automatisierung.png) no-repeat; height: 120px; margin-left: 40px; margin-top: 10px; position: fixed; width: 220px; top: 0; left: 0; } -#logo:after { color: #e56524; content: "2.14"; opacity: 0.7; } +#logo { color: #e56524; background: url(../hausautomatisierung-com/images/haus_automatisierung.png) no-repeat; height: 120px; margin-left: 40px; margin-top: 10px; position: fixed; width: 220px; top: 0; left: 0; } +#logo .theme-version { opacity: 0.7; font-weight: bold; } +#logo #clock { opacity: 0.7; position: absolute; font-weight: bold; right: 0; top: 0; } -body { background: #354d69 url(../hausautomatisierung-com/images/bg_wrapper.jpg) no-repeat center 0 fixed; color: #fff; font-family: 'Open Sans', sans-serif; font-size: 14px; margin: 0 auto; padding: 0; tab-size: 4; } +body { background: #354d69 url(../hausautomatisierung-com/images/bg_wrapper.jpg) no-repeat center 0 fixed; background-size: cover; background-position: top center; color: #fff; font-family: 'Open Sans', sans-serif; font-size: 13px; margin: 0 auto; padding: 0; tab-size: 4; } body[id~=Media] { background-color: #A5A5A5; font-family: Arial, sans-serif; font-size: 9px; background-image: url(../icons/Media.bak); background-repeat: no-repeat; } @@ -46,8 +47,6 @@ img { border-style: none; } table { -moz-border-radius: 8px; border-radius: 8px; } table.dummy { min-width: 100px; } -table a:hover { font-weight: bold; } -table#floorplans tr:nth-child(1) { display: none; } .devicename { font-size: 11px; text-align: center; } diff --git a/www/pgm2/hausautomatisierung_comstyle.css b/www/pgm2/hausautomatisierung_comstyle.css index 02d749d..6c6d0cc 100644 --- a/www/pgm2/hausautomatisierung_comstyle.css +++ b/www/pgm2/hausautomatisierung_comstyle.css @@ -18,7 +18,7 @@ a img { border: none; } article, aside, details, figcaption, figure, footer, header, hgroup, main, menu, nav, section, summary { display: block; } /* Author: Matthias Kleine */ -body { background: #354d69 url(../hausautomatisierung-com/images/bg_wrapper.jpg) no-repeat center 0 fixed; background-size: cover; background-position: top center; color: #fff; font-family: 'Open Sans', sans-serif; font-size: 13px; margin: 0 auto; padding: 0; tab-size: 4; background-size: cover; } +body { background: #354d69 url(../hausautomatisierung-com/images/bg_wrapper.jpg) no-repeat center 0 fixed; background-size: cover; background-position: top center; color: #fff; font-family: 'Open Sans', sans-serif; font-size: 13px; margin: 0 auto; padding: 0; tab-size: 4; } div { font-family: 'Open Sans', sans-serif !important; font-size: 13px !important; }