From: Bernhard Tittelbach <xro@realraum.at>
Date: Thu, 4 Apr 2013 14:36:33 +0000 (+0000)
Subject: switch.cgi nofloat=1 includes ymhremote
X-Git-Url: https://git.realraum.at/?a=commitdiff_plain;h=4836dbabd9011a70ff28a07aa19083538e20f56f;p=svn42.git

switch.cgi nofloat=1 includes ymhremote
---

diff --git a/powersensordaemon/switch.cgi b/powersensordaemon/switch.cgi
index af83698..19d863e 100755
--- a/powersensordaemon/switch.cgi
+++ b/powersensordaemon/switch.cgi
@@ -137,7 +137,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 +242,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 +264,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)"
diff --git a/powersensordaemon/ymhremote.html b/powersensordaemon/ymhremote.html
index 3a43e59..572e674 100755
--- a/powersensordaemon/ymhremote.html
+++ b/powersensordaemon/ymhremote.html
@@ -3,7 +3,7 @@
 <title>Realraum Yamaha Remote</title>
 <script type="text/javascript">
 
-function sendButton( btn )
+function sendYmhButton( btn )
 {
   //alert(btn);
   document.getElementById('indicator').style.backgroundColor="red";
@@ -25,38 +25,38 @@ function remoteKeyboard( e )
 	e = e || window.event;
 	switch( e.keyCode )
 	{
-		//case 81: sendButton( ( e.altKey ? 'REBOOT' : 'w' ) ); break;	// ALT-Q = reboot, Q = Power
-		case 38: sendButton( 'ymhprgup' ); break; //up
-		case 37: sendButton( 'ymhminus' ); break; //left
-		//case 13: sendButton( '' ); break;  //enter
-		case 39: sendButton( 'ymhplus' ); break; //right
-		case 40: sendButton( 'ymhprgdown' ); break; //down
-		//case  8: sendButton( 'T_back' ); break; //backspace
-		//case 27: sendButton( 't_stop' ); break;	// ESC
-		case 77: sendButton( 'ymhmenu' ); break;	// M
-		case 84: sendButton( 'ymhtimelevel' ); break;	// T
-		//case 32: sendButton( '' ); break;	// Space
-		case 83: sendButton( 'ymhsleep' ); break;		// S
-		case 36: sendButton( 'ymhmute' ); break; //pos1        
-		case 33: sendButton( 'ymhvolup' ); break;	// P = 80, PAGEUP = 33
-		case 43: sendButton( 'ymhvolup' ); break;	// +
-		case 34: sendButton( 'ymhvoldown' ); break;	// N = 78, PAGEDOWN = 34
-		case 45: sendButton( 'ymhvoldown' ); break;	// -
-		case 46: sendButton( 'ymhtunplus' ); break;	// .
-		case 44: sendButton( 'ymhtunminus' ); break;	// ,
-		case 59: sendButton( 'ymhtunabcde' ); break;	// ; 
-		case 69: sendButton( 'ymheffect' ); break;	// E
-		case 80: sendButton( 'ymhpower' ); break;	// P
-		case 48: sendButton( 'ymhtest' ); break;	// 0
-		case 49: sendButton( 'ymhcd' ); break;	// 1
-		case 50: sendButton( 'ymhtuner' ); break;	// 2
-		case 51: sendButton( 'ymhtape' ); break;	// 3
-		case 52: sendButton( 'ymhwdtv' ); break;	// 4
-		case 53: sendButton( 'ymhsattv' ); break;	// 5
-		case 54: sendButton( 'ymhvcr' ); break;	// 6
-		case 55: sendButton( 'ymh7' ); break;	// 7
-		case 56: sendButton( 'ymhaux' ); break;	// 8
-		case 57: sendButton( 'ymhextdec' ); break;	// 9
+		//case 81: sendYmhButton( ( e.altKey ? 'REBOOT' : 'w' ) ); break;	// ALT-Q = reboot, Q = Power
+		case 38: sendYmhButton( 'ymhprgup' ); break; //up
+		case 37: sendYmhButton( 'ymhminus' ); break; //left
+		//case 13: sendYmhButton( '' ); break;  //enter
+		case 39: sendYmhButton( 'ymhplus' ); break; //right
+		case 40: sendYmhButton( 'ymhprgdown' ); break; //down
+		//case  8: sendYmhButton( 'T_back' ); break; //backspace
+		//case 27: sendYmhButton( 't_stop' ); break;	// ESC
+		case 77: sendYmhButton( 'ymhmenu' ); break;	// M
+		case 84: sendYmhButton( 'ymhtimelevel' ); break;	// T
+		//case 32: sendYmhButton( '' ); break;	// Space
+		case 83: sendYmhButton( 'ymhsleep' ); break;		// S
+		case 36: sendYmhButton( 'ymhmute' ); break; //pos1        
+		case 33: sendYmhButton( 'ymhvolup' ); break;	// P = 80, PAGEUP = 33
+		case 43: sendYmhButton( 'ymhvolup' ); break;	// +
+		case 34: sendYmhButton( 'ymhvoldown' ); break;	// N = 78, PAGEDOWN = 34
+		case 45: sendYmhButton( 'ymhvoldown' ); break;	// -
+		case 46: sendYmhButton( 'ymhtunplus' ); break;	// .
+		case 44: sendYmhButton( 'ymhtunminus' ); break;	// ,
+		case 59: sendYmhButton( 'ymhtunabcde' ); break;	// ; 
+		case 69: sendYmhButton( 'ymheffect' ); break;	// E
+		case 80: sendYmhButton( 'ymhpower' ); break;	// P
+		case 48: sendYmhButton( 'ymhtest' ); break;	// 0
+		case 49: sendYmhButton( 'ymhcd' ); break;	// 1
+		case 50: sendYmhButton( 'ymhtuner' ); break;	// 2
+		case 51: sendYmhButton( 'ymhtape' ); break;	// 3
+		case 52: sendYmhButton( 'ymhwdtv' ); break;	// 4
+		case 53: sendYmhButton( 'ymhsattv' ); break;	// 5
+		case 54: sendYmhButton( 'ymhvcr' ); break;	// 6
+		case 55: sendYmhButton( 'ymh7' ); break;	// 7
+		case 56: sendYmhButton( 'ymhaux' ); break;	// 8
+		case 57: sendYmhButton( 'ymhextdec' ); break;	// 9
 	}
 }
 
@@ -65,40 +65,40 @@ document.onkeydown = remoteKeyboard;
 
 </script>
 <map name="ymhremote">
-<area shape ="rect" coords ="57,36,121,59" onClick="sendButton('ymhpower');"  />
+<area shape ="rect" coords ="57,36,121,59" onClick="sendYmhButton('ymhpower');"  />
 
-<area shape ="circle" coords ="36,98,17" onClick="sendButton('ymhcd');" alt="ymhcd" />
-<area shape ="circle" coords ="88,98,17" onClick="sendButton('ymhtuner');" alt="ymhtuner" />
-<area shape ="circle" coords ="142,98,17" onClick="sendButton('ymhtape');" alt="ymhtape" />
-<area shape ="circle" coords ="36,145,17" onClick="sendButton('ymhwdtv');" alt="ymhwdtv" />
-<area shape ="circle" coords ="88,145,17" onClick="sendButton('ymhsattv');" alt="ymhsattv" />
-<area shape ="circle" coords ="142,145,17" onClick="sendButton('ymhvcr');" alt="ymhvcr" />
-<area shape ="circle" coords ="36,192,17" onClick="sendButton('ymh7');" alt="ymh7" />
-<area shape ="circle" coords ="88,192,17" onClick="sendButton('ymhaux');" alt="ymhaux" />
-<area shape ="circle" coords ="142,192,17" onClick="sendButton('ymhextdec');" alt="ymhextdec" />
-<area shape ="circle" coords ="36,240,17" onClick="sendButton('ymhtest');" alt="ymhtest" />
-<area shape ="circle" coords ="88,240,17" onClick="sendButton('ymhtunabcde');" alt="ymhtunabcde" />
-<area shape ="circle" coords ="142,240,17" onClick="sendButton('ymheffect');" alt="ymheffect" />
+<area shape ="circle" coords ="36,98,17" onClick="sendYmhButton('ymhcd');" alt="ymhcd" />
+<area shape ="circle" coords ="88,98,17" onClick="sendYmhButton('ymhtuner');" alt="ymhtuner" />
+<area shape ="circle" coords ="142,98,17" onClick="sendYmhButton('ymhtape');" alt="ymhtape" />
+<area shape ="circle" coords ="36,145,17" onClick="sendYmhButton('ymhwdtv');" alt="ymhwdtv" />
+<area shape ="circle" coords ="88,145,17" onClick="sendYmhButton('ymhsattv');" alt="ymhsattv" />
+<area shape ="circle" coords ="142,145,17" onClick="sendYmhButton('ymhvcr');" alt="ymhvcr" />
+<area shape ="circle" coords ="36,192,17" onClick="sendYmhButton('ymh7');" alt="ymh7" />
+<area shape ="circle" coords ="88,192,17" onClick="sendYmhButton('ymhaux');" alt="ymhaux" />
+<area shape ="circle" coords ="142,192,17" onClick="sendYmhButton('ymhextdec');" alt="ymhextdec" />
+<area shape ="circle" coords ="36,240,17" onClick="sendYmhButton('ymhtest');" alt="ymhtest" />
+<area shape ="circle" coords ="88,240,17" onClick="sendYmhButton('ymhtunabcde');" alt="ymhtunabcde" />
+<area shape ="circle" coords ="142,240,17" onClick="sendYmhButton('ymheffect');" alt="ymheffect" />
 
-<!--area shape ="polygon" coords ="57,336,89,308,119,333,110,445,66,445" onClick="sendButton('ymhtvlolup');" alt="ymhtvlolup" /-->
-<!--area shape ="polygon" coords ="57,418,66,407,110,407,119,418,89,445" onClick="sendButton('ymhtvvoldown');"  alt="ymhtvvoldown"  /-->
-<area shape ="polygon" coords ="19,377,47,347,59,355,59,398,47,408" onClick="sendButton('ymhvoldown');"  alt="ymhvoldown"  />
-<area shape ="polygon" coords ="118,355,129,346,158,377,130,408,118,398" onClick="sendButton('ymhvolup');"  alt="ymhvolup"  />
-<area shape ="circle" coords ="89,377,16" onClick="sendButton('ymhmute');" alt="ymhmute" />
+<!--area shape ="polygon" coords ="57,336,89,308,119,333,110,445,66,445" onClick="sendYmhButton('ymhtvlolup');" alt="ymhtvlolup" /-->
+<!--area shape ="polygon" coords ="57,418,66,407,110,407,119,418,89,445" onClick="sendYmhButton('ymhtvvoldown');"  alt="ymhtvvoldown"  /-->
+<area shape ="polygon" coords ="19,377,47,347,59,355,59,398,47,408" onClick="sendYmhButton('ymhvoldown');"  alt="ymhvoldown"  />
+<area shape ="polygon" coords ="118,355,129,346,158,377,130,408,118,398" onClick="sendYmhButton('ymhvolup');"  alt="ymhvolup"  />
+<area shape ="circle" coords ="89,377,16" onClick="sendYmhButton('ymhmute');" alt="ymhmute" />
 
-<area shape ="circle" coords ="36,455,17" onClick="sendButton('ymhsleep');" alt="ymhsleep" />
-<area shape ="circle" coords ="142,455,17" onClick="sendButton('ymhp5');" alt="ymhp5" />
+<area shape ="circle" coords ="36,455,17" onClick="sendYmhButton('ymhsleep');" alt="ymhsleep" />
+<area shape ="circle" coords ="142,455,17" onClick="sendYmhButton('ymhp5');" alt="ymhp5" />
 
-<area shape ="rect" coords ="18,278,67,301" onClick="sendButton('ymhtunminus');"  />
-<area shape ="rect" coords ="111,278,160,301" onClick="sendButton('ymhtunplus');"  />
+<area shape ="rect" coords ="18,278,67,301" onClick="sendYmhButton('ymhtunminus');"  />
+<area shape ="rect" coords ="111,278,160,301" onClick="sendYmhButton('ymhtunplus');"  />
 
-<area shape ="polygon" coords ="57,524,89,496,119,521,110,524,66,533" onClick="sendButton('ymhprgup');" alt="ymhprgup" />
-<area shape ="polygon" coords ="57,606,66,595,110,595,119,606,89,634" onClick="sendButton('ymhprgdown');"  alt="ymhprgdown"  />
-<area shape ="polygon" coords ="19,565,47,534,59,543,59,586,47,595" onClick="sendButton('ymhminus');"  alt="ymhminus"  />
-<area shape ="polygon" coords ="118,543,129,534,158,565,130,595,118,586" onClick="sendButton('ymhplus');"  alt="ymhplus"  />
+<area shape ="polygon" coords ="57,524,89,496,119,521,110,524,66,533" onClick="sendYmhButton('ymhprgup');" alt="ymhprgup" />
+<area shape ="polygon" coords ="57,606,66,595,110,595,119,606,89,634" onClick="sendYmhButton('ymhprgdown');"  alt="ymhprgdown"  />
+<area shape ="polygon" coords ="19,565,47,534,59,543,59,586,47,595" onClick="sendYmhButton('ymhminus');"  alt="ymhminus"  />
+<area shape ="polygon" coords ="118,543,129,534,158,565,130,595,118,586" onClick="sendYmhButton('ymhplus');"  alt="ymhplus"  />
 
-<area shape ="circle" coords ="36,634,17" onClick="sendButton('ymhtimelevel');" alt="ymhtimelevel" />
-<area shape ="circle" coords ="142,634,17" onClick="sendButton('ymhmenu');" alt="ymhmenu" />
+<area shape ="circle" coords ="36,634,17" onClick="sendYmhButton('ymhtimelevel');" alt="ymhtimelevel" />
+<area shape ="circle" coords ="142,634,17" onClick="sendYmhButton('ymhmenu');" alt="ymhmenu" />
 <!-- href ="./cgi-bin/switch.cgi" target ="_blank" -->
 </map>
 </head>
@@ -106,7 +106,7 @@ document.onkeydown = remoteKeyboard;
 <center>
 <table border="0" cellspacing="0" cellpadding="0" width="180">
 <tr><td id="indicator" style="background-color:white; height:2px;"></td></tr>
-<tr><td><img src="rx-v396-remote.png" width="180" height="714" usemap="#ymhremote" id="remoteimg" border="0" /></td></tr>
+<tr><td><img src="/rx-v396-remote.png" width="180" height="714" usemap="#ymhremote" id="remoteimg" border="0" /></td></tr>
 </table>
 <p id="commandlabel" style="display:hidden; width:180px;">&nbsp;</p>
 </center>