switch all

[svn42.git] / powersensordaemon / switch.cgi
diff --git a/powersensordaemon/switch.cgi b/powersensordaemon/switch.cgi

index 765778c..648de32 100755 (executable)
--- a/powersensordaemon/switch.cgi
+++ b/powersensordaemon/switch.cgi
@@ -16,14 +16,16 @@ for QUERY in `echo $QUERY_STRING | tr '&' ' '`; do
  done
  
  UNIXSOCK=/var/run/powersensordaemon/cmd.sock
-VALIDIDS="werkzeug stereo labor schreibtisch logo idee deckehinten deckevorne"
+VALIDIDS="werkzeug stereo labor schreibtisch logo idee deckehinten deckevorne decke lichter all"
+
+
  
  if [ "$POWER" == "on" -o "$POWER" == "off" ]; then
    for CHECKID in $VALIDIDS; do
      if [ "$CHECKID" == "$ID" ]; then
        echo "power $POWER $ID" | usocket $UNIXSOCK
      fi
-   done
+  done
  fi
  
  DESC_werkzeug="Werkzeug LEDs"
@@ -34,6 +36,9 @@ DESC_logo="Logo"
  DESC_idee="Idee"
  DESC_deckehinten="Decke Hinten"
  DESC_deckevorne="Decke Vorne"
+DESC_decke="Deckenlichter"
+DESC_lichter="Alle Lichter"
+DESC_all="Alles"
  
  echo "Content-type: text/html"
  echo ""
@@ -42,20 +47,17 @@ echo "<head>"
  echo "<title>Realraum rf433ctl</title>"
  echo "</head>"
  echo "<body>"
-echo "<h1>Realraum rf433ctl</h1>"
-echo "<table cellspacing='0'>"
+#echo "<h1>Realraum rf433ctl</h1>"
  for DISPID in $VALIDIDS; do
    NAME="$(eval echo \$DESC_$DISPID)"
    [ -z "$NAME" ] && NAME=$DISPID
    echo "<form action=\"/cgi-bin/switch.cgi\">"
    echo "<input type=\"hidden\" name=\"id\" value=\"$DISPID\" />"
-#  echo " <tr><td>$NAME</td><td><a href=\"switch.cgi?id=$DISPID&power=on\"><button value=\"ON\" /></a></td><td><a href=\"switch.cgi?id=$DISPID&power=off\"><button value=\"OFF\" /></a></td></tr>"
-  echo "<tr><td style=\"font-size:11pt; border-top:1px solid black; border-right:1px solid black; border-left:1px solid black;\">$NAME</td></tr><tr><td align='right' style=\"border-bottom:1px solid black; border-right:1px solid black; border-left:1px solid black;\">"
+  echo "<div style=\"float:left; margin:2px; padding:1px; max-width:236px; font-size:10pt; border:1px solid black;\"><div style='width:10em; display:inline-block; vertical-align:middle;'>$NAME</div><span style='float:right; text-align:right;'>"
    echo " <input type='submit' name='power' value='on' />"
    echo " <input type='submit' name='power' value='off' />"
-  echo "</td></tr><tr><td style=\"height:1ex;\"></td></tr>"
+  echo "</span></div>"
    echo "</form>"
  done
-echo "</table>"
  echo "</body>"
  echo "</html>"