web/niv1_videoplayer.html
changeset 46 542252e0c615
parent 41 f2123b4487e9
child 78 8c3f0b94d056
--- a/web/niv1_videoplayer.html	Tue Dec 11 21:13:42 2012 +0100
+++ b/web/niv1_videoplayer.html	Wed Dec 12 03:10:24 2012 +0100
@@ -46,26 +46,27 @@
 
 	       				<button id="btnSDHD" class="btn" onClick="/">SD/HD</button>
 	                    
-	                    <button id="btnBck" class="btn txt_hidden" onClick="incPlayer.ctrlPrev();">Back</button>  
 
 	                    <div id="progressContainer">
 		                    
 		                    <div id="progressBar" class="progress_bar">
 		                    	<span id="progress" class="progress_bar"></span>
-		                    	<!--I use a single button, which will serve as a play button when the video is paused (or stopped) and a pause button when it's playing.
-		                    	-->
-		                    	<button id="btnPlayPause" class="btn txt_hidden" title="play" onClick="incPlayer.ctrlPlay(this);">Play/Pause</button>
+		                    	<button id="stateBar" class="txt_hidden" onClick="/"></button>
 		                	</div>
 		                    
 		                   	<ul id="progressTime">
 		                   		<!-- class="txt_white" can be used to color current time in white -->
 		                   		<li id="current" class="floatL"></li>
-		   						<li id="duration" class="floatR"></li>
+		   						<li id="duration" class="floatR">0'00''</li>
 		   					</ul>
 						
 						</div>
-	                    
-	                    <button id="btnFwd" class="btn txt_hidden" onClick="incPlayer.ctrlNext();">Forward</button> 
+	                    <button id="btnBck" class="btn txt_hidden" onClick="incPlayer.ctrlPrev();">Back</button>  
+		                <!--I use a single button, which will serve as a play button when the video is paused (or stopped) and a pause button when it's playing.
+		                -->	                    
+	                    <button id="btnPlayPause" class="btn txt_hidden" title="play" onClick="incPlayer.ctrlPlay(this);">Play/Pause</button> 
+
+	                    <button id="btnFwd" class="btn txt_hidden" onClick="incPlayer.ctrlNext();">Forward</button>
 
 	                    <button id="btnChoice" class="btn">Choice</button>             
                     </div>
@@ -77,18 +78,19 @@
 		<script src="http://static.francetv.fr/js/jquery.metanav-min.js" charset="utf-8"></script>
 		<!-- JavaScript -->
         <script src="static/res/js/jquery-1.8.2.min.js"></script>
+       	<script src="static/res/js/jquery.cookie.js"></script>        	      
         <script src="static/res/js/popcorn-complete.js"></script>
         <script src="static/res/js/popcorn.sequence.js"></script>
-        <script src="static/res/js/incresize.js"></script>
         <script src="static/res/js/incplayer.js"></script>        
+        <script src="static/res/js/incchoice.js"></script>        
         <script>        
             $(function() {
-            	// Init the resize object
-            	//incResize.init("content", null, "video", null, "footer", 0, 1920/1080);
+            	// Init the video player
+                if (incPlayer.init("video", "btnPlayPause", "current", "duration", "static/res/json/sequences.json", true)) {
+                    incPlayer.createPopSequence(incChoice.getChoosenWords());             
 
-            	// Init the video player
-                if (incPlayer.init("video", "btnPlayPause", "current", "duration", "static/res/json/sequences2.json", true)) {
-                    incPlayer.createPopSequence();
+					// Add class on all videos
+           			$("#video").children().addClass("small_video");			
                 }                    	
             });
         </script>