Skip to content

Commit

Permalink
Floorplans
Browse files Browse the repository at this point in the history
  • Loading branch information
[email protected] authored and [email protected] committed Aug 9, 2019
1 parent 1ead0bf commit 5fa61b2
Show file tree
Hide file tree
Showing 5 changed files with 32 additions and 26 deletions.
1 change: 0 additions & 1 deletion sass/_base.scss
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,6 @@ body {
margin: 0 auto;
padding: 0;
tab-size: 4;
background-size: cover;
}

div {
Expand Down
30 changes: 16 additions & 14 deletions sass/hausautomatisierung_comfloorplanstyle.scss
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand All @@ -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;
Expand Down Expand Up @@ -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 {
Expand Down
16 changes: 11 additions & 5 deletions www/pgm2/hausautomatisierung_com.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -65,7 +65,7 @@ jQuery(document).ready(function ($) {
).append(
$('<span id="clock"></span>')
);

// Add clock
window.addEventListener('load', getClock, false);

Expand Down Expand Up @@ -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'];

Expand All @@ -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
Expand All @@ -207,6 +210,9 @@ jQuery(document).ready(function ($) {
attrSelect.append(optGroups[optGroup]);
}
};

// select previously selected item
selectedItem.prop('selected', true);
}

(function($, window, document, undefined) {
Expand Down
9 changes: 4 additions & 5 deletions www/pgm2/hausautomatisierung_comfloorplanstyle.css
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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; }

Expand All @@ -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; }

Expand Down
2 changes: 1 addition & 1 deletion www/pgm2/hausautomatisierung_comstyle.css
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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; }

Expand Down

0 comments on commit 5fa61b2

Please sign in to comment.