Merge branch 'master' of git://github.com/tanelt/megaspeaker

Conflicts: lib/public/master.html
msokk · Mar 25, 2012 · 8f9b916 · 8f9b916
2 parents 69ecdd1 + fa06a14
commit 8f9b916
Show file tree

Hide file tree

Showing 4 changed files with 17 additions and 6 deletions.
diff --git a/lib/public/css/style.css b/lib/public/css/style.css
@@ -269,7 +269,16 @@ body {
   background-size: contain;
 }
 
-
+#speaker-on {
+  position: absolute;
+  top: 8.4em;
+  left: 9.4em;
+  width: 3.4em;
+  height: 3.4em;
+  background: #25E610;
+  -webkit-border-radius: 3.4em;
+  display: none;
+}
 
 .counter {
   position: absolute;
@@ -295,7 +304,7 @@ body {
 }
 
 #playBtn img {
-  width: 175px;
+  width: 172px;
 }
 
 header {

diff --git a/lib/public/index.html b/lib/public/index.html
@@ -53,12 +53,13 @@ <h1 id="title"></h1>
     </div>
     <div id="loading"></div>
     <div id="speakerBg">
-      <div id="speaker-animation"></div>
       <a href="#" id="playBtn">
-        <img src="/img/play.png" alt="Play" title="Play" />
+        <img src="/img/power.png" alt="Power On!" title="Power On!" />
       </a>
       <span id="readySpeakers" class="counter" title="Ready speakers">0</span>
       <span id="totalSpeakers" class="counter" title="Total speakers">0</span>
+      <div id="speaker-animation"></div>
+      <div id="speaker-on"></div>
     </div>
 
   </div>

diff --git a/lib/public/js/app_client.js b/lib/public/js/app_client.js
@@ -199,7 +199,8 @@ $(function() {
   // Player started
   ms.on('ready', function() {
     ms.socket.emit('playerReady');
-    $("#playBtn").remove();
+    $("#playBtn").hide();
+    $("#speaker-on").show();
   });
 
   // Track loaded

diff --git a/lib/public/master.html b/lib/public/master.html
@@ -82,7 +82,7 @@
         </div>
         <div class="ready" style="display: none;"></div>
         <div class="play"></div>
-        <div class="stop"></div> 
+		<div class="stop"></div> 
         <!-- <div class="pause"></div>-->
 			</div>
 		</div>