# HG changeset patch # User Gautier Thibault # Date 1270024420 -7200 # Node ID 99497716e36d35fa7f0f537e8bec8408ffd067eb # Parent cae5b5ff4058f70683d6fd2c7ee08d96fb14d6a3# Parent d58f6b5ab97657631226b9399ab0b7ecc05b6801 Merge with d58f6b5ab97657631226b9399ab0b7ecc05b6801 diff -r d58f6b5ab976 -r 99497716e36d web/thdProject/apps/frontend/config/app.yml --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/web/thdProject/apps/frontend/config/app.yml Wed Mar 31 10:33:40 2010 +0200 @@ -0,0 +1,27 @@ +# default values +all: + storage: + #segmentation files + uploads: "/Users/gautierthibault/Sites/mosatags/web/thdProject/web/uploads/" + format: ".csv" + + video: + root_uri: "http://thdmercurial/videos" + + image: + root_uri: "/Users/gautierthibault/Sites/mosatags/web/thdProject/web/images" + + poster: + root_uri: "http://thdmercurial/posters" + + + sf_phpopenid_plugin: + lib_path: "/Users/gautierthibault/SRV/php-openid-2.1.3" + + openid: + fake: true + + +#dev: + + diff -r d58f6b5ab976 -r 99497716e36d web/thdProject/apps/frontend/config/factories.yml --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/web/thdProject/apps/frontend/config/factories.yml Wed Mar 31 10:33:40 2010 +0200 @@ -0,0 +1,140 @@ +prod: + logger: + class: sfNoLogger + param: + level: err + loggers: ~ + +cli: + controller: + class: sfConsoleController + request: + class: sfConsoleRequest + response: + class: sfConsoleResponse + +test: + storage: + class: sfSessionTestStorage + param: + session_path: %SF_TEST_CACHE_DIR%/sessions + + response: + class: sfWebResponse + param: + send_http_headers: false + +all: + routing: + class: sfPatternRouting + param: + generate_shortest_url: true + extra_parameters_as_query_string: true + + request: + class: sfWebRequest + param: + logging: %SF_LOGGING_ENABLED% + path_info_array: SERVER + path_info_key: PATH_INFO + //relative_url_root: /web/thdProject/web + +#all: +# controller: +# class: sfFrontWebController +# +# request: +# class: sfWebRequest +# param: +# logging: %SF_LOGGING_ENABLED% +# path_info_array: SERVER +# path_info_key: PATH_INFO +# relative_url_root: ~ +# formats: +# txt: text/plain +# js: [application/javascript, application/x-javascript, text/javascript] +# css: text/css +# json: [application/json, application/x-json] +# xml: [text/xml, application/xml, application/x-xml] +# rdf: application/rdf+xml +# atom: application/atom+xml +# +# response: +# class: sfWebResponse +# param: +# logging: %SF_LOGGING_ENABLED% +# charset: %SF_CHARSET% +# send_http_headers: true +# +# user: +# class: myUser +# param: +# timeout: 1800 +# logging: %SF_LOGGING_ENABLED% +# use_flash: true +# default_culture: %SF_DEFAULT_CULTURE% +# +# storage: +# class: sfSessionStorage +# param: +# session_name: symfony +# +# view_cache: +# class: sfFileCache +# param: +# automatic_cleaning_factor: 0 +# cache_dir: %SF_TEMPLATE_CACHE_DIR% +# lifetime: 86400 +# prefix: %SF_APP_DIR%/template +# +# i18n: +# class: sfI18N +# param: +# source: XLIFF +# debug: off +# untranslated_prefix: "[T]" +# untranslated_suffix: "[/T]" +# cache: +# class: sfFileCache +# param: +# automatic_cleaning_factor: 0 +# cache_dir: %SF_I18N_CACHE_DIR% +# lifetime: 31556926 +# prefix: %SF_APP_DIR%/i18n +# +# routing: +# class: sfPatternRouting +# param: +# load_configuration: true +# suffix: '' +# default_module: default +# default_action: index +# debug: %SF_DEBUG% +# logging: %SF_LOGGING_ENABLED% +# generate_shortest_url: false +# extra_parameters_as_query_string: false +# cache: +# class: sfFileCache +# param: +# automatic_cleaning_factor: 0 +# cache_dir: %SF_CONFIG_CACHE_DIR%/routing +# lifetime: 31556926 +# prefix: %SF_APP_DIR%/routing +# +# logger: +# class: sfAggregateLogger +# param: +# level: debug +# loggers: +# sf_web_debug: +# class: sfWebDebugLogger +# param: +# level: debug +# condition: %SF_WEB_DEBUG% +# xdebug_logging: true +# web_debug_class: sfWebDebug +# sf_file_debug: +# class: sfFileLogger +# param: +# level: debug +# file: %SF_LOG_DIR%/%SF_APP%_%SF_ENVIRONMENT%.log diff -r d58f6b5ab976 -r 99497716e36d web/thdProject/apps/frontend/modules/editor/actions/addFilmSegmentAction.class.php --- a/web/thdProject/apps/frontend/modules/editor/actions/addFilmSegmentAction.class.php Tue Mar 30 19:25:16 2010 +0200 +++ b/web/thdProject/apps/frontend/modules/editor/actions/addFilmSegmentAction.class.php Wed Mar 31 10:33:40 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 d58f6b5ab976 -r 99497716e36d web/thdProject/apps/frontend/modules/editor/config/view.yml --- a/web/thdProject/apps/frontend/modules/editor/config/view.yml Tue Mar 30 19:25:16 2010 +0200 +++ b/web/thdProject/apps/frontend/modules/editor/config/view.yml Wed Mar 31 10:33:40 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 d58f6b5ab976 -r 99497716e36d web/thdProject/apps/frontend/modules/editor/templates/_player.php --- a/web/thdProject/apps/frontend/modules/editor/templates/_player.php Tue Mar 30 19:25:16 2010 +0200 +++ b/web/thdProject/apps/frontend/modules/editor/templates/_player.php Wed Mar 31 10:33:40 2010 +0200 @@ -96,34 +96,28 @@ echo " {".$film->getOriginalTitle()."}"; } ?> - De - getDirectors(), 'name'); ?> + De getDirectors(), 'name'); ?>
-

- - - -

+
+ + + +
getRef()}&film_slug={$film->getSlugUrl()}");?>" method="post" id="segmentForm" class="ajax" style="display: none;">

Enregistrer votre segment

-

Vous aller créer un segment, entre 0 et 0.

-

+

Vous aller créer un segment, entre 0 secondes et 0 secondes.

+ Votre tag :   Nom d'utilisateur : - - - getSlugUrl(); ?>" /> - - -

+ + + getSlugUrl(); ?>" /> + + +
+
diff -r d58f6b5ab976 -r 99497716e36d web/thdProject/apps/frontend/modules/editor/templates/indexSuccess.php --- a/web/thdProject/apps/frontend/modules/editor/templates/indexSuccess.php Tue Mar 30 19:25:16 2010 +0200 +++ b/web/thdProject/apps/frontend/modules/editor/templates/indexSuccess.php Wed Mar 31 10:33:40 2010 +0200 @@ -1,9 +1,3 @@ -
- -
- -
-
- -
+
+
\ No newline at end of file diff -r d58f6b5ab976 -r 99497716e36d web/thdProject/apps/frontend/modules/homepage/config/view.yml --- a/web/thdProject/apps/frontend/modules/homepage/config/view.yml Tue Mar 30 19:25:16 2010 +0200 +++ b/web/thdProject/apps/frontend/modules/homepage/config/view.yml Wed Mar 31 10:33:40 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 d58f6b5ab976 -r 99497716e36d web/thdProject/apps/frontend/modules/homepage/templates/_lastTaggedList.php --- a/web/thdProject/apps/frontend/modules/homepage/templates/_lastTaggedList.php Tue Mar 30 19:25:16 2010 +0200 +++ b/web/thdProject/apps/frontend/modules/homepage/templates/_lastTaggedList.php Wed Mar 31 10:33:40 2010 +0200 @@ -13,11 +13,11 @@ $video_file = $item->getVideos(); ?>
  • -
    ') no-repeat;" href=""> +
    De getDirectors(), 'name'); ?>
    - +
    • @@ -44,7 +44,7 @@
    - +
    Tagger le film
    • diff -r d58f6b5ab976 -r 99497716e36d web/thdProject/apps/frontend/modules/homepage/templates/_mostTaggedList.php --- a/web/thdProject/apps/frontend/modules/homepage/templates/_mostTaggedList.php Tue Mar 30 19:25:16 2010 +0200 +++ b/web/thdProject/apps/frontend/modules/homepage/templates/_mostTaggedList.php Wed Mar 31 10:33:40 2010 +0200 @@ -14,11 +14,11 @@ ?>
  • -
    ') no-repeat;" href="""> +
    De getDirectors(), 'name'); ?>
    - +
    • @@ -45,6 +45,7 @@
    +
    Tagger le film
    • diff -r d58f6b5ab976 -r 99497716e36d web/thdProject/apps/frontend/modules/homepage/templates/_randomFilm.php --- a/web/thdProject/apps/frontend/modules/homepage/templates/_randomFilm.php Tue Mar 30 19:25:16 2010 +0200 +++ b/web/thdProject/apps/frontend/modules/homepage/templates/_randomFilm.php Wed Mar 31 10:33:40 2010 +0200 @@ -21,10 +21,10 @@

    Regardez et annotez des extraits :

    - Anna M
    De Michel Spinosa + Anna M
    De Michel Spinosa
    - +
    @@ -61,4 +61,5 @@
    +
    Tagger le film
    diff -r d58f6b5ab976 -r 99497716e36d web/thdProject/apps/frontend/modules/homepage/templates/_resultList.php --- a/web/thdProject/apps/frontend/modules/homepage/templates/_resultList.php Tue Mar 30 19:25:16 2010 +0200 +++ b/web/thdProject/apps/frontend/modules/homepage/templates/_resultList.php Wed Mar 31 10:33:40 2010 +0200 @@ -16,7 +16,7 @@ $directors = json_decode($item->getDirectors(), true); ?>
  • -
    ') no-repeat;" href="""> +
    ') no-repeat;" href=""">
    De <
    diff -r d58f6b5ab976 -r 99497716e36d web/thdProject/apps/frontend/modules/partials/actions/components.class.php --- a/web/thdProject/apps/frontend/modules/partials/actions/components.class.php Tue Mar 30 19:25:16 2010 +0200 +++ b/web/thdProject/apps/frontend/modules/partials/actions/components.class.php Wed Mar 31 10:33:40 2010 +0200 @@ -2,7 +2,7 @@ user = $this->getUser(); if (!$this->user->isAuthenticated()) return sfView::NONE; diff -r d58f6b5ab976 -r 99497716e36d web/thdProject/apps/frontend/modules/partials/templates/_navigation.php --- a/web/thdProject/apps/frontend/modules/partials/templates/_navigation.php Tue Mar 30 19:25:16 2010 +0200 +++ b/web/thdProject/apps/frontend/modules/partials/templates/_navigation.php Wed Mar 31 10:33:40 2010 +0200 @@ -2,7 +2,7 @@
    > + + +
    - - - +