pollin a-d

[svn42.git] / powersensordaemon / switch.cgi

diff --git a/powersensordaemon/switch.cgi b/powersensordaemon/switch.cgi
index baaf33d..8198e90 100755 (executable)
--- a/powersensordaemon/switch.cgi
+++ b/powersensordaemon/switch.cgi
@@ -24,7 +24,7 @@ for QUERY in `echo $QUERY_STRING | tr '&' ' '`; do
 done
 
 UNIXSOCK=/var/run/powersensordaemon/cmd.sock
 done
 
 UNIXSOCK=/var/run/powersensordaemon/cmd.sock

-VALID_ONOFF_IDS="decke ambientlights lichter all werkzeug labor dart logo spots1 deckehinten deckevorne boiler lichterkette"
+VALID_ONOFF_IDS="decke ambientlights lichter all werkzeug labor dart logo spots1 deckehinten deckevorne boiler lichterkette pcblueleds"

 VALID_SEND_IDS="ymhpoweron ymhpoweroff ymhpower ymhvolup ymhvoldown ymhcd ymhwdtv ymhtuner ymhaux ymhsattv ymhvolmute ymhmenu ymhplus ymhminus ymhtest ymhtimelevel ymheffect ymhprgup ymhprgdown ymhtunplus ymhtunminus ymhtunabcde ymhtape ymhvcr ymhextdec ymhsleep ymhp5 panicled blueled moviemode"
 VALID_BANSHEE_IDS="playPause next prev"
 
 VALID_SEND_IDS="ymhpoweron ymhpoweroff ymhpower ymhvolup ymhvoldown ymhcd ymhwdtv ymhtuner ymhaux ymhsattv ymhvolmute ymhmenu ymhplus ymhminus ymhtest ymhtimelevel ymheffect ymhprgup ymhprgdown ymhtunplus ymhtunminus ymhtunabcde ymhtape ymhvcr ymhextdec ymhsleep ymhp5 panicled blueled moviemode"
 VALID_BANSHEE_IDS="playPause next prev"
 

@@ -59,6 +59,9 @@ if [ "$POWER" == "on" -o "$POWER" == "off" ]; then
   done
 fi
 
   done
 fi
 

+DESC_pcblueleds="Blaue Leds PC"
+DESC_pollina="Pollin A"
+DESC_pollinb="Pollin B"

 DESC_werkzeug="Werkzeug LEDs"
 DESC_stereo="Receiver On/Off"
 DESC_ambientlights="Ambient Lichter"
 DESC_werkzeug="Werkzeug LEDs"
 DESC_stereo="Receiver On/Off"
 DESC_ambientlights="Ambient Lichter"

@@ -127,18 +130,24 @@ for DISPID in $VALID_ONOFF_IDS; do
 
   echo "<form action=\"/cgi-bin/switch.cgi\">"
   echo "<input type=\"hidden\" name=\"id\" value=\"$DISPID\" />"
 
   echo "<form action=\"/cgi-bin/switch.cgi\">"
   echo "<input type=\"hidden\" name=\"id\" value=\"$DISPID\" />"

-  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 "<div style=\"float:left; margin:2px; padding:1px; max-width:236px; font-size:10pt; border:1px solid black;\">"
+  echo "<div style='width:10em; display:inline-block; vertical-align:middle;'>$NAME</div>"
+  echo "<span style='float:right; text-align:right;'>"

   echo " <input type='submit' name='power' value='on' />"
   echo " <input type='submit' name='power' value='off' />"
   echo " <input type='submit' name='power' value='on' />"
   echo " <input type='submit' name='power' value='off' />"

-  echo "</span></div>"
+  echo "</span>"
+  echo "</div>"

   echo "</form>"
   
   else
   
   echo "</form>"
   
   else
   

-  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 "<div style=\"float:left; margin:2px; padding:1px; max-width:236px; font-size:10pt; border:1px solid black;\">"
+  echo "<span style='float:left; text-align:left;'>"

   echo " <button onClick='sendButton(\"on\",\"$DISPID\");'>On</button>"
   echo " <button onClick='sendButton(\"off\",\"$DISPID\");'>Off</button>"
   echo " <button onClick='sendButton(\"on\",\"$DISPID\");'>On</button>"
   echo " <button onClick='sendButton(\"off\",\"$DISPID\");'>Off</button>"

-  echo "</span></div>"
+  echo "</span>"
+  echo "<div style='width:10em; float:right; display:inline-block; margin-left:1ex; vertical-align:middle;'>$NAME</div>"
+  echo "</div>"

   
   fi
   if [ "$MOBILE" == "1" ]; then
   
   fi
   if [ "$MOBILE" == "1" ]; then

@@ -162,10 +171,13 @@ for DISPID in $VALID_SEND_IDS; do
 
   else
   
 
   else
   

-  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 "<div style=\"float:left; margin:2px; padding:1px; max-width:236px; font-size:10pt; border:1px solid black;\">"
+  echo "<span style='float:left; text-align:left;'>"

   echo " <button onClick='sendButton(\"on\",\"$DISPID\");'>Send</button>"
   echo " <button onClick='sendButton(\"on\",\"$DISPID\");'>Send</button>"

-  echo "</span></div>"
-  
+  echo "</span>"
+  echo "<div style='width:10em; float:right; display:inline-block; margin-left:1ex; vertical-align:middle;'>$NAME</div>"
+  echo "</div>"
+    

   fi
 done
 echo "</div>"
   fi
 done
 echo "</div>"