Mercurial Mercurial > theend / changeset
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | raw | zip | gz | bz2 | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
début écrans de choix
authorEdwin Razafimahatratra <edwin@robotalismsoft.com>
Tue, 11 Dec 2012 13:13:44 +0100
changeset 41 f2123b4487e9
parent 40 f667f24b4a01
child 42 01415303372e
début écrans de choix
.hgignore file | annotate | diff | comparison | revisions
web/choix_1.html file | annotate | diff | comparison | revisions
web/choix_2.html file | annotate | diff | comparison | revisions
web/choix_3.html file | annotate | diff | comparison | revisions
web/index4.html file | annotate | diff | comparison | revisions
web/inter_choix.html file | annotate | diff | comparison | revisions
web/niv1_videoplayer.html file | annotate | diff | comparison | revisions
web/prologue.html file | annotate | diff | comparison | revisions 
--- a/.hgignore	Mon Dec 10 22:31:19 2012 +0100
+++ b/.hgignore	Tue Dec 11 13:13:44 2012 +0100
@@ -22,3 +22,6 @@
 ^\.gitignore$
 ^src/log
 ^src/\.htaccess$
+syntax: glob
+web/static/res/js/theend.sublime-project
+web/static/res/js/theend.sublime-workspace
\ No newline at end of file
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/web/choix_1.html	Tue Dec 11 13:13:44 2012 +0100
@@ -0,0 +1,67 @@
+<!DOCTYPE html>
+<html lang="fr">
+	<head>
+		<meta charset="utf-8">
+		<title>The End - @todo</title>
+		
+		<meta name="description" content="@todo">
+		
+		<!-- Mobile Specific Metas -->
+		<meta name="viewport" content="initial-scale=1.0, width=device-width" />
+		
+		<link rel="stylesheet" href="static/res/css/style_1024.css" /> 
+		<!-- stylesheet for ipad 3 
+		<link rel="stylesheet" href="static/res/css/style_2048.css" /> 
+		-->
+		
+	</head>
+	<body>
+		<!-- div content - site takes the full height of browser -->	
+		<div id="content" class="full_screen">
+			<!--this div empty allows the element content_vcentering to be vertically aligned -->
+			<div class="strut"></div><!--
+			this comment corrects the white-space (display: inline);
+			--><section class="fullScreen_vcentering container_vcentering choix">
+					<div id="choix1" class="box_vcentering blue big_txt">
+						<p><a href="/" onClick="">Famille</a></p>
+						<p><a href="/" onClick="">Amour</a></p>
+						<p><a href="/" onClick="">Travail</a></p>
+						<p><a href="/" onClick="">International</a></p>
+						<p><a href="/" onClick="">Dieu</a></p>
+						<p><a href="/" onClick="">Président</a></p>
+					</div>
+				</section>
+				
+				<!-- il faut regler comment on nome ici les id. j'aimerai changer id="main" mais je ne sai pas si je peux
+				-->
+				<section id="main" class="mosaic_choice">
+		            <canvas id="mosaic" width="100" height="100"></canvas> 			
+				</section>	
+		</div>	
+
+		<!-- Metanav FranceTV 	-->
+		<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/ease.js"></script>        
+        <script src="static/res/js/incresize.js"></script>
+        <script src="static/res/js/incmosaic.js"></script>
+        <script>        
+            $(function() {
+            	// Init the resize object
+            	//incResize.init("content", "top", "mosaic", "bottom", "footer", 130, 1800/750, null, incMosaic.registerPostNewCanvasSize);
+
+            	// Set mosaic pair of images
+                incMosaic.addImageUrl("static/res/img/accueil-00.jpg");
+                incMosaic.addImageUrl("static/res/img/accueil-01.jpg");
+                incMosaic.addImageUrl("static/res/img/accueil-02.jpg");
+                incMosaic.addImageUrl("static/res/img/accueil-03.jpg");
+                incMosaic.addImageUrl("static/res/img/accueil-04.jpg");
+                incMosaic.addImageUrl("static/res/img/accueil-05.jpg");
+
+                // Start mosaic effect
+    			incMosaic.start("mosaic", 9, 5);
+            });
+        </script>		
+			</body>
+</html>
\ No newline at end of file
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/web/choix_2.html	Tue Dec 11 13:13:44 2012 +0100
@@ -0,0 +1,67 @@
+<!DOCTYPE html>
+<html lang="fr">
+	<head>
+		<meta charset="utf-8">
+		<title>The End - @todo</title>
+		
+		<meta name="description" content="@todo">
+		
+		<!-- Mobile Specific Metas -->
+		<meta name="viewport" content="initial-scale=1.0, width=device-width" />
+		
+		<link rel="stylesheet" href="static/res/css/style_1024.css" /> 
+		<!-- stylesheet for ipad 3 
+		<link rel="stylesheet" href="static/res/css/style_2048.css" /> 
+		-->
+		
+	</head>
+	<body>
+		<!-- div content - site takes the full height of browser -->	
+		<div id="content" class="full_screen">
+			<!--this div empty allows the element content_vcentering to be vertically aligned -->
+			<div class="strut"></div><!--
+			this comment corrects the white-space (display: inline);
+			--><section class="fullScreen_vcentering container_vcentering choix">
+					<div id="choix2" class="box_vcentering white big_txt">
+						<p><a href="/" onClick="">Actif</a></p>
+						<p><a href="/" onClick="">Passif</a></p>
+						<p><a href="/" onClick="">Corps</a></p>
+						<p><a href="/" onClick="">Charité</a></p>
+						<p><a href="/" onClick="">Patrie</a></p>
+						<p><a href="/" onClick="">Politique</a></p>
+					</div>
+				</section>
+				
+				<!-- il faut regler comment on nome ici les id. j'aimerai changer id="main" mais je ne sai pas si je peux
+				-->
+				<section id="main" class="mosaic_choice">
+		            <canvas id="mosaic" width="100" height="100"></canvas> 			
+				</section>	
+		</div>	
+
+		<!-- Metanav FranceTV 	-->
+		<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/ease.js"></script>        
+        <script src="static/res/js/incresize.js"></script>
+        <script src="static/res/js/incmosaic.js"></script>
+        <script>        
+            $(function() {
+            	// Init the resize object
+            	//incResize.init("content", "top", "mosaic", "bottom", "footer", 130, 1800/750, null, incMosaic.registerPostNewCanvasSize);
+
+            	// Set mosaic pair of images
+                incMosaic.addImageUrl("static/res/img/accueil-00.jpg");
+                incMosaic.addImageUrl("static/res/img/accueil-01.jpg");
+                incMosaic.addImageUrl("static/res/img/accueil-02.jpg");
+                incMosaic.addImageUrl("static/res/img/accueil-03.jpg");
+                incMosaic.addImageUrl("static/res/img/accueil-04.jpg");
+                incMosaic.addImageUrl("static/res/img/accueil-05.jpg");
+
+                // Start mosaic effect
+    			incMosaic.start("mosaic", 9, 5);
+            });
+        </script>		
+			</body>
+</html>
\ No newline at end of file
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/web/choix_3.html	Tue Dec 11 13:13:44 2012 +0100
@@ -0,0 +1,67 @@
+<!DOCTYPE html>
+<html lang="fr">
+	<head>
+		<meta charset="utf-8">
+		<title>The End - @todo</title>
+		
+		<meta name="description" content="@todo">
+		
+		<!-- Mobile Specific Metas -->
+		<meta name="viewport" content="initial-scale=1.0, width=device-width" />
+		
+		<link rel="stylesheet" href="static/res/css/style_1024.css" /> 
+		<!-- stylesheet for ipad 3 
+		<link rel="stylesheet" href="static/res/css/style_2048.css" /> 
+		-->
+		
+	</head>
+	<body>
+		<!-- div content - site takes the full height of browser -->	
+		<div id="content" class="full_screen">
+			<!--this div empty allows the element content_vcentering to be vertically aligned -->
+			<div class="strut"></div><!--
+			this comment corrects the white-space (display: inline);
+			--><section class="fullScreen_vcentering container_vcentering choix">
+					<div id="choix3" class="box_vcentering red big_txt">
+						<p><a href="/" onClick="">Spleen</a></p>
+						<p><a href="/" onClick="">Idéal</a></p>
+						<p><a href="/" onClick="">Origines</a></p>
+						<p><a href="/" onClick="">Peur</a></p>
+						<p><a href="/" onClick="">Désir</a></p>
+						<p><a href="/" onClick="">Bonheur</a></p>
+					</div>
+				</section>
+				
+				<!-- il faut regler comment on nome ici les id. j'aimerai changer id="main" mais je ne sai pas si je peux
+				-->
+				<section id="main" class="mosaic_choice">
+		            <canvas id="mosaic" width="100" height="100"></canvas> 			
+				</section>	
+		</div>	
+
+		<!-- Metanav FranceTV 	-->
+		<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/ease.js"></script>        
+        <script src="static/res/js/incresize.js"></script>
+        <script src="static/res/js/incmosaic.js"></script>
+        <script>        
+            $(function() {
+            	// Init the resize object
+            	//incResize.init("content", "top", "mosaic", "bottom", "footer", 130, 1800/750, null, incMosaic.registerPostNewCanvasSize);
+
+            	// Set mosaic pair of images
+                incMosaic.addImageUrl("static/res/img/accueil-00.jpg");
+                incMosaic.addImageUrl("static/res/img/accueil-01.jpg");
+                incMosaic.addImageUrl("static/res/img/accueil-02.jpg");
+                incMosaic.addImageUrl("static/res/img/accueil-03.jpg");
+                incMosaic.addImageUrl("static/res/img/accueil-04.jpg");
+                incMosaic.addImageUrl("static/res/img/accueil-05.jpg");
+
+                // Start mosaic effect
+    			incMosaic.start("mosaic", 9, 5);
+            });
+        </script>		
+			</body>
+</html>
\ No newline at end of file
--- a/web/index4.html	Mon Dec 10 22:31:19 2012 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,53 +0,0 @@
-<!DOCTYPE html>
-<html lang="fr">
-    <head>
-        <meta charset="utf-8">
-        <title>The End - @todo</title>
-        <link rel="stylesheet" href="static/res/css/style.css" />
-    </head>
-    <body>
-    
-        <!-- Content Video + Controls -->
-        <div id="playerContainer">
-            <!-- Video -->
-            <div id="video">
-            </div> 
-            <!-- /Video -->
-            
-            <!-- Controls container -->
-            <div id="controlContainer">
-                <div id="controlbar">
-                    <button id="btnPlay" class="bnt" 
-                    onClick="incPlayer.ctrlPlay(this);">Play/Pause</button><!--        
-                    
-                    --><button id="btnBck" class="bnt"
-                    onClick="incPlayer.ctrlBackward(this);">Back</button><!--        
-                    
-                    --><button id="btnFwd" class="bnt"
-                    onClick="incPlayer.ctrlForward(this);">Forward</button><!--        
-                    
-                    --><button id="btnFullScr" class="bnt"
-                    onClick="incPlayer.ctrlFullscreen(this);">FS</button><!--        
-                    
-                    --><button id="btnHD" class="bnt"
-                    onClick="incPlayer.ctrlHd(this);">HD</button>
-                </div>              
-            </div>   
-            <!-- /Controlbar container -->
-        </div>
-        <!-- /Content Video + Controls -->
-        
-        <!-- jQuery -->
-        <script src="static/res/js/jquery-1.8.2.min.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/incplayer.js"></script>
-        <script>        
-            $(function() {
-                if (incPlayer.init("video", "#playButton", "static/res/json/sequences.json", true)) {
-                    incPlayer.createPopSequence();
-                }        
-            });
-        </script>
-    </body>
-</html>
\ No newline at end of file
--- a/web/inter_choix.html	Mon Dec 10 22:31:19 2012 +0100
+++ b/web/inter_choix.html	Tue Dec 11 13:13:44 2012 +0100
@@ -22,18 +22,17 @@
 			<!--this div empty allows the element content_vcentering to be vertically aligned -->
 			<div class="strut"></div><!--
 			this comment corrects the white-space (display: inline);
-			--><section class="fullScreen_vcentering container_vcentering">
+			--><section class="fullScreen_vcentering container_vcentering inter_choice">
 					<!-- pour changer la tranparance tu accedes à la class ="box_transparance" et tu changes 'opacity: 0;' maintenat c'est 'opacity : 1;' -->
-					<div class="box_vcentering box_transparance">
-						<p class="big_txt">3 ÉCRANS</p>
-						<p class="big_txt">CHOISISSEZ UN MOT PAR ÉCRANS</p>
-						<p class="big_txt">COMPOSEZ VOTRE FILM</p>
+					<div class="box_vcentering box_transparance big_txt">
+						<p>3 ÉCRANS</p>
+						<p>CHOISISSEZ UN MOT PAR ÉCRANS</p>
+						<p>COMPOSEZ VOTRE FILM</p>
 					</div>
 			</section>				
 		</div>	
 
 		<!-- Metanav FranceTV 	-->
-		<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>        
--- a/web/niv1_videoplayer.html	Mon Dec 10 22:31:19 2012 +0100
+++ b/web/niv1_videoplayer.html	Tue Dec 11 13:13:44 2012 +0100
@@ -14,21 +14,24 @@
 	</head>
 	<body>
 		<!-- div content - site takes the full height of browser -->	
-		<div id="content">
+		<div id="content" class="full_screen">
 			
 			<!-- div content_top - the elements takes the full height of "content_top" -->				
 			<div id="content_top">	
-				
-				<section>	
+				<div class="strut"></div><!--
+			this comment corrects the white-space (display: inline);
+			--><section class="fullScreen_vcentering">	
 		            <!-- Video -->
-	            	<div id="video_sequence">
-	            		<!-- 
-	            		controls attribute - you're going to turn the default controls off via JavaScript 
-	            		poster - sets a default image to display instead of the video's first frame.
-	            		-->
-			            <div id="video">
-			            </div> 
-	            	</div> 
+	           		<!-- 
+	           		controls attribute - you're going to turn the default controls off via JavaScript 
+	          		poster - sets a default image to display instead of the video's first frame.
+	            		
+	           		<video controls poster="/">
+	  					<p>Votre navigateur ne gère pas l'élément video @todo</p>
+					</video>
+					-->
+			        <div id="video">
+			        </div> 
 	            	<!-- /Video -->	
 				</section>
 			
@@ -81,7 +84,7 @@
         <script>        
             $(function() {
             	// Init the resize object
-            	incResize.init("content", null, "video", null, "footer", 0, 1920/1080);
+            	//incResize.init("content", null, "video", null, "footer", 0, 1920/1080);
 
             	// Init the video player
                 if (incPlayer.init("video", "btnPlayPause", "current", "duration", "static/res/json/sequences2.json", true)) {
--- a/web/prologue.html	Mon Dec 10 22:31:19 2012 +0100
+++ b/web/prologue.html	Tue Dec 11 13:13:44 2012 +0100
@@ -24,8 +24,8 @@
 			this comment corrects the white-space (display: inline);
 			--><section class="fullScreen_vcentering">
 	            <video autoplay poster="/">
-	           		<sourcesrc="/"type="video/mp4" />
-	           		<sourcesrc="/"type="video/webm" />
+	           		<source src="static/res/video/boucle/FOND2.mp4"type="video/mp4" />
+	           		<source src="/"type="video/webm" />
 	  				<p>Votre navigateur ne gère pas l'élément video @todo</p>
 				</video>
 			</section>
theend