# HG changeset patch # User IRI <> # Date 1270656387 -7200 # Node ID 2dcf4fe5175f39c77dfa6c4ebf4f9f53c2a3e6a6 # Parent 03504c36074dd81d5256aef7e3971efe05409387 Clean up repository from personal settings diff -r 03504c36074d -r 2dcf4fe5175f .hgignore --- a/.hgignore Tue Apr 06 17:11:59 2010 +0200 +++ b/.hgignore Wed Apr 07 18:06:27 2010 +0200 @@ -28,4 +28,6 @@ syntax: regexp ^web/thdProject/plugins/uvmcSolrSearchPlugin/config/solr\.yml$ syntax: regexp -^web/thdProject/plugins/iriSonyenginePlugin/config/sonyengine\.yml$ \ No newline at end of file +^web/thdProject/plugins/iriSonyenginePlugin/config/sonyengine\.yml$ +syntax: regexp +^web/thdProject/config/databases\.yml$ \ No newline at end of file diff -r 03504c36074d -r 2dcf4fe5175f web/thdProject/apps/frontend/config/app.yml --- a/web/thdProject/apps/frontend/config/app.yml Tue Apr 06 17:11:59 2010 +0200 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,27 +0,0 @@ -# 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 03504c36074d -r 2dcf4fe5175f web/thdProject/apps/frontend/config/app.yml.tmpl --- a/web/thdProject/apps/frontend/config/app.yml.tmpl Tue Apr 06 17:11:59 2010 +0200 +++ b/web/thdProject/apps/frontend/config/app.yml.tmpl Wed Apr 07 18:06:27 2010 +0200 @@ -5,9 +5,19 @@ uploads: "/Users/gautierthibault/Sites/thd/web/uploads/" format: ".csv" - player: - videoPath: "http://localhost/thd/web/videos/" + 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: service_uri: "http://atalante.ucopenid/index.php" fake: true diff -r 03504c36074d -r 2dcf4fe5175f web/thdProject/apps/frontend/config/factories.yml --- a/web/thdProject/apps/frontend/config/factories.yml Tue Apr 06 17:11:59 2010 +0200 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,140 +0,0 @@ -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 03504c36074d -r 2dcf4fe5175f web/thdProject/apps/frontend/modules/homepage/templates/searchSuccess.php --- a/web/thdProject/apps/frontend/modules/homepage/templates/searchSuccess.php Tue Apr 06 17:11:59 2010 +0200 +++ b/web/thdProject/apps/frontend/modules/homepage/templates/searchSuccess.php Wed Apr 07 18:06:27 2010 +0200 @@ -2,7 +2,7 @@
- +
diff -r 03504c36074d -r 2dcf4fe5175f web/thdProject/config/ProjectConfiguration.class.php --- a/web/thdProject/config/ProjectConfiguration.class.php Tue Apr 06 17:11:59 2010 +0200 +++ b/web/thdProject/config/ProjectConfiguration.class.php Wed Apr 07 18:06:27 2010 +0200 @@ -7,7 +7,7 @@ define('SF_ENVIRONMENT', 'dev'); -require_once '/Users/gautierthibault/SRV/symfony-1.2.8/lib/autoload/sfCoreAutoload.class.php'; +require_once dirname(__FILE__).'/../lib/vendor/symfony/lib/autoload/sfCoreAutoload.class.php'; sfCoreAutoload::register(); class ProjectConfiguration extends sfProjectConfiguration diff -r 03504c36074d -r 2dcf4fe5175f web/thdProject/config/databases.yml --- a/web/thdProject/config/databases.yml Tue Apr 06 17:11:59 2010 +0200 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,7 +0,0 @@ -all: - doctrine: - class: sfDoctrineDatabase - param: - dsn: mysql:host=127.0.0.1;dbname=thd - username: thd - password: ghostware diff -r 03504c36074d -r 2dcf4fe5175f web/thdProject/config/databases.yml.tmpl --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/web/thdProject/config/databases.yml.tmpl Wed Apr 07 18:06:27 2010 +0200 @@ -0,0 +1,7 @@ +all: + doctrine: + class: sfDoctrineDatabase + param: + dsn: mysql:host=127.0.0.1;dbname=thd + username: thd + password: ghostware