--- a/web/thdProject/apps/frontend/config/app.yml.tmpl Wed Apr 28 20:06:59 2010 +0200
+++ b/web/thdProject/apps/frontend/config/app.yml.tmpl Wed Apr 28 20:08:07 2010 +0200
@@ -1,19 +1,6 @@
# default values
all:
- storage:
- #segmentation files
- uploads: "/Users/gautierthibault/Sites/thd/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"
-
film_image:
root_uri: "http://thd.universcine.com/media/images"
--- a/web/thdProject/plugins/UcImageScalerPlugin/lib/UcImageCacheManager.class.php Wed Apr 28 20:06:59 2010 +0200
+++ b/web/thdProject/plugins/UcImageScalerPlugin/lib/UcImageCacheManager.class.php Wed Apr 28 20:08:07 2010 +0200
@@ -44,7 +44,8 @@
//not already cached
if(!$this->cache->has($imageKey)) {
- $thumbnail = new sfThumbnail($mw, $mh, $keepRatio, true, 80, 'sfImageMagickAdapter');
+ //$thumbnail = new sfThumbnail($mw, $mh, $keepRatio, true, 80, 'sfImageMagickAdapter');
+ $thumbnail = new sfThumbnail($mw, $mh, $keepRatio, true, 80, 'sfGDAdapter');
try {
$thumbnail->loadFile($imageUrl);
--- a/web/thdProject/web/js/uc.common.js Wed Apr 28 20:06:59 2010 +0200
+++ b/web/thdProject/web/js/uc.common.js Wed Apr 28 20:08:07 2010 +0200
@@ -25,7 +25,7 @@
});
// Instantiate all flow player
- flowplayer(".player-item", "/flashes/flowplayer-3.1.3.swf",
+ flowplayer(".player-item", "flashes/flowplayer-3.1.3.swf",
{
// configuration for a clip
clip: {