From ae52d4b32d2c2a92b229d8a279c6f28b3cd0b73e Mon Sep 17 00:00:00 2001
From: rudolfkoenig <rudolfkoenig@2b470e98-0d58-463d-a4d8-8e2adae1ed80>
Date: Wed, 20 Jul 2011 16:36:11 +0000
Subject: [PATCH] Smallscreen tuning for android

git-svn-id: svn://svn.code.sf.net/p/fhem/code/trunk@951 2b470e98-0d58-463d-a4d8-8e2adae1ed80
---
 fhem/webfrontend/pgm2/01_FHEMWEB.pm         | 15 +++++++++------
 fhem/webfrontend/pgm2/style_smallscreen.css |  8 ++++----
 2 files changed, 13 insertions(+), 10 deletions(-)

diff --git a/fhem/webfrontend/pgm2/01_FHEMWEB.pm b/fhem/webfrontend/pgm2/01_FHEMWEB.pm
index 55b8af2bb..054707ea2 100755
--- a/fhem/webfrontend/pgm2/01_FHEMWEB.pm
+++ b/fhem/webfrontend/pgm2/01_FHEMWEB.pm
@@ -687,8 +687,7 @@ FW_roomOverview($)
       if(FW_calcWeblink(undef,undef)) {
         pO FW_textfield("cmd", $FW_ss ? 20 : 40);
         $tf_done = 1;
-        pO "</td><td>";
-        pO "&nbsp;&nbsp;";
+        pO "</td><td>&nbsp;&nbsp;</td>";
         FW_zoomLink("zoom=-1", "Zoom-in.png", "zoom in");
         FW_zoomLink("zoom=1",  "Zoom-out.png","zoom out");
         FW_zoomLink("off=-1",  "Prev.png",    "prev");
@@ -696,7 +695,7 @@ FW_roomOverview($)
       }
     }
   }
-  pO FW_textfield("cmd", $FW_ss ? 28 : 40) if(!$tf_done);
+  pO FW_textfield("cmd", $FW_ss ? 25 : 40) if(!$tf_done);
   pO "</td></tr></table>";
   pO "</div>";
   pO "</form>";
@@ -735,10 +734,12 @@ FW_roomOverview($)
   push(@list1, ""); push(@list2, "");
 
   pO "<div id=\"menu\">";
+  pO "<table>";
   if($FW_ss) {  # Make a selection sensitive dropdown list
+    pO "  <tr><td>";
     foreach(my $idx = 0; $idx < @list1; $idx++) {
       if(!$list1[$idx]) {
-        pO "</select>" if($idx);
+        pO "</select></td><td>" if($idx);
         pO "<select OnChange=\"location.href=" .
                               "this.options[this.selectedIndex].value\">"
           if($idx<int(@list1)-1);
@@ -747,10 +748,10 @@ FW_roomOverview($)
         pO "  <option value=$list2[$idx]$sel>$list1[$idx]</option>";
       }
     }
+    pO "  </td></tr>";
 
   } else {
 
-    pO "<table>";
     foreach(my $idx = 0; $idx < @list1; $idx++) {
       my ($l1, $l2) = ($list1[$idx], $list2[$idx]);
       if(!$l1) {
@@ -768,9 +769,9 @@ FW_roomOverview($)
         pO "</tr>";
       }
     }
-    pO "</table>";
 
   }
+  pO "</table>";
   pO "</div>";
 }
 
@@ -1313,8 +1314,10 @@ FW_zoomLink($$$)
   }
 
 
+  pO "<td>";
   pHPlain "$cmd", "<img style=\"border-color:transparent\" alt=\"$alt\" ".
                 "src=\"$FW_ME/icons/$img\"/>";
+  pO "</td>";
 }
 
 ##################
diff --git a/fhem/webfrontend/pgm2/style_smallscreen.css b/fhem/webfrontend/pgm2/style_smallscreen.css
index 39405ba4f..8096d9bb2 100644
--- a/fhem/webfrontend/pgm2/style_smallscreen.css
+++ b/fhem/webfrontend/pgm2/style_smallscreen.css
@@ -1,8 +1,8 @@
 body     { background-color: #FFFFE7; }
-#logo    { position:absolute; top:10px; left:10px; }
-#menu    { position:absolute; top:10px; left:85px; }
-#hdr     { position:absolute; top:40px; left:85px; }
-#content { position:absolute; top:85px; left:10px; }
+#logo    { position:absolute; top: 2px; left: 2px; }
+#menu    { position:absolute; top: 2px; left:65px; }
+#hdr     { position:absolute; top:40px; left:65px; }
+#content { position:absolute; top:85px; left: 5px; }
 
 a {  color: #278727; }