Merge branch 'master' of git.xpub.nl:/var/www/git.xpub.nl/repos/tgc3

master
ugrnm 8 years ago
commit bcef7062d3

@ -7,16 +7,16 @@ import subprocess
f = cgi.FieldStorage() f = cgi.FieldStorage()
p = f.getvalue("p", "Bump.mp3") p = f.getvalue("p", "Bump.mp3")
p = os.path.join("voice", p) p = os.path.join("voice", p)
out = subprocess.check_output(["mplayer", p], stderr=subprocess.STDOUT) out = subprocess.check_output(["mpv", p], cwd="/media/floppy/noweb", stderr=subprocess.STDOUT)
# print "Location: /pushingscore-Karina.html" # print "Location: /index.html"
# print # print
print "Content-type:text/html; charset=utf-8" print "Content-type:text/html; charset=utf-8"
print print
print """<html> print """<html>
<head> <head>
<meta http-equiv="refresh" content="0;url=/pushingscore-Karina.html" /> <meta http-equiv="refresh" content="0;url=/index.html" />
</head> </head>
<body> <body>
</body> </body>

@ -1 +1,69 @@
GREAT JOB! <html>
<head>
<title></title>
<style>
body {
margin-left: 20;
margin-right: 20;
padding: 0;
color: grey;
}
form.buttons {
}
form.buttons input {
width: 150px;
height: 150px;
/*hide the labels*/
font-size: 0;
line-height: 0;
border: 0;
margin: ;
}
</style>
</head>
<body>
<form action="cgi-bin/play.cgi" class="buttons">
<input type="submit" name="p" value="BasicTurn.mp3" style="background:url(images/choreology1-BasicTurn.svg) no-repeat;" />
<input type="submit" name="p" value="Follow.mp3" style="background:url(images/choreology2-Follow.svg) no-repeat;" />
<br>
<input type="submit" name="p" value="AmericanSpin.mp3" style="background:url(images/choreology3-AmericanSpin.svg) no-repeat;" />
<input type="submit" name="p" value="Bump.mp3" style="background:url(images/choreology4-Bump.svg) no-repeat;" />
<br>
<input type="submit" name="p" value="StopAndGo.mp3" style="background:url(images/choreology5-StopAndGo.svg) no-repeat;" />
<input type="submit" name="p" value="Windmill.mp3" style="background:url(images/choreology6-Windmill.svg) no-repeat;" />
<br>
<input type="submit" name="p" value="SpanishArms.mp3" style="background:url(images/choreology7-SpanishArms.svg) no-repeat;" />
<input type="submit" name="p" value="Hucklebuck.mp3" style="background:url(images/choreology8-Hucklebuck.svg) no-repeat;" />
<br>
<!--"Whip" of "The Whip" options - needs testing with music playing in the background
<input type="submit" name="p" value="TheWhip.mp3" style="background:url(images/choreology9-Whip.svg) no-repeat;" />
-->
<input type="submit" name="p" value="Whip.mp3" style="background:url(images/choreology9-Whip.svg) no-repeat;" />
<input type="submit" name="p" value="ChickenWalks.mp3" style="background:url(images/choreology10-ChickenWalks.svg) no-repeat;" />
<div class="tempo">
<br>
<br>
<br>
<input id="slider3" type="range" min ="100" max="180" step ="1" style="width: 640px" />
<!-- <input id="slider3" type="range" min ="100" max="180" step ="1" orient="vertical" style="-webkit-appearance: slider-vertical; writing-mode: bt-lr" />
-->
</div>
</form>
</body>
</html>

@ -1,77 +0,0 @@
<html>
<head>
<title></title>
<style>
body {
margin-left: 20;
margin-right: 20;
padding: 0;
color: grey;
}
form.buttons {
}
form.buttons input {
width: 150px;
height: 150px;
/*hide the labels*/
font-size: 0;
line-height: 0;
border: 0;
margin: ;
}
</style>
</head>
<body>
<form action="cgi-bin/play.cgi" class="buttons">
<input type="submit" name="p" value="BasicTurn.mp3" style="background:url(images/choreology1-BasicTurn.svg) no-repeat;" />
<input type="submit" name="p" value="Follow.mp3" style="background:url(images/choreology2-Follow.svg) no-repeat;" />
<br>
<input type="submit" name="p" value="AmericanSpin.mp3" style="background:url(images/choreology3-AmericanSpin.svg) no-repeat;" />
<input type="submit" name="p" value="Bump.mp3" style="background:url(images/choreology4-Bump.svg) no-repeat;" />
<br>
<input type="submit" name="p" value="StopAndGo.mp3" style="background:url(images/choreology5-StopAndGo.svg) no-repeat;" />
<input type="submit" name="p" value="Windmill.mp3" style="background:url(images/choreology6-Windmill.svg) no-repeat;" />
<br>
<input type="submit" name="p" value="SpanishArms.mp3" style="background:url(images/choreology7-SpanishArms.svg) no-repeat;" />
<input type="submit" name="p" value="Hucklebuck.mp3" style="background:url(images/choreology8-Hucklebuck.svg) no-repeat;" />
<br>
<!-- "Whip" of "The Whip" options - needs testing with music playing in the background
<input type="submit" name="p" value="TheWhip.mp3" style="background:url(images/choreology9-Whip.svg) no-repeat;" />
-->
<input type="submit" name="p" value="Whip.mp3" style="background:url(images/choreology9-Whip.svg) no-repeat;" />
<input type="submit" name="p" value="ChickenWalks.mp3" style="background:url(images/choreology10-ChickenWalks.svg) no-repeat;" />
<div class="tempo">
<br>
<br>
<br>
<input id="slider3" type="range" min ="100" max="180" step ="1" style="width: 640px" />
<!-- <input id="slider3" type="range" min ="100" max="180" step ="1" orient="vertical" style="-webkit-appearance: slider-vertical; writing-mode: bt-lr" />
-->
</div>
</form>
</body>
</html>
Loading…
Cancel
Save