Merge with 4bf8ee3cba88ddbaa4414b50d6cd7c473dab1b17
authorymh <ymh.work@gmail.com>
Wed, 28 Apr 2010 20:08:07 +0200
changeset 103 4227dc4dd211
parent 102 8ceec54970b1 (diff)
parent 97 4bf8ee3cba88 (current diff)
child 104 17b95f521b01
Merge with 4bf8ee3cba88ddbaa4414b50d6cd7c473dab1b17
--- 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: {