# HG changeset patch
# User Gautier Thibault <gthibault@universcine.com>
# Date 1270023376 -7200
# Node ID cae5b5ff4058f70683d6fd2c7ee08d96fb14d6a3
# Parent  1b5c6294e805cefb6d8f53adf48d2f5a2101d10b
update left column and tag Editor

diff -r 1b5c6294e805 -r cae5b5ff4058 web/thdProject/apps/frontend/modules/editor/actions/addFilmSegmentAction.class.php
--- a/web/thdProject/apps/frontend/modules/editor/actions/addFilmSegmentAction.class.php	Mon Mar 29 12:29:11 2010 +0200
+++ b/web/thdProject/apps/frontend/modules/editor/actions/addFilmSegmentAction.class.php	Wed Mar 31 10:16:16 2010 +0200
@@ -6,13 +6,12 @@
   {
   	if ($request->getMethodName() != sfWebRequest::POST) return sfView::ERROR;
   	
-  	$in=$request->getParameter('timein');
-	$out=$request->getParameter('timeout');
+  	$in=$request->getParameter('frmIn');
+	$out=$request->getParameter('frmOut');
 	$tag=addslashes($request->getParameter('usertag'));
 	$user=addslashes($request->getParameter('username'));
 	$refFilm=$request->getParameter('refFilm');
 	$film=$request->getParameter('film');
-	
 	// Get file Path	
 	$this->path = sfConfig::get('app_storage_uploads');	
 	$this->format = sfConfig::get('app_storage_format');
@@ -28,7 +27,7 @@
 
 	// Create or Update the file
 	$fp = fopen($file, "a");
-	fwrite($fp,$line);
+	fputcsv($fp,$line);
 	fclose($fp);
 	
 	return sfView::SUCCESS;
diff -r 1b5c6294e805 -r cae5b5ff4058 web/thdProject/apps/frontend/modules/editor/config/view.yml
--- a/web/thdProject/apps/frontend/modules/editor/config/view.yml	Mon Mar 29 12:29:11 2010 +0200
+++ b/web/thdProject/apps/frontend/modules/editor/config/view.yml	Wed Mar 31 10:16:16 2010 +0200
@@ -2,4 +2,7 @@
   
   stylesheets:    [ /css/editor.css, /css/flashplayer.css ]
 
-  javascripts:   [ /js/flowplayer/flowplayer-3.1.0.min.js, /js/flowplayer/uc.flowplayer.config.js, /js/segmentation/segments.js, /js/segmentation/tagtool.js]
\ No newline at end of file
+  javascripts:   [ /js/flowplayer/flowplayer-3.1.0.min.js, /js/flowplayer/uc.flowplayer.config.js, /js/segmentation/segments.js, /js/segmentation/tagtool.js]
+  
+  components: 
+    sideBar: [ editor, leftPanel ]
\ No newline at end of file
diff -r 1b5c6294e805 -r cae5b5ff4058 web/thdProject/apps/frontend/modules/editor/templates/_player.php
--- a/web/thdProject/apps/frontend/modules/editor/templates/_player.php	Mon Mar 29 12:29:11 2010 +0200
+++ b/web/thdProject/apps/frontend/modules/editor/templates/_player.php	Wed Mar 31 10:16:16 2010 +0200
@@ -96,34 +96,28 @@
 			echo " <span class=\"ost\">{".$film->getOriginalTitle()."}</span>";
 		}
 	?>
-	<span class="film-infos">De
-  <?php echo thd_render_flat_list($film->getDirectors(), 'name'); ?></span></h2>
+	<span class="film-infos">De <?php echo thd_render_flat_list($film->getDirectors(), 'name'); ?></span></h2>
 	<div class="section">
 		<div id="player" class="player-ba"></div>
-		<p id="segmentMarkerButtons" style="text-align:center;opacity:0.5">
-			<button type="button" id="btMarkIn"  disabled onClick="segmentMarker.markIn()">
-			  Marquer le début
-			</button>
-			<button type="button" id="btMarkOut" disabled onClick="segmentMarker.markOut()">
-			  Marquer la fin
-			</button>
-			<button type="button" id="btPlaySegment" disabled onClick="segmentMarker.playSegment()">
-			  Lire la séquence
-			</button>
-		 </p>
+		<div id="segmentMarkerButtons" style="text-align:center;opacity:0.5">
+			<button type="button" id="btMarkIn" class="submit" disabled onClick="segmentMarker.markIn()">Marquer le début</button>
+			<button type="button" id="btMarkOut" class="submit" disabled onClick="segmentMarker.markOut()">Marquer la fin</button>
+			<button type="button" id="btPlaySegment" class="submit" disabled onClick="segmentMarker.playSegment()">Lire la séquence</button>
+		 
 		 <form action="<?php echo url_for("@addFilmSegment?ref={$film->getRef()}&film_slug={$film->getSlugUrl()}");?>" method="post" id="segmentForm" class="ajax" style="display: none;">
 		    <h3>Enregistrer votre segment</h3>
-		    <p>Vous aller créer un segment, entre <span id="mkin">0</span> et <span id="mkout">0</span>.</p>
-		    <p style="text-align: center;">
+		    <p>Vous aller créer un segment, entre <span id="mkin">0</span> secondes et <span id="mkout">0</span> secondes.</p>
+		    <span style="text-align: center;">
 		      Votre tag : <input type="text" id="usertag" name="usertag" />&nbsp;
 		      Nom d'utilisateur : <input type="text" id="username" name="username" value="visiteur" />
 		      <input type="hidden" name="xtid" value="<?php echo extract.id;?>" />
-		      <input type="hidden" name="timein" id="frmIn" value="0" />
-		      <input type="hidden" name="timeout" id="frmOut" value="0" />
-		      <input type="hidden" name="ref" id="refFilm" value="<?php echo $film->getRef()."_".$film->getSlugUrl(); ?>" />
-		      <input type="hidden" name="film" id="Film" value="<?php echo $film->getTitle(); ?>" />
-		      <input type="submit" value="Enregistrer" />
-		    </p>
+		      <input type="hidden" name="frmIn" id="frmIn" value="0" />
+		      <input type="hidden" name="frmOut" id="frmOut" value="0" />
+		      <input type="hidden" name="refFilm" id="refFilm" value="<?php echo $film->getRef()."_".$film->getSlugUrl(); ?>" />
+		      <input type="hidden" name="Film" id="Film" value="<?php echo $film->getTitle(); ?>" />
+		      <input type="submit" value="Enregistrer" class="submit" />
+		    </span>
 		 </form>
+		 </div>
 	</div>
 </div>
diff -r 1b5c6294e805 -r cae5b5ff4058 web/thdProject/apps/frontend/modules/editor/templates/indexSuccess.php
--- a/web/thdProject/apps/frontend/modules/editor/templates/indexSuccess.php	Mon Mar 29 12:29:11 2010 +0200
+++ b/web/thdProject/apps/frontend/modules/editor/templates/indexSuccess.php	Wed Mar 31 10:16:16 2010 +0200
@@ -1,9 +1,3 @@
-<div id="global">
-	<?php include_partial('partials/navigation')?>
-	<div id="document-sidebar">
-		<?php include_component( "editor", "leftPanel" ) ?>
-	</div>
-	<div id="document">
-		<?php include_component( "editor", "player" ) ?>	
-	</div>
+<div id="content">
+	<?php include_component( "editor", "player" ) ?>	
 </div>
\ No newline at end of file
diff -r 1b5c6294e805 -r cae5b5ff4058 web/thdProject/apps/frontend/modules/homepage/config/view.yml
--- a/web/thdProject/apps/frontend/modules/homepage/config/view.yml	Mon Mar 29 12:29:11 2010 +0200
+++ b/web/thdProject/apps/frontend/modules/homepage/config/view.yml	Wed Mar 31 10:16:16 2010 +0200
@@ -1,4 +1,8 @@
 all:
   stylesheets:    [ /css/flashplayer.css ]
 
-  javascripts:   [ /js/flowplayer/flowplayer-3.1.0.min.js, /js/flowplayer/uc.flowplayer.config.js]
\ No newline at end of file
+  javascripts:   [ /js/flowplayer/flowplayer-3.1.0.min.js, /js/flowplayer/uc.flowplayer.config.js]
+  
+  components: 
+    sideBar: [ homepage, sideBar ]
+  
diff -r 1b5c6294e805 -r cae5b5ff4058 web/thdProject/apps/frontend/modules/homepage/templates/_lastTaggedList.php
--- a/web/thdProject/apps/frontend/modules/homepage/templates/_lastTaggedList.php	Mon Mar 29 12:29:11 2010 +0200
+++ b/web/thdProject/apps/frontend/modules/homepage/templates/_lastTaggedList.php	Wed Mar 31 10:16:16 2010 +0200
@@ -13,11 +13,11 @@
 		$video_file = $item->getVideos();
 	?>
 	<li>
-		<div id="player-<?php echo $ref; ?>" class="player-item" style="background:transparent url('posters/<?php echo $image_file[0]['file'].".jpg"; ?>') no-repeat;" href="<?php echo video_path($video_file[0]['file']);?>">
+		<div id="player-<?php echo $ref; ?>" class="player-item" style="background:transparent url('<?php echo image_path('posters/'.$image_file[0]['file'].'.jpg'); ?>') no-repeat;" href="<?php echo video_path($video_file[0]['file']);?>">
 			<div class="infos">
 		    	<a href="<?php echo url_for('@editor?ref='.$ref.'&film_slug='.$slug); ?>" class="title" target="_top"><?php echo $title; ?></a> <span class="film-infos">De <?php echo thd_render_flat_list($item->getDirectors(), 'name'); ?></span>
 		    </div>
-		    <img src="<?php echo image_path('images/buttons/btn_play.png'); ?>"/ id="play"></a>
+		    <img src="<?php echo image_path('buttons/btn_play.png'); ?>"/ id="play"></a>
 		     <div class="tags">
 				<ul class="item-list tag-list">
 				<li><span class="head">
@@ -44,7 +44,7 @@
 				</ul>
 		    </div>
 		</div>
-
+		<div class="tag-action"><a href="<?php echo url_for('@editor?ref='.$ref.'&film_slug='.$slug); ?>" class="link-button">Tagger le film</a></div>
 	</li>
 	<?php endforeach; ?>
 	</ul>
diff -r 1b5c6294e805 -r cae5b5ff4058 web/thdProject/apps/frontend/modules/homepage/templates/_mostTaggedList.php
--- a/web/thdProject/apps/frontend/modules/homepage/templates/_mostTaggedList.php	Mon Mar 29 12:29:11 2010 +0200
+++ b/web/thdProject/apps/frontend/modules/homepage/templates/_mostTaggedList.php	Wed Mar 31 10:16:16 2010 +0200
@@ -14,11 +14,11 @@
 
 	?>
 	<li>
-		<div id="playerMostTagged-<?php echo $ref; ?>" class="player-item" style="background:transparent url('posters/<?php echo $image_file[0]['file'].".jpg"; ?>') no-repeat;" href="<?php echo 	$videoPath.$video_file[0]['file'].".f4v";?>"">
+		<div id="playerMostTagged-<?php echo $ref; ?>" class="player-item" style="background:transparent url('<?php echo image_path('posters/'.$image_file[0]['file'].'.jpg'); ?>') no-repeat;" href="<?php echo video_path($video_file[0]['file']);?>">
 			<div class="infos">
 		    	<a href="<?php echo url_for('@editor?ref='.$ref.'&film_slug='.$slug); ?>" class="title"><?php echo $title; ?></a> <span class="film-infos">De <?php echo thd_render_flat_list($item->getDirectors(), 'name'); ?></span>
 		    </div>
-		    <img src="images/buttons/btn_play.png"/ id="play"></a>
+		    <img src="<?php echo image_path('buttons/btn_play.png'); ?>"/ id="play"></a>
 		     <div class="tags">
 				<ul class="item-list tag-list">
 				<li><span class="head">
@@ -45,6 +45,7 @@
 				</ul>
 		    </div>
 		</div>
+		<div class="tag-action"><a href="<?php echo url_for('@editor?ref='.$ref.'&film_slug='.$slug); ?>" class="link-button">Tagger le film</a></div>
 	</li>
 	<?php endforeach; ?>
 	</ul>
diff -r 1b5c6294e805 -r cae5b5ff4058 web/thdProject/apps/frontend/modules/homepage/templates/_randomFilm.php
--- a/web/thdProject/apps/frontend/modules/homepage/templates/_randomFilm.php	Mon Mar 29 12:29:11 2010 +0200
+++ b/web/thdProject/apps/frontend/modules/homepage/templates/_randomFilm.php	Wed Mar 31 10:16:16 2010 +0200
@@ -21,10 +21,10 @@
   	<h3 class="head">Regardez et annotez des extraits :</h3>
 	<div id="player-ba" class="player-ba" style="background:transparent url(<?php echo image_path('test/anna_m/capt720.jpg'); ?>) no-repeat;">
 		<div class="infos">
-	    	<a href="http://embryon/videos/001009_l-humanite.f4v" onclick="launchSelected(this.href);return false;" class="title">Anna M</a><br/><span class="film-infos">De <b>Michel Spinosa</b></span>
+	    	<a href="" onclick="launchSelected(this.href);return false;" class="title">Anna M</a><br/><span class="film-infos">De <b>Michel Spinosa</b></span>
 	    </div>
 	    <div id="play">
-			<a href="http://embryon/videos/001009_l-humanite.f4v" onclick="launchSelected(this.href);return false;"><img src="<?php echo image_path('buttons/btn_play.png') ?>"/></a>
+			<a href="" onclick="launchSelected(this.href);return false;"><img src="<?php echo image_path('buttons/btn_play.png') ?>"/></a>
 	    </div>
 	     <div class="tags">
 	    	<span class="head">
@@ -61,4 +61,5 @@
 			</ul>
 	    </div>
 	</div>
+	<div class="tag-action"><a href="" class="link-button">Tagger le film</a></div>
 </div>
diff -r 1b5c6294e805 -r cae5b5ff4058 web/thdProject/apps/frontend/modules/homepage/templates/_resultList.php
--- a/web/thdProject/apps/frontend/modules/homepage/templates/_resultList.php	Mon Mar 29 12:29:11 2010 +0200
+++ b/web/thdProject/apps/frontend/modules/homepage/templates/_resultList.php	Wed Mar 31 10:16:16 2010 +0200
@@ -16,7 +16,7 @@
 		$directors = json_decode($item->getDirectors(), true);
 	?>
 	<li>	
-		<div id="playerMostTagged-<?php echo $ref; ?>" class="player-item" style="background:transparent url('posters/<?php echo $image_file[0]['file'].".jpg"; ?>') no-repeat;" href="<?php echo 	$videoPath.$video_file[0]['file'].".f4v";?>"">
+		<div id="playerMostTagged-<?php echo $ref; ?>" class="player-item" style="background:transparent url('<?php echo $imagePath.$image_file[0]['file'].".jpg"; ?>') no-repeat;" href="<?php echo 	$videoPath.$video_file[0]['file'].".f4v";?>"">
 			<div class="infos">
 		    	<a href="<?php echo url_for('@editor?ref='.$ref.'&film_slug='.$slug); ?>" class="title"><?php echo $title; ?></a> <span class="film-infos">De <?php echo $directors['name']; ?></span><
 		    </div>
diff -r 1b5c6294e805 -r cae5b5ff4058 web/thdProject/apps/frontend/modules/partials/actions/components.class.php
--- a/web/thdProject/apps/frontend/modules/partials/actions/components.class.php	Mon Mar 29 12:29:11 2010 +0200
+++ b/web/thdProject/apps/frontend/modules/partials/actions/components.class.php	Wed Mar 31 10:16:16 2010 +0200
@@ -2,7 +2,7 @@
 <?php
 
 class partialsComponents extends sfComponents {
-
+  
   public function executeUserPanel() {
     $this->user = $this->getUser();
     if (!$this->user->isAuthenticated()) return sfView::NONE;
diff -r 1b5c6294e805 -r cae5b5ff4058 web/thdProject/apps/frontend/modules/partials/templates/_navigation.php
--- a/web/thdProject/apps/frontend/modules/partials/templates/_navigation.php	Mon Mar 29 12:29:11 2010 +0200
+++ b/web/thdProject/apps/frontend/modules/partials/templates/_navigation.php	Wed Mar 31 10:16:16 2010 +0200
@@ -2,7 +2,7 @@
 	<div id="navigation-left"><!----></div>
 	<div id="navigation-right">
 		<ul>
-			<li class="first"><a href="">Accueil</a></li>
+			<li class="first"><a href="/">Accueil</a></li>
 			<li><a href="<?php echo url_for('@editor?ref=13002&film_slug=apres-lui') ?>">Films</a></li>
 			<li><a href="<?php echo url_for('@editor?ref=13002&film_slug=apres-lui') ?>">Top des films taggés</a></li>
 			<li><a href="">Aide</a></li>
diff -r 1b5c6294e805 -r cae5b5ff4058 web/thdProject/apps/frontend/modules/partials/templates/_userPanel.php
--- a/web/thdProject/apps/frontend/modules/partials/templates/_userPanel.php	Mon Mar 29 12:29:11 2010 +0200
+++ b/web/thdProject/apps/frontend/modules/partials/templates/_userPanel.php	Wed Mar 31 10:16:16 2010 +0200
@@ -1,14 +1,16 @@
 <div id="header-user">
   <div class="main">
-  <form class="table-form<?php if (isset($classes)) echo ' '.$classes; ?>" method="post" action="<?php echo url_for('@logoutUser')?>">
-    <span class="head">Bienvenue sur UniversCine THD</span>
-    <ul>
-      <li><a href="" class="link-action">Mon compte</a></li>
-      <li><a href=""class ="link-action">Mes tags</a></li>
-    </ul>
-    <div class="buttons">
-      <?php echo uc_render_submit_button('se déconnecter'); ?>
-    </div>
-  </form>
+	  <div class="login">
+	  <form class="table-form<?php if (isset($classes)) echo ' '.$classes; ?>" method="post" action="<?php echo url_for('@logoutUser')?>">
+	    <span class="head">Bienvenue sur UniversCine THD</span>
+	    <ul>
+	      <li><a href="" class="link-action">Mon compte</a></li>
+	      <li><a href=""class ="link-action">Mes tags</a></li>
+	    </ul>
+	    <div class="buttons">
+	      <?php echo uc_render_submit_button('se déconnecter'); ?>
+	    </div>
+	  </form>
+	  </div>
   </div>
 </div>
\ No newline at end of file
diff -r 1b5c6294e805 -r cae5b5ff4058 web/thdProject/apps/frontend/templates/layout.php
--- a/web/thdProject/apps/frontend/templates/layout.php	Mon Mar 29 12:29:11 2010 +0200
+++ b/web/thdProject/apps/frontend/templates/layout.php	Wed Mar 31 10:16:16 2010 +0200
@@ -20,14 +20,15 @@
               <?php include_component('partials', 'navigation'); ?>
             </div>
             <div id="content-wrapper"<?php if ($hasSideBar) echo ' class="sidebar"' ;?>>
+            <?php if ($hasSideBar): ?>
+              <div id="sidebar">
+              <?php include_component_slot('sideBar'); ?>
+              </div>
+              <?php endif; ?>
               <div id="content">
                 <?php echo $sf_content ?>
               </div>
-              <?php if ($hasSideBar): ?>
-              <div id="sidebar">
-                <?php include_component_slot('sideBar'); ?>
-              </div>
-              <?php endif; ?>
+              
             </div>
             <div id="footer">
           	  <?php include_partial('partials/footer')?>
diff -r 1b5c6294e805 -r cae5b5ff4058 web/thdProject/lib/helper/ThdHtmlHelper.php
--- a/web/thdProject/lib/helper/ThdHtmlHelper.php	Mon Mar 29 12:29:11 2010 +0200
+++ b/web/thdProject/lib/helper/ThdHtmlHelper.php	Wed Mar 31 10:16:16 2010 +0200
@@ -45,6 +45,11 @@
   return implode($glue, $itemsHtml);
 }
 
+function poster_path($source, $absolute = false) {
+   return sfConfig::get('app_poster_root_uri').'/'.$source;
+}
+
+
 function flash_path($source, $absolute = false) {
   return _compute_public_path($source, 'flashes', 'swf', $absolute);
 }
diff -r 1b5c6294e805 -r cae5b5ff4058 web/thdProject/web/css/base.css
--- a/web/thdProject/web/css/base.css	Mon Mar 29 12:29:11 2010 +0200
+++ b/web/thdProject/web/css/base.css	Wed Mar 31 10:16:16 2010 +0200
@@ -63,8 +63,7 @@
   font-family:arial, verdana, sans-serif;
   font-size:11px;
   color:#656565;
-  border:1px solid #CCCCCC;
-  height:15px;
+  height:19px;
 }
 
 input.submit,
@@ -73,8 +72,8 @@
   font-family: arial, verdana, sans-serif;
   font-weight: normal;
   color: #FFFFFF;
-  padding: 1px 20px 4px 20px;
-  height: 22px;
+  padding: 1px 10px 8px 10px;
+  height: 30px;
   border: none;
   background: url("../images/buttons/bg_btn.png") repeat-x;
   text-transform: uppercase;
@@ -130,10 +129,10 @@
   line-height: 21px;
 }
 
-h1 span,
-h2 span,
-h3 span,
-h4 span {
+h1 span.film-infos,
+h2 span.film-infos,
+h3 span.film-infos,
+h4 span.film-infos {
   display: block;
 }
 
@@ -436,4 +435,13 @@
 #register .access {
 text-align:center;
   padding: 20px;
+}
+
+a.link-button {
+  padding: 4px;
+  font-size: 10px;
+  font-weight: normal;
+  color: #FFFFFF;
+  text-transform: uppercase;
+  background: #990000;
 }
\ No newline at end of file
diff -r 1b5c6294e805 -r cae5b5ff4058 web/thdProject/web/css/editor.css
--- a/web/thdProject/web/css/editor.css	Mon Mar 29 12:29:11 2010 +0200
+++ b/web/thdProject/web/css/editor.css	Wed Mar 31 10:16:16 2010 +0200
@@ -19,17 +19,17 @@
   margin: 10px;
 }
 .segtimeline {
-  height:15px;  
-  background: #330000;
+  height:20px;  
+  background: #990000;
   border: 1px solid #000000;
 }
 .segtimeline  div {
-  height: 15px;
-  background: #990000;
+  height: 20px;
+  background: #FFFFFF;
   color: #990000;
 }
 .seghiglighted {
-  background: #ffcc33 !important;
+  background: #FFFFFF !important;
 }
 #segment-list strong {
 color: #FF9999;
diff -r 1b5c6294e805 -r cae5b5ff4058 web/thdProject/web/css/layout.css
--- a/web/thdProject/web/css/layout.css	Mon Mar 29 12:29:11 2010 +0200
+++ b/web/thdProject/web/css/layout.css	Wed Mar 31 10:16:16 2010 +0200
@@ -13,7 +13,7 @@
 /* HEADER ===================== */
 #header {
   position: relative;
-  width: 1200px;
+  width: 1280px;
   height: 120px;
   background: #000000;
 }
@@ -61,9 +61,10 @@
 #header-user {
 	position: absolute;
 	top: 7px;
-	right: 0px;
+	right: 100px;
 	width: 380px;
 	height: 240px;
+    
 }
 
 #header-user .main {
@@ -76,7 +77,7 @@
 #header-user .login,
 #header-user .profile {
 	position: relative;
-  height: 117px;
+  height: 113px;
 }
 
 #header-user .register a {
@@ -111,7 +112,7 @@
 
 #header-user .login .buttons {
 	text-align: center;
-	padding: 15px 7px;
+	padding: 12px 5px;
 }
 
 #header-user .login label {
@@ -185,7 +186,7 @@
 position: relative;
   width: 1280px;
   padding: 5px;
-  top: 10px;
+  top: 24px;
   background:#000000;
   opacity:0.5;
 }
@@ -234,7 +235,7 @@
 #homepage {
   position: relative;
   width: 100%;
-  background: #000000 url("../images/layout/bg-homepage.jpg") no-repeat;
+  
 }
 #homepage:after {
   content: ".";
@@ -246,21 +247,26 @@
 }
 
 /* HOEMPAGE FILMS */
-#homepage #document #lastTagged-list,
-#homepage #document #mostTagged-list {
+#homepage #lastTagged-list,
+#homepage #mostTagged-list {
   float:left;
   width: 359px;
 }
 
-#homepage #document #lastTagged-list li,
-#homepage #document #mostTagged-list li {
+#homepage #lastTagged-list li,
+#homepage #mostTagged-list li {
   display:block;    
   margin-top: 5px;
 }
 
+.tag-action {
+text-align:center;
+  margin: 7px 0 20px 0;
+}
+
 
 /* LEFT HOMEPAGE===== */
-#document-sidebar {
+#sidebar {
   float: left;
   width:380px;
   padding: 15px;
@@ -275,9 +281,9 @@
 
 
 /* RIGHT HOMEPAGE===== */
-#document {
+#content {
   float: left;
-  padding: 15px;
+  margin: 15px;
 }
 
 .select-action{
@@ -287,6 +293,18 @@
 } 
 
 
+/*EDITOR*/
+#editor {
+  padding: 10px 0;
+}
+
+#segmentMarkerButtons{
+  margin: 15px 0;
+  padding: 15px;
+  background: #333333 url("../images/layout/bg_tagEditor.png") top repeat-x;
+}
+
+
 /* FOOTER============= */
 #footer {
   clear:both;
diff -r 1b5c6294e805 -r cae5b5ff4058 web/thdProject/web/images/layout/bg_login.png
Binary file web/thdProject/web/images/layout/bg_login.png has changed
diff -r 1b5c6294e805 -r cae5b5ff4058 web/thdProject/web/images/layout/bg_tagEditor.png
Binary file web/thdProject/web/images/layout/bg_tagEditor.png has changed
diff -r 1b5c6294e805 -r cae5b5ff4058 web/thdProject/web/images/posters/0625c797-7c56-11de-bfb5-5b02eae1fc54.jpg
Binary file web/thdProject/web/images/posters/0625c797-7c56-11de-bfb5-5b02eae1fc54.jpg has changed
diff -r 1b5c6294e805 -r cae5b5ff4058 web/thdProject/web/images/posters/0c45e138-7c56-11de-a235-375dca301e99.jpg
Binary file web/thdProject/web/images/posters/0c45e138-7c56-11de-a235-375dca301e99.jpg has changed
diff -r 1b5c6294e805 -r cae5b5ff4058 web/thdProject/web/images/posters/1482b3f8-7c56-11de-94a8-99b39278c804.jpg
Binary file web/thdProject/web/images/posters/1482b3f8-7c56-11de-94a8-99b39278c804.jpg has changed
diff -r 1b5c6294e805 -r cae5b5ff4058 web/thdProject/web/images/posters/2b95e3dc-7c56-11de-b8e9-8d849c1c2c06.jpg
Binary file web/thdProject/web/images/posters/2b95e3dc-7c56-11de-b8e9-8d849c1c2c06.jpg has changed
diff -r 1b5c6294e805 -r cae5b5ff4058 web/thdProject/web/uploads/013002_apres-lui.csv
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/web/thdProject/web/uploads/013002_apres-lui.csv	Wed Mar 31 10:16:16 2010 +0200
@@ -0,0 +1,1 @@
+5900,18900,Enterrement,Gautier
diff -r 1b5c6294e805 -r cae5b5ff4058 web/thdProject/web/uploads/025001_a-travers-la-foret.csv
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/web/thdProject/web/uploads/025001_a-travers-la-foret.csv	Wed Mar 31 10:16:16 2010 +0200
@@ -0,0 +1,2 @@
+3200,41200,Illusion,Gautier
+31400,40000,chanson,Gautier