From de03da96527403ecf970dad18207d0c2f4a6ded7 Mon Sep 17 00:00:00 2001 From: ulimaass Date: Fri, 28 Jun 2013 16:41:54 +0000 Subject: [PATCH] added css-tags rc_body and rc_button git-svn-id: svn://svn.code.sf.net/p/fhem/code/trunk@3350 2b470e98-0d58-463d-a4d8-8e2adae1ed80 --- fhem/FHEM/95_remotecontrol.pm | 33 +++++++++++++++++++++++---------- 1 file changed, 23 insertions(+), 10 deletions(-) diff --git a/fhem/FHEM/95_remotecontrol.pm b/fhem/FHEM/95_remotecontrol.pm index 40e3dd849..92a46ff49 100644 --- a/fhem/FHEM/95_remotecontrol.pm +++ b/fhem/FHEM/95_remotecontrol.pm @@ -41,6 +41,7 @@ # bugfix "use strict" upon foreign makenotify - June 24, 2013 # converted to UNIX-LF - June 25, 2013 # fixed minor html-bug - June 26, 2013 +# added css-tags rc_body and rc_button - June 27, 2013 @@ -145,14 +146,14 @@ RC_Set($@) } elsif ($cmd eq "makeweblink") { my $wname = $a[2] ? $a[2] : "weblink_".$nam; fhem("define $wname weblink htmlCode {fhem(\"get $hash->{NAME} htmlcode\", 1)}"); - Log 2, "[remotecontrol] Weblink $wname created."; + Log 2, "[remotecontrol] Weblink created: $wname"; return "Weblink created: $wname"; ## set makenotify } elsif ($cmd eq "makenotify") { if ($a[2]) { my $ndev = $a[2]; my $fn = $defs{$ndev}{TYPE} ? $defs{$ndev}{TYPE} : undef; - if (defined($data{RC_makenotify}{$fn})) { #foreign makenotify + if (defined($fn) && defined($data{RC_makenotify}{$fn})) { #foreign makenotify no strict "refs"; my $msg = &{$data{RC_makenotify}{$fn}}($nam,$ndev); use strict "refs"; @@ -168,11 +169,16 @@ RC_Set($@) } ## set ? } elsif ($cmd eq "?") { - return "layout makeweblink makenotify"; - ## set + my $ret = "Unknown argument $cmd choose one of makeweblink makenotify state layout:"; + foreach my $fn (sort keys %{$data{RC_layout}}) { + $ret .= $fn . ","; + } + $ret =~ s/[:,]$//; + return $ret; + ## set state } else { Log GetLogLevel($nam,4), "[remotecontrol] set $nam $cmd $par"; - readingsSingleUpdate($hash,"state",$cmd,1) if (!$par); + readingsSingleUpdate($hash,"state",$cmd,1); } } @@ -199,7 +205,7 @@ RC_Get($@) return $layoutlist; ## get -> error } else { - return "Unknown parameter $arg. Choose one of: html"; + return "Unknown argument $arg choose one of: htmlcode layout"; } } @@ -215,7 +221,7 @@ RC_attr2html($) { my $row; $rc_html = "\n
"; # $rc_html = "\n
"; # provokes update by longpoll - $rc_html.= ''; + $rc_html.= '
'; foreach my $rownr (0..19) { $rownr = sprintf("%2.2d",$rownr); $row = AttrVal("$name","row$rownr",undef); @@ -223,7 +229,7 @@ RC_attr2html($) { $rc_html .= "\n"; my @btn = split (",",$row); foreach my $btnnr (0..$#btn) { - $rc_html .= "
"; + $rc_html .= ''; if ($btn[$btnnr] ne "") { my $cmd; my $img; @@ -296,7 +302,7 @@ RC_layout_samsung() { $row[5]=":blank,0,PRECH"; $row[6]=":blank,:blank,:blank"; $row[7]="VOLUP:UP,MUTE,CHUP"; - $row[8]=":VOL,:BLANK,:PROG"; + $row[8]=":VOL,:blank,:PROG"; $row[9]="VOLDOWN:DOWN,CH_LIST,CHDOWN"; $row[10]="MENU,:blank,GUIDE"; $row[11]=":blank,:blank,:blank"; @@ -321,13 +327,18 @@ sub RC_layout_itunes() { my $ret; my @row; - $row[0]="play:PLAY,pause:PAUSE,prev:REWIND,next:FF,louder:VOLUP,quieter:VOLDOWN"; + $row[0]="play:PLAY,pause:PAUSE,prev:REWIND,next:FF,quieter:VOLDOWN,louder:VOLUP"; $row[1]="attr rc_iconpath icons/remotecontrol"; $row[2]="attr rc_iconprefix black_btn_"; # unused available commands return @row; } +#css +#.rc_body { 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; } 1; @@ -491,3 +502,5 @@ RC_layout_itunes() { =end html_DE =cut + +