X-Git-Url: https://git.realraum.at/?p=svn42.git;a=blobdiff_plain;f=powersensordaemon%2Fswitch.cgi;h=c10c5fabccd9ca3000a4ee7b659b9857e788cf15;hp=af8369889ea93c0236052f259a5db0bce6c7be30;hb=a34e51d757fe52cb19de2937ae1b211894167524;hpb=2e5efa2d148232cec660312c25d404512a9063a8

diff --git a/powersensordaemon/switch.cgi b/powersensordaemon/switch.cgi
index af83698..c10c5fa 100755
--- a/powersensordaemon/switch.cgi
+++ b/powersensordaemon/switch.cgi
@@ -22,7 +22,7 @@ done
 
 
 UNIXSOCK=/var/run/powersensordaemon/cmd.sock
-VALID_ONOFF_IDS="decke ambientlights lichter all werkzeug labor dart logo spots1 deckehinten deckevorne boiler whiteboard pcblueleds bikewcblue"
+VALID_ONOFF_IDS="regalleinwand labortisch bluebar couchred couchwhite all lichter ambientlights cxleds mashadecke boiler"
 VALID_SEND_IDS_CUSTOM_DISPLAY="ymhpoweroff ymhpower ymhvolup ymhvoldown"
 VALID_SEND_IDS="ymhpoweron 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"
@@ -73,21 +73,15 @@ if [ "$POWER" == "on" -o "$POWER" == "off" ]; then
   done
 fi
 
-DESC_pcblueleds="Blaue Leds PC"
-DESC_bikewcblue="Blaue Lichterkette WC"
-DESC_weissB="WeissB"
-DESC_werkzeug="Werkzeug LEDs"
-DESC_stereo="Receiver On/Off"
+DESC_regalleinwand="LEDs Regal Leinwand"
+DESC_bluebar="Blaue LEDs Bar"
+DESC_labortisch="Labortisch"
+DESC_couchred="LEDs Couch Red"
+DESC_couchwhite="LEDS Couch White"
+DESC_cxleds="CX Leds"
+DESC_mashadecke="MaSha Decke"
 DESC_ambientlights="Ambient Lichter"
-DESC_labor="Labor Licht"
-DESC_boiler="Warmwasser WC"
-DESC_dart="Dart Scheibe"
-DESC_logo="Logo"
-DESC_spots1="Spots"
-DESC_deckehinten="Decke Hinten"
-DESC_deckevorne="Decke Vorne"
-DESC_whiteboard="Whiteboard Vorne"
-DESC_decke="Deckenlichter"
+DESC_boiler="Warmwasser Küche"
 DESC_lichter="Alle Lichter"
 DESC_all="Alles"
 DESC_ymhpoweron="Receiver On (off+tgl)"
@@ -137,7 +131,9 @@ echo ' //google chrome workaround'
 echo ' req.setRequestHeader("googlechromefix","");'
 echo ' req.send(null);'
 echo '}'
+[ "$NOFLOAT" == "1" ] && tail -n+6 /www/ymhremote.html | head -n 58
 echo '</script>'
+[ "$NOFLOAT" == "1" ] && tail -n+67 /www/ymhremote.html | head -n 37
 echo '<style>'
 echo 'div.switchbox {'
 echo '    float:left;'
@@ -240,7 +236,7 @@ echo "</div>"
 
 if [ "$MOBILE" != "1" ]; then                                                             
 
-echo "<div style=\"float:left; border:1px solid black;\">"
+echo "<div style=\"float:left; border:1px solid black; margin-right:2ex; margin-bottom:2ex;\">"
 
 ITEMCOUNT=0
 
@@ -262,6 +258,13 @@ for DISPID in $VALID_SEND_IDS; do
 done
 echo '<div class="switchbox">Goto <a href="/ymhremote.html">Yamaha Receiver Remote</a></div>'
 echo "</div>"
+
+ if [ "$NOFLOAT" == "1" ]; then
+    echo "<div style=\"float:left; border:1px solid black;\">"
+    tail -n+107 /www/ymhremote.html | head -n 5
+    echo "</div>"
+ fi 
+
 echo "<div style=\"float:left; border:1px solid black; margin-top:5px;\">"
 for DISPID in $VALID_BANSHEE_IDS $VALID_CAM_MOTOR_IDS; do
   NAME="$(eval echo \$DESC_$DISPID)"