--- a/web/thdProject/apps/frontend/config/routing.yml Wed Mar 31 10:33:40 2010 +0200
+++ b/web/thdProject/apps/frontend/config/routing.yml Wed Mar 31 17:22:20 2010 +0200
@@ -46,7 +46,30 @@
requirements: { page_nb: \d+ }
+########
+# TAGGING
+########
+tagging:
+ url: /tagging
+ param: { module: tag, action: viewTag }
+
+
+########
+# FILMS
+########
+
+viewFilmList:
+ url: /films/:sort_by/:sort_order/:page_nb
+ param: { module: films, action: viewFilmList, sort_by: date, sort_order: desc, page_nb: 1}
+ requirements: { page_nb: \d+ }
+
+viewTopFilmList:
+ url: /top-des-films
+ param: { module: films, action: viewTopFilmList }
+
+
+
default_index:
url: /:module
--- a/web/thdProject/apps/frontend/modules/editor/templates/_player.php Wed Mar 31 10:33:40 2010 +0200
+++ b/web/thdProject/apps/frontend/modules/editor/templates/_player.php Wed Mar 31 17:22:20 2010 +0200
@@ -86,7 +86,7 @@
}
</script>
<div id="editor">
- <h2><?php
+ <h1><?php
echo $film->getTitle();
// original title if exist
@@ -96,7 +96,7 @@
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></h1>
<div class="section">
<div id="player" class="player-ba"></div>
<div id="segmentMarkerButtons" style="text-align:center;opacity:0.5">
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/web/thdProject/apps/frontend/modules/films/actions/actions.class.php Wed Mar 31 17:22:20 2010 +0200
@@ -0,0 +1,14 @@
+<?php
+
+class filmsActions extends sfActions
+{
+ /**
+ * Executes index action
+ *
+ * @param sfRequest $request A request object
+ */
+ public function executeIndex(sfWebRequest $request)
+ {
+ $this->forward('default', 'module');
+ }
+}
\ No newline at end of file
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/web/thdProject/apps/frontend/modules/films/actions/components.class.php Wed Mar 31 17:22:20 2010 +0200
@@ -0,0 +1,9 @@
+<?php
+
+class filmsComponents extends sfComponents
+{
+ public function executeSideBar() {
+
+ }
+
+}
\ No newline at end of file
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/web/thdProject/apps/frontend/modules/films/actions/viewFilmListAction.class.php Wed Mar 31 17:22:20 2010 +0200
@@ -0,0 +1,23 @@
+<?php
+
+/**
+ * Display films list
+ */
+class viewFilmListAction extends sfAction
+{
+ public function execute($request)
+ {
+ // FIXME: Dummy value
+ $this->tag = Array('score' => 3);
+ $query = Doctrine_Query::create()
+ ->from('ThdFilm F')
+ ->leftJoin('F.images I ')
+ ->leftJoin('F.videos V')
+ //->where("cu.code='{$culture}' AND mo.code='{$module}' AND ms.code='{$section}'")
+ ->orderBy('F.id DESC')
+ ->limit(0,10);
+ $this->films = $query->execute();
+ $this->videoPath = sfConfig::get('app_player_videoPath');
+ }
+}
+?>
\ No newline at end of file
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/web/thdProject/apps/frontend/modules/films/actions/viewTopFilmListAction.class.php Wed Mar 31 17:22:20 2010 +0200
@@ -0,0 +1,18 @@
+<?php
+
+class viewTopFilmListAction extends sfAction {
+
+ public function execute($request) {
+ // FIXME: Dummy value
+ $this->tag = Array('score' => 3);
+ $query = Doctrine_Query::create()
+ ->from('ThdFilm F')
+ ->leftJoin('F.images I ')
+ ->leftJoin('F.videos V')
+ //->where("cu.code='{$culture}' AND mo.code='{$module}' AND ms.code='{$section}'")
+ ->orderBy('F.ref ASC')
+ ->limit(0,10);
+ $this->mostTaggedFilms = $query->execute();
+ $this->videoPath = sfConfig::get('app_player_videoPath');
+ }
+}
\ No newline at end of file
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/web/thdProject/apps/frontend/modules/films/config/view.yml Wed Mar 31 17:22:20 2010 +0200
@@ -0,0 +1,8 @@
+all:
+ stylesheets: [ /css/flashplayer.css ]
+
+ javascripts: [ /js/flowplayer/flowplayer-3.1.0.min.js, /js/flowplayer/uc.flowplayer.config.js]
+
+ components:
+ sideBar: [ homepage, sideBar ]
+
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/web/thdProject/apps/frontend/modules/films/templates/_filmList.php Wed Mar 31 17:22:20 2010 +0200
@@ -0,0 +1,51 @@
+<div id="suggestionFilm-list">
+ <ul>
+ <?php
+ foreach($films as $item):
+ $ref = $item->getRef();
+ $slug = $item->getSlugUrl();
+ $title = $item->getTitle();
+
+ // image file
+ $image_file = $item->getImages();
+ // image file
+ $video_file = $item->getVideos();
+
+ ?>
+ <li>
+ <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="<?php echo image_path('buttons/btn_play.png'); ?>"/ id="play"></a>
+ <div class="tags">
+ <ul class="item-list tag-list">
+ <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>
+ </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>
+</div>
\ No newline at end of file
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/web/thdProject/apps/frontend/modules/films/templates/viewFilmListSuccess.php Wed Mar 31 17:22:20 2010 +0200
@@ -0,0 +1,54 @@
+<div id="content">
+ <div id="film-list">
+ <h3>Tous les films</h3>
+ <ul>
+ <?php
+ foreach($films as $item):
+ $ref = $item->getRef();
+ $slug = $item->getSlugUrl();
+ $title = $item->getTitle();
+
+ // image file
+ $image_file = $item->getImages();
+ // image file
+ $video_file = $item->getVideos();
+
+ ?>
+ <li>
+ <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="<?php echo image_path('buttons/btn_play.png'); ?>"/ id="play"></a>
+ <div class="tags">
+ <ul class="item-list tag-list">
+ <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="">pleurs</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>
+ </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>
+</div>
+</div>
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/web/thdProject/apps/frontend/modules/films/templates/viewTopFilmListSuccess.php Wed Mar 31 17:22:20 2010 +0200
@@ -0,0 +1,54 @@
+<div id="content">
+ <div id="film-list">
+ <h3>Top des films</h3>
+ <ul>
+ <?php
+ foreach($mostTaggedFilms as $item):
+ $ref = $item->getRef();
+ $slug = $item->getSlugUrl();
+ $title = $item->getTitle();
+
+ // image file
+ $image_file = $item->getImages();
+ // image file
+ $video_file = $item->getVideos();
+
+ ?>
+ <li>
+ <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="<?php echo image_path('buttons/btn_play.png'); ?>"/ id="play"></a>
+ <div class="tags">
+ <ul class="item-list tag-list">
+ <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>
+ </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>
+</div>
+</div>
--- a/web/thdProject/apps/frontend/modules/homepage/templates/_sideBar.php Wed Mar 31 10:33:40 2010 +0200
+++ b/web/thdProject/apps/frontend/modules/homepage/templates/_sideBar.php Wed Mar 31 17:22:20 2010 +0200
@@ -1,2 +1,2 @@
-<?php include_component( "homepage", "search" ) ?>
-<?php include_component( "homepage", "tagList" ) ?>
\ No newline at end of file
+<?php include_component( "homepage", "tagList" ) ?>
+<?php include_component( "homepage", "search" ) ?>
\ No newline at end of file
--- a/web/thdProject/apps/frontend/modules/homepage/templates/_tagList.php Wed Mar 31 10:33:40 2010 +0200
+++ b/web/thdProject/apps/frontend/modules/homepage/templates/_tagList.php Wed Mar 31 17:22:20 2010 +0200
@@ -2,7 +2,7 @@
<h3 class="head">Navigation par tag :</h3>
<ul class="item-list tag-list">
<li class="tag-score-<?php echo $tag['score']; ?>">
- <a href="">tag</a>
+ <a href="<?php echo url_for('@tagging?tag=tag'); ?>">tag</a>
</li><li class="tag-score-5">
<a href="">tag</a>
</li><li class="tag-score-3">
--- a/web/thdProject/apps/frontend/modules/partials/templates/_navigation.php Wed Mar 31 10:33:40 2010 +0200
+++ b/web/thdProject/apps/frontend/modules/partials/templates/_navigation.php Wed Mar 31 17:22:20 2010 +0200
@@ -3,10 +3,9 @@
<div id="navigation-right">
<ul>
<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>
- <li><a href="">Qui sommes-nous ?</a></li>
+ <li><a href="<?php echo url_for('@viewFilmList') ?>">Films</a></li>
+ <li><a href="<?php echo url_for('@viewTopFilmList') ?>">Top des films taggés</a></li>
+ <li><a href="">Le projet</a></li>
</ul>
</div>
</div>
\ No newline at end of file
--- a/web/thdProject/apps/frontend/modules/partials/templates/_userPanel.php Wed Mar 31 10:33:40 2010 +0200
+++ b/web/thdProject/apps/frontend/modules/partials/templates/_userPanel.php Wed Mar 31 17:22:20 2010 +0200
@@ -4,8 +4,7 @@
<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>
+ <li><a href=""class ="link-action">Voir mes tags</a></li>
</ul>
<div class="buttons">
<?php echo uc_render_submit_button('se déconnecter'); ?>
--- a/web/thdProject/apps/frontend/modules/search/templates/_tagNavigator.php Wed Mar 31 10:33:40 2010 +0200
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,6 +0,0 @@
-<div id="tagNavigator-list">
-<ul>
- <li><a href="" class="navigateTotag">-</a> Tristesse <a href="" class="navigateTotag">+</a><li>
- <li><a href="" class="navigateTotag">-</a> Folie <a href="" class="navigateTotag">+</a></li>
-</ul>
-</div>
\ No newline at end of file
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/web/thdProject/apps/frontend/modules/tag/actions/actions.class.php Wed Mar 31 17:22:20 2010 +0200
@@ -0,0 +1,10 @@
+<?php
+
+class tagActions extends sfActions
+{
+
+ public function executeIndex(sfWebRequest $request)
+ {
+ $this->forward('tag', 'viewTag');
+ }
+}
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/web/thdProject/apps/frontend/modules/tag/actions/components.class.php Wed Mar 31 17:22:20 2010 +0200
@@ -0,0 +1,43 @@
+<?php
+
+class tagComponents extends sfComponents
+{
+
+ public function executeTagNavigator() {
+
+ }
+
+ public function executePlayer() {
+ $ref = '013002';
+ $film_slug = 'apres-lui';
+
+ // 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()->getFirst();
+ if (!$this->film) return sfView::NONE;
+
+ // retrieve video infos
+ $videos = $this->film->getVideos();
+ $this->filmVideo = ($videos) ? $videos[0] : null;
+
+ return sfView::SUCCESS;
+ }
+
+ public function executeSuggestionFilmList() {
+ $this->tag = Array('score' => 3);
+ $query = Doctrine_Query::create()
+ ->from('ThdFilm F')
+ ->leftJoin('F.images I ')
+ ->leftJoin('F.videos V')
+ //->where("cu.code='{$culture}' AND mo.code='{$module}' AND ms.code='{$section}'")
+ ->orderBy('F.ref ASC')
+ ->limit(0,10);
+ $this->mostTaggedFilms = $query->execute();
+ $this->videoPath = sfConfig::get('app_player_videoPath');
+ }
+
+}
\ No newline at end of file
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/web/thdProject/apps/frontend/modules/tag/actions/viewTagAction.class.php Wed Mar 31 17:22:20 2010 +0200
@@ -0,0 +1,13 @@
+<?php
+
+class viewTagAction extends sfAction {
+
+ public function execute($request) {
+ // Parse request parameters
+ $format = $request->getRequestFormat();
+ $this->text = (string) $request->getParameter('tag');
+
+
+ return sfView::SUCCESS;
+ }
+}
\ No newline at end of file
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/web/thdProject/apps/frontend/modules/tag/config/view.yml Wed Mar 31 17:22:20 2010 +0200
@@ -0,0 +1,10 @@
+all:
+
+ stylesheets: [ /css/flashplayer.css, search.css ]
+
+ javascripts: [ /js/flowplayer/flowplayer-3.1.0.min.js, /js/flowplayer/uc.flowplayer.config.js]
+
+
+ components:
+ sideBar: [ tag, tagNavigator ]
+
\ No newline at end of file
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/web/thdProject/apps/frontend/modules/tag/templates/_player.php Wed Mar 31 17:22:20 2010 +0200
@@ -0,0 +1,98 @@
+<script type="text/javascript">
+ // Charge le player
+ flowplayer("player", "<?php echo flash_path('flowplayer-3.1.2.swf') ?>",
+ {
+ clip: {url: "<?php echo video_path($filmVideo['file']); ?>",
+ autoPlay: false,
+ autoBuffering: true,
+ onSeek: function() {
+ playerSeek();
+ }
+ },
+
+ plugins: {
+
+ content: {url: "<?php echo flash_path('flowplayer.content-3.1.0.swf') ?>",
+ backgroundColor: 'transparent',
+ display: 'none',
+ style: {p: {fontSize: 15}}
+ }
+
+ },
+
+ onLoad: function() {
+ playerLoaded(this);
+ },
+
+ onUnload: function() {
+ playerUnloaded(this);
+ },
+ onError: function(code,msg) {
+ alert(msg);
+ },
+ });
+
+
+ function loadSegments() {
+
+ if ($f().getClip() == undefined) {
+ window.setTimeout("loadSegments()",2000);
+ return false;
+ }
+
+ var duration = Math.round($f().getClip().fullDuration*10) * 100;
+
+
+ var segments = tagTool.segments;
+
+ for (seg in segments) {
+ var segd = segments[seg].sout - segments[seg].sin;
+ var percent = Math.round(segd * 100 / duration);
+ var offset = Math.round(segments[seg].sin * 100 / duration);
+ var c = $('#seg_container_template').clone().removeAttr("id");
+ $("#segments").append(c);
+ $("span", c).html('<strong>' + tagTool.segments[seg].tag +'</strong> par ' + segments[seg].user);
+ $("#seg_0", c).css({'margin-left': offset+'%', 'width': percent+'%'})
+ .attr('id', 'seg_' + seg)
+ .click(function() {
+ seg_id = $(this).attr("id");
+ seg_id = seg_id.substr(seg_id.indexOf('_') + 1);
+ tagTool.playSegment(seg_id, $("#pauseAfter").val());
+ });
+ c.show();
+ }
+ }
+
+
+ function playerSeek() {
+ tagTool.rebuildCurrentTags(tagTool.player.getTime() * 1000);
+ }
+
+
+ function playerLoaded(player) {
+
+ // Charge les tags
+
+
+ tagTool.player = $f("player");
+ tagTool.showTagInPage = false;
+
+ }
+ </script>
+<div id="editor">
+ <h1><?php
+
+ echo $film->getTitle();
+ // original title if exist
+
+ if($film->getOriginalTitle()!= null)
+ {
+ echo " <span class=\"ost\">{".$film->getOriginalTitle()."}</span>";
+ }
+ ?>
+ <span class="film-infos">De <?php echo thd_render_flat_list($film->getDirectors(), 'name'); ?></span></h1>
+ <div class="section">
+ <div id="player" class="player-ba"></div>
+ <div class="tag-action"><a href="" class="link-button">Tagger le film</a></div>
+ </div>
+</div>
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/web/thdProject/apps/frontend/modules/tag/templates/_suggestionFilmList.php Wed Mar 31 17:22:20 2010 +0200
@@ -0,0 +1,52 @@
+<div id="suggestionFilm-list">
+ <h3 class="head">Les films suivants</h3>
+ <ul>
+ <?php
+ foreach($mostTaggedFilms as $item):
+ $ref = $item->getRef();
+ $slug = $item->getSlugUrl();
+ $title = $item->getTitle();
+
+ // image file
+ $image_file = $item->getImages();
+ // image file
+ $video_file = $item->getVideos();
+
+ ?>
+ <li>
+ <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="<?php echo image_path('buttons/btn_play.png'); ?>"/ id="play"></a>
+ <div class="tags">
+ <ul class="item-list tag-list">
+ <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>
+ </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>
+</div>
\ No newline at end of file
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/web/thdProject/apps/frontend/modules/tag/templates/_tagNavigator.php Wed Mar 31 17:22:20 2010 +0200
@@ -0,0 +1,12 @@
+<div id="tagNavigator-list">
+ <h3>Autres Tags associés à cet extrait</h3>
+ <ul>
+ <li>
+ <div class="tag">tristesse</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
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/web/thdProject/apps/frontend/modules/tag/templates/viewTagSuccess.php Wed Mar 31 17:22:20 2010 +0200
@@ -0,0 +1,4 @@
+<div id="content">
+ <?php include_component( "tag", "player" ) ?>
+ <?php include_component( "tag", "suggestionFilmList" ) ?>
+</div>
--- a/web/thdProject/web/css/base.css Wed Mar 31 10:33:40 2010 +0200
+++ b/web/thdProject/web/css/base.css Wed Mar 31 17:22:20 2010 +0200
@@ -57,6 +57,19 @@
color: #ffffff;
text-transform: uppercase;
}
+.link-button {
+ font-size: 11px;
+ font-family: arial, verdana, sans-serif;
+ font-weight: normal;
+ color: #FFFFFF;
+ padding: 1px 10px 8px 10px;
+ height: 30px;
+ border: none;
+ background: url("../images/buttons/bg_btn.png") repeat-x;
+ text-transform: uppercase;
+ cursor: pointer;
+ overflow: hidden;
+}
/* Forms */
input {
@@ -117,7 +130,7 @@
}
h1 {
- color: #000000;
+ color: #FFFFFF;
font-size: 30px;
line-height: 30px;
}
@@ -169,10 +182,11 @@
}
#navigation li a {
- font-family: Georgia, "Times New Roman", Times,serif;
+ font-family: arial, verdana, sans-serif;
font-weight: normal;
- font-size: 14px;
+ font-size: 12px;
color: #FFFFFF;
+ text-transform: uppercase;
}
#navigation li a:hover {
color: #FF9999;
@@ -203,7 +217,7 @@
display: block;
font-family: Georgia, "Times New Roman", Times,serif;
font-weight: normal;
- line-height: 20px;
+ line-height: 18px;
color: #666666;
}
@@ -444,4 +458,82 @@
color: #FFFFFF;
text-transform: uppercase;
background: #990000;
+}
+
+
+/*Tag Navigator*/
+#suggestionFilm-list ul, li {
+ margin: 0;
+ padding: 0;
+}
+#suggestionFilm-list li {
+ float: left;
+ margin: 0 10px 0 10px;
+}
+
+
+#tagNavigator-list ul {
+ padding: 0;
+}
+
+#tagNavigator-list ul, li {
+ margin: 0;
+ padding: 0;
+}
+
+#tagNavigator-list li {
+ clear: both;
+ display: block;
+ font-size: 12px;
+ font-weight: normal;
+ font-family: arial;
+ text-transform: uppercase;
+ text-align: center;
+ color: #FFFFFF;
+ line-height: auto;
+ padding: 2px 0 2px 20px;
+ margin: 2px 0 20px 0;
+}
+
+#tagNavigator-list .button {
+ float:left;
+}
+#tagNavigator-list .tag {
+ float: left;
+ width: 200px;
+}
+#tagNavigator-list .tagActivated {
+ background: #990000;
+ font-size: 12px;
+ font-weight: normal;
+ color: #FFFFFF;
+ text-align: center;
+ padding: 2px 5px 2px 5px;
+ float: left;
+ width: 200px;
+}
+
+
+#tagNavigator-list .button a {
+ background: #990000;
+ font-size: 14px;
+ font-weight: normal;
+ color: #FFFFFF;
+ text-align: center;
+ padding: 2px 5px 2px 5px;
+}
+
+#tagNavigator-list .btnClose {
+ float: right;
+}
+
+
+/*Film list*/
+#film-list ul, li {
+ margin: 0;
+ padding: 0;
+}
+#film-list li {
+ float: left;
+ margin: 0 10px 0 10px;
}
\ No newline at end of file
--- a/web/thdProject/web/css/flashplayer.css Wed Mar 31 10:33:40 2010 +0200
+++ b/web/thdProject/web/css/flashplayer.css Wed Mar 31 17:22:20 2010 +0200
@@ -115,7 +115,7 @@
}
.player-item .tags {
position:relative;
- top: 22px;
+ top: 19px;
height:55px;
background:#000;
opacity:0.8;
@@ -124,11 +124,13 @@
text-align:left;
font-family:arial,"bitstream vera sans","trebuchet ms";
font-size:14px;
+ line-height: 0px;
z-index: 1000;
}
.player-item .tags .head {
padding: 5px;
font-size: 12px;
+ line-height: 13px;
font-weight: normal;
font-family: georgia;
color: #FFFFFF;
@@ -155,7 +157,7 @@
display: block;
font-family: Georgia, "Times New Roman", Times,serif;
font-weight: normal;
- line-height: 16px;
+ line-height: 13px;
color: #666666;
}
--- a/web/thdProject/web/css/layout.css Wed Mar 31 10:33:40 2010 +0200
+++ b/web/thdProject/web/css/layout.css Wed Mar 31 17:22:20 2010 +0200
@@ -305,6 +305,29 @@
}
+/*TAG Navigation*/
+#suggestionFilm-list {
+ width: 780px;
+}
+
+
+
+#tagNavigator-list {
+ padding: 15px;
+}
+
+
+
+/*FILMS LIST*/
+
+#film-list {
+ width: 780px;
+ margin: 20px 0;
+}
+
+
+
+
/* FOOTER============= */
#footer {
clear:both;
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/web/thdProject/web/uploads/039031_buenos-aires-100-km.csv Wed Mar 31 17:22:20 2010 +0200
@@ -0,0 +1,2 @@
+21900,46400,Emois,Gautier
+5800,21800,Betise,Gautier