X-Git-Url: https://git.realraum.at/?a=blobdiff_plain;f=powersensordaemon%2Fswitch.cgi;h=bd77e61089d827a0da9a1b026e9fc586b47e6dd6;hb=2bfc092c0484a6f3c61c518205afd45b13d47743;hp=18b3c4f281cc0f243545f50b5860027d5c8ad1c3;hpb=ad367276bbd17bc9b6516ffd9a13cf46639c153d;p=svn42.git

diff --git a/powersensordaemon/switch.cgi b/powersensordaemon/switch.cgi
index 18b3c4f..bd77e61 100755
--- a/powersensordaemon/switch.cgi
+++ b/powersensordaemon/switch.cgi
@@ -24,12 +24,14 @@ for QUERY in `echo $QUERY_STRING | tr '&' ' '`; do
 done
 
 UNIXSOCK=/var/run/powersensordaemon/cmd.sock
-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_CAM_MOTOR_IDS="c C w W"
+VALID_ONOFF_IDS="decke ambientlights lichter all werkzeug labor dart logo spots1 deckehinten deckevorne boiler whiteboard pcblueleds bikewcblue"
+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"
+#VALID_CAM_MOTOR_IDS="c C w W"
 
-[ "$POWER" == "send" ] && POWER=on
+[ "$POWER" == "Off" ] && POWER=off
+[ "$POWER" != "off" ] && POWER=on
 if [ "$POWER" == "on" -o "$POWER" == "off" ]; then
   for CHECKID in $VALID_ONOFF_IDS $VALID_SEND_IDS; do 
     if [ "$CHECKID" == "$ID" ]; then
@@ -75,8 +77,8 @@ if [ "$POWER" == "on" -o "$POWER" == "off" ]; then
 fi
 
 DESC_pcblueleds="Blaue Leds PC"
-DESC_pollina="Pollin A"
-DESC_pollinb="Pollin B"
+DESC_bikewcblue="Blaue Lichterkette WC"
+DESC_weissB="WeissB"
 DESC_werkzeug="Werkzeug LEDs"
 DESC_stereo="Receiver On/Off"
 DESC_ambientlights="Ambient Lichter"
@@ -87,17 +89,17 @@ DESC_logo="Logo"
 DESC_spots1="Spots"
 DESC_deckehinten="Decke Hinten"
 DESC_deckevorne="Decke Vorne"
-DESC_lichterkette="Blaue Lichterkette"
+DESC_whiteboard="Whiteboard Vorne"
 DESC_decke="Deckenlichter"
 DESC_lichter="Alle Lichter"
 DESC_all="Alles"
-DESC_ymhpoweron="Receiver On"
+DESC_ymhpoweron="Receiver On (off+tgl)"
 DESC_ymhpoweroff="Receiver Off"
 DESC_ymhpower="Receiver On/Off"
 DESC_ymhvolup="VolumeUp"
 DESC_ymhvoldown="VolumeDown"
 DESC_ymhcd="Input CD"
-DESC_ymhwdtv="Input WDlxTV"
+DESC_ymhwdtv="Input S/PDIF Wuerfel"
 DESC_ymhtuner="Input Tuner"
 DESC_ymhvolmute="Mute"
 DESC_ymhmenu="Menu"
@@ -139,6 +141,58 @@ echo ' req.setRequestHeader("googlechromefix","");'
 echo ' req.send(null);'
 echo '}'
 echo '</script>'
+echo '<style>'
+echo 'div.switchbox {'
+echo '    float:left;'
+echo '    margin:2px;'
+#echo '    max-width:236px;'
+echo '    max-width:300px;'
+echo '    font-size:10pt;'
+echo '    border:1px solid black;'
+#echo '    height: 32px;'
+echo '    padding:0;'
+echo '}'
+  
+echo 'div.switchnameleft {'
+echo '    width:12em; display:inline-block; vertical-align:middle; margin-left:3px;'
+echo '}'
+
+echo 'span.alignbuttonsright {'
+echo '    top:0px; float:right; display:inline-block; text-align:right; padding:0;'
+echo '}'
+
+echo 'div.switchnameright {'
+echo '    width:12em; display:inline-block; vertical-align:middle; float:right; display:inline-block; margin-left:1ex; margin-right:3px; margin-top:3px; margin-bottom:3px;'
+echo '}'
+
+echo 'span.alignbuttonsleft {'
+echo '    float:left; text-align:left; padding:0;'
+echo '}'
+
+echo '.onbutton {'
+echo '    font-size:11pt;'
+echo '    width: 40px;'
+echo '    height: 32px;'
+echo '    background-color: lime;'
+echo '    margin: 0px;'
+echo '}'
+
+echo '.offbutton {'
+echo '    font-size:11pt;'
+echo '    width: 40px;'
+echo '    height: 32px;'
+echo '    background-color: red;'
+echo '    margin: 0px;'
+echo '}'
+
+echo '.sendbutton {'
+echo '    font-size:11pt;'
+echo '    width: 40px;'
+echo '    height: 32px;'
+#echo '    background-color: grey;'
+echo '    margin: 0px;'
+echo '}'
+echo '</style>'
 echo "</head>"
 echo "<body>"
 #echo "<h1>Realraum rf433ctl</h1>"
@@ -150,23 +204,21 @@ for DISPID in $VALID_ONOFF_IDS; do
 
   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;\">"
-  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 "<div class=\"switchbox\"><div class=\"switchnameleft\">$NAME</div><span class=\"alignbuttonsright\">"
+  echo " <input class=\"onbutton\" type='submit' name='power' value='on' />"
+  echo " <input class=\"offbutton\" type='submit' name='power' value='off' />"
   echo "</span>"
   echo "</div>"
   echo "</form>"
   
   else
   
-  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 "<div class=\"switchbox\">"
+  echo "<span class=\"alignbuttonsleft\">"
+  echo " <button class=\"onbutton\" onClick='sendButton(\"on\",\"$DISPID\");'>On</button>"
+  echo " <button class=\"offbutton\" onClick='sendButton(\"off\",\"$DISPID\");'>Off</button>"
   echo "</span>"
-  echo "<div style='width:10em; float:right; display:inline-block; margin-left:1ex; vertical-align:middle;'>$NAME</div>"
+  echo "<div class=\"switchnameright\">$NAME</div>"
   echo "</div>"
   
   fi
@@ -175,8 +227,41 @@ for DISPID in $VALID_ONOFF_IDS; do
   fi 
 done
 echo "</div>"
-if [ "$MOBILE" != "1" ]; then                                                                                   
+if [ "$MOBILE" != "1" ]; then                                                             
 echo "<div style=\"float:left; border:1px solid black; margin-top:5px;\">"
+
+  if [ -z "$AJAX" ]; then
+
+  echo "<div class=\"switchbox\"><div class=\"switchnameleft\">Receiver Power</div><span class=\"alignbuttonsright\">"
+  echo "<form action=\"/cgi-bin/switch.cgi\"><input type=\"hidden\" name=\"id\" value=\"ymhpower\" /><input class=\"sendbutton\" type='submit' name='power' value='tgl' /></form>"
+  echo "<form action=\"/cgi-bin/switch.cgi\"><input type=\"hidden\" name=\"id\" value=\"ymhpower\" /><input class=\"offbutton\" type='submit' name='power' value='off' /></form>"
+  echo "</span></div>"
+
+  echo "<div class=\"switchbox\"><div class=\"switchnameleft\">Receiver Volume</div><span class=\"alignbuttonsright\">"
+  echo "<form action=\"/cgi-bin/switch.cgi\"><input type=\"hidden\" name=\"id\" value=\"ymhvolup\" /><input class=\"sendbutton\" type='submit' name='power' value='&uarr;' /></form>"
+  echo "<form action=\"/cgi-bin/switch.cgi\"><input type=\"hidden\" name=\"id\" value=\"ymhvoldown\" /><input class=\"sendbutton\" type='submit' name='power' value='&darr;' /></form>"
+  echo "</span></div>"
+
+  else
+  
+  echo "<div class=\"switchbox\">"
+  echo "<span class=\"alignbuttonsleft\">"
+  echo " <button class=\"sendbutton\" onClick='sendButton(\"on\",\"ymhpower\");'>Tgl</button>"
+  echo " <button class=\"offbutton\" onClick='sendButton(\"on\",\"ymhpoweroff\");'>Off</button>"
+  echo "</span>"
+  echo "<div class=\"switchnameright\">Receiver Power</div>"
+  echo "</div>"
+    
+  echo "<div class=\"switchbox\">"
+  echo "<span class=\"alignbuttonsleft\">"
+  echo " <button class=\"sendbutton\" onClick='sendButton(\"on\",\"ymhvolup\");'>&uarr;</button>"
+  echo " <button class=\"sendbutton\" onClick='sendButton(\"on\",\"ymhvoldown\");'>&darr;</button>"
+  echo "</span>"
+  echo "<div class=\"switchnameright\">Receiver Volume</div>"
+  echo "</div>"    
+    
+  fi
+
 for DISPID in $VALID_SEND_IDS; do
   NAME="$(eval echo \$DESC_$DISPID)"
   [ -z "$NAME" ] && NAME=$DISPID
@@ -185,17 +270,17 @@ for DISPID in $VALID_SEND_IDS; do
   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 " <input type='submit' name='power' value='send' />"
+  echo " <input class=\"sendbutton\" type='submit' name='power' value='  ' />"
   echo "</span></div>"
   echo "</form>"
 
   else
   
-  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 "<div class=\"switchbox\">"
+  echo "<span class=\"alignbuttonsleft\">"
+  echo " <button class=\"sendbutton\" onClick='sendButton(\"on\",\"$DISPID\");'> </button>"
   echo "</span>"
-  echo "<div style='width:10em; float:right; display:inline-block; margin-left:1ex; vertical-align:middle;'>$NAME</div>"
+  echo "<div class=\"switchnameright\">$NAME</div>"
   echo "</div>"
     
   fi
@@ -210,17 +295,17 @@ for DISPID in $VALID_BANSHEE_IDS $VALID_CAM_MOTOR_IDS; do
   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 " <input type='submit' name='power' value='send' />"
+  echo " <input class=\"sendbutton\" type='submit' name='power' value='  ' />"
   echo "</span></div>"
   echo "</form>"
 
   else
   
-  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 "<div class=\"switchbox\">"
+  echo "<span class=\"alignbuttonsleft\">"
+  echo " <button class=\"sendbutton\" onClick='sendButton(\"on\",\"$DISPID\");'> </button>"
   echo "</span>"
-  echo "<div style='width:10em; float:right; display:inline-block; margin-left:1ex; vertical-align:middle;'>$NAME</div>"
+  echo "<div class=\"switchnameright\">$NAME</div>"
   echo "</div>"
     
   fi