Permalink
Browse files

Front end bug fixing and enhancements

  • Loading branch information...
1 parent c520b94 commit 909241370bce554316e16dc097f4dd825bf90b83 @mbarton committed Apr 18, 2012
View
@@ -17,15 +17,15 @@
{
margin-top: 50px;
}
-.span1
+#sequencer .span1
{
background-color: gray;
padding-top: 20px;
padding-bottom: 20px;
text-align: center;
border-radius: 5px;
}
-.span1.label
+#sequencer .span1.label
{
color: white;
}
@@ -43,9 +43,9 @@
{
background-color: rgb(255, 231, 4) !important;
}
-.trigger.enabled
+#sequencer .trigger.enabled
{
- background-color: rgb(67, 176, 48);
+ background-color: rgb(67, 176, 48);
}
.error_report
{
@@ -92,11 +92,17 @@
color: #EEE;
font-size: .7em;
}
-.dark-footer img
+.dark-footer a
+{
+ float: right;
+ margin-left: 10px;
+}
+#controls .span3 h3
{
float: left;
+ margin-right: 10px;
}
-#homepage .span1
+#tempo
{
- background-color: white;
-}
+ width: 100px;
+}
View
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
View
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
View
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
View
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
View
@@ -53,19 +53,18 @@
<li><a href="http://twitter.com/#!/ciudilo">Kiril</a></li>
<li><a href="https://github.com/mbarton">Michael</a></li>
</ul>
- for the <a href="http://londonrealtime.co.uk/">London Realtime Hack Weekend 2012</a> and was built in under 48 hours
+ for the <a href="http://londonrealtime.co.uk/">London Realtime Hack Weekend 2012</a> and was built in under 48 hours thanks to the super awesome APIs below
</div>
</div>
<div class="row dark-footer">
<div class="span7">
&copy; 2012 Andrejs Jermakovics, Kiril Piskunov, Michael Barton
</div>
- <div class="span2">
+ <div class="span5">
+ <a target="new" href="http://www.gosquared.com/"><img src="img/gosquared.png" /></a>
+ <a target="new" href="http://www.twilio.com"><img src="img/twilio_ball.png" /></a>
<a target="new" href="http://www.pusher.com"><img src="img/pusher.png" /></a>
- </div>
- <div class="span3">
- <a target="new" href="http://www.twilio.com/" style="text: decoration: none; display: inline-block; width: 166px; height: 0; overflow: hidden; padding-top: 31px; background: url(http://www.twilio.com/packages/company/img/logos_icon_poweredbysmall.png) no-repeat;">powered by twilio™</a>
- </div>
+ </div>
</div>
</div>
<div id="sequencer">
@@ -82,7 +81,7 @@ <h3 id="room_name">Realtime Room</h3>
<button id="stop" class="btn"><img src="img/stop.png" /></button>
</div>
</div>
- <div class="span4">
+ <div class="span3">
<div class="btn-group">
<button class="btn dropdown-toggle" data-toggle="dropdown"></button>
</a>
@@ -91,14 +90,28 @@ <h3 id="room_name">Realtime Room</h3>
<button id="add_track" class="btn"><img src="img/add.png" /></button>
</div>
</div>
- <div class="span2">
- <h3>Tempo</h3>
+ <div class="span4">
+ Phone <strong>0800 011 9881</strong> to add a new sample
</div>
- <div class="span2 control-group">
+ <div class="span3 control-group">
+ <h3>Tempo</h3>
<input id="tempo" type="text" value="140" />
</div>
</div>
</div>
</div>
+<!-- Well you gotta get Go Squared in somehow -->
+<script type="text/javascript">
+ var GoSquared={};
+ GoSquared.acct = "GSN-379516-P";
+ (function(w){
+ function gs(){
+ w._gstc_lt=+(new Date); var d=document;
+ var g = d.createElement("script"); g.type = "text/javascript"; g.async = true; g.src = "//d1l6p2sc9645hc.cloudfront.net/tracker.js";
+ var s = d.getElementsByTagName("script")[0]; s.parentNode.insertBefore(g, s);
+ }
+ w.addEventListener?w.addEventListener("load",gs,false):w.attachEvent("onload",gs);
+ })(window);
+</script>
</body>
-</html>
+</html>
View
@@ -159,7 +159,7 @@ function pushPusherTempo(tempo)
$.get(url);
}
-function loadMatrix(callback)
+function loadMatrix(room, callback)
{
var url = image_endpoint() + "/" + room + "/?callback=?";
@@ -214,7 +214,9 @@ var room = window.location.hash.replace("#", "");
function loadPage(room)
{
- if(room === undefined)
+ if(room !== undefined)
+ room = room.replace("#", "");
+ else
room = window.location.hash.replace("#", "");
logInfo("Loading...");
@@ -239,7 +241,7 @@ function loadPage(room)
renderSampleChooser();
});
- loadMatrix(function()
+ loadMatrix(room, function()
{
renderFromMatrix();
loadAudio();
@@ -348,4 +350,4 @@ $(function(){
});
loadPage();
-});
+});

0 comments on commit 9092413

Please sign in to comment.