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

Add scrolling to the default-style menu

Browse Source 
git-svn-id: https://fhem.svn.sourceforge.net/svnroot/fhem/trunk/fhem@2682 2b470e98-0d58-463d-a4d8-8e2adae1ed80
This commit is contained in:
rudolfkoenig
2013-02-10 18:07:53 +00:00
parent 44358f3b51
commit 70a775b3cf
2 changed files with 28 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

35
FHEM/01_FHEMWEB.pm
View File

@@ -929,6 +929,7 @@ FW_roomOverview($)
############## ##############
# LOGO # LOGO
my $hasMenuScroll;
if($FW_detail && $FW_ss) { if($FW_detail && $FW_ss) {
$FW_room = AttrVal($FW_detail, "room", undef); $FW_room = AttrVal($FW_detail, "room", undef);
$FW_room = $1 if($FW_room && $FW_room =~ m/^([^,]*),/); $FW_room = $1 if($FW_room && $FW_room =~ m/^([^,]*),/);
@@ -939,25 +940,13 @@ FW_roomOverview($)
return; return;
} else { } else {
FW_pH "", "<div id=\"logo\"></div>"; $hasMenuScroll = 1;
FW_pO '<div id="menuScrollArea">';
FW_pH "", '<div id="logo"></div>';
} }
##############
# HEADER
FW_pO "<div id=\"hdr\">";
FW_pO '<table border="0"><tr><td style="padding:0">';
FW_pO "<form method=\"get\" action=\"$FW_ME\">";
FW_pO FW_hidden("room", "$FW_room") if($FW_room);
FW_pO FW_textfield("cmd", $FW_ss ? 25 : 40, "maininput");
if(!$FW_ss && !$FW_hiddenroom{save}) {
FW_pO "</form></td><td><form>" . FW_submit("cmd", "save");
}
FW_pO "</form>";
FW_pO "</td></tr></table>";
FW_pO "</div>";
############## ##############
# MENU # MENU
my (@list1, @list2); my (@list1, @list2);
@@ -1060,6 +1049,22 @@ FW_roomOverview($)
} }
FW_pO "</table>"; FW_pO "</table>";
FW_pO "</div>"; FW_pO "</div>";
FW_pO "</div>" if($hasMenuScroll);
##############
# HEADER
FW_pO "<div id=\"hdr\">";
FW_pO '<table border="0"><tr><td style="padding:0">';
FW_pO "<form method=\"get\" action=\"$FW_ME\">";
FW_pO FW_hidden("room", "$FW_room") if($FW_room);
FW_pO FW_textfield("cmd", $FW_ss ? 25 : 40, "maininput");
if(!$FW_ss && !$FW_hiddenroom{save}) {
FW_pO "</form></td><td><form>" . FW_submit("cmd", "save");
}
FW_pO "</form>";
FW_pO "</td></tr></table>";
FW_pO "</div>";
} }

12
www/pgm2/style.css
View File

@@ -3,13 +3,17 @@ body { background-color: #FFFFE7;
input { font-family:Arial, sans-serif; font-size:16px; } input { font-family:Arial, sans-serif; font-size:16px; }
select { font-family:Arial, sans-serif; font-size:16px; } select { font-family:Arial, sans-serif; font-size:16px; }
#logo { position:fixed; top:10px; left:20px; #logo { margin-top:10px; margin-left:20px; width:120px; height:132px;
width:120px; height:132px; background-image:url(../icons/fhemicon.png); } background-image:url(../icons/fhemicon.png); }
#menu { position:fixed; top:152px;left:20px; width:140px; } #menu { margin-top:10px; margin-left:20px; width:140px; }
#menuScrollArea { width: 175px; left:0px; top:0px; height:100%;
position:fixed; overflow-x:hidden; overflow-y:auto; }
#hdr { position:absolute; top:10px; left:180px; } #hdr { position:absolute; top:10px; left:180px; }
#content { position:absolute; top:50px; left:180px; bottom:20px; right:10px; } #content { position:absolute; top:50px; left:180px; bottom:20px; right:10px; }
#connect_err { background-color: #000000; color: #FFFFFF; position:absolute; top:0px; left:40px; z-index: 10; } #connect_err { background-color: #000000; color: #FFFFFF;
position:absolute; top:0px; left:40px; z-index: 10; }
.devType { padding-top:20px; } .devType { padding-top:20px; }
a { color: #278727; } a { color: #278727; }
img { border-style: none; } img { border-style: none; }