# HG changeset patch # User Gautier Thibault # Date 1270048940 -7200 # Node ID 6343b857d7c30748602f512f11de06b4ec5624b5 # Parent 99497716e36d35fa7f0f537e8bec8408ffd067eb add top films add last films add tag navigation change css diff -r 99497716e36d -r 6343b857d7c3 web/thdProject/apps/frontend/config/routing.yml --- 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 diff -r 99497716e36d -r 6343b857d7c3 web/thdProject/apps/frontend/modules/editor/templates/_player.php --- 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 @@ }
-

getTitle(); // original title if exist @@ -96,7 +96,7 @@ echo " {".$film->getOriginalTitle()."}"; } ?> - De getDirectors(), 'name'); ?>

+ De getDirectors(), 'name'); ?>
diff -r 99497716e36d -r 6343b857d7c3 web/thdProject/apps/frontend/modules/films/actions/actions.class.php --- /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 @@ +forward('default', 'module'); + } +} \ No newline at end of file diff -r 99497716e36d -r 6343b857d7c3 web/thdProject/apps/frontend/modules/films/actions/components.class.php --- /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 @@ +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 diff -r 99497716e36d -r 6343b857d7c3 web/thdProject/apps/frontend/modules/films/actions/viewTopFilmListAction.class.php --- /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 @@ +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 diff -r 99497716e36d -r 6343b857d7c3 web/thdProject/apps/frontend/modules/films/config/view.yml --- /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 ] + diff -r 99497716e36d -r 6343b857d7c3 web/thdProject/apps/frontend/modules/films/templates/_filmList.php --- /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 @@ +
+
    + getRef(); + $slug = $item->getSlugUrl(); + $title = $item->getTitle(); + + // image file + $image_file = $item->getImages(); + // image file + $video_file = $item->getVideos(); + + ?> +
  • +
    +
    + De getDirectors(), 'name'); ?> +
    + +
    + +
    +
    + +
  • + +
+
\ No newline at end of file diff -r 99497716e36d -r 6343b857d7c3 web/thdProject/apps/frontend/modules/films/templates/viewFilmListSuccess.php --- /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 @@ +
+
+

Tous les films

+
    + getRef(); + $slug = $item->getSlugUrl(); + $title = $item->getTitle(); + + // image file + $image_file = $item->getImages(); + // image file + $video_file = $item->getVideos(); + + ?> +
  • +
    +
    + De getDirectors(), 'name'); ?> +
    + +
    + +
    +
    + +
  • + +
+
+
diff -r 99497716e36d -r 6343b857d7c3 web/thdProject/apps/frontend/modules/films/templates/viewTopFilmListSuccess.php --- /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 @@ +
+
+

Top des films

+
    + getRef(); + $slug = $item->getSlugUrl(); + $title = $item->getTitle(); + + // image file + $image_file = $item->getImages(); + // image file + $video_file = $item->getVideos(); + + ?> +
  • +
    +
    + De getDirectors(), 'name'); ?> +
    + +
    + +
    +
    + +
  • + +
+
+
diff -r 99497716e36d -r 6343b857d7c3 web/thdProject/apps/frontend/modules/homepage/templates/_sideBar.php --- 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 @@ - - \ No newline at end of file + + \ No newline at end of file diff -r 99497716e36d -r 6343b857d7c3 web/thdProject/apps/frontend/modules/homepage/templates/_tagList.php --- 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 @@

Navigation par tag :

\ No newline at end of file diff -r 99497716e36d -r 6343b857d7c3 web/thdProject/apps/frontend/modules/partials/templates/_userPanel.php --- 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 @@
Bienvenue sur UniversCine THD
diff -r 99497716e36d -r 6343b857d7c3 web/thdProject/apps/frontend/modules/search/templates/_tagNavigator.php --- 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 @@ -
-
    -
  • - Tristesse +
  • -
  • - Folie +
  • -
-
\ No newline at end of file diff -r 99497716e36d -r 6343b857d7c3 web/thdProject/apps/frontend/modules/tag/actions/actions.class.php --- /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 @@ +forward('tag', 'viewTag'); + } +} diff -r 99497716e36d -r 6343b857d7c3 web/thdProject/apps/frontend/modules/tag/actions/components.class.php --- /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 @@ +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 diff -r 99497716e36d -r 6343b857d7c3 web/thdProject/apps/frontend/modules/tag/actions/viewTagAction.class.php --- /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 @@ +getRequestFormat(); + $this->text = (string) $request->getParameter('tag'); + + + return sfView::SUCCESS; + } +} \ No newline at end of file diff -r 99497716e36d -r 6343b857d7c3 web/thdProject/apps/frontend/modules/tag/config/view.yml --- /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 diff -r 99497716e36d -r 6343b857d7c3 web/thdProject/apps/frontend/modules/tag/templates/_player.php --- /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 @@ + +
+

getTitle(); + // original title if exist + + if($film->getOriginalTitle()!= null) + { + echo " {".$film->getOriginalTitle()."}"; + } + ?> + De getDirectors(), 'name'); ?>

+ +
diff -r 99497716e36d -r 6343b857d7c3 web/thdProject/apps/frontend/modules/tag/templates/_suggestionFilmList.php --- /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 @@ +
+

Les films suivants

+
    + getRef(); + $slug = $item->getSlugUrl(); + $title = $item->getTitle(); + + // image file + $image_file = $item->getImages(); + // image file + $video_file = $item->getVideos(); + + ?> +
  • +
    +
    + De getDirectors(), 'name'); ?> +
    + +
    + +
    +
    + +
  • + +
+
\ No newline at end of file diff -r 99497716e36d -r 6343b857d7c3 web/thdProject/apps/frontend/modules/tag/templates/_tagNavigator.php --- /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 @@ +
+

Autres Tags associés à cet extrait

+ +
\ No newline at end of file diff -r 99497716e36d -r 6343b857d7c3 web/thdProject/apps/frontend/modules/tag/templates/viewTagSuccess.php --- /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 @@ +
+ + +
diff -r 99497716e36d -r 6343b857d7c3 web/thdProject/web/css/base.css --- 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 diff -r 99497716e36d -r 6343b857d7c3 web/thdProject/web/css/flashplayer.css --- 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; } diff -r 99497716e36d -r 6343b857d7c3 web/thdProject/web/css/layout.css --- 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; diff -r 99497716e36d -r 6343b857d7c3 web/thdProject/web/uploads/039031_buenos-aires-100-km.csv --- /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