2
0
mirror of https://github.com/fhem/fhem-mirror.git synced 2024-11-22 09:49:50 +00:00

f18.js:smallscreen fixes, fhemweb:autoreload on style change (Forum #82351)

git-svn-id: https://svn.fhem.de/fhem/trunk@17214 2b470e98-0d58-463d-a4d8-8e2adae1ed80
This commit is contained in:
rudolfkoenig 2018-08-26 12:24:57 +00:00
parent 0d70ab06ca
commit a67d122947
7 changed files with 324 additions and 151 deletions

View File

@ -221,7 +221,8 @@ SVG_FwFn($$$$)
my $hash = $defs{$d};
my $ret = "";
my $isFirst = (!$pageHash || !$pageHash->{index} || $pageHash->{index} == 1);
my $isFirst = (!$pageHash || !$pageHash->{svgLoaded});
$pageHash->{svgLoaded} = 1 if($pageHash);
$ret .= "<script type='text/javascript' src='$FW_ME/pgm2/svg.js'></script>"
if($isFirst);

View File

@ -1,2 +1,2 @@
#Mon Aug 26 17:59:14 2013
{"lcCinema":{"Break":{"CeilingLight":"dim37%","ReadingLight":"dim37%"},"Cinema":{"CeilingLight":"off","Projector":"on","Screen":"down","ReadingLight":"off","TV":"off"},"WatchTV":{"CeilingLight":"off","Projector":"off","Screen":"up","ReadingLight":"dim12%","TV":"on"},"AllOff":{"CeilingLight":"off","Projector":"off","Screen":"up","ReadingLight":"off","TV":"off"}}}
#Sun Aug 26 12:32:29 2018
{"lcCinema":{"Break":{"ReadingLight":"dim37%","CeilingLight":"dim37%"},"Cinema":{"Projector":"on","ReadingLight":"off","TV":"off","Screen":"down","CeilingLight":"off"},"AllOff":{"CeilingLight":"off","Screen":"up","TV":"off","ReadingLight":"off","Projector":"off"},"WatchTV":{"TV":"on","Projector":"off","ReadingLight":"dim12%","Screen":"up","CeilingLight":"off"}}}

View File

@ -1,16 +1,16 @@
#Sun Jul 15 15:31:10 2018
#Sun Aug 26 12:32:29 2018
setstate Alarm on
setstate Alarm 2015-01-04 16:22:21 state on
setstate AllLights on
setstate AllLights 2015-01-04 16:22:04 LastDevice Alarm
setstate AllLights 2015-01-04 16:22:04 LastDevice_Abs Alarm
setstate AllLights 2015-01-04 16:22:04 state undefined
setstate AllLights undefined
setstate AllLights 2018-08-26 08:08:39 LastDevice Office
setstate AllLights 2018-08-26 08:08:39 LastDevice_Abs Office
setstate AllLights 2018-08-26 08:08:39 state undefined
setstate AllResidentsAway active
setstate AllResidentsAway 2018-07-15 15:27:23 state active
setstate AllResidentsAway 2018-08-25 21:11:31 state active
setstate CT off
setstate CT 2015-01-03 01:10:50 ct 3703
setstate CT 2015-01-04 13:30:52 lastCmd off
setstate CT 2018-07-15 15:27:23 state off
setstate CT 2018-08-25 21:11:31 state off
setstate CeilingLight dim0%
setstate CeilingLight 2015-01-04 16:22:40 state off
setstate Cellar T: 21.1 H: 54.6
@ -31,7 +31,7 @@ setstate Garden 2013-08-13 15:03:17 israining no
setstate Garden 2013-08-13 15:03:17 rain 81.9
setstate Garden 2013-08-13 15:03:17 rain_raw 321
setstate Garden 2013-08-13 15:03:17 rain_raw_adj 321
setstate Garden 2018-07-15 15:27:23 state defined
setstate Garden 2018-08-25 21:11:31 state defined
setstate Garden 2013-08-13 15:03:17 temperature 18.3
setstate Garden 2013-08-13 15:03:17 tsecs 1376805797
setstate Garden 2013-08-13 15:03:17 unknown1 a
@ -46,7 +46,7 @@ setstate Log.Garden active
setstate Log.Predicted active
setstate Logfile active
setstate Office on
setstate Office 2015-01-04 16:22:21 state on
setstate Office 2018-08-26 08:08:39 state on
setstate Outdoor on
setstate Outdoor 2015-01-04 16:22:21 state on
setstate Projector off
@ -55,11 +55,11 @@ setstate RGB off
setstate RGB 2015-01-04 12:55:47 hue 220
setstate RGB 2015-01-04 13:30:54 lastCmd off
setstate RGB 2015-01-04 12:55:47 rgb 0054FF
setstate RGB 2018-07-15 15:27:23 state off
setstate RGB 2018-08-25 21:11:31 state off
setstate ReadingLight dim0%
setstate ReadingLight 2015-01-04 16:22:40 state off
setstate ResidentsComeHome active
setstate ResidentsComeHome 2018-07-15 15:27:23 state active
setstate ResidentsComeHome 2018-08-25 21:11:31 state active
setstate SVG_01_Garden initialized
setstate SVG_02_Cellar initialized
setstate SVG_03_Dewpoint initialized
@ -69,19 +69,20 @@ setstate Screen up
setstate Screen 2015-01-04 16:22:40 state up
setstate TV off
setstate TV 2015-01-04 16:22:40 state off
setstate WEB 2018-08-25 21:11:31 state Initialized
setstate Weather.weblink initialized
setstate autocreate active
setstate colorInit 2018-07-15 15:27:23
setstate colorInit 2018-07-15 15:27:23 state active
setstate colorInit 2018-08-25 21:11:31
setstate colorInit 2018-08-25 21:11:31 state active
setstate dew_all active
setstate eventTypes active
setstate global no definition
setstate lcCinema 2015-01-04 16:22:40 state AllOff
setstate outdoorNotifier active
setstate outdoorNotifier 2018-07-15 15:27:23 state active
setstate outdoorNotifier 2018-08-25 21:11:31 state active
setstate rg_Guest1 none
setstate rg_Guest1 2018-07-15 15:30:38 durTimerAbsence 38640:21:18
setstate rg_Guest1 2018-07-15 15:30:38 durTimerAbsence_cr 2318421
setstate rg_Guest1 2018-08-26 12:31:35 durTimerAbsence 39645:22:15
setstate rg_Guest1 2018-08-26 12:31:35 durTimerAbsence_cr 2378722
setstate rg_Guest1 2015-01-04 16:19:19 durTimerPresence 00:00:00
setstate rg_Guest1 2015-01-04 16:19:19 durTimerPresence_cr 0
setstate rg_Guest1 2015-01-04 16:19:19 durTimerSleep 00:00:00
@ -102,8 +103,8 @@ setstate rg_Guest1 2014-02-16 14:09:20 presence absent
setstate rg_Guest1 2014-02-16 14:09:20 state none
setstate rg_Guest1 2014-02-15 16:16:27 wayhome 0
setstate rg_Guest2 none
setstate rg_Guest2 2018-07-15 15:30:38 durTimerAbsence 38640:29:53
setstate rg_Guest2 2018-07-15 15:30:38 durTimerAbsence_cr 2318430
setstate rg_Guest2 2018-08-26 12:31:35 durTimerAbsence 39645:30:50
setstate rg_Guest2 2018-08-26 12:31:35 durTimerAbsence_cr 2378731
setstate rg_Guest2 2015-01-04 16:19:19 durTimerPresence 00:00:00
setstate rg_Guest2 2015-01-04 16:19:19 durTimerPresence_cr 0
setstate rg_Guest2 2015-01-04 16:19:19 durTimerSleep 00:00:00
@ -126,8 +127,8 @@ setstate rg_Guest2 2014-02-15 16:16:29 wayhome 0
setstate rgr_Children home
setstate rgr_Children 2018-07-15 15:19:54 durTimerAbsence 00:00:00
setstate rgr_Children 2018-07-15 15:19:54 durTimerAbsence_cr 0
setstate rgr_Children 2018-07-15 15:30:38 durTimerPresence 38639:59:33
setstate rgr_Children 2018-07-15 15:30:38 durTimerPresence_cr 2318400
setstate rgr_Children 2018-08-26 12:31:35 durTimerPresence 39645:00:30
setstate rgr_Children 2018-08-26 12:31:35 durTimerPresence_cr 2378701
setstate rgr_Children 2018-07-15 15:19:54 durTimerSleep 00:00:00
setstate rgr_Children 2018-07-15 15:19:54 durTimerSleep_cr 0
setstate rgr_Children 2015-01-04 16:19:19 lastActivity gone
@ -154,8 +155,8 @@ setstate rgr_Children 2014-02-16 14:58:01 residentsTotalPresent 1
setstate rgr_Children 2014-02-15 16:16:25 residentsTotalWayhome 0
setstate rgr_Children 2014-02-17 20:45:12 state home
setstate rgr_Guests none
setstate rgr_Guests 2018-07-15 15:30:38 durTimerAbsence 38640:21:18
setstate rgr_Guests 2018-07-15 15:30:38 durTimerAbsence_cr 2318421
setstate rgr_Guests 2018-08-26 12:31:35 durTimerAbsence 39645:22:15
setstate rgr_Guests 2018-08-26 12:31:35 durTimerAbsence_cr 2378722
setstate rgr_Guests 2018-07-15 15:19:54 durTimerPresence 00:00:00
setstate rgr_Guests 2018-07-15 15:19:54 durTimerPresence_cr 0
setstate rgr_Guests 2018-07-15 15:19:54 durTimerSleep 00:00:00
@ -183,8 +184,8 @@ setstate rgr_Guests 2014-02-16 14:09:20 state none
setstate rgr_Parents home
setstate rgr_Parents 2018-07-15 15:19:54 durTimerAbsence 00:00:00
setstate rgr_Parents 2018-07-15 15:19:54 durTimerAbsence_cr 0
setstate rgr_Parents 2018-07-15 15:30:38 durTimerPresence 38640:14:21
setstate rgr_Parents 2018-07-15 15:30:38 durTimerPresence_cr 2318414
setstate rgr_Parents 2018-08-26 12:31:35 durTimerPresence 39645:15:18
setstate rgr_Parents 2018-08-26 12:31:35 durTimerPresence_cr 2378715
setstate rgr_Parents 2018-07-15 15:19:54 durTimerSleep 00:00:00
setstate rgr_Parents 2018-07-15 15:19:54 durTimerSleep_cr 0
setstate rgr_Parents 2015-01-04 16:19:19 lastActivity gone
@ -213,8 +214,8 @@ setstate rgr_Parents 2014-02-16 14:16:17 state home
setstate rgr_Residents home
setstate rgr_Residents 2018-07-15 15:19:54 durTimerAbsence 00:00:00
setstate rgr_Residents 2018-07-15 15:19:54 durTimerAbsence_cr 0
setstate rgr_Residents 2018-07-15 15:30:38 durTimerPresence 38640:14:21
setstate rgr_Residents 2018-07-15 15:30:38 durTimerPresence_cr 2318414
setstate rgr_Residents 2018-08-26 12:31:35 durTimerPresence 39645:15:18
setstate rgr_Residents 2018-08-26 12:31:35 durTimerPresence_cr 2378715
setstate rgr_Residents 2018-07-15 15:19:54 durTimerSleep 00:00:00
setstate rgr_Residents 2018-07-15 15:19:54 durTimerSleep_cr 0
setstate rgr_Residents 2015-01-04 16:19:19 lastActivity gone
@ -243,8 +244,8 @@ setstate rgr_Residents 2014-02-16 14:16:17 state home
setstate rr_Baby home
setstate rr_Baby 2015-01-04 16:19:19 durTimerAbsence 00:00:00
setstate rr_Baby 2015-01-04 16:19:19 durTimerAbsence_cr 0
setstate rr_Baby 2018-07-15 15:30:38 durTimerPresence 38640:00:17
setstate rr_Baby 2018-07-15 15:30:38 durTimerPresence_cr 2318400
setstate rr_Baby 2018-08-26 12:31:35 durTimerPresence 39645:01:14
setstate rr_Baby 2018-08-26 12:31:35 durTimerPresence_cr 2378701
setstate rr_Baby 2015-01-04 16:19:19 durTimerSleep 00:00:00
setstate rr_Baby 2015-01-04 16:19:19 durTimerSleep_cr 0
setstate rr_Baby 2014-02-16 14:30:21 lastArrival 2014-02-16 14:30:21
@ -261,8 +262,8 @@ setstate rr_Baby 2014-02-16 14:30:21 presence present
setstate rr_Baby 2014-02-17 20:45:12 state home
setstate rr_Baby 2014-02-16 14:30:21 wayhome 0
setstate rr_Daughter gone
setstate rr_Daughter 2018-07-15 15:30:38 durTimerAbsence 38639:32:39
setstate rr_Daughter 2018-07-15 15:30:38 durTimerAbsence_cr 2318373
setstate rr_Daughter 2018-08-26 12:31:35 durTimerAbsence 39644:33:36
setstate rr_Daughter 2018-08-26 12:31:35 durTimerAbsence_cr 2378674
setstate rr_Daughter 2015-01-04 16:19:19 durTimerPresence 00:00:00
setstate rr_Daughter 2015-01-04 16:19:19 durTimerPresence_cr 0
setstate rr_Daughter 2015-01-04 16:19:19 durTimerSleep 00:00:00
@ -283,8 +284,8 @@ setstate rr_Daughter 2014-02-16 14:57:59 presence absent
setstate rr_Daughter 2015-01-04 16:19:19 state gone
setstate rr_Daughter 2014-02-16 13:46:26 wayhome 0
setstate rr_Father gone
setstate rr_Father 2018-07-15 15:30:38 durTimerAbsence 38640:03:46
setstate rr_Father 2018-07-15 15:30:38 durTimerAbsence_cr 2318404
setstate rr_Father 2018-08-26 12:31:35 durTimerAbsence 39645:04:43
setstate rr_Father 2018-08-26 12:31:35 durTimerAbsence_cr 2378705
setstate rr_Father 2015-01-04 16:19:19 durTimerPresence 00:00:00
setstate rr_Father 2015-01-04 16:19:19 durTimerPresence_cr 0
setstate rr_Father 2015-01-04 16:19:19 durTimerSleep 00:00:00
@ -304,8 +305,8 @@ setstate rr_Father 2014-02-16 13:46:02 wayhome 0
setstate rr_Mother home
setstate rr_Mother 2015-01-04 16:19:19 durTimerAbsence 00:00:00
setstate rr_Mother 2015-01-04 16:19:19 durTimerAbsence_cr 0
setstate rr_Mother 2018-07-15 15:30:38 durTimerPresence 38640:14:21
setstate rr_Mother 2018-07-15 15:30:38 durTimerPresence_cr 2318414
setstate rr_Mother 2018-08-26 12:31:35 durTimerPresence 39645:15:18
setstate rr_Mother 2018-08-26 12:31:35 durTimerPresence_cr 2378715
setstate rr_Mother 2015-01-04 16:19:19 durTimerSleep 00:00:00
setstate rr_Mother 2015-01-04 16:19:19 durTimerSleep_cr 0
setstate rr_Mother 2014-02-16 14:16:17 lastArrival 2014-02-16 14:16:17
@ -321,8 +322,8 @@ setstate rr_Mother 2014-02-16 14:16:17 presence present
setstate rr_Mother 2014-02-16 14:16:17 state home
setstate rr_Mother 2014-02-16 13:46:09 wayhome 0
setstate rr_Son gone
setstate rr_Son 2018-07-15 15:30:38 durTimerAbsence 38639:32:37
setstate rr_Son 2018-07-15 15:30:38 durTimerAbsence_cr 2318373
setstate rr_Son 2018-08-26 12:31:35 durTimerAbsence 39644:33:34
setstate rr_Son 2018-08-26 12:31:35 durTimerAbsence_cr 2378674
setstate rr_Son 2015-01-04 16:19:19 durTimerPresence 00:00:00
setstate rr_Son 2015-01-04 16:19:19 durTimerPresence_cr 0
setstate rr_Son 2015-01-04 16:19:19 durTimerSleep 00:00:00
@ -342,8 +343,9 @@ setstate rr_Son 2014-02-16 14:58:01 mood -
setstate rr_Son 2014-02-16 14:58:01 presence absent
setstate rr_Son 2015-01-04 16:19:19 state gone
setstate rr_Son 2014-02-16 13:46:38 wayhome 0
setstate sunRise Next: 04:50:28
setstate sunRise 2018-07-15 15:27:23 state Next: 04:50:28
setstate sunSet Next: 22:12:30
setstate sunSet 2018-07-15 15:27:23 state Next: 22:12:30
setstate sunRise Next: 05:57:09
setstate sunRise 2018-08-26 08:08:39 state Next: 05:57:09
setstate sunSet Next: 20:57:55
setstate sunSet 2018-08-25 21:11:31 state Next: 20:57:55
setstate telnetPort 2018-08-25 21:11:31 state Initialized
setstate wlCinema initialized

View File

@ -4,7 +4,12 @@ attr global autosave 0
attr global backup_before_update 0
attr global logfile -
attr global modpath .
attr global motd
attr global motd SecurityCheck:\
WEB is not password protected\
telnetPort is not password protected\
\
Protect this FHEM installation by defining an allowed device with define allowed allowed\
You can disable this message with attr global motd none
attr global mseclog 1
attr global room System
attr global sendStatistics never
@ -37,17 +42,113 @@ attr WEB styleData {\
"fixedInput": true,\
"hidePin": true,\
"showDragger": false,\
"Pos.Room_Bla_svgZoomControl": {\
"left": 412,\
"top": 308,\
"width": 1566,\
"height": 0,\
"oTop": 0,\
"oLeft": 0\
},\
"Pos.Room_Bla_SVG_01_Garden": {\
"left": 0,\
"top": 218,\
"width": 1566,\
"height": 164,\
"oTop": -164,\
"oLeft": 0\
},\
"Pos.Room_Bla_SVG_05_Polar": {\
"left": 0,\
"top": 540,\
"width": 1566,\
"height": 304,\
"oTop": -304,\
"oLeft": 0\
},\
"Pos.Room_Sensors_grp_FileLog": {\
"left": 600,\
"top": 0,\
"width": 260,\
"height": 138,\
"oTop": 20,\
"oLeft": 0\
},\
"Pos.Room_Sensors_grp_Helper": {\
"left": 40,\
"top": -20,\
"width": 260,\
"height": 40,\
"oTop": 40,\
"oLeft": 0\
},\
"Pos.Room_Sensors_grp_Sensors": {\
"left": 40,\
"top": 60,\
"width": 260,\
"height": 60,\
"oTop": 40,\
"oLeft": 0\
},\
"Pos.Room_Sensors_svgZoomControl": {\
"left": 100,\
"top": 220,\
"width": 1580,\
"height": 0,\
"oTop": 0,\
"oLeft": 0\
},\
"Pos.Room_Sensors_SVG_01_Garden": {\
"left": 0,\
"top": 660,\
"width": 1580,\
"height": 180,\
"oTop": -164,\
"oLeft": 0\
},\
"Pos.Room_Sensors_SVG_02_Cellar": {\
"left": 0,\
"top": 840,\
"width": 1580,\
"height": 180,\
"oTop": -164,\
"oLeft": 0\
},\
"Pos.Room_Sensors_SVG_03_Dewpoint": {\
"left": 0,\
"top": 480,\
"width": 1580,\
"height": 180,\
"oTop": -164,\
"oLeft": 0\
},\
"Pos.Room_Sensors_SVG_04_Sun": {\
"left": 0,\
"top": 1020,\
"width": 1580,\
"height": 180,\
"oTop": -164,\
"oLeft": 0\
},\
"Pos.Room_Sensors_SVG_05_Polar": {\
"left": 280,\
"top": 300,\
"width": 340,\
"height": 320,\
"oTop": -304,\
"oLeft": 0\
},\
"Pos.style_list_Styles": {\
"left": 20,\
"top": 0,\
"width": 240,\
"height": 260,\
"height": 300,\
"oTop": 20,\
"oLeft": 0\
},\
"Pos.style_list_f18_special": {\
"left": 20,\
"top": 280,\
"top": 320,\
"width": 240,\
"height": 140,\
"oTop": 40,\
@ -57,153 +158,209 @@ attr WEB styleData {\
"left": 280,\
"top": -20,\
"width": 240,\
"height": 400,\
"height": 480,\
"oTop": 40,\
"oLeft": 0\
},\
"Pos.Room_Light_grp_Color_Lights": {\
"left": 0,\
"top": 0,\
"width": 860,\
"height": 80,\
"oTop": 21,\
"oLeft": 1\
},\
"Pos.Room_Light_grp_Notify": {\
"left": 420,\
"top": 300,\
"width": 440,\
"height": 38,\
"oTop": 41,\
"oLeft": 1\
},\
"Pos.Room_Light_grp_Single_Lights": {\
"left": 0,\
"top": 100,\
"width": 400,\
"height": 240,\
"oTop": 41,\
"oLeft": 1\
},\
"Pos.Room_Light_grp_Structure": {\
"left": 420,\
"top": 220,\
"width": 440,\
"height": 38,\
"oTop": 41,\
"oLeft": 1\
},\
"Pos.Room_Light_grp_Timer": {\
"left": 420,\
"top": 100,\
"width": 440,\
"height": 78,\
"oTop": 41,\
"oLeft": 1\
},\
"snapToGrid": true,\
"Pos.Room_Cinema_grp_AV": {\
"left": 0,\
"top": 0,\
"width": 560,\
"height": 120,\
"oTop": 21,\
"oLeft": 1\
"oTop": 20,\
"oLeft": 0\
},\
"Pos.Room_Cinema_grp_Control": {\
"left": 0,\
"top": 140,\
"width": 560,\
"height": 40,\
"oTop": 41,\
"oLeft": 1\
"oTop": 40,\
"oLeft": 0\
},\
"Pos.Room_Cinema_grp_Light": {\
"left": 0,\
"top": 220,\
"width": 560,\
"height": 78,\
"oTop": 41,\
"oLeft": 1\
"height": 80,\
"oTop": 40,\
"oLeft": 0\
},\
"Pos.Room_Cinema_grp_Scenes": {\
"left": 0,\
"top": 360,\
"width": 560,\
"height": 180,\
"oTop": 24,\
"height": 198,\
"oTop": 20,\
"oLeft": 0\
},\
"Pos.Room_Sensors_grp_FileLog": {\
"Pos.Room_Residents_grp_Baby": {\
"left": 0,\
"top": 0,\
"width": 260,\
"height": 120,\
"oTop": 21,\
"oLeft": 1\
"width": 280,\
"height": 40,\
"oTop": 20,\
"oLeft": 0\
},\
"Pos.Room_Sensors_grp_Helper": {\
"Pos.Room_Residents_grp_Daughter": {\
"left": 0,\
"top": 60,\
"width": 280,\
"height": 40,\
"oTop": 40,\
"oLeft": 0\
},\
"Pos.Room_Residents_grp_Father": {\
"left": 0,\
"top": 300,\
"width": 280,\
"height": 60,\
"oTop": 40,\
"oLeft": 0\
},\
"Pos.Room_Residents_grp_Guests": {\
"left": 300,\
"top": 180,\
"width": 280,\
"height": 80,\
"oTop": 40,\
"oLeft": 0\
},\
"Pos.Room_Residents_grp_Home_State": {\
"left": 300,\
"top": -20,\
"width": 280,\
"height": 160,\
"oTop": 40,\
"oLeft": 0\
},\
"Pos.Room_Residents_grp_Mother": {\
"left": 0,\
"top": 220,\
"width": 280,\
"height": 40,\
"oTop": 40,\
"oLeft": 0\
},\
"Pos.Room_Residents_grp_Son": {\
"left": 0,\
"top": 140,\
"width": 260,\
"height": 20,\
"oTop": 41,\
"oLeft": 1\
"width": 280,\
"height": 40,\
"oTop": 40,\
"oLeft": 0\
},\
"Pos.Room_Sensors_grp_Sensors": {\
"Pos.Room_Residents_grp_notify": {\
"left": 300,\
"top": 300,\
"width": 280,\
"height": 58,\
"oTop": 40,\
"oLeft": 0\
},\
"Pos.Room_undefined_grp_Color_Lights": {\
"left": 0,\
"top": 0,\
"width": 640,\
"height": 100,\
"oTop": 20,\
"oLeft": 0\
},\
"Pos.Room_undefined_grp_Notify": {\
"left": 0,\
"top": 120,\
"width": 440,\
"height": 40,\
"oTop": 40,\
"oLeft": 0\
},\
"Pos.Room_undefined_grp_Single_Lights": {\
"left": 0,\
"top": 200,\
"width": 260,\
"width": 440,\
"height": 160,\
"oTop": 40,\
"oLeft": 0\
},\
"Pos.Room_undefined_grp_Structure": {\
"left": 0,\
"top": 400,\
"width": 440,\
"height": 40,\
"oTop": 41,\
"oLeft": 1\
"oTop": 40,\
"oLeft": 0\
},\
"Pos.svgZoomControl": {\
"Pos.Room_undefined_grp_Timer": {\
"left": 0,\
"top": 480,\
"width": 440,\
"height": 80,\
"oTop": 40,\
"oLeft": 0\
},\
"Pos.Room_System_grp_CUL": {\
"left": 0,\
"top": 0,\
"width": 240,\
"height": 40,\
"oTop": 20,\
"oLeft": 0\
},\
"Pos.Room_System_grp_FHEMWEB": {\
"left": 0,\
"top": 60,\
"width": 240,\
"height": 40,\
"oTop": 40,\
"oLeft": 0\
},\
"Pos.Room_System_grp_FileLog": {\
"left": 0,\
"top": 120,\
"width": 240,\
"height": 40,\
"oTop": 40,\
"oLeft": 0\
},\
"Pos.Room_System_grp_Global": {\
"left": 0,\
"top": 180,\
"width": 240,\
"height": 40,\
"oTop": 40,\
"oLeft": 0\
},\
"Pos.Room_System_grp_autocreate": {\
"left": 0,\
"top": 240,\
"width": 240,\
"height": 40,\
"oTop": 40,\
"oLeft": 0\
},\
"Pos.Room_System_grp_eventTypes": {\
"left": 0,\
"top": 300,\
"width": 1040,\
"height": 0,\
"oTop": 0,\
"width": 240,\
"height": 40,\
"oTop": 40,\
"oLeft": 0\
},\
"Pos.SVG_01_Garden": {\
"Pos.Room_System_grp_logProxy": {\
"left": 0,\
"top": 500,\
"width": 1040,\
"height": 180,\
"oTop": -164,\
"top": 380,\
"width": 240,\
"height": 40,\
"oTop": 40,\
"oLeft": 0\
},\
"Pos.SVG_02_Cellar": {\
"Pos.Room_System_grp_telnet": {\
"left": 0,\
"top": 680,\
"width": 1040,\
"height": 180,\
"oTop": -164,\
"oLeft": 0\
},\
"Pos.SVG_03_Dewpoint": {\
"left": 0,\
"top": 860,\
"width": 1040,\
"height": 180,\
"oTop": -164,\
"oLeft": 0\
},\
"Pos.SVG_04_Sun": {\
"left": 0,\
"top": 1040,\
"width": 1040,\
"height": 180,\
"oTop": -164,\
"oLeft": 0\
},\
"Pos.SVG_05_Polar": {\
"left": 280,\
"top": 300,\
"width": 1040,\
"height": 320,\
"oTop": -304,\
"top": 440,\
"width": 240,\
"height": 40,\
"oTop": 40,\
"oLeft": 0\
}\
}\

View File

@ -409,7 +409,7 @@ function
f18_resize()
{
var w=$(window).width();
log("f18.js W:"+w+" S:"+screen.width);
log("f18.js resize W:"+w+" S:"+screen.width);
var hl = f18_getAttr("hideLogo"),
hi = f18_getAttr("hideInput"),
pm = f18_getAttr("Pinned.menu"),

View File

@ -227,7 +227,7 @@ body.fixedInput #hdr {
table.block tr td:nth-child(2) { width: 0; }
table.block tr td:nth-child(n+3) { width: 0px; display: none; }
.SVGplot { width: 100%; overflow-x: auto;}
.SVGplot { overflow-x: auto;}
/* flex-collapsing table */
.wrapcolumns,

View File

@ -260,7 +260,7 @@ FW_jqueryReadyFn()
$(this).html(txt);
$(this).find("a").click(function(){
var txt = $(this).text();
var ma = txt.match(/configuring.*device (.*)/);
var ma = txt.match(/configuring.*device (.*)/); // ??
if(ma)
location.href = FW_root+"?detail="+ma[1];
FW_cmd(FW_root+"?cmd="+encodeURIComponent(txt)+"&XHR=1",
@ -303,6 +303,19 @@ FW_jqueryReadyFn()
FW_inlineModify();
FW_rawDef();
FW_treeMenu();
// automatic reload for style change
if(location.search.indexOf("cmd=style%20select") > 0) {
$('a[href*="style set"],a[onclick*="style set"]').each(function(){
var href = $(this).attr("href");
if(!href && (href = $(this).attr("onclick")))
href = href.substr(15,href.length-16);
$(this).click(function(e){
e.preventDefault();
FW_cmd(href+"&XHR=1", function(data) { location.reload(true); });
});
});
}
}
var FW_helpData;