WIP - graphical integration. popcorn-port
authorhamidouk
Fri, 25 Nov 2011 17:30:23 +0100
branchpopcorn-port
changeset 338 3ff4499f79bb
parent 337 ee1d1e4fcf45
child 339 a7e288ce7957
WIP - graphical integration.
src/css/LdtPlayer.css
src/js/widgets/playerWidget.js
src/templates/player.html
--- a/src/css/LdtPlayer.css	Fri Nov 25 16:55:48 2011 +0100
+++ b/src/css/LdtPlayer.css	Fri Nov 25 17:30:23 2011 +0100
@@ -149,7 +149,6 @@
 
     .Ldt-RightPlayerControls {
       float: right;
-      padding: 4px;
     }
 
     .Ldt-CtrlPlay {
@@ -183,23 +182,23 @@
 
     .Ldt-Time {
       float: left;
-      padding: 4px;
       border-right: 1px solid #b6b8b8;
-      height: 25px;
-      overflow: auto;
+      top: 15px;
+      left: 2px;
     }
     
     .Ldt-ElapsedTime {
+      float: left;
       color: #4a4a4a;
     }
     
     .Ldt-TotalTime {
+      float: right;
       color: #b2b2b2; 
     }
 
     .Ldt-CtrlSound {
       float: right;
-      padding: 4px;
     }
     .Ldt-cleaner {
       clear:both;
--- a/src/js/widgets/playerWidget.js	Fri Nov 25 16:55:48 2011 +0100
+++ b/src/js/widgets/playerWidget.js	Fri Nov 25 17:30:23 2011 +0100
@@ -61,9 +61,8 @@
   var totalTime = IriSP.secondsToTime(duration);
   var elapsedTime = IriSP.secondsToTime(this._Popcorn.currentTime());
   
-  var timeTemplate = "{{hours}}:{{minutes}}:{{seconds}}";
-  this.selector.find(".Ldt-ElapsedTime").html(Mustache.to_html(timeTemplate, elapsedTime));
-  this.selector.find(".Ldt-TotalTime").html(Mustache.to_html(timeTemplate, totalTime));
+  this.selector.find(".Ldt-ElapsedTime").html(elapsedTime.toString());
+  this.selector.find(".Ldt-TotalTime").html(totalTime.toString());
   this._previousSecond = this._Popcorn.roundTime();
 };
 
--- a/src/templates/player.html	Fri Nov 25 16:55:48 2011 +0100
+++ b/src/templates/player.html	Fri Nov 25 17:30:23 2011 +0100
@@ -7,11 +7,9 @@
 	</div>	
 	<div class='Ldt-RightPlayerControls'>
     <div class='Ldt-Time'>
-      <span class='Ldt-ElapsedTime'></span>
-      /
-      <span class='Ldt-TotalTime'></span>
+      <div class='Ldt-ElapsedTime'></div> /
+      <div class='Ldt-TotalTime'></div>
     </div>
 		<div class='Ldt-CtrlSound'>Sound</div>
 	</div>
-	<div class='cleaner'>&nbsp;</div>
 </div>