From 006c0b9fd2b6d9516aaf9ac13e2c0ab6170f7512 Mon Sep 17 00:00:00 2001 From: rudolfkoenig <> Date: Sun, 22 Sep 2013 12:14:48 +0000 Subject: [PATCH] FHEMWEB: darksmallscreen added + some fhem-icon reorganizations git-svn-id: https://svn.fhem.de/fhem/trunk@3937 2b470e98-0d58-463d-a4d8-8e2adae1ed80 --- fhem/FHEM/01_FHEMWEB.pm | 5 +- fhem/www/images/darktouchpad/darklogo.png | Bin 5634 -> 0 bytes fhem/www/images/default/fhemicon_bright.png | Bin 0 -> 1094 bytes .../fhemicon_dark.png} | Bin .../www/images/default/fhemicon_darksmall.png | Bin 0 -> 6079 bytes .../fhemicon_smallscreen.png} | Bin fhem/www/pgm2/brightstyle.css | 2 +- fhem/www/pgm2/darkfloorplanstyle.css | 4 +- fhem/www/pgm2/darksmallscreenstyle.css | 98 ++++++++++++++++++ fhem/www/pgm2/darksmallscreensvg_defs.svg | 43 ++++++++ fhem/www/pgm2/darksmallscreensvg_style.css | 31 ++++++ fhem/www/pgm2/darkstyle.css | 2 +- fhem/www/pgm2/ios7smallscreenstyle.css | 2 +- fhem/www/pgm2/smallscreenstyle.css | 2 +- 14 files changed, 181 insertions(+), 8 deletions(-) delete mode 100644 fhem/www/images/darktouchpad/darklogo.png create mode 100644 fhem/www/images/default/fhemicon_bright.png rename fhem/www/images/{dark/darklogo.png => default/fhemicon_dark.png} (100%) create mode 100644 fhem/www/images/default/fhemicon_darksmall.png rename fhem/www/images/{smallscreen/fhem_smallscreen.png => default/fhemicon_smallscreen.png} (100%) create mode 100644 fhem/www/pgm2/darksmallscreenstyle.css create mode 100644 fhem/www/pgm2/darksmallscreensvg_defs.svg create mode 100644 fhem/www/pgm2/darksmallscreensvg_style.css diff --git a/fhem/FHEM/01_FHEMWEB.pm b/fhem/FHEM/01_FHEMWEB.pm index 50a2fca3f..c01f3fa9b 100755 --- a/fhem/FHEM/01_FHEMWEB.pm +++ b/fhem/FHEM/01_FHEMWEB.pm @@ -404,6 +404,7 @@ FW_answerCall($) $dir =~ s,www/,,g; # Want commandref.html to work from file://... my $file = $ofile; + $file =~ s/\?.*//; # Remove timestamp of CSS reloader if($file =~ m/^(.*)\.([^.]*)$/) { $file = $1; $ext = $2; } @@ -1002,7 +1003,7 @@ FW_roomOverview($) foreach(my $idx = 0; $idx < @list1; $idx++) { next if(!$list1[$idx]); my $sel = ($list1[$idx] eq $FW_room ? " selected=\"selected\"" : ""); - FW_pO ""; + FW_pO ""; } FW_pO ""; FW_pO ""; @@ -1511,7 +1512,7 @@ FW_iconTable($$$$) $imgName =~ s/\.[^.]*$//; # Cut extension next if(!$FW_icons{$style}{$imgName}); # Dont cut it twice: FS20.on.png next if($FW_icons{$style}{$imgName} !~ m/$imgName/); # Skip alias - next if($imgName=~m+^(weather/|shutter.*big|fhemicon|favicon|darklogo)+); + next if($imgName=~m+^(weather/|shutter.*big|fhemicon|favicon|ws_.*_kl)+); $icoList{$imgName} = 1; } } diff --git a/fhem/www/images/darktouchpad/darklogo.png b/fhem/www/images/darktouchpad/darklogo.png deleted file mode 100644 index 4f8329e182381b3d56f0fbcf3699def7ad37234e..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 5634 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 diff --git a/fhem/www/images/default/fhemicon_bright.png b/fhem/www/images/default/fhemicon_bright.png new file mode 100644 index 0000000000000000000000000000000000000000..6e51365d074f284b2aba9d027b95996dd146a720 GIT binary patch literal 1094 zcmV-M1iAZ(P)h($8FWQhbW?9;ba!ELWdL_~cP?peYja~^ zaAhuUa%Y?FJQ@H11H(x~K~zYIot9l_990y@e{*N{Bb%D7S%t+0Bu!E^iTT(V@(`(_ zq);NFEk*mF_#8_N6k9EVLPcTIho)ltBvcV>6pbw{*sdlJ8rqPg&DJD^hTRafb`kbr z6O*(%AJ>PO*>>GYj2^gLW;o}6?*GiW=Rb;+k`1g1Xb0MWn6m>+0oR;;0{DGh1SzH0 z3P>sAQc6?)yP1w}zza+9U=Rbo0vZ5TjU`gKB;B&78F<>0f(zzrj zl07Ug&#{)Z$j+FoW-L}RCP)ZY3Idf1(GDM>M+J{RR8Md7Nw$ZZ-6S0@6E{J?`Ctv{ zT#`d$T^N>5W?bj?XdcUhfTBQ4ZwOzx;;``%?@YK!X0aRMo^bq+0u6?h=R~px!_v8R z<}SYt+u&WD-5mem3x>a*=A+(Y0BosJ3*Z2z)ScKo&i6YCAh28UAi&^!oWEkF*qN09}fam0=v(}stX@d3Jj{lO{j{GNTZ6-ATf4<9}|NcmIUC3 zOW%+fyMWLj(x{>;KB~h_MGPhYGpL5xTiZujM6hkAAAtAz4{-M9Z`TDs_se%2Io1on zww->;B7(iOeFW7IfC)^vv*;7xeZ$K0?$`?~H2s{W-D+SXoCMF znKyv9+>;k<9ntqoDLYEUK-SPErR`egV$DDd@^xHBH{IMRu-x<49QWusGO#lD@ M07*qoM6N<$f?E6U$N&HU literal 0 HcmV?d00001 diff --git a/fhem/www/images/dark/darklogo.png b/fhem/www/images/default/fhemicon_dark.png similarity index 100% rename from fhem/www/images/dark/darklogo.png rename to fhem/www/images/default/fhemicon_dark.png diff --git a/fhem/www/images/default/fhemicon_darksmall.png b/fhem/www/images/default/fhemicon_darksmall.png new file mode 100644 index 0000000000000000000000000000000000000000..2176163dfcd6ed6f67fbf65ddcc0da3036250e52 GIT binary patch literal 6079 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 PR}MfaYbuo^ErR|B|0!u< literal 0 HcmV?d00001 diff --git a/fhem/www/images/smallscreen/fhem_smallscreen.png b/fhem/www/images/default/fhemicon_smallscreen.png similarity index 100% rename from fhem/www/images/smallscreen/fhem_smallscreen.png rename to fhem/www/images/default/fhemicon_smallscreen.png diff --git a/fhem/www/pgm2/brightstyle.css b/fhem/www/pgm2/brightstyle.css index afc8c7b1b..c335e7d0f 100644 --- a/fhem/www/pgm2/brightstyle.css +++ b/fhem/www/pgm2/brightstyle.css @@ -3,7 +3,7 @@ a:link, a:visited { color:#309bbd; text-decoration:none; } a:hover { color:#003366; } a img { border:medium none; } -div#logo { position: fixed; z-index:12000; top:3px; left:5px; float:left; width:24px;height:24px; background:url("/fhem/icons/fhem.png") no-repeat;} +div#logo { position: fixed; z-index:12000; top:3px; left:5px; float:left; width:24px;height:24px; background:url("../images/default/fhemicon_bright.png") no-repeat;} #menu { position: relative; top: 60px; float:left; width: 25%; padding: 0px 20px 120px;} #hdr { position: fixed; z-index: 1000; float: left; clear: both; height:32px; width: 100%; -webkit-box-sizing: border-box; moz-box-sizing: border-box; box-sizing: border-box; background:black; background-image: linear-gradient(#333333,#222222); } #content { width:70%; float:right; margin-top:60px; } diff --git a/fhem/www/pgm2/darkfloorplanstyle.css b/fhem/www/pgm2/darkfloorplanstyle.css index 964973395..fa11d7790 100644 --- a/fhem/www/pgm2/darkfloorplanstyle.css +++ b/fhem/www/pgm2/darkfloorplanstyle.css @@ -1,8 +1,8 @@ -body { background-color: #444444; font-family:Arial, Helvetica, sans-serif; font-size:13px; background-image:url(../icons/darklogo); background-repeat:no-repeat; } +body { background-color: #444444; font-family:Arial, Helvetica, sans-serif; font-size:13px; background-image:url(../images/default/fhemicon_dark.png); background-repeat:no-repeat; } body[id~=Media] { background-color: #A5A5A5; font-family:Arial, Helvetica, sans-serif; font-size:13px; background-image:url(../icons/Media.bak); background-repeat:no-repeat; } #backimg {position:absolute; top:15px; left:190px;} -#logo { position:absolute; top: 10px; left: 10px; width:180px; height:600px; background-image:url(../icons/darklogo); visibility:hidden;} +#logo { position:absolute; top: 10px; left: 10px; width:180px; height:600px; background-image:url(../images/default/fhemicon_dark.png); visibility:hidden;} #fpmenu.fp_arrange { position:absolute; bottom:20px; left:30px; min-width:310px; font-size:9px; border:1px solid #CCCCCC; background: #111111; -moz-border-radius:8px; border-radius:8px; border-spacing: 6px; padding: 6px; box-shadow:5px 5px 5px #000; } diff --git a/fhem/www/pgm2/darksmallscreenstyle.css b/fhem/www/pgm2/darksmallscreenstyle.css new file mode 100644 index 000000000..db789ae78 --- /dev/null +++ b/fhem/www/pgm2/darksmallscreenstyle.css @@ -0,0 +1,98 @@ +/* Author: Bernd auf Basis der Vorlage von Till*/ +body { background-color: #444444; background-image:url(../images/default/fhemicon_darksmall.png); background-repeat:no-repeat; color: #CCCCCC; font-family:Arial, Helvetica, sans-serif; font-size:13px;} +#logo { position:absolute; top:10px; left:20px; width:78px; visibility:hidden; } +#menu { position:absolute; top: 2px; left:65px; } +#hdr { position:absolute; top:40px; left:65px; } +#content { position:absolute; top:75px; left: 0px; right: 0px;} +#connect_err { background-color: #000000; color: #FFFFFF; position:absolute; top:0px; left:0px; z-index: 10; } + +a { color: #CCCCCC; text-decoration: none;} +a:hover { color: #ffffff; } +.wide { width:100%; } + +table.block { border:1px solid #ffffff; width: 300px; + background: #333333; box-shadow:5px 5px 5px #000;} +table.block tr.odd { background: #111111; } +table.block tr.sel { background: red; } +table { border-radius:8px; border-spacing: 0px; + padding-bottom: 6px; padding-top: 6px; } + +table.room { background: #111111; width: 140px; border:1px solid #CCCCCC; box-shadow:5px 5px 5px #000;} +table.room a { color: #CCCCCC; text-decoration: none; } +table.room a:hover { color: #ffffff; } +table.room tr.sel { background: red; } +th {color:red; text-align: left; padding-left: 10px; font-weight: bold;} +td {padding-left: 10px; padding-right: 10px; padding-top: 3px; padding-bottom: 3px;} + +input {outline:none; background-color: #111111; + border: 1px solid #ffffff; color: #cccccc; padding:5px; + margin-left: 10px; border-radius:8px; box-shadow: 5px 5px 5px #000000;} +input:focus {border: 1px solid red;} +input:disabled {color: #808080; } +input[type="submit"] { background-color: #353535; border-style:outset; border-width:2px } + +textarea {background-color: #111111; + border: 1px solid #ffffff; color: #cccccc; + padding:5px; margin-left: 10px; + border-radius:8px; box-shadow: 5px 5px 5px #000000;} + +/* +next lines are for commandref and faq +*/ +#left { position:absolute; top:140px; left:60px; width:140px; } +#right { position:absolute; top:20px; left:200px; bottom:20px; +right:10px; } +body>div#left { position:fixed; } +div#block { border:1px solid gray; background: #101010; padding:0.7em; } +div#dist { padding-top:0.3em; } +button.dist { margin:10px; background:transparent; border:0px; cursor:pointer; } +h2,h3,h4 { color:#EEE; line-height:1.3; margin-top:1.5em; font-family:Verdana; } + +a img { border-style:none; } +.col2 { text-align:center; } + +/* detail-selector & slider */ +.makeTable { display:inline; float:left; clear:left; + margin-top:10px; margin-bottom:20px;} +.makeSelect { display:inline; float:left; clear:left; vertical-align:middle; } + +select { margin-left:5px; margin-right:5px; } +.get,.set,.attr { margin-bottom:5px; float:left; } +.slider { float:right; width:300px; height:26px; } +.get .slider,.set .slider,.attr .slider { + background:#101010; border-radius:8px; } + +/* timepicker */ +.set .set { margin-bottom:2px; margin-top:3px; } + +.slider { margin-left:10px; float:left; width:250px; height:26px; + border-style:solid; border-width:2px; border-color:#555555 } + +.handle { position:relative; cursor:pointer; width:50px; + height:20px; line-height:20px; + -webkit-user-select:none; -moz-user-select:none; -user-select:none; + border:2px solid; color:white; text-align:center; } +.downText,.makeSelect select { margin:0.7em; } + + +svg { height:32px; width:32px; fill:#fff; } +g.on { fill:red; } + +/* next lines are for remotecontrol */ +.rc_body { border-style: solid; border-color: gray; border-width: 2px; + padding: 5px; background: #101010; font-size:6px;} +.rc_button { padding: 5px 7px;} +.rc_button img { border-style: solid; border-width: 1px; + border-color: transparent; } +.rc_button img:active { border-color: gray; } + +.changed { color:red; } + +div.dname, div.dval { + width: 152px; + white-space: nowrap; overflow: hidden; text-overflow: ellipsis; + font-size:16px; +} +div.tiny { font-size:10px; } + + diff --git a/fhem/www/pgm2/darksmallscreensvg_defs.svg b/fhem/www/pgm2/darksmallscreensvg_defs.svg new file mode 100644 index 000000000..aa4034ff4 --- /dev/null +++ b/fhem/www/pgm2/darksmallscreensvg_defs.svg @@ -0,0 +1,43 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/fhem/www/pgm2/darksmallscreensvg_style.css b/fhem/www/pgm2/darksmallscreensvg_style.css new file mode 100644 index 000000000..0685c46d5 --- /dev/null +++ b/fhem/www/pgm2/darksmallscreensvg_style.css @@ -0,0 +1,31 @@ +/* Author: Volker */ +.background { fill:#444444; } + +text { font-family:Arial, Helvetica, sans-serif; font-size:12px; fill:#CCCCCC;} +text.title {font-family:Arial, Helvetica, sans-serif; font-size:16px; fill:#CCCCCC;} +text.copy { text-decoration:underline; stroke:none; fill:blue;} +text.paste { text-decoration:underline; stroke:none; fill:blue;} + +polyline { stroke:black; fill:none; } +.border { stroke:black; fill:url(#gr_bg);} +.vgrid { stroke:gray; stroke-dasharray:2,6;} +.hgrid { stroke:gray; stroke-dasharray:2,6;} +.pasted { stroke:black; stroke-dasharray:1,1;} + +.l0 { stroke:red; } text.l0 { stroke:none; fill:red; } +.l1 { stroke:green; } text.l1 { stroke:none; fill:green; } +.l2 { stroke:blue; } text.l2 { stroke:none; fill:blue; } +.l3 { stroke:magenta; } text.l3 { stroke:none; fill:magenta; } +.l4 { stroke:brown; } text.l4 { stroke:none; fill:brown; } +.l5 { stroke:black; } text.l5 { stroke:none; fill:black; } +.l6 { stroke:olive; } text.l6 { stroke:none; fill:olive; } +.l7 { stroke:gray; } text.l7 { stroke:none; fill:gray; } +.l8 { stroke:yellow; } text.l8 { stroke:none; fill:yellow; } + +.l0fill{ stroke:#f00; fill:url(#gr_0); } text.l0fill{ stroke:none; fill:#f00; } +.l1fill{ stroke:#291; fill:url(#gr_1); } text.l1fill{ stroke:none; fill:#291; } +.l2fill{ stroke:#00f; fill:url(#gr_2); } text.l2fill{ stroke:none; fill:#00f; } +.l3fill{ stroke:#f0f; fill:url(#gr_3); } text.l3fill{ stroke:none; fill:#f0f; } +.l4fill{ stroke:#ff0; fill:url(#gr_4); } text.l4fill{ stroke:none; fill:#ff0; } +.l5fill{ stroke:#0ff; fill:url(#gr_5); } text.l5fill{ stroke:none; fill:#0ff; } +.l6fill{ stroke:#000; fill:url(#gr_6); } text.l6fill{ stroke:none; fill:#000; } diff --git a/fhem/www/pgm2/darkstyle.css b/fhem/www/pgm2/darkstyle.css index c322839b1..51df986c5 100644 --- a/fhem/www/pgm2/darkstyle.css +++ b/fhem/www/pgm2/darkstyle.css @@ -1,5 +1,5 @@ /* Author: Till */ -body { background-color: #444444; background-image:url(../images/dark/darklogo.png); background-repeat:no-repeat; color: #CCCCCC; font-family:Arial, Helvetica, sans-serif; font-size:13px;} +body { background-color: #444444; background-image:url(../images/default/fhemicon_dark.png); background-repeat:no-repeat; color: #CCCCCC; font-family:Arial, Helvetica, sans-serif; font-size:13px;} #logo { position:absolute; top:10px; left:20px; width:140px; visibility:hidden; } #menu { position:absolute; top:170px;left:20px; width:140px; } #hdr { position:absolute; top:10px; left:180px; } diff --git a/fhem/www/pgm2/ios7smallscreenstyle.css b/fhem/www/pgm2/ios7smallscreenstyle.css index 7f1eaa3af..0da8f7fd9 100644 --- a/fhem/www/pgm2/ios7smallscreenstyle.css +++ b/fhem/www/pgm2/ios7smallscreenstyle.css @@ -8,7 +8,7 @@ input { font-family:Helvetica; font-weight:300; font-size:16px;} select { font-family:Helvetica; font-weight:300; font-size:16px;} #back { position:absolute; top: 2px; left:18px; } #logo { position:absolute; top: 2px; left: 2px; - width:64px; height:67px; background-image:url(../images/smallscreen/fhem_smallscreen.png); } + width:64px; height:67px; background-image:url(../images/default/fhemicon_smallscreen.png); } #menu { position:absolute; top: 2px; left:65px; } #hdr { position:absolute; top:40px; left:65px; } #content { position:absolute; top:85px; left: 0px; right: 0px;} diff --git a/fhem/www/pgm2/smallscreenstyle.css b/fhem/www/pgm2/smallscreenstyle.css index 4c88a1aab..38d43e922 100644 --- a/fhem/www/pgm2/smallscreenstyle.css +++ b/fhem/www/pgm2/smallscreenstyle.css @@ -5,7 +5,7 @@ input { font-family:Arial, sans-serif; font-size:16px;} select { font-family:Arial, sans-serif; font-size:16px;} #back { position:absolute; top: 2px; left:18px; } #logo { position:absolute; top: 2px; left: 2px; - width:64px; height:67px; background-image:url(../images/smallscreen/fhem_smallscreen.png); } + width:64px; height:67px; background-image:url(../images/default/fhemicon_smallscreen.png); } #menu { position:absolute; top: 2px; left:65px; } #hdr { position:absolute; top:40px; left:65px; } #content { position:absolute; top:85px; left: 0px; right: 0px;}