mhop/fhem
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Added fp_viewport-attribute for touchpad

Browse Source 
git-svn-id: https://fhem.svn.sourceforge.net/svnroot/fhem/trunk/fhem@2849 2b470e98-0d58-463d-a4d8-8e2adae1ed80
This commit is contained in:
ulimaass
2013-03-03 12:52:59 +00:00
parent cd6791ee94
commit fb95e94523
1 changed files with 14 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
FHEM/95_FLOORPLAN.pm
View File

@@ -33,6 +33,7 @@
# 0022: longpoll by Matthias Gehre (November 27, 2012) # 0022: longpoll by Matthias Gehre (November 27, 2012)
# 0023: longpoll updates readings also - by Matthias Gehre; FW_longpoll is now a global variable (January 21, 2013) # 0023: longpoll updates readings also - by Matthias Gehre; FW_longpoll is now a global variable (January 21, 2013)
# 0024: fix for readings longpoll, added js-extension from Dirk (February 16, 2013) # 0024: fix for readings longpoll, added js-extension from Dirk (February 16, 2013)
# 0025: Added fp_viewport-attribute from (March 03, 2013)
# #
################################################################ ################################################################
# #
@@ -127,6 +128,7 @@ my %FW_zoom; # copied from FHEMWEB - using local version to
my @FW_zoom; # copied from FHEMWEB - using local version to avoid global variable my @FW_zoom; # copied from FHEMWEB - using local version to avoid global variable
# $FW_subdir # from FHEMWEB: path of floorplan-subdir - enables reusability of FHEMWEB-routines for sub-URLS like floorplan # $FW_subdir # from FHEMWEB: path of floorplan-subdir - enables reusability of FHEMWEB-routines for sub-URLS like floorplan
# $FW_cname # from FHEMWEB: Current connection name # $FW_cname # from FHEMWEB: Current connection name
my $FP_viewport; # Define width for touchpad device
#------------------------------------------------------------------------------- #-------------------------------------------------------------------------------
sub sub
@@ -134,12 +136,13 @@ FLOORPLAN_Initialize($)
{ {
my ($hash) = @_; my ($hash) = @_;
$hash->{DefFn} = "FP_define"; $hash->{DefFn} = "FP_define";
$hash->{AttrList} = "loglevel:0,1,2,3,4,5,6 refresh fp_arrange:1,detail,WEB,0 commandfield:1,0 fp_default:1,0 stylesheet fp_noMenu:1,0 fp_backgroundimg fp_setbutton:1,0"; $hash->{AttrList} = "loglevel:0,1,2,3,4,5,6 refresh fp_arrange:1,detail,WEB,0 commandfield:1,0 fp_default:1,0 stylesheet fp_noMenu:1,0 fp_backgroundimg fp_setbutton:1,0 fp_viewport";
# fp_arrange : show addtl. menu for attr fp_<name> .... # fp_arrange : show addtl. menu for attr fp_<name> ....
# commandfield : shows an fhem-commandline inputfield on floorplan # commandfield : shows an fhem-commandline inputfield on floorplan
# fp_default : set for ONE floorplan. If set, floorplan-startscreen is skipped. # fp_default : set for ONE floorplan. If set, floorplan-startscreen is skipped.
# fp_stylesheetPrefix : e.g. for darkstyle, set value dark -> uses darkfloorplanstyle.css # fp_stylesheetPrefix : e.g. for darkstyle, set value dark -> uses darkfloorplanstyle.css
# fp_noMenu : suppresses display of the floorplan-menu on the floorplan # fp_noMenu : suppresses display of the floorplan-menu on the floorplan
# fp_viewport : define a viewport for mobile devices
# CGI # CGI
my $name = "floorplan"; my $name = "floorplan";
@@ -206,6 +209,7 @@ FP_CGI(){
if ($FP_name) { # a floorplan-name is part of URL if ($FP_name) { # a floorplan-name is part of URL
$FP_arrange = AttrVal($FP_name, "fp_arrange", 0) if ($FP_name); # set arrange mode $FP_arrange = AttrVal($FP_name, "fp_arrange", 0) if ($FP_name); # set arrange mode
$FP_viewport = AttrVal($FP_name, "fp_viewport", "width=768") if ($FP_name); # viewport definition
if(!defined($defs{$FP_name})){ if(!defined($defs{$FP_name})){
$FW_RET = "ERROR: Floorplan $FP_name not defined \n"; # check for typo in URL $FW_RET = "ERROR: Floorplan $FP_name not defined \n"; # check for typo in URL
return ("text/plain; charset=$FW_encoding", $FW_RET); return ("text/plain; charset=$FW_encoding", $FW_RET);
@@ -322,7 +326,7 @@ FP_htmlHeader($) {
if($FW_ss) { if($FW_ss) {
FW_pO "<meta name=\"viewport\" content=\"width=320\"/>"; FW_pO "<meta name=\"viewport\" content=\"width=320\"/>";
} elsif($FW_tp) { } elsif($FW_tp) {
FW_pO "<meta name=\"viewport\" content=\"width=768\"/>"; FW_pO "<meta name=\"viewport\" content=\"".$FP_viewport."\"/>";
} }
} }
# refresh-value # refresh-value
@@ -847,6 +851,10 @@ FP_input(@)
<code>attr Groundfloor fp_backgroundimg foobar.png</code><br><br> <code>attr Groundfloor fp_backgroundimg foobar.png</code><br><br>
</ul> </ul>
<li><a name="fp_viewport">fp_viewport</a><br>
Allows usage of a user-defined viewport-value for touchpad.<br>
Default-viewport-value is "width=768".
<li><a name="fp_inherited">Inherited from FHEMWEB</a><br> <li><a name="fp_inherited">Inherited from FHEMWEB</a><br>
The following attributes are inherited from the underlying <a href="#FHEMWEB">FHEMWEB</a> instance:<br> The following attributes are inherited from the underlying <a href="#FHEMWEB">FHEMWEB</a> instance:<br>
<ul> <ul>
@@ -998,6 +1006,9 @@ FP_input(@)
<ul> <ul>
<code>attr Erdgeschoss fp_backgroundimg foobar.png</code><br><br> <code>attr Erdgeschoss fp_backgroundimg foobar.png</code><br><br>
</ul> </ul>
<li><a name="fp_viewport">fp_viewport</a><br>
Gestattet die Verwendung eines abweichenden viewport-Wertes für die touchpad-Ausgabe.<br>
Die Default-viewport-Angbe ist "width=768".
<li><a name="fp_inherited">Vererbt von FHEMWEB</a><br> <li><a name="fp_inherited">Vererbt von FHEMWEB</a><br>
Die folgenden Attribute werden von der zugrundliegenden <a href="#FHEMWEB">FHEMWEB</a>-Instanz vererbt:<br> Die folgenden Attribute werden von der zugrundliegenden <a href="#FHEMWEB">FHEMWEB</a>-Instanz vererbt:<br>