# HG changeset patch
# User Gautier Thibault <gthibault@universcine.com>
# Date 1271773936 -7200
# Node ID c19b7400ac1b599b2cfb77fae63143b168a6e7e4
# Parent  7c693f70ac4f240f202b41586595d27d5d4a9a25
update tag list

diff -r 7c693f70ac4f -r c19b7400ac1b web/thdProject/apps/frontend/modules/partials/actions/components.class.php
--- a/web/thdProject/apps/frontend/modules/partials/actions/components.class.php	Tue Apr 20 14:55:54 2010 +0200
+++ b/web/thdProject/apps/frontend/modules/partials/actions/components.class.php	Tue Apr 20 16:32:16 2010 +0200
@@ -29,6 +29,15 @@
       $image = $images[0];
       $this->imageFilename = $image->getFile();
     }
+    
+    
+    // Get Tags
+    $tags = $this->film->getTagsArray();
+    $this->tagList = null;
+    if ($tags) {
+    	$this->tagList = $tags;
+    }
+    
 
     // Get video filename
     $videos = $this->film->getVideos();
diff -r 7c693f70ac4f -r c19b7400ac1b web/thdProject/apps/frontend/modules/partials/templates/_filmItem.php
--- a/web/thdProject/apps/frontend/modules/partials/templates/_filmItem.php	Tue Apr 20 14:55:54 2010 +0200
+++ b/web/thdProject/apps/frontend/modules/partials/templates/_filmItem.php	Tue Apr 20 16:32:16 2010 +0200
@@ -8,24 +8,16 @@
     <li><span class="head">
       <i>Tags liés au film :</i>
     </span></li>
-     <li class="tag-score-<?php echo $tag['score']; ?>">
-        <a href="">anna</a>
-      </li><li class="tag-score-5">
-        <a href="">Jalousie</a>
-      </li><li class="tag-score-3">
-        <a href="">erotomanie</a>
-      </li><li class="tag-score-2">
-        <a href="">violence</a>
-      </li>
-      <li class="tag-score-<?php echo $tag['score']; ?>">
-        <a href="">anna</a>
-      </li><li class="tag-score-5">
-        <a href="">Jalousie</a>
-      </li><li class="tag-score-3">
-        <a href="">erotomanie</a>
-      </li><li class="tag-score-2">
-        <a href="">violence</a>
-      </li>
+    <?php 
+	    foreach($film->getTagsArray() as $item) {
+	    	if($item){ 
+	    	$tag = $item;
+	    	echo '<li class="tag-score-'.$tag['score'].'"><a href="">'.$tag.'</a>
+	      </li>';
+	        
+	    }
+    } ?>
+     
     </ul>
     </div>
 </div>
\ No newline at end of file
diff -r 7c693f70ac4f -r c19b7400ac1b web/thdProject/apps/frontend/modules/reflex/actions/components.class.php
--- a/web/thdProject/apps/frontend/modules/reflex/actions/components.class.php	Tue Apr 20 14:55:54 2010 +0200
+++ b/web/thdProject/apps/frontend/modules/reflex/actions/components.class.php	Tue Apr 20 16:32:16 2010 +0200
@@ -3,20 +3,35 @@
 class reflexComponents extends sfComponents
 {
   
-  public function executeReflexNavigator() {
-	
-  }
-  
-  public function executePlayer() {
-	$ref = '013002';
-  	$film_slug = 'apres-lui';
-
+  public function executeTagNavigator() {
+  	$ref = '058000';
+  	
   	// retrieve infos in database
   	$query = Doctrine_Query::create()
       ->from('ThdFilm F')
       ->leftJoin('F.images I ')
       ->leftJoin('F.videos V')
       ->where("F.ref='{$ref}'");
+    //$this->film = $query->execute();
+	 // if (!$this->film) return sfView::NONE;
+
+	  // retrieve tags infos
+	 // $film = $this->film();
+
+	  
+	return sfView::SUCCESS;
+  
+  }
+  
+  public function executePlayer() {
+    $this->film_uniqueid = (string) $request->getParameter('film_uniqueid'); 
+  	// retrieve infos in database
+
+  	$query = Doctrine_Query::create()
+      ->from('ThdFilm F')
+      ->leftJoin('F.images I ')
+      ->leftJoin('F.videos V')
+      ->where("F.uniqueid='{$film_uniqueid}'");
     $this->film = $query->execute()->getFirst();
 	  if (!$this->film) return sfView::NONE;
 
diff -r 7c693f70ac4f -r c19b7400ac1b web/thdProject/apps/frontend/modules/reflex/templates/_suggestionFilmList.php
--- a/web/thdProject/apps/frontend/modules/reflex/templates/_suggestionFilmList.php	Tue Apr 20 14:55:54 2010 +0200
+++ b/web/thdProject/apps/frontend/modules/reflex/templates/_suggestionFilmList.php	Tue Apr 20 16:32:16 2010 +0200
@@ -1,3 +1,4 @@
+
 <div id="suggestionFilm-list">
 	<h3 class="head">Les films suivants</h3>
 	<ul>
diff -r 7c693f70ac4f -r c19b7400ac1b web/thdProject/apps/frontend/modules/reflex/templates/_tagNavigator.php
--- a/web/thdProject/apps/frontend/modules/reflex/templates/_tagNavigator.php	Tue Apr 20 14:55:54 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,12 +0,0 @@
-<div id="tagNavigator-list">
-	<h3>Autres Tags  associés à cet extrait</h3>
-	<ul>
-		<li>			
-			<div><span class="tag"><a href="<?php echo "" ?>">-</a>tristesse<a href="<?php echo "" ?>">+</a></span></div>
-		</li>
-		<!-- tag activated -->
-		<li>
-			<div class="tagActivated"><a href="">Enterrement <div class="btnClose">X</div></a></div>
-		</li>
-	</ul>
-</div>
\ No newline at end of file
diff -r 7c693f70ac4f -r c19b7400ac1b web/thdProject/apps/frontend/modules/tag/actions/components.class.php
--- a/web/thdProject/apps/frontend/modules/tag/actions/components.class.php	Tue Apr 20 14:55:54 2010 +0200
+++ b/web/thdProject/apps/frontend/modules/tag/actions/components.class.php	Tue Apr 20 16:32:16 2010 +0200
@@ -4,12 +4,25 @@
 {
   
   public function executeTagNavigator() {
-	
+  	$ref = '058000';
+  	
+  	// retrieve infos in database
+  	$query = Doctrine_Query::create()
+      ->from('ThdFilm F')
+      ->leftJoin('F.images I ')
+      ->leftJoin('F.videos V')
+      ->where("F.ref='{$ref}'");
+    $this->film = $query->execute();
+	  if (!$this->film) return sfView::NONE;
+
+	  // retrieve tags infos
+	 $film = $this->film;
+	  
+	return sfView::SUCCESS;
   }
   
   public function executePlayer() {
-	$ref = '013002';
-  	$film_slug = 'apres-lui';
+	$ref = '058000';
 
   	// retrieve infos in database
   	$query = Doctrine_Query::create()
@@ -21,6 +34,7 @@
 	  if (!$this->film) return sfView::NONE;
 
 	  // retrieve video infos
+	  $film = $this->film;
 	  $videos = $this->film->getVideos();
 	  $this->filmVideo = ($videos) ? $videos[0] : null;
 
diff -r 7c693f70ac4f -r c19b7400ac1b web/thdProject/apps/frontend/modules/tag/actions/viewTagListAction.class.php
--- a/web/thdProject/apps/frontend/modules/tag/actions/viewTagListAction.class.php	Tue Apr 20 14:55:54 2010 +0200
+++ b/web/thdProject/apps/frontend/modules/tag/actions/viewTagListAction.class.php	Tue Apr 20 16:32:16 2010 +0200
@@ -1,7 +1,7 @@
 <?php
 
 class viewTagListAction extends sfAction {
-
+  
   public function execute($request) {
   	
   	// Parse request parameters
diff -r 7c693f70ac4f -r c19b7400ac1b web/thdProject/apps/frontend/modules/tag/templates/_player.php
--- a/web/thdProject/apps/frontend/modules/tag/templates/_player.php	Tue Apr 20 14:55:54 2010 +0200
+++ b/web/thdProject/apps/frontend/modules/tag/templates/_player.php	Tue Apr 20 16:32:16 2010 +0200
@@ -2,7 +2,7 @@
     // Charge le player
     flowplayer("player", "<?php echo flash_path('flowplayer-3.1.2.swf') ?>",
                {
-                   clip: {url: "<?php echo video_path($filmVideo['file']); ?>",
+                   clip: {url: "<?php echo film_video_path($filmVideo['file']); ?>",
                           autoPlay: false,
                           autoBuffering: true,
                           onSeek: function() {
diff -r 7c693f70ac4f -r c19b7400ac1b web/thdProject/apps/frontend/modules/tag/templates/_tagNavigator.php
--- a/web/thdProject/apps/frontend/modules/tag/templates/_tagNavigator.php	Tue Apr 20 14:55:54 2010 +0200
+++ b/web/thdProject/apps/frontend/modules/tag/templates/_tagNavigator.php	Tue Apr 20 16:32:16 2010 +0200
@@ -1,12 +1,14 @@
 <div id="tagNavigator-list">
-	<h3>Autres Tags  associés à cet extrait</h3>
+	<h3>Tags associés à cet extrait</h3>
 	<ul>
-		<li>			
-			<div><span class="tag"><a href="<?php echo url_for('@searchReflex?film_uniqueid=&tag=tristesse&direction=less&distance=5'); ?>">-</a>tristesse<a href="<?php echo "" ?>">+</a></span></div>
-		</li>
-		<!-- tag activated -->
-		<li>
-			<div class="tagActivated"><a href="">Enterrement <div class="btnClose">X</div></a></div>
-		</li>
-	</ul>
+	<?php 
+	 $tag = "jalousietest";
+	 $uniqueId = "8b4c6c4e-47ef-11df-8746-6d6f73617461";
+	?>	
+	<li>			
+		<div class="tagActivated"><a href="<?php echo url_for('@searchReflex?film_uniqueid='.$uniqueId.'&tag='.$tag.'&direction=less&distance=5'); ?>">-</a></div>
+		<div class="tag"><?php echo $tag; ?></div>
+		<div class="tagActivated"><a href="<?php echo url_for('@searchReflex?film_uniqueid='.$uniqueId.'&tag='.$tag.'&direction=more&distance=5'); ?>">+</a><div></div>
+	</li>				
+</ul>
 </div>
\ No newline at end of file
diff -r 7c693f70ac4f -r c19b7400ac1b web/thdProject/apps/frontend/modules/tag/templates/viewTagListSuccess.php
--- a/web/thdProject/apps/frontend/modules/tag/templates/viewTagListSuccess.php	Tue Apr 20 14:55:54 2010 +0200
+++ b/web/thdProject/apps/frontend/modules/tag/templates/viewTagListSuccess.php	Tue Apr 20 16:32:16 2010 +0200
@@ -1,3 +1,3 @@
 <h3 class="head">Résultats pour : <i><?php echo $tag; ?></i></h3> 
-<?php include_component( "tag", "player" ) ?>	
+<?php include_component( 'tag', 'player'); ?>	
 <?php include_partial('tag/suggestionFilmList', array('filter' => 'all', 'filmCount' => '10', 'mostTaggedFilms' => $mostTaggedFilms, 'pageIndex' => $pageIndex, 'pageNbItems' => $pageNbItems)); ?>	
diff -r 7c693f70ac4f -r c19b7400ac1b web/thdProject/web/css/base.css
--- a/web/thdProject/web/css/base.css	Tue Apr 20 14:55:54 2010 +0200
+++ b/web/thdProject/web/css/base.css	Tue Apr 20 16:32:16 2010 +0200
@@ -510,7 +510,6 @@
   text-align: center;
   padding: 2px 5px 2px 5px;
   float: left;
-  width: 200px;
 }