From 5c0f19c86c4969ef54329cdc8c893719cee16877 Mon Sep 17 00:00:00 2001 From: rudolfkoenig Date: Thu, 15 Mar 2012 07:43:09 +0000 Subject: [PATCH] stylesheetprefix moved around for FLOORPLAN/UliM git-svn-id: svn://svn.code.sf.net/p/fhem/code/trunk@1344 2b470e98-0d58-463d-a4d8-8e2adae1ed80 --- fhem/webfrontend/pgm2/01_FHEMWEB.pm | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/fhem/webfrontend/pgm2/01_FHEMWEB.pm b/fhem/webfrontend/pgm2/01_FHEMWEB.pm index 6f61715a4..18673e0c2 100755 --- a/fhem/webfrontend/pgm2/01_FHEMWEB.pm +++ b/fhem/webfrontend/pgm2/01_FHEMWEB.pm @@ -352,11 +352,7 @@ FW_AnswerCall($) } elsif($arg =~ m,^$FW_ME/(.*).css,) { my $cssName = $1; - my $prf = AttrVal($FW_wname, "stylesheetPrefix", ""); - $prf = "smallscreen" if(!$prf && $FW_ss); - $prf = "touchpad" if(!$prf && $FW_tp); - return 0 if(!open(FH, "$FW_dir/$prf$cssName.css") && - !open(FH, "$FW_dir/$cssName.css")); + return 0 if(!open(FH, "$FW_dir/$cssName.css")); FW_pO join("", ); close(FH); $FW_RETTYPE = "text/css"; @@ -509,7 +505,11 @@ FW_AnswerCall($) my $rf = AttrVal($FW_wname, "refresh", ""); FW_pO "" if($rf); - FW_pO ""; + + my $prf = AttrVal($FW_wname, "stylesheetPrefix", ""); + $prf = "smallscreen" if(!$prf && $FW_ss); + $prf = "touchpad" if(!$prf && $FW_tp); + FW_pO ""; FW_pO "{STYLESHEET}\" rel=\"stylesheet\"/>" if($fwextPtr && $fwextPtr->{STYLESHEET}); FW_pO ""