diff --git a/fhem/FHEM/01_FHEMWEB.pm b/fhem/FHEM/01_FHEMWEB.pm index f39a293e5..db9f86dde 100755 --- a/fhem/FHEM/01_FHEMWEB.pm +++ b/fhem/FHEM/01_FHEMWEB.pm @@ -183,8 +183,12 @@ FHEMWEB_Initialize($) $FW_icondir = "$FW_dir/images"; $FW_cssdir = "$FW_dir/pgm2"; $FW_gplotdir = "$FW_dir/gplot"; + + # Blacklist is needed due to an update bug, where MOV was not implemented + my %bl = (_multiple=>1,_noArg=>1,_slider=>1,_svg=>1,_textField=>1,_time=>1); if(opendir(DH, "$FW_dir/pgm2")) { - @FW_fhemwebjs = sort grep /^fhemweb.*js$/, readdir(DH); + @FW_fhemwebjs = sort grep { $_ =~ m/^fhemweb(.*).js$/ && !$bl{$1}; } + readdir(DH); closedir(DH); } diff --git a/fhem/FHEM/98_update.pm b/fhem/FHEM/98_update.pm index 43fcd19c3..c64ca3fa0 100644 --- a/fhem/FHEM/98_update.pm +++ b/fhem/FHEM/98_update.pm @@ -165,7 +165,8 @@ doUpdate($$) return 1; } upd_mkDir($root, $r[2], 0); - uLog 4, "mv $root/$r[1] $root/$r[2]"; + my $mvret = mv "$root/$r[1]", "$root/$r[2]"; + uLog 4, "mv $root/$r[1] $root/$r[2]". ($mvret ? " FAILED:$mvret":""); } next if($r[0] ne "UPD"); diff --git a/fhem/www/pgm2/brightstyle.css b/fhem/www/pgm2/brightstyle.css index afd3e9d16..c5642d652 100644 --- a/fhem/www/pgm2/brightstyle.css +++ b/fhem/www/pgm2/brightstyle.css @@ -73,3 +73,31 @@ div[id*="Kalender-"] { width: 250px; white-space: nowrap; overflow: hidden; text div[id*="disp"] { width: 250px; white-space: nowrap; overflow: hidden; text-overflow: ellipsis; } table.block tr.even a[onclick*="Javascript"], table.block tr.odd a[onclick*="Javascript"] { font-weight: bold; cursor: pointer } div.dval { margin-left:10px; } + + + +.colorpicker_ct .slider { background: url(../jscolor/ct_background.svg); } +.colorpicker_hue .slider { background: url(../jscolor/hue_background.svg); } +.get,.set,.attr { margin-bottom:5px; float:left; } +select.svgSrc { width:100px; } +select.svgColumn { width:50px; } +select.svgRegexp { width:120px; } + +/* jQuery-UI mods */ +div.ui-dialog { border:3px solid #278727; padding: 0.2em; } +div.ui-dialog div.ui-dialog-titlebar { display:none; } +div.ui-widget-content { background:#FFFFE7; } +#fwmenu { + position: absolute; z-index:1005; + text-align:left; max-width:600px; + font-weight: normal; font-size: 100%; + background:#FFFFE7; border:1px solid #278727; +} +#fwmenu li a { color:#278727; } + +div#svgmarker { + position: absolute; z-index:1005; padding: 6px 10px; + text-align:left; max-width:600px; + color:#278727; background:#FFFFE7; + border:2px solid #278727; border-radius:4px; +} diff --git a/fhem/www/pgm2/darkstyle.css b/fhem/www/pgm2/darkstyle.css index 776cf75fd..f7e1c2e78 100644 --- a/fhem/www/pgm2/darkstyle.css +++ b/fhem/www/pgm2/darkstyle.css @@ -93,3 +93,30 @@ g.on { fill:red; } .rc_button img:active { border-color: gray; } .changed { color:red; } + + +.colorpicker_ct .slider { background: url(../jscolor/ct_background.svg); } +.colorpicker_hue .slider { background: url(../jscolor/hue_background.svg); } +.get,.set,.attr { margin-bottom:5px; float:left; } +select.svgSrc { width:100px; } +select.svgColumn { width:50px; } +select.svgRegexp { width:120px; } + +/* jQuery-UI mods */ +div.ui-dialog { border:3px solid white; padding: 0.2em; } +div.ui-dialog div.ui-dialog-titlebar { display:none; } +div.ui-widget-content { background:black; color:white} +#fwmenu { + position: absolute; z-index:1005; + text-align:left; max-width:600px; + font-weight: normal; font-size: 100%; + background:black; border:1px solid white; +} +#fwmenu li a { color:white; } + +div#svgmarker { + position: absolute; z-index:1005; padding: 6px 10px; + text-align:left; max-width:600px; + color:white; background:black; + border:2px solid white; border-radius:4px; +} diff --git a/fhem/www/pgm2/fhemweb_multiple.js b/fhem/www/pgm2/fhemweb_multiple.js deleted file mode 100644 index 8d1c8b69c..000000000 --- a/fhem/www/pgm2/fhemweb_multiple.js +++ /dev/null @@ -1 +0,0 @@ - diff --git a/fhem/www/pgm2/fhemweb_noArg.js b/fhem/www/pgm2/fhemweb_noArg.js deleted file mode 100644 index 8d1c8b69c..000000000 --- a/fhem/www/pgm2/fhemweb_noArg.js +++ /dev/null @@ -1 +0,0 @@ - diff --git a/fhem/www/pgm2/fhemweb_slider.js b/fhem/www/pgm2/fhemweb_slider.js deleted file mode 100644 index 8d1c8b69c..000000000 --- a/fhem/www/pgm2/fhemweb_slider.js +++ /dev/null @@ -1 +0,0 @@ - diff --git a/fhem/www/pgm2/fhemweb_svg.js b/fhem/www/pgm2/fhemweb_svg.js deleted file mode 100644 index 8d1c8b69c..000000000 --- a/fhem/www/pgm2/fhemweb_svg.js +++ /dev/null @@ -1 +0,0 @@ - diff --git a/fhem/www/pgm2/fhemweb_textField.js b/fhem/www/pgm2/fhemweb_textField.js deleted file mode 100644 index 8d1c8b69c..000000000 --- a/fhem/www/pgm2/fhemweb_textField.js +++ /dev/null @@ -1 +0,0 @@ - diff --git a/fhem/www/pgm2/fhemweb_time.js b/fhem/www/pgm2/fhemweb_time.js deleted file mode 100644 index 8d1c8b69c..000000000 --- a/fhem/www/pgm2/fhemweb_time.js +++ /dev/null @@ -1 +0,0 @@ - diff --git a/fhem/www/pgm2/ios6Common.css b/fhem/www/pgm2/ios6Common.css index b76ab92f6..34abd95e8 100644 --- a/fhem/www/pgm2/ios6Common.css +++ b/fhem/www/pgm2/ios6Common.css @@ -221,4 +221,30 @@ background-image: linear-gradient(to bottom, #C0E2FC 0%, #44AAF8 2%, #0589F5 4%, } .checkbox:before{ left:0; -} \ No newline at end of file +} + +.colorpicker_ct .slider { background: url(../jscolor/ct_background.svg); } +.colorpicker_hue .slider { background: url(../jscolor/hue_background.svg); } +.get,.set,.attr { margin-bottom:5px; float:left; } +select.svgSrc { width:100px; } +select.svgColumn { width:50px; } +select.svgRegexp { width:120px; } + +/* jQuery-UI mods */ +div.ui-dialog { border:3px solid #278727; padding: 0.2em; } +div.ui-dialog div.ui-dialog-titlebar { display:none; } +div.ui-widget-content { background:#FFFFE7; } +#fwmenu { + position: absolute; z-index:1005; + text-align:left; max-width:600px; + font-weight: normal; font-size: 100%; + background:#FFFFE7; border:1px solid #278727; +} +#fwmenu li a { color:#278727; } + +div#svgmarker { + position: absolute; z-index:1005; padding: 6px 10px; + text-align:left; max-width:600px; + color:black; background:#999; + border:1px solid #fff; border-radius:4px; +} diff --git a/fhem/www/pgm2/ios7Common.css b/fhem/www/pgm2/ios7Common.css index 9e625ff73..e72ee4f2a 100644 --- a/fhem/www/pgm2/ios7Common.css +++ b/fhem/www/pgm2/ios7Common.css @@ -4,3 +4,25 @@ div.ui-dialog { border:3px solid #e5e5e5; padding: 0.2em; } div.ui-dialog div.ui-dialog-titlebar { display:none; } div.ui-widget-content { font-family:Helvetica; background:white; color:#151515;} + +.colorpicker_ct .slider { background: url(../jscolor/ct_background.svg); } +.colorpicker_hue .slider { background: url(../jscolor/hue_background.svg); } +.get,.set,.attr { margin-bottom:5px; float:left; } +select.svgSrc { width:100px; } +select.svgColumn { width:50px; } +select.svgRegexp { width:120px; } + +/* jQuery-UI mods */ +#fwmenu { + position: absolute; z-index:1005; + text-align:left; max-width:600px; + font-weight: normal; font-size: 100%; + background:#e5e5e5; +} +#fwmenu li a { color:black; } + +div#svgmarker { + position: absolute; z-index:1005; padding: 6px 10px; + text-align:left; max-width:600px; + color:black; background:#e5e5e5; +}