diff --git a/.bowerrc b/.bowerrc
index bb6d6aafdb..28ccb8a9e0 100644
--- a/.bowerrc
+++ b/.bowerrc
@@ -1,4 +1,3 @@
 {
-    "directory" : "www/bower_components",
-    "timeout": 1200000
+    "directory": "www/bower_components"
 }
diff --git a/lib/Alchemy/Phrasea/Controller/Admin/SubdefsController.php b/lib/Alchemy/Phrasea/Controller/Admin/SubdefsController.php
index cdee52835e..d9f0e778ce 100644
--- a/lib/Alchemy/Phrasea/Controller/Admin/SubdefsController.php
+++ b/lib/Alchemy/Phrasea/Controller/Admin/SubdefsController.php
@@ -33,9 +33,9 @@ class SubdefsController extends Controller
         $subviews_mapping = $this->getSubviewsMapping();
 
         return $this->render('admin/subdefs.html.twig', [
-            'databox' => $databox,
-            'subdefs' => $databox->get_subdef_structure(),
-            'config' => $config,
+            'databox'          => $databox,
+            'subdefs'          => $databox->get_subdef_structure(),
+            'config'           => $config,
             'subviews_mapping' => $subviews_mapping
         ]);
     }
@@ -53,7 +53,7 @@ class SubdefsController extends Controller
 
         $databox = $this->findDataboxById((int) $sbas_id);
 
-        $add_subdef = ['class' => null, 'name'  => null, 'group' => null, 'mediaType' => null, 'presets' => null];
+        $add_subdef = ['class' => null, 'name' => null, 'group' => null, 'mediaType' => null, 'presets' => null];
         foreach ($add_subdef as $k => $v) {
             if (!isset($toadd_subdef[$k]) || trim($toadd_subdef[$k]) === '') {
                 unset($add_subdef[$k]);
@@ -68,7 +68,8 @@ class SubdefsController extends Controller
             $name = $delete_subef[1];
             $subdefs = $databox->get_subdef_structure();
             $subdefs->delete_subdef($group, $name);
-        } elseif (count($add_subdef) === 5) {
+        }
+        elseif (count($add_subdef) === 5) {
             $subdefs = $databox->get_subdef_structure();
 
             $group = $add_subdef['group'];
@@ -87,7 +88,7 @@ class SubdefsController extends Controller
                 $config = $this->getConfiguration();
 
                 //On applique directement les valeurs du preset à la sous def
-                switch($mediatype) {
+                switch ($mediatype) {
                     case Subdef::TYPE_IMAGE :
                         $options["path"] = "";
                         $options["meta"] = true;
@@ -98,7 +99,7 @@ class SubdefsController extends Controller
                         $options[Image::OPTION_FLATTEN] = $config["image"]["definitions"][$preset][Image::OPTION_FLATTEN];
                         $options[Image::OPTION_QUALITY] = $config["image"]["definitions"][$preset][Image::OPTION_QUALITY];
                         $options[Image::OPTION_ICODEC] = $config["image"]["definitions"][$preset][Image::OPTION_ICODEC];
-                        foreach($config["image"]["definitions"][$preset][Subdef::OPTION_DEVICE] as $devices) {
+                        foreach ($config["image"]["definitions"][$preset][Subdef::OPTION_DEVICE] as $devices) {
                             $options[Subdef::OPTION_DEVICE][] = $devices;
                         }
                         break;
@@ -114,7 +115,7 @@ class SubdefsController extends Controller
                         $options[Video::OPTION_FRAMERATE] = $config["video"]["definitions"][$preset][Video::OPTION_FRAMERATE];
                         $options[Video::OPTION_VCODEC] = $config["video"]["definitions"][$preset][Video::OPTION_VCODEC];
                         $options[Video::OPTION_ACODEC] = $config["video"]["definitions"][$preset][Video::OPTION_ACODEC];
-                        foreach($config["video"]["definitions"][$preset][Subdef::OPTION_DEVICE] as $devices) {
+                        foreach ($config["video"]["definitions"][$preset][Subdef::OPTION_DEVICE] as $devices) {
                             $options[Subdef::OPTION_DEVICE][] = $devices;
                         }
                         break;
@@ -122,7 +123,7 @@ class SubdefsController extends Controller
                         $options["path"] = "";
                         $options["meta"] = true;
                         $options["mediatype"] = $mediatype;
-                        foreach($config["document"]["definitions"][$preset]["devices"] as $devices) {
+                        foreach ($config["document"]["definitions"][$preset]["devices"] as $devices) {
                             $options["devices"][] = $devices;
                         }
                         break;
@@ -132,7 +133,7 @@ class SubdefsController extends Controller
                         $options["mediatype"] = $mediatype;
                         $options[Gif::OPTION_SIZE] = $config["gif"]["definitions"][$preset][Gif::OPTION_SIZE];
                         $options[Gif::OPTION_DELAY] = $config["gif"]["definitions"][$preset][Gif::OPTION_DELAY];
-                        foreach($config["gif"]["definitions"][$preset][Subdef::OPTION_DEVICE] as $devices) {
+                        foreach ($config["gif"]["definitions"][$preset][Subdef::OPTION_DEVICE] as $devices) {
                             $options[Subdef::OPTION_DEVICE][] = $devices;
                         }
                         break;
@@ -143,7 +144,7 @@ class SubdefsController extends Controller
                         $options[Audio::OPTION_AUDIOBITRATE] = $config["audio"]["definitions"][$preset][Audio::OPTION_AUDIOBITRATE];
                         $options[Audio::OPTION_AUDIOSAMPLERATE] = $config["audio"]["definitions"][$preset][Audio::OPTION_AUDIOSAMPLERATE];
                         $options[Audio::OPTION_ACODEC] = $config["audio"]["definitions"][$preset][Audio::OPTION_ACODEC];
-                        foreach($config["audio"]["definitions"][$preset][Subdef::OPTION_DEVICE] as $devices) {
+                        foreach ($config["audio"]["definitions"][$preset][Subdef::OPTION_DEVICE] as $devices) {
                             $options[Subdef::OPTION_DEVICE][] = $devices;
                         }
                         break;
@@ -206,13 +207,13 @@ class SubdefsController extends Controller
      */
     protected function getSubviewsMapping()
     {
-        $mapping = array(
-            Type::TYPE_IMAGE => array(Subdef::TYPE_IMAGE),
-            Type::TYPE_VIDEO => array(Subdef::TYPE_IMAGE, Subdef::TYPE_VIDEO, Subdef::TYPE_ANIMATION),
-            Type::TYPE_AUDIO => array(Subdef::TYPE_IMAGE, Subdef::TYPE_AUDIO),
-            Type::TYPE_DOCUMENT => array(Subdef::TYPE_IMAGE, Subdef::TYPE_FLEXPAPER),
-            Type::TYPE_FLASH => array(Subdef::TYPE_IMAGE)
-        );
+        $mapping = [
+            Type::TYPE_IMAGE    => [Subdef::TYPE_IMAGE],
+            Type::TYPE_VIDEO    => [Subdef::TYPE_IMAGE, Subdef::TYPE_VIDEO, Subdef::TYPE_ANIMATION],
+            Type::TYPE_AUDIO    => [Subdef::TYPE_IMAGE, Subdef::TYPE_AUDIO],
+            Type::TYPE_DOCUMENT => [Subdef::TYPE_IMAGE, Subdef::TYPE_FLEXPAPER],
+            Type::TYPE_FLASH    => [Subdef::TYPE_IMAGE]
+        ];
 
         return $mapping;
     }
@@ -222,135 +223,135 @@ class SubdefsController extends Controller
      */
     protected function getConfiguration()
     {
-        $config = array(
-            Subdef::TYPE_IMAGE => array(
-                "definitions" => array(
-                    "JPG" => null,
-                    "160px JPG" => array(
+        $config = [
+            Subdef::TYPE_IMAGE     => [
+                "definitions" => [
+                    "JPG"                               => null,
+                    "160px JPG"                         => [
                         Image::OPTION_SIZE       => "160",
                         Image::OPTION_RESOLUTION => "75",
                         Image::OPTION_STRIP      => "yes",
                         Image::OPTION_FLATTEN    => "yes",
                         Image::OPTION_QUALITY    => "75",
                         Image::OPTION_ICODEC     => "jpeg",
-                        Subdef::OPTION_DEVICE     => ["all"]
-                    ),
-                    "320 px JPG (thumbnail Phraseanet)" => array(
+                        Subdef::OPTION_DEVICE    => ["all"]
+                    ],
+                    "320 px JPG (thumbnail Phraseanet)" => [
                         Image::OPTION_SIZE       => "320",
                         Image::OPTION_RESOLUTION => "75",
                         Image::OPTION_STRIP      => "yes",
                         Image::OPTION_FLATTEN    => "yes",
                         Image::OPTION_QUALITY    => "75",
                         Image::OPTION_ICODEC     => "jpeg",
-                        Subdef::OPTION_DEVICE     => ["all"]
-                    ),
-                    "640px JPG" => array(
+                        Subdef::OPTION_DEVICE    => ["all"]
+                    ],
+                    "640px JPG"                         => [
                         Image::OPTION_SIZE       => "640",
                         Image::OPTION_RESOLUTION => "75",
                         Image::OPTION_STRIP      => "yes",
                         Image::OPTION_FLATTEN    => "yes",
                         Image::OPTION_QUALITY    => "75",
                         Image::OPTION_ICODEC     => "jpeg",
-                        Subdef::OPTION_DEVICE     => ["all"]
-                    ),
-                    "1280px JPG (preview Phraseanet)" => array(
+                        Subdef::OPTION_DEVICE    => ["all"]
+                    ],
+                    "1280px JPG (preview Phraseanet)"   => [
                         Image::OPTION_SIZE       => "1280",
                         Image::OPTION_RESOLUTION => "75",
                         Image::OPTION_STRIP      => "yes",
                         Image::OPTION_FLATTEN    => "yes",
                         Image::OPTION_QUALITY    => "75",
                         Image::OPTION_ICODEC     => "jpeg",
-                        Subdef::OPTION_DEVICE     => ["all"]
-                    ),
-                    "2560px JPG" => array(
+                        Subdef::OPTION_DEVICE    => ["all"]
+                    ],
+                    "2560px JPG"                        => [
                         Image::OPTION_SIZE       => "2560",
                         Image::OPTION_RESOLUTION => "75",
                         Image::OPTION_STRIP      => "yes",
                         Image::OPTION_FLATTEN    => "yes",
                         Image::OPTION_QUALITY    => "75",
                         Image::OPTION_ICODEC     => "jpeg",
-                        Subdef::OPTION_DEVICE     => ["all"]
-                    ),
-                    "PNG" => null,
-                    "160px PNG 8 bits" => array(
+                        Subdef::OPTION_DEVICE    => ["all"]
+                    ],
+                    "PNG"                               => null,
+                    "160px PNG 8 bits"                  => [
                         Image::OPTION_SIZE       => "160",
                         Image::OPTION_RESOLUTION => "75",
                         Image::OPTION_STRIP      => "yes",
                         Image::OPTION_FLATTEN    => "yes",
                         Image::OPTION_QUALITY    => "75",
                         Image::OPTION_ICODEC     => "png",
-                        Subdef::OPTION_DEVICE     => ["all"]
-                    ),
-                    "320px PNG 8 bits" => array(
+                        Subdef::OPTION_DEVICE    => ["all"]
+                    ],
+                    "320px PNG 8 bits"                  => [
                         Image::OPTION_SIZE       => "320",
                         Image::OPTION_RESOLUTION => "75",
                         Image::OPTION_STRIP      => "yes",
                         Image::OPTION_FLATTEN    => "yes",
                         Image::OPTION_QUALITY    => "75",
                         Image::OPTION_ICODEC     => "png",
-                        Subdef::OPTION_DEVICE     => ["all"]
-                    ),
-                    "640px PNG 8 bits" => array(
+                        Subdef::OPTION_DEVICE    => ["all"]
+                    ],
+                    "640px PNG 8 bits"                  => [
                         Image::OPTION_SIZE       => "640",
                         Image::OPTION_RESOLUTION => "75",
                         Image::OPTION_STRIP      => "yes",
                         Image::OPTION_FLATTEN    => "yes",
                         Image::OPTION_QUALITY    => "75",
                         Image::OPTION_ICODEC     => "png",
-                        Subdef::OPTION_DEVICE     => ["all"]
-                    ),
-                    "1280px PNG 8 bits" => array(
+                        Subdef::OPTION_DEVICE    => ["all"]
+                    ],
+                    "1280px PNG 8 bits"                 => [
                         Image::OPTION_SIZE       => "1280",
                         Image::OPTION_RESOLUTION => "75",
                         Image::OPTION_STRIP      => "yes",
                         Image::OPTION_FLATTEN    => "yes",
                         Image::OPTION_QUALITY    => "75",
                         Image::OPTION_ICODEC     => "png",
-                        Subdef::OPTION_DEVICE     => ["all"]
-                    ),
-                    "2560px PNG 8 bits" => array(
+                        Subdef::OPTION_DEVICE    => ["all"]
+                    ],
+                    "2560px PNG 8 bits"                 => [
                         Image::OPTION_SIZE       => "2560",
                         Image::OPTION_RESOLUTION => "75",
                         Image::OPTION_STRIP      => "yes",
                         Image::OPTION_FLATTEN    => "yes",
                         Image::OPTION_QUALITY    => "75",
                         Image::OPTION_ICODEC     => "png",
-                        Subdef::OPTION_DEVICE     => ["all"]
-                    ),
-                    "TIFF" => null,
-                    "1280 TIFF" => array(
+                        Subdef::OPTION_DEVICE    => ["all"]
+                    ],
+                    "TIFF"                              => null,
+                    "1280 TIFF"                         => [
                         Image::OPTION_SIZE       => "1280",
                         Image::OPTION_RESOLUTION => "75",
                         Image::OPTION_STRIP      => "yes",
                         Image::OPTION_FLATTEN    => "yes",
                         Image::OPTION_QUALITY    => "75",
                         Image::OPTION_ICODEC     => "tiff",
-                        Subdef::OPTION_DEVICE     => ["all"]
-                    ),
-                    "2560px TIFF" => array(
+                        Subdef::OPTION_DEVICE    => ["all"]
+                    ],
+                    "2560px TIFF"                       => [
                         Image::OPTION_SIZE       => "2560",
                         Image::OPTION_RESOLUTION => "75",
                         Image::OPTION_STRIP      => "yes",
                         Image::OPTION_FLATTEN    => "yes",
                         Image::OPTION_QUALITY    => "75",
                         Image::OPTION_ICODEC     => "tiff",
-                        Subdef::OPTION_DEVICE     => ["all"]
-                    ),
-                ),
-                "form" => array(
+                        Subdef::OPTION_DEVICE    => ["all"]
+                    ],
+                ],
+                "form"        => [
                     Image::OPTION_SIZE       => "slide",
                     Image::OPTION_RESOLUTION => "slide",
                     Image::OPTION_STRIP      => "radio",
                     Image::OPTION_FLATTEN    => "radio",
                     Image::OPTION_QUALITY    => "slide",
                     Image::OPTION_ICODEC     => "select",
-                    Subdef::OPTION_DEVICE     => "checkbox",
-                ),
-            ),
-            Subdef::TYPE_VIDEO => array(
-                "definitions" => array(
-                    "video codec H264" => null,
-                    "144P H264 128 kbps ACC 128kbps" => array(
+                    Subdef::OPTION_DEVICE    => "checkbox",
+                ],
+            ],
+            Subdef::TYPE_VIDEO     => [
+                "definitions" => [
+                    "video codec H264"                 => null,
+                    "144P H264 128 kbps ACC 128kbps"   => [
                         Video::OPTION_AUDIOBITRATE    => "128",
                         Video::OPTION_AUDIOSAMPLERATE => "44100",
                         Video::OPTION_BITRATE         => "128",
@@ -359,9 +360,9 @@ class SubdefsController extends Controller
                         Video::OPTION_FRAMERATE       => "25",
                         Video::OPTION_VCODEC          => "libx264",
                         Video::OPTION_ACODEC          => "libfaac",
-                        Subdef::OPTION_DEVICE          => ["all"]
-                    ),
-                    "240P H264 256 kbps ACC 128kbps" => array(
+                        Subdef::OPTION_DEVICE         => ["all"]
+                    ],
+                    "240P H264 256 kbps ACC 128kbps"   => [
                         Video::OPTION_AUDIOBITRATE    => "128",
                         Video::OPTION_AUDIOSAMPLERATE => "44100",
                         Video::OPTION_BITRATE         => "256",
@@ -370,9 +371,9 @@ class SubdefsController extends Controller
                         Video::OPTION_FRAMERATE       => "25",
                         Video::OPTION_VCODEC          => "libx264",
                         Video::OPTION_ACODEC          => "libfaac",
-                        Subdef::OPTION_DEVICE          => ["all"]
-                    ),
-                    "360P H264 576 kbps ACC 128kbps" => array(
+                        Subdef::OPTION_DEVICE         => ["all"]
+                    ],
+                    "360P H264 576 kbps ACC 128kbps"   => [
                         Video::OPTION_AUDIOBITRATE    => "128",
                         Video::OPTION_AUDIOSAMPLERATE => "44100",
                         Video::OPTION_BITRATE         => "576",
@@ -381,9 +382,9 @@ class SubdefsController extends Controller
                         Video::OPTION_FRAMERATE       => "25",
                         Video::OPTION_VCODEC          => "libtheora",
                         Video::OPTION_ACODEC          => "libfaac",
-                        Subdef::OPTION_DEVICE          => ["all"]
-                    ),
-                    "480P H264 750 kbps ACC 128kbps" => array(
+                        Subdef::OPTION_DEVICE         => ["all"]
+                    ],
+                    "480P H264 750 kbps ACC 128kbps"   => [
                         Video::OPTION_AUDIOBITRATE    => "128",
                         Video::OPTION_AUDIOSAMPLERATE => "44100",
                         Video::OPTION_BITRATE         => "750",
@@ -392,9 +393,9 @@ class SubdefsController extends Controller
                         Video::OPTION_FRAMERATE       => "25",
                         Video::OPTION_VCODEC          => "libx264",
                         Video::OPTION_ACODEC          => "libfaac",
-                        Subdef::OPTION_DEVICE          => ["all"]
-                    ),
-                    "720P H264 1492 kbps ACC 128kbps" => array(
+                        Subdef::OPTION_DEVICE         => ["all"]
+                    ],
+                    "720P H264 1492 kbps ACC 128kbps"  => [
                         Video::OPTION_AUDIOBITRATE    => "128",
                         Video::OPTION_AUDIOSAMPLERATE => "44100",
                         Video::OPTION_BITRATE         => "1492",
@@ -403,9 +404,9 @@ class SubdefsController extends Controller
                         Video::OPTION_FRAMERATE       => "25",
                         Video::OPTION_VCODEC          => "libx264",
                         Video::OPTION_ACODEC          => "libfaac",
-                        Subdef::OPTION_DEVICE          => ["all"]
-                    ),
-                    "1080P H264 2420 kbps ACC 128kbps" => array(
+                        Subdef::OPTION_DEVICE         => ["all"]
+                    ],
+                    "1080P H264 2420 kbps ACC 128kbps" => [
                         Video::OPTION_AUDIOBITRATE    => "128",
                         Video::OPTION_AUDIOSAMPLERATE => "44100",
                         Video::OPTION_BITRATE         => "2420",
@@ -414,10 +415,10 @@ class SubdefsController extends Controller
                         Video::OPTION_FRAMERATE       => "25",
                         Video::OPTION_VCODEC          => "libx264",
                         Video::OPTION_ACODEC          => "libfaac",
-                        Subdef::OPTION_DEVICE          => ["all"]
-                    ),
-                    "video codec libvpx" => null,
-                    "144P webm 128 kbps ACC 128kbps" => array(
+                        Subdef::OPTION_DEVICE         => ["all"]
+                    ],
+                    "video codec libvpx"               => null,
+                    "144P webm 128 kbps ACC 128kbps"   => [
                         Video::OPTION_AUDIOBITRATE    => "128",
                         Video::OPTION_AUDIOSAMPLERATE => "44100",
                         Video::OPTION_BITRATE         => "128",
@@ -426,9 +427,9 @@ class SubdefsController extends Controller
                         Video::OPTION_FRAMERATE       => "25",
                         Video::OPTION_VCODEC          => "libvpx",
                         Video::OPTION_ACODEC          => "libfaac",
-                        Subdef::OPTION_DEVICE          => ["all"]
-                    ),
-                    "240P webm 256 kbps ACC 128kbps" => array(
+                        Subdef::OPTION_DEVICE         => ["all"]
+                    ],
+                    "240P webm 256 kbps ACC 128kbps"   => [
                         Video::OPTION_AUDIOBITRATE    => "128",
                         Video::OPTION_AUDIOSAMPLERATE => "44100",
                         Video::OPTION_BITRATE         => "256",
@@ -437,9 +438,9 @@ class SubdefsController extends Controller
                         Video::OPTION_FRAMERATE       => "25",
                         Video::OPTION_VCODEC          => "libvpx",
                         Video::OPTION_ACODEC          => "libfaac",
-                        Subdef::OPTION_DEVICE          => ["all"]
-                    ),
-                    "360P webm 576 kbps ACC 128kbps" => array(
+                        Subdef::OPTION_DEVICE         => ["all"]
+                    ],
+                    "360P webm 576 kbps ACC 128kbps"   => [
                         Video::OPTION_AUDIOBITRATE    => "128",
                         Video::OPTION_AUDIOSAMPLERATE => "44100",
                         Video::OPTION_BITRATE         => "576",
@@ -448,9 +449,9 @@ class SubdefsController extends Controller
                         Video::OPTION_FRAMERATE       => "25",
                         Video::OPTION_VCODEC          => "libvpx",
                         Video::OPTION_ACODEC          => "libfaac",
-                        Subdef::OPTION_DEVICE          => ["all"]
-                    ),
-                    "480P webm 750 kbps ACC 128kbps" => array(
+                        Subdef::OPTION_DEVICE         => ["all"]
+                    ],
+                    "480P webm 750 kbps ACC 128kbps"   => [
                         Video::OPTION_AUDIOBITRATE    => "128",
                         Video::OPTION_AUDIOSAMPLERATE => "44100",
                         Video::OPTION_BITRATE         => "750",
@@ -459,9 +460,9 @@ class SubdefsController extends Controller
                         Video::OPTION_FRAMERATE       => "25",
                         Video::OPTION_VCODEC          => "libvpx",
                         Video::OPTION_ACODEC          => "libfaac",
-                        Subdef::OPTION_DEVICE          => ["all"]
-                    ),
-                    "720P webm 1492 kbps ACC 128kbps" => array(
+                        Subdef::OPTION_DEVICE         => ["all"]
+                    ],
+                    "720P webm 1492 kbps ACC 128kbps"  => [
                         Video::OPTION_AUDIOBITRATE    => "128",
                         Video::OPTION_AUDIOSAMPLERATE => "44100",
                         Video::OPTION_BITRATE         => "1492",
@@ -470,9 +471,9 @@ class SubdefsController extends Controller
                         Video::OPTION_FRAMERATE       => "25",
                         Video::OPTION_VCODEC          => "libvpx",
                         Video::OPTION_ACODEC          => "libfaac",
-                        Subdef::OPTION_DEVICE          => ["all"]
-                    ),
-                    "1080P webm 2420 kbps ACC 128kbps" => array(
+                        Subdef::OPTION_DEVICE         => ["all"]
+                    ],
+                    "1080P webm 2420 kbps ACC 128kbps" => [
                         Video::OPTION_AUDIOBITRATE    => "128",
                         Video::OPTION_AUDIOSAMPLERATE => "44100",
                         Video::OPTION_BITRATE         => "2420",
@@ -481,10 +482,10 @@ class SubdefsController extends Controller
                         Video::OPTION_FRAMERATE       => "25",
                         Video::OPTION_VCODEC          => "libvpx",
                         Video::OPTION_ACODEC          => "libfaac",
-                        Subdef::OPTION_DEVICE          => ["all"]
-                    ),
-                ),
-                "form" => array(
+                        Subdef::OPTION_DEVICE         => ["all"]
+                    ],
+                ],
+                "form"        => [
                     Video::OPTION_AUDIOBITRATE    => "slide",
                     Video::OPTION_AUDIOSAMPLERATE => "select",
                     Video::OPTION_BITRATE         => "slide",
@@ -493,67 +494,67 @@ class SubdefsController extends Controller
                     Video::OPTION_FRAMERATE       => "slide",
                     Video::OPTION_VCODEC          => "select",
                     Video::OPTION_ACODEC          => "select",
-                    Subdef::OPTION_DEVICE          => "checkbox",
-                ),
-            ),
-            Subdef::TYPE_ANIMATION => array(
-                "definitions" => array(
-                    "256 px fast 200 ms" => array(
-                        Gif::OPTION_SIZE    => "256",
-                        Gif::OPTION_DELAY   => "200",
-                        Subdef::OPTION_DEVICE  => ["all"]
-                    ),
-                    "256 px very fast 120 ms" => array(
-                        Gif::OPTION_SIZE    => "256",
-                        Gif::OPTION_DELAY   => "120",
-                        Subdef::OPTION_DEVICE  => ["all"]
-                    ),
-                    "320 px fast 200 ms" => array(
-                        Gif::OPTION_SIZE    => "320",
-                        Gif::OPTION_DELAY   => "200",
-                        Subdef::OPTION_DEVICE  => ["all"]
-                    ),
-                ),
-                "form" => array(
-                    Gif::OPTION_SIZE        => "slide",
-                    Gif::OPTION_DELAY       => "slide",
-                    Subdef::OPTION_DEVICE      => "checkbox",
-                ),
-            ),
-            Subdef::TYPE_AUDIO => array(
-                "definitions" => array(
-                    "Low AAC 96 kbit/s" => array(
-                        Audio::OPTION_AUDIOBITRATE      => "100",
-                        Audio::OPTION_AUDIOSAMPLERATE   => "8000",
-                        Audio::OPTION_ACODEC            => "libmp3lame",
-                        Subdef::OPTION_DEVICE            => ["all"]
-                    ),
-                    "Normal AAC 128 kbit/s" => array(
-                        Audio::OPTION_AUDIOBITRATE      => "180",
-                        Audio::OPTION_AUDIOSAMPLERATE   => "44100",
-                        Audio::OPTION_ACODEC            => "libmp3lame",
-                        Subdef::OPTION_DEVICE            => ["all"]
-                    ),
-                    "High AAC 320 kbit/s" => array(
-                        Audio::OPTION_AUDIOBITRATE      => "230",
-                        Audio::OPTION_AUDIOSAMPLERATE   => "50000",
-                        Audio::OPTION_ACODEC            => "libmp3lame",
-                        Subdef::OPTION_DEVICE            => ["all"]
-                    ),
-                ),
-                "form" => array(
-                    Audio::OPTION_AUDIOBITRATE      => "slide",
-                    Audio::OPTION_AUDIOSAMPLERATE   => "select",
-                    Audio::OPTION_ACODEC            => "select",
-                    Subdef::OPTION_DEVICE            => "checkbox",
-                ),
-            ),
-            Subdef::TYPE_FLEXPAPER => array(
-                "definitions" => array(
-                ),
-                "form" => array(),
-            ),
-        );
+                    Subdef::OPTION_DEVICE         => "checkbox",
+                ],
+            ],
+            Subdef::TYPE_ANIMATION => [
+                "definitions" => [
+                    "256 px fast 200 ms"      => [
+                        Gif::OPTION_SIZE      => "256",
+                        Gif::OPTION_DELAY     => "200",
+                        Subdef::OPTION_DEVICE => ["all"]
+                    ],
+                    "256 px very fast 120 ms" => [
+                        Gif::OPTION_SIZE      => "256",
+                        Gif::OPTION_DELAY     => "120",
+                        Subdef::OPTION_DEVICE => ["all"]
+                    ],
+                    "320 px fast 200 ms"      => [
+                        Gif::OPTION_SIZE      => "320",
+                        Gif::OPTION_DELAY     => "200",
+                        Subdef::OPTION_DEVICE => ["all"]
+                    ],
+                ],
+                "form"        => [
+                    Gif::OPTION_SIZE      => "slide",
+                    Gif::OPTION_DELAY     => "slide",
+                    Subdef::OPTION_DEVICE => "checkbox",
+                ],
+            ],
+            Subdef::TYPE_AUDIO     => [
+                "definitions" => [
+                    "Low AAC 96 kbit/s"     => [
+                        Audio::OPTION_AUDIOBITRATE    => "100",
+                        Audio::OPTION_AUDIOSAMPLERATE => "8000",
+                        Audio::OPTION_ACODEC          => "libmp3lame",
+                        Subdef::OPTION_DEVICE         => ["all"]
+                    ],
+                    "Normal AAC 128 kbit/s" => [
+                        Audio::OPTION_AUDIOBITRATE    => "180",
+                        Audio::OPTION_AUDIOSAMPLERATE => "44100",
+                        Audio::OPTION_ACODEC          => "libmp3lame",
+                        Subdef::OPTION_DEVICE         => ["all"]
+                    ],
+                    "High AAC 320 kbit/s"   => [
+                        Audio::OPTION_AUDIOBITRATE    => "230",
+                        Audio::OPTION_AUDIOSAMPLERATE => "50000",
+                        Audio::OPTION_ACODEC          => "libmp3lame",
+                        Subdef::OPTION_DEVICE         => ["all"]
+                    ],
+                ],
+                "form"        => [
+                    Audio::OPTION_AUDIOBITRATE    => "slide",
+                    Audio::OPTION_AUDIOSAMPLERATE => "select",
+                    Audio::OPTION_ACODEC          => "select",
+                    Subdef::OPTION_DEVICE         => "checkbox",
+                ],
+            ],
+            Subdef::TYPE_FLEXPAPER => [
+                "definitions" => [
+                ],
+                "form"        => [],
+            ],
+        ];
 
         return $config;
     }
diff --git a/lib/Alchemy/Phrasea/Controller/Prod/MoveCollectionController.php b/lib/Alchemy/Phrasea/Controller/Prod/MoveCollectionController.php
index d89fc9ae32..0c540b4c4d 100644
--- a/lib/Alchemy/Phrasea/Controller/Prod/MoveCollectionController.php
+++ b/lib/Alchemy/Phrasea/Controller/Prod/MoveCollectionController.php
@@ -41,7 +41,7 @@ class MoveCollectionController extends Controller
             $settings = $this->app['settings'];
             $userOrderSetting = $settings->getUserSetting($this->app->getAuthenticatedUser(), 'order_collection_by');
             // a temporary array to sort the collections
-            $aName = array();
+            $aName = [];
             list($ukey, $uorder) = ["order", SORT_ASC];     // default ORDER_BY_ADMIN
             switch ($userOrderSetting) {
                 case $settings::ORDER_ALPHA_ASC :
@@ -52,9 +52,10 @@ class MoveCollectionController extends Controller
                     break;
             }
             foreach ($collections as $key => $row) {
-                if($ukey == "order") {
+                if ($ukey == "order") {
                     $aName[$key] = $row->get_ord();
-                }else {
+                }
+                else {
                     $aName[$key] = $row->get_name();
                 }
             }
diff --git a/lib/Alchemy/Phrasea/Controller/Prod/ShareController.php b/lib/Alchemy/Phrasea/Controller/Prod/ShareController.php
index 04b0f00612..8aa6323348 100644
--- a/lib/Alchemy/Phrasea/Controller/Prod/ShareController.php
+++ b/lib/Alchemy/Phrasea/Controller/Prod/ShareController.php
@@ -31,7 +31,7 @@ class ShareController extends Controller
         $databoxSubdefs = $record->getDatabox()->get_subdef_structure()->getSubdefGroup($record->getType());
         $acl = $this->getAclForUser();
         $subdefList = [];
-        $defaultKey =  null;
+        $defaultKey = null;
         foreach ($subdefs as $subdef) {
             $subdefName = $subdef->get_name();
             if ($subdefName == 'document') {
@@ -55,7 +55,7 @@ class ShareController extends Controller
             $defaultKey = $value;   // will set a default option if neither preview,thumbnail or document is present
 
 
-            if ( ($previewLink = $preview->get_permalink()) !== null ) {
+            if (($previewLink = $preview->get_permalink()) !== null) {
                 $permalinkUrl = $previewLink->get_url()->__toString();
                 $permaviewUrl = $previewLink->get_page();
                 $previewWidth = $preview->get_width();
@@ -74,7 +74,7 @@ class ShareController extends Controller
         }
 
         // candidates as best default selected option
-        foreach(["preview", "thumbnail", "document"] as $k) {
+        foreach (["preview", "thumbnail", "document"] as $k) {
             if (array_key_exists($k, $subdefList)) {
                 $defaultKey = $k;
                 break;
@@ -84,8 +84,8 @@ class ShareController extends Controller
         // the twig MUST handle that
         $outputVars = [
             'isAvailable' => !empty($subdefList),
-            'subdefList' => $subdefList,
-            'defaultKey' => $defaultKey
+            'subdefList'  => $subdefList,
+            'defaultKey'  => $defaultKey
         ];
 
         return $this->renderResponse('prod/Share/record.html.twig', $outputVars);
diff --git a/lib/Alchemy/Phrasea/Controller/Prod/UploadController.php b/lib/Alchemy/Phrasea/Controller/Prod/UploadController.php
index 85bd81def4..a42ba5145c 100644
--- a/lib/Alchemy/Phrasea/Controller/Prod/UploadController.php
+++ b/lib/Alchemy/Phrasea/Controller/Prod/UploadController.php
@@ -247,7 +247,7 @@ class UploadController extends Controller
             $sbasId = $databox->get_sbas_id();
             foreach ($acl->get_granted_base([\ACL::CANADDRECORD], [$sbasId]) as $collection) {
                 $databox = $collection->get_databox();
-                if ( ! isset($collections[$sbasId])) {
+                if (!isset($collections[$sbasId])) {
                     $collections[$databox->get_sbas_id()] = [
                         'databox'             => $databox,
                         'databox_collections' => []
diff --git a/lib/Alchemy/Phrasea/ControllerProvider/Prod/Share.php b/lib/Alchemy/Phrasea/ControllerProvider/Prod/Share.php
index d2f1901814..dddcb6e61d 100644
--- a/lib/Alchemy/Phrasea/ControllerProvider/Prod/Share.php
+++ b/lib/Alchemy/Phrasea/ControllerProvider/Prod/Share.php
@@ -48,13 +48,13 @@ class Share implements ControllerProviderInterface, ServiceProviderInterface
         $controllers->get('/record/{base_id}/{record_id}/', 'controller.prod.share:shareRecord')
             ->before(function (Request $request) use ($app, $firewall) {
                 $socialTools = $app['conf']->get(['registry', 'actions', 'social-tools']);
-                if($socialTools === "all") {
+                if ($socialTools === "all") {
                     return;
                 }
-                elseif($socialTools === "none") {
+                elseif ($socialTools === "none") {
                     $app->abort(403, 'social tools disabled');
                 }
-                elseif($socialTools === "publishers") {
+                elseif ($socialTools === "publishers") {
                     $firewall->requireRightOnSbas(
                         \phrasea::sbasFromBas($app, $request->attributes->get('base_id')),
                         \ACL::BAS_CHUPUB
diff --git a/lib/Alchemy/Phrasea/Core/Configuration/StructureTemplate.php b/lib/Alchemy/Phrasea/Core/Configuration/StructureTemplate.php
index 727cdd0bce..075fbf89e1 100644
--- a/lib/Alchemy/Phrasea/Core/Configuration/StructureTemplate.php
+++ b/lib/Alchemy/Phrasea/Core/Configuration/StructureTemplate.php
@@ -7,9 +7,11 @@
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
  */
+
 namespace Alchemy\Phrasea\Core\Configuration;
 
 use Alchemy\Phrasea\Application;
+
 /**
  * Class StructureTemplate
  * @package Alchemy\Phrasea\Core\Configuration
@@ -23,6 +25,7 @@ class StructureTemplate
     {
         $this->app = $app;
     }
+
     /**
      * @return $this
      * @throws \Exception
@@ -30,59 +33,72 @@ class StructureTemplate
     public function getAvailable()
     {
         $templateList = new \DirectoryIterator($this->app['root.path'] . '/lib/conf.d/data_templates');
-        if(empty($templateList)) throw new \Exception('No available structure template');
+        if (empty($templateList)) {
+            throw new \Exception('No available structure template');
+        }
         $templates = [];
         $abbreviationLength = 2;
-        foreach ($templateList as $template)
-        {
-            if($template->isDot()
+        foreach ($templateList as $template) {
+            if ($template->isDot()
                 || !$template->isFile()
-                || $template->getExtension() !== self::TEMPLATE_EXTENSION) continue;
-            $name = $template->getFilename();
-            $abbreviation = strtolower(substr($name,0,$abbreviationLength));
-            if(array_key_exists($abbreviation,$templates) ){
-                $abbreviation = strtolower(substr($name,0,++$abbreviationLength));
+                || $template->getExtension() !== self::TEMPLATE_EXTENSION
+            ) {
+                continue;
             }
-            $templates[$abbreviation] = $template->getBasename('.'.self::TEMPLATE_EXTENSION);
+            $name = $template->getFilename();
+            $abbreviation = strtolower(substr($name, 0, $abbreviationLength));
+            if (array_key_exists($abbreviation, $templates)) {
+                $abbreviation = strtolower(substr($name, 0, ++$abbreviationLength));
+            }
+            $templates[$abbreviation] = $template->getBasename('.' . self::TEMPLATE_EXTENSION);
         }
         $this->templates = $templates;
+
         return $this;
     }
+
     /**
      * @return string
      */
     public function __toString()
     {
-        if(!$this->templates){
+        if (!$this->templates) {
             return '';
         }
         $templateToString = '';
         $cpt = 1;
         $templateLength = count($this->templates);
-        foreach ($this->templates as $key => $value){
+        foreach ($this->templates as $key => $value) {
             if (($templateLength - 1) == $cpt) {
                 $separator = ' and ';
-            }elseif(end($this->templates) == $value){
-                $separator =  '';
-            }else{
+            }
+            elseif (end($this->templates) == $value) {
+                $separator = '';
+            }
+            else {
                 $separator = ', ';
             }
-            $templateToString .= $key.' ('.$value.')'. $separator;
+            $templateToString .= $key . ' (' . $value . ')' . $separator;
             $cpt++;
         }
+
         return $templateToString;
     }
+
     /**
      * @param $template
      * @return mixed
      * @throws \Exception
      */
-    public function getTemplateName($template = 'en'){
-        if(!array_key_exists($template,$this->templates)){
-            throw new \Exception('Not found template : '.$template);
+    public function getTemplateName($template = 'en')
+    {
+        if (!array_key_exists($template, $this->templates)) {
+            throw new \Exception('Not found template : ' . $template);
         }
+
         return $this->templates[$template];
     }
+
     /**
      * @return mixed
      */
diff --git a/lib/Alchemy/Phrasea/Databox/Subdef/SubdefPreset.php b/lib/Alchemy/Phrasea/Databox/Subdef/SubdefPreset.php
index 7a954badc7..5e16a08fde 100644
--- a/lib/Alchemy/Phrasea/Databox/Subdef/SubdefPreset.php
+++ b/lib/Alchemy/Phrasea/Databox/Subdef/SubdefPreset.php
@@ -16,6 +16,7 @@ class SubdefPreset
      * @var array
      */
     private $definitions;
+
     /**
      * @param string $mediaType
      * @param array $definitions
@@ -23,12 +24,13 @@ class SubdefPreset
     public function __construct($mediaType, array $definitions)
     {
         foreach ($definitions as $definition) {
-            if (! $definition instanceof Subdef) {
+            if (!$definition instanceof Subdef) {
             }
         }
-        $this->mediaType = (string) $mediaType;
+        $this->mediaType = (string)$mediaType;
         $this->definitions = $definitions;
     }
+
     /**
      * @return string
      */
@@ -36,6 +38,7 @@ class SubdefPreset
     {
         return $this->label;
     }
+
     /**
      * @return array
      */
diff --git a/lib/Alchemy/Phrasea/Databox/Subdef/SubdefPresetProvider.php b/lib/Alchemy/Phrasea/Databox/Subdef/SubdefPresetProvider.php
index 2f6c989ad8..f7b90d283f 100644
--- a/lib/Alchemy/Phrasea/Databox/Subdef/SubdefPresetProvider.php
+++ b/lib/Alchemy/Phrasea/Databox/Subdef/SubdefPresetProvider.php
@@ -5,15 +5,17 @@ namespace Alchemy\Phrasea\Databox\Subdef;
 class SubdefPresetProvider
 {
     private $presets = [];
+
     /**
      * @param string $type Type of media for which to get presets
      * @return SubdefPreset[]
      */
     public function getPresets($type)
     {
-        if (! isset($this->presets[$type])) {
+        if (!isset($this->presets[$type])) {
             throw new \InvalidArgumentException('Invalid type');
         }
+
         return $this->presets[$type];
     }
 }
\ No newline at end of file
diff --git a/lib/Alchemy/Phrasea/Helper/Prod.php b/lib/Alchemy/Phrasea/Helper/Prod.php
index 54470f60ee..3e2a97b179 100644
--- a/lib/Alchemy/Phrasea/Helper/Prod.php
+++ b/lib/Alchemy/Phrasea/Helper/Prod.php
@@ -46,9 +46,9 @@ class Prod extends Helper
                 $selected = $saveSettings ? ((isset($searchSet['bases']) && isset($searchSet['bases'][$sbasId])) ? (in_array($coll->get_base_id(), $searchSet['bases'][$sbasId])) : true) : true;
                 $bases[$sbasId]['collections'][] = array(
                     'selected' => $selected,
-                    'base_id' => $coll->get_base_id(),
-                    'name'    => $coll->get_name(),
-                    'order'   => $coll->get_ord()
+                    'base_id'  => $coll->get_base_id(),
+                    'name'     => $coll->get_name(),
+                    'order'    => $coll->get_ord()
                 );
             }
 
@@ -57,7 +57,7 @@ class Prod extends Helper
             $userOrderSetting = $settings->getUserSetting($this->app->getAuthenticatedUser(), 'order_collection_by');
 
             // a temporary array to sort the collections
-            $aName = array();
+            $aName = [];
             list($ukey, $uorder) = ["order", SORT_ASC];     // default ORDER_BY_ADMIN
             switch ($userOrderSetting) {
                 case $settings::ORDER_ALPHA_ASC :
diff --git a/lib/classes/databox/subdef.php b/lib/classes/databox/subdef.php
index 188e1ccc22..a0f4228b5c 100644
--- a/lib/classes/databox/subdef.php
+++ b/lib/classes/databox/subdef.php
@@ -39,12 +39,12 @@ class databox_subdef
     protected $downloadable;
     protected $translator;
     protected static $mediaTypeToSubdefTypes = [
-        SubdefType::TYPE_AUDIO => [SubdefSpecs::TYPE_IMAGE, SubdefSpecs::TYPE_AUDIO],
+        SubdefType::TYPE_AUDIO    => [SubdefSpecs::TYPE_IMAGE, SubdefSpecs::TYPE_AUDIO],
         SubdefType::TYPE_DOCUMENT => [SubdefSpecs::TYPE_IMAGE, SubdefSpecs::TYPE_FLEXPAPER],
-        SubdefType::TYPE_FLASH => [SubdefSpecs::TYPE_IMAGE],
-        SubdefType::TYPE_IMAGE => [SubdefSpecs::TYPE_IMAGE],
-        SubdefType::TYPE_VIDEO => [SubdefSpecs::TYPE_IMAGE, SubdefSpecs::TYPE_VIDEO, SubdefSpecs::TYPE_ANIMATION],
-        SubdefType::TYPE_UNKNOWN => [SubdefSpecs::TYPE_IMAGE],
+        SubdefType::TYPE_FLASH    => [SubdefSpecs::TYPE_IMAGE],
+        SubdefType::TYPE_IMAGE    => [SubdefSpecs::TYPE_IMAGE],
+        SubdefType::TYPE_VIDEO    => [SubdefSpecs::TYPE_IMAGE, SubdefSpecs::TYPE_VIDEO, SubdefSpecs::TYPE_ANIMATION],
+        SubdefType::TYPE_UNKNOWN  => [SubdefSpecs::TYPE_IMAGE],
     ];
     const CLASS_THUMBNAIL = 'thumbnail';
     const CLASS_PREVIEW = 'preview';
@@ -303,7 +303,7 @@ class databox_subdef
         return $this->downloadable;
     }
 
-     /**
+    /**
      * @return bool
      */
     public function isOrderable()
diff --git a/resources/ansible/roles/app/templates/configuration.tpl b/resources/ansible/roles/app/templates/configuration.tpl
index bf39dd9a68..905c19b731 100644
--- a/resources/ansible/roles/app/templates/configuration.tpl
+++ b/resources/ansible/roles/app/templates/configuration.tpl
@@ -12,7 +12,7 @@ main:
         port: 3306
         user: '{{ mariadb.user }}'
         password: '{{ mariadb.password }}'
-        dbname: '{{ mariadb.appbox_db }}'
+dbname: '{{ mariadb.appbox_db }}'
         driver: pdo_mysql
         charset: UTF8
     database-test:
diff --git a/resources/www/admin/styles/main.scss b/resources/www/admin/styles/main.scss
index 8e9235c66d..d238fee86b 100644
--- a/resources/www/admin/styles/main.scss
+++ b/resources/www/admin/styles/main.scss
@@ -350,6 +350,7 @@ div.switch_right.unchecked {
   right: 40px;
   z-index: 1;
 }
+
 h2.subdefName {
   display: inline-block;
   margin-right: 1.5rem;
@@ -364,7 +365,7 @@ h2.subdefName {
   vertical-align: top;
 }
 
-.langTab h3{
+.langTab h3 {
   font-weight: 700;
   font-size: 13px;
   margin: 4px 0;
@@ -372,13 +373,14 @@ h2.subdefName {
   text-align: center;
 }
 
-.toggle{
+.toggle {
   display: block;
   margin: 15px 0;
   color: #08c;
   cursor: pointer;
 }
-.subdefTab input, .langTab input{
+
+.subdefTab input, .langTab input {
   margin: 0;
 }
 
@@ -387,6 +389,7 @@ label[for="elasticsearch_settings_highlight"] {
   margin-left: 0.5rem;
   margin-bottom: 1rem;
 }
+
 input[id="elasticsearch_settings_highlight"] {
   float: left;
 }
@@ -394,6 +397,7 @@ input[id="elasticsearch_settings_highlight"] {
 #downbutton {
   margin: 1rem 0;
 }
+
 #upbutton {
   width: 100%;
   text-align: left;
@@ -521,7 +525,7 @@ span.simplecolorpicker.picker {
 }
 
 @media screen and (max-width: 1150px) {
-  .langTab{
+  .langTab {
     display: block;
   }
 }
diff --git a/templates/web/admin/subdefs.html.twig b/templates/web/admin/subdefs.html.twig
index d103d7022c..6971846d5e 100644
--- a/templates/web/admin/subdefs.html.twig
+++ b/templates/web/admin/subdefs.html.twig
@@ -16,16 +16,16 @@
     <script type="text/javascript" src="/assets/vendors/jquery-ui/jquery-ui{% if not app.debug %}.min{% endif %}.js"></script>
     <script type="text/javascript" src="/assets/vendors/jquery-test-paths/jquery.test-paths{% if not app.debug %}.min{% endif %}.js"></script>#}
     <script type="text/javascript">
-        $(document).ready(function(){
+        $(document).ready(function () {
             $('.path_testable').path_file_test();
             $('.url_testable').url_test();
             $('.tabs').tabs({
-                beforeActivate:function(event, ui){
+                beforeActivate: function (event, ui) {
                     $('.path_testable:visible, .url_testable:visible').trigger('keyup');
                 }
             });
 
-            $(".toggle").on("click", function() {
+            $(".toggle").on("click", function () {
                 var box = $(this).data("toggle");
                 $(box).toggle("500");
             });
@@ -40,101 +40,100 @@
 
         function fillCheckbox(section, name, defType, fieldname, values) {
 
-            $("[name='"+section+"_"+name+"_"+defType+"["+fieldname+"][]']").each(function(){
+            $("[name='" + section + "_" + name + "_" + defType + "[" + fieldname + "][]']").each(function () {
                 $(this).removeAttr("checked");
 
-                for(var key in values){
-                    if($(this).val() == values[key])
+                for (var key in values) {
+                    if ($(this).val() == values[key])
                         $(this).prop("checked", "true");
                 }
             });
         }
         function fillRadio(section, name, defType, fieldname, value) {
-            $("[name='"+section+"_"+name+"_"+defType+"["+fieldname+"]'][value='"+value+"']").prop( "checked", true );
+            $("[name='" + section + "_" + name + "_" + defType + "[" + fieldname + "]'][value='" + value + "']").prop("checked", true);
         }
 
         function fillSelect(section, name, defType, fieldname, value) {
-            $("[name='"+section+"_"+name+"_"+defType+"["+fieldname+"]']").val(value)
+            $("[name='" + section + "_" + name + "_" + defType + "[" + fieldname + "]']").val(value)
         }
 
         function fillSlide(section, name, defType, fieldname, value) {
-            $("#slider"+section+name+defType+fieldname).slider({value:value});
-            $("#slidervalue"+section+name+defType+fieldname).val(value);
+            $("#slider" + section + name + defType + fieldname).slider({value: value});
+            $("#slidervalue" + section + name + defType + fieldname).val(value);
         }
 
 
         function populate_values(section, name) {
 
             var config = JSON.parse('{{ config |json_encode|raw }}'),
-                    i = 0,
-                    defType = $('[name="'+section+'_'+name+'_mediatype"]').val(),
-                    preset = $('[name="'+section+'_'+name+'_presets"]').val(),
-                    optionValue = $('[name="'+section+'_'+name+'_presets"] option:selected').attr("value");
+                i = 0,
+                defType = $('[name="' + section + '_' + name + '_mediatype"]').val(),
+                preset = $('[name="' + section + '_' + name + '_presets"]').val(),
+                optionValue = $('[name="' + section + '_' + name + '_presets"] option:selected').attr("value");
 
-            if(typeof optionValue === 'undefined'){
+            if (typeof optionValue === 'undefined') {
 
                 return;
             }
 
             for (var input in config[defType].form) {
-                if(config[defType].form[input] == "slide"){
+                if (config[defType].form[input] == "slide") {
                     fillSlide(section, name, defType, input, config[defType].definitions[preset][input]);
                 }
-                if(config[defType].form[input] == "radio"){
+                if (config[defType].form[input] == "radio") {
                     fillRadio(section, name, defType, input, config[defType].definitions[preset][input]);
                 }
-                if(config[defType].form[input] == "select"){
+                if (config[defType].form[input] == "select") {
                     fillSelect(section, name, defType, input, config[defType].definitions[preset][input]);
                 }
-                if(config[defType].form[input] == "checkbox"){
+                if (config[defType].form[input] == "checkbox") {
                     fillCheckbox(section, name, defType, input, config[defType].definitions[preset][input]);
                 }
                 i++;
             }
         }
 
-        function select_mediatype(type, name, selector)
-        {
+        function select_mediatype(type, name, selector) {
             var config = JSON.parse('{{ config |json_encode|raw }}'),
-                    inputPresets = '[name="'+type+'_'+name+'_presets"]',
-                    defType = $(selector).val();
+                inputPresets = '[name="' + type + '_' + name + '_presets"]',
+                defType = $(selector).val();
 
 
-            $('.'+type+name).hide();
+            $('.' + type + name).hide();
 
-            $('[data-toggle^="#box'+type+name+'"]').hide();
-            $('[data-toggle="#box'+type+name+defType+'"]').show();
+            $('[data-toggle^="#box' + type + name + '"]').hide();
+            $('[data-toggle="#box' + type + name + defType + '"]').show();
 
-            $('#box'+type+name+$(selector).val()).show();
+            $('#box' + type + name + $(selector).val()).show();
 
-            if(defType == 'flexpaper'){
+            if (defType == 'flexpaper') {
                 $(inputPresets).closest("tr").hide();
                 return;
-            }else{
+            } else {
                 $(inputPresets).closest("tr").show();
             }
 
             $(inputPresets)
-                    .find('option')
-                    .remove()
-                    .end()
-                    .append($("<option value='custom'></option>").text('{{ 'Custom' | trans }}'));
+                .find('option')
+                .remove()
+                .end()
+                .append($("<option value='custom'></option>").text('{{ 'Custom' | trans }}'));
 
-            if(typeof config[defType] === 'undefined'){
+            if (typeof config[defType] === 'undefined') {
 
                 return;
             }
 
             for (var key in config[defType].definitions) {
-                if (config[defType].definitions[key] == null){
+                if (config[defType].definitions[key] == null) {
                     $(inputPresets).append($("<option></option>")
-                            .attr("disabled", "disabled")
-                            .text(key)
+                        .attr("disabled", "disabled")
+                        .text(key)
                     );
-                }else{
+                } else {
                     $(inputPresets).append($("<option></option>")
-                            .attr("value", key)
-                            .text(key)
+                        .attr("value", key)
+                        .text(key)
                     );
                 }
             }
@@ -142,74 +141,75 @@
 
         function subview_type(selector) {
             var mapping = JSON.parse('{{ subviews_mapping |json_encode|raw }}'),
-                    subviewType = $(selector).val();
+                subviewType = $(selector).val();
 
             $("#mediaType")
-                    .find('option')
-                    .remove()
-                    .end()
-                    .append($("<option></option>").text('{{ 'Choisir' | trans }}'));
+                .find('option')
+                .remove()
+                .end()
+                .append($("<option></option>").text('{{ 'Choisir' | trans }}'));
 
             for (var key in mapping[subviewType]) {
                 $("#mediaType").append($('<option></option>')
-                        .attr("value", mapping[subviewType][key])
-                        .text(mapping[subviewType][key])
+                    .attr("value", mapping[subviewType][key])
+                    .text(mapping[subviewType][key])
                 );
             }
         }
 
-        function media_type(selector){
+        function media_type(selector) {
             var config = JSON.parse('{{ config |json_encode|raw }}'),
-                    defType = $(selector).val();
+                defType = $(selector).val();
 
             $("#presets")
-                    .find('option')
-                    .remove()
-                    .end()
-                    .append($("<option></option>").text('{{ 'Choisir' | trans }}'));
+                .find('option')
+                .remove()
+                .end()
+                .append($("<option></option>").text('{{ 'Choisir' | trans }}'));
 
-            if(typeof config[defType] === 'undefined'){
+            if (typeof config[defType] === 'undefined') {
 
                 return;
             }
 
             for (var key in config[defType].definitions) {
-                if (config[defType].definitions[key] == null){
+                if (config[defType].definitions[key] == null) {
                     $("#presets").append($("<option></option>")
-                            .attr("disabled", "disabled")
-                            .text(key)
+                        .attr("disabled", "disabled")
+                        .text(key)
                     );
-                }else{
+                } else {
                     $("#presets").append($('<option></option>')
-                            .attr("value", key)
-                            .text(key)
+                        .attr("value", key)
+                        .text(key)
                     );
                 }
             }
         }
 
-        $(function() {
+        $(function () {
             // a workaround for a flaw in the demo system (http://dev.jqueryui.com/ticket/4375), ignore!
-            $( "#dialog:ui-dialog" ).dialog( "destroy" );
+            $("#dialog:ui-dialog").dialog("destroy");
 
-            var name = $( "#name" ), accessclass = $( "#accessclass" ), subviewType =$( "#subviewType" ) , mediaType = $( "#mediaType" ), presets = $( "#presets" ),
-                    allFields = $( [] ).add( name ).add(accessclass).add(subviewType).add(mediaType).add(presets),
-                    tips = $( ".validateTips" );
+            var name = $("#name"), accessclass = $("#accessclass"), subviewType = $("#subviewType"),
+                mediaType = $("#mediaType"), presets = $("#presets"),
+                allFields = $([]).add(name).add(accessclass).add(subviewType).add(mediaType).add(presets),
+                tips = $(".validateTips");
 
-            function updateTips( t ) {
+            function updateTips(t) {
                 tips
-                        .text( t )
-                        .addClass( "ui-state-highlight" );
-                setTimeout(function() {
-                    tips.removeClass( "ui-state-highlight", 1500 );
-                }, 500 );
+                    .text(t)
+                    .addClass("ui-state-highlight");
+                setTimeout(function () {
+                    tips.removeClass("ui-state-highlight", 1500);
+                }, 500);
             }
 
-            function checkLength( o, n, min, max ) {
-                if ( o.val().length > max || o.val().length < min ) {
-                    o.addClass( "ui-state-error" );
-                    updateTips( "Length of " + n + " must be between " +
-                            min + " and " + max + "." );
+            function checkLength(o, n, min, max) {
+                if (o.val().length > max || o.val().length < min) {
+                    o.addClass("ui-state-error");
+                    updateTips("Length of " + n + " must be between " +
+                        min + " and " + max + ".");
 
                     return false;
                 } else {
@@ -217,12 +217,12 @@
                 }
             }
 
-            function checkPresence( mediaType, o ) {
+            function checkPresence(mediaType, o) {
 
-                var el = $('input[name="subdefs[]"][value="'+mediaType+'_'+o.val()+'"]');
-                if ( el.length !== 0 ) {
-                    o.addClass( "ui-state-error" );
-                    updateTips( "SubdefName should be unique per group" );
+                var el = $('input[name="subdefs[]"][value="' + mediaType + '_' + o.val() + '"]');
+                if (el.length !== 0) {
+                    o.addClass("ui-state-error");
+                    updateTips("SubdefName should be unique per group");
 
                     return false;
                 } else {
@@ -230,84 +230,81 @@
                 }
             }
 
-            function checkSpecialChar( o )
-            {
+            function checkSpecialChar(o) {
                 var ok = true;
-                var reg = new RegExp("[A-Za-z0-9-]+","g");
+                var reg = new RegExp("[A-Za-z0-9-]+", "g");
 
-                if(o.val().match(reg)[0].length !== o.val().length)
-                {
+                if (o.val().match(reg)[0].length !== o.val().length) {
                     ok = false;
-                    o.addClass( "ui-state-error" );
-                    updateTips( "Special characters (except minus) or espaces are not authorized" );
+                    o.addClass("ui-state-error");
+                    updateTips("Special characters (except minus) or espaces are not authorized");
                 }
 
                 return ok;
             }
 
 
-            $( "#dialog-form" ).dialog({
+            $("#dialog-form").dialog({
                 autoOpen: false,
                 height: 420,
                 width: 300,
                 modal: true,
                 buttons: {
-                    "Create a Subdef": function() {
+                    "Create a Subdef": function () {
                         var bValid = true;
 
-                        allFields.removeClass( "ui-state-error" );
+                        allFields.removeClass("ui-state-error");
 
-                        bValid = bValid && checkLength( name, "subdef name", 3, 16 );
-                        bValid = bValid && checkSpecialChar( name );
-                        bValid = bValid && checkPresence( subviewType.val(), name );
+                        bValid = bValid && checkLength(name, "subdef name", 3, 16);
+                        bValid = bValid && checkSpecialChar(name);
+                        bValid = bValid && checkPresence(subviewType.val(), name);
 
-                        if ( bValid ) {
+                        if (bValid) {
                             $('input[name="add_subdef[group]"]').val(subviewType.val());
                             $('input[name="add_subdef[name]"]').val(name.val());
                             $('input[name="add_subdef[mediaType]"]').val(mediaType.val());
                             $('input[name="add_subdef[class]"]').val(accessclass.val());
                             $('input[name="add_subdef[presets]"]').val(presets.val());
-                            $( this ).dialog( "close" );
+                            $(this).dialog("close");
                             $('form.subdefs').submit();
                         }
                     },
-                    Cancel: function() {
-                        $( this ).dialog( "close" );
+                    Cancel: function () {
+                        $(this).dialog("close");
                     }
                 },
-                close: function() {
-                    allFields.val( "" ).removeClass( "ui-state-error" );
+                close: function () {
+                    allFields.val("").removeClass("ui-state-error");
                 }
             });
 
-            $( "#create-subdef" )
+            $("#create-subdef")
             // .button()
-                    .click(function() {
-                        $( "#dialog-form" ).dialog( "open" );
-                    });
+                .click(function () {
+                    $("#dialog-form").dialog("open");
+                });
 
             $('.subdef_deleter')
             // .button()
-                    .click(function(){
-                        delete_subdef($(this).next('input[name="subdef"]').val());
+                .click(function () {
+                    delete_subdef($(this).next('input[name="subdef"]').val());
 
-                        return false;
-                    });
+                    return false;
+                });
 
-            function delete_subdef(name)
-            {
-                $( "#dialog-delete-subdef" ).dialog({
+            function delete_subdef(name) {
+                $("#dialog-delete-subdef").dialog({
                     resizable: false,
-                    height:140,
+                    height: 140,
                     modal: true,
                     buttons: {
-                        "Delete subdef": function() {
+                        "Delete subdef": function () {
                             $('#delete_subdef').val(name);
-                            $( this ).dialog( "destroy" );
+                            $(this).dialog("destroy");
                             $('form.subdefs').submit();
                         },
-                        Cancel: function() {
-                            $( this ).dialog( "destroy" );
+                        Cancel: function () {
+                            $(this).dialog("destroy");
                         }
                     }
                 });
@@ -363,44 +360,56 @@
         </form>
     </div>
 
-    <form method="post" action="{{ path('admin_subdefs_subdef_update', { 'sbas_id' : databox.get_sbas_id }) }}" target="_self" class="subdefs">
+    <form method="post" action="{{ path('admin_subdefs_subdef_update', { 'sbas_id' : databox.get_sbas_id }) }}"
+          target="_self" class="subdefs">
         <div class="tabs">
             <ul>
                 {% for subdefgroup, subdeflist in subdefs %}
-                    <li><a class="no-ajax" href="#{{subdefgroup}}">{{subdefgroup}}</a></li>
+                    <li><a class="no-ajax" href="#{{ subdefgroup }}">{{ subdefgroup }}</a></li>
                 {% endfor %}
             </ul>
-            <button type="submit" disabled="disabled" class="btn btn-primary subviews-submit">{{ 'boutton::valider' | trans }}</button>
+            <button type="submit" disabled="disabled"
+                    class="btn btn-primary subviews-submit">{{ 'boutton::valider' | trans }}</button>
             {% for subdefgroup, subdeflist in subdefs %}
-                <div id="{{subdefgroup}}">
+                <div id="{{ subdefgroup }}">
                     {% for subdefname , subdef in subdeflist %}
                         <div>
-                            <input type="hidden" name="subdefs[]" value="{{subdefgroup}}_{{subdefname}}"/>
-                            <h2 class="subdefName">{{subdefname}}</h2><button class="subdef_deleter btn btn-danger btn-mini">{{ 'boutton::supprimer' | trans }}</button>
-                            <input type="hidden" name="subdef" value="{{subdefgroup}}_{{subdefname}}"/>
-                            <br />
-                            <table class="subdefTab" cellspacing="0" cellpading="0" border="0" style="display:inline-block;">
+                            <input type="hidden" name="subdefs[]" value="{{ subdefgroup }}_{{ subdefname }}"/>
+                            <h2 class="subdefName">{{ subdefname }}</h2>
+                            <button class="subdef_deleter btn btn-danger btn-mini">{{ 'boutton::supprimer' | trans }}</button>
+                            <input type="hidden" name="subdef" value="{{ subdefgroup }}_{{ subdefname }}"/>
+                            <br/>
+                            <table class="subdefTab" cellspacing="0" cellpading="0" border="0"
+                                   style="display:inline-block;">
                                 <tbody>
                                 <tr>
                                     <td style="width:100px;line-height: 0.9rem;">{{ 'Telechargeable' | trans }}</td>
-                                    <td style="width:300px;"><input type="checkbox" name="{{subdefgroup}}_{{subdefname}}_downloadable" {% if subdef.isDownloadable() %}checked="checked"{% endif %} value="1" /></td>
+                                    <td style="width:300px;"><input type="checkbox"
+                                                                    name="{{ subdefgroup }}_{{ subdefname }}_downloadable"
+                                                                    {% if subdef.isDownloadable() %}checked="checked"{% endif %}
+                                                                    value="1"/></td>
                                     <td></td>
                                 </tr>
                                 <tr>
                                     <td>{{ 'subdef.orderable' | trans }}</td>
-                                    <td><input type="checkbox" name="{{subdefgroup}}_{{subdefname}}_orderable" {% if subdef.isOrderable() %}checked="checked"{% endif %} value="1" /></td>
+                                    <td><input type="checkbox" name="{{ subdefgroup }}_{{ subdefname }}_orderable"
+                                               {% if subdef.isOrderable() %}checked="checked"{% endif %} value="1"/>
+                                    </td>
                                     <td></td>
-                               </tr>
+                                </tr>
                                 <tr>
                                     <td>
                                         {{ 'classe' | trans }}
                                     </td>
                                     <td>
-                                        <select name="{{subdefgroup}}_{{subdefname}}_class">
+                                        <select name="{{ subdefgroup }}_{{ subdefname }}_class">
                                             <option>{{ 'classe' | trans }}</option>
-                                            <option value="document" {% if subdef.get_class() == "document" %}selected="selected"{% endif %}>{{ 'document' | trans }}</option>
-                                            <option value="preview" {% if subdef.get_class() == "preview" %}selected="selected"{% endif %}>{{ 'preview' | trans }}</option>
-                                            <option value="thumbnail" {% if subdef.get_class() == "thumbnail" %}selected="selected"{% endif %}>{{ 'tout le monde' | trans }}</option>
+                                            <option value="document"
+                                                    {% if subdef.get_class() == "document" %}selected="selected"{% endif %}>{{ 'document' | trans }}</option>
+                                            <option value="preview"
+                                                    {% if subdef.get_class() == "preview" %}selected="selected"{% endif %}>{{ 'preview' | trans }}</option>
+                                            <option value="thumbnail"
+                                                    {% if subdef.get_class() == "thumbnail" %}selected="selected"{% endif %}>{{ 'tout le monde' | trans }}</option>
                                         </select>
                                     </td>
                                     <td></td>
@@ -410,10 +419,12 @@
                                         {{ 'mediatype' | trans }}
                                     </td>
                                     <td>
-                                        <select onchange="select_mediatype('{{subdefgroup}}', '{{subdefname}}', this);" name="{{subdefgroup}}_{{subdefname}}_mediatype">
+                                        <select onchange="select_mediatype('{{ subdefgroup }}', '{{ subdefname }}', this);"
+                                                name="{{ subdefgroup }}_{{ subdefname }}_mediatype">
                                             <option>{{ 'Choisir' | trans }}</option>
                                             {% for subdefType in subdef.getAvailableSubdefTypes() %}
-                                                <option value="{{ subdefType.getType() }}" {% if subdef.getSubdefType.getType() == subdefType.getType() %}selected="selected"{% endif %}>{{ subdefType.getType() }}</option>
+                                                <option value="{{ subdefType.getType() }}"
+                                                        {% if subdef.getSubdefType.getType() == subdefType.getType() %}selected="selected"{% endif %}>{{ subdefType.getType() }}</option>
                                             {% endfor %}
                                         </select>
                                     </td>
@@ -424,14 +435,16 @@
                                         {{ 'Presets' | trans }}
                                     </td>
                                     <td>
-                                        <select onchange="populate_values('{{subdefgroup}}', '{{subdefname}}');" name="{{subdefgroup}}_{{subdefname}}_presets">
+                                        <select onchange="populate_values('{{ subdefgroup }}', '{{ subdefname }}');"
+                                                name="{{ subdefgroup }}_{{ subdefname }}_presets">
                                             <option value="custom">{{ 'Custom' | trans }}</option>
                                             {% set defType = subdef.getSubdefType.getType() %}
                                             {% for key, pressets in config[defType].definitions %}
                                                 {% if pressets == null %}
                                                     <option disabled="disabled">{{ key }}</option>
                                                 {% else %}
-                                                    <option value="{{ key }}" {% if subdef.get_preset() == key %}selected="selected"{% endif %}>{{ key }}</option>
+                                                    <option value="{{ key }}"
+                                                            {% if subdef.get_preset() == key %}selected="selected"{% endif %}>{{ key }}</option>
                                                 {% endif %}
                                             {% endfor %}
                                         </select>
@@ -443,7 +456,9 @@
                                         Path
                                     </td>
                                     <td>
-                                        <input class="path_testable test_writeable" type="text" value="{{subdef.get_path()}}" name="{{subdefgroup}}_{{subdefname}}_path"/>
+                                        <input class="path_testable test_writeable" type="text"
+                                               value="{{ subdef.get_path() }}"
+                                               name="{{ subdefgroup }}_{{ subdefname }}_path"/>
                                     </td>
                                     <td></td>
                                 </tr>
@@ -452,7 +467,9 @@
                                         {{ 'Write Metas' | trans }}
                                     </td>
                                     <td>
-                                        <input type="checkbox" value="yes" {% if subdef.isMetadataUpdateRequired() %}checked="checked"{% endif %} name="{{subdefgroup}}_{{subdefname}}_meta"/>
+                                        <input type="checkbox" value="yes"
+                                               {% if subdef.isMetadataUpdateRequired() %}checked="checked"{% endif %}
+                                               name="{{ subdefgroup }}_{{ subdefname }}_meta"/>
                                     </td>
                                     <td></td>
                                 </tr>
@@ -465,73 +482,88 @@
                                 {% for code, language in app['locales.available'] %}
                                     <tr>
                                         <td style="width:100px;">{{ language }}</td>
-                                        <td style="width:300px;"><input type="text" name="{{subdefgroup}}_{{subdefname}}_label[{{ code }}]" value="{{ subdef.get_label(code, false) }}" /></td>
+                                        <td style="width:300px;"><input type="text"
+                                                                        name="{{ subdefgroup }}_{{ subdefname }}_label[{{ code }}]"
+                                                                        value="{{ subdef.get_label(code, false) }}"/>
+                                        </td>
                                     </tr>
                                 {% endfor %}
                             </table>
                             {% for subdefType in subdef.getAvailableSubdefTypes() %}
-                                <span class="toggle" data-toggle="#box{{subdefgroup}}{{subdefname}}{{ subdefType.getType() }}" {% if subdef.getSubdefType.getType() != subdefType.getType() %}style="display:none;"{% endif %}>
+                                <span class="toggle"
+                                      data-toggle="#box{{ subdefgroup }}{{ subdefname }}{{ subdefType.getType() }}"
+                                      {% if subdef.getSubdefType.getType() != subdefType.getType() %}style="display:none;"{% endif %}>
                     {{ 'Advanced settings' | trans }}
                 </span>
-                                <div id="box{{subdefgroup}}{{subdefname}}{{ subdefType.getType() }}" class="{{subdefgroup}}{{subdefname}}" {% if subdef.getSubdefType.getType() != subdefType.getType() %}style="display:none;"{% endif %}>
+                                <div id="box{{ subdefgroup }}{{ subdefname }}{{ subdefType.getType() }}"
+                                     class="{{ subdefgroup }}{{ subdefname }}"
+                                     {% if subdef.getSubdefType.getType() != subdefType.getType() %}style="display:none;"{% endif %}>
                                     <table cellspacing="0" cellpading="0" border="0" style="width:500px;">
                                         {% for option in subdefType.getOptions() %}
                                             {% set varname = subdefgroup~'_'~subdefname~'_'~subdefType.getType()~'['~ option.getName() ~']' %}
                                             <tr>
                                                 <td style="width:120px;">
-                                                    {{option.getDisplayName()}}
+                                                    {{ option.getDisplayName() }}
                                                 </td>
                                                 <td style="width:250px;">
                                                     {% set extradata = '' %}
                                                     {% if option.getType() == constant('\\Alchemy\\Phrasea\\Media\\Subdef\\OptionType\\OptionType::TYPE_RANGE') %}
-                                                        <div style="width:250px;" id="slider{{subdefgroup}}{{subdefname}}{{subdefType.getType()}}{{ option.getName() }}"></div>
+                                                        <div style="width:250px;"
+                                                             id="slider{{ subdefgroup }}{{ subdefname }}{{ subdefType.getType() }}{{ option.getName() }}"></div>
                                                         <script type="text/javascript">
 
-                                                            $('#slider{{subdefgroup}}{{subdefname}}{{subdefType.getType()}}{{ option.getName() }}')
-                                                                    .slider({
-                                                                        value:{{ option.getValue }},
-                                                                        min: {{ option.getMinValue() }},
-                                                                        max: {{ option.getMaxValue() }},
-                                                                        {% if option.getStep() is not empty %}step : {{ option.getStep() }},{% endif %}
-                                                                        slide: function( event, ui ) {
-                                                                            $( "#slidervalue{{subdefgroup}}{{subdefname}}{{ subdefType.getType() }}{{ option.getName() }}" ).val( ui.value );
-                                                                            jQuery('[name={{subdefgroup}}_{{subdefname}}_presets]').val("custom");
-                                                                            if(jQuery(".subviews-submit").attr("disabled"))
-                                                                                activeSubmit();
-                                                                        },
-                                                                        create: function (event, ui) {
-                                                                            {# add no-ajax class to slider link to prevent page load in IE7 #}
-                                                                            $("a.ui-slider-handle", event.target).addClass("no-ajax");
-                                                                        }
-                                                                    });
+                                                            $('#slider{{ subdefgroup }}{{ subdefname }}{{ subdefType.getType() }}{{ option.getName() }}')
+                                                                .slider({
+                                                                    value:{{ option.getValue }},
+                                                                    min: {{ option.getMinValue() }},
+                                                                    max: {{ option.getMaxValue() }},
+                                                                    {% if option.getStep() is not empty %}step: {{ option.getStep() }},{% endif %}
+                                                                    slide: function (event, ui) {
+                                                                        $("#slidervalue{{ subdefgroup }}{{ subdefname }}{{ subdefType.getType() }}{{ option.getName() }}").val(ui.value);
+                                                                        jQuery('[name={{ subdefgroup }}_{{ subdefname }}_presets]').val("custom");
+                                                                        if (jQuery(".subviews-submit").attr("disabled"))
+                                                                            activeSubmit();
+                                                                    },
+                                                                    create: function (event, ui) {
+                                                                        {# add no-ajax class to slider link to prevent page load in IE7 #}
+                                                                        $("a.ui-slider-handle", event.target).addClass("no-ajax");
+                                                                    }
+                                                                });
 
-                                                            $('#slidervalue{{subdefgroup}}{{subdefname}}{{subdefType.getType()}}{{ option.getName() }}').on('change', function(){
+                                                            $('#slidervalue{{ subdefgroup }}{{ subdefname }}{{ subdefType.getType() }}{{ option.getName() }}').on('change', function () {
                                                                 var $this = $(this);
-                                                                $('#slider{{subdefgroup}}{{subdefname}}{{subdefType.getType()}}{{ option.getName() }}').slider( "option", "value", $this.val() );
+                                                                $('#slider{{ subdefgroup }}{{ subdefname }}{{ subdefType.getType() }}{{ option.getName() }}').slider("option", "value", $this.val());
                                                             })
 
                                                         </script>
                                                         {% elseif option.getType() == constant('\\Alchemy\\Phrasea\\Media\\Subdef\\OptionType\\OptionType::TYPE_ENUM') %}
-                                                        <select name="{{varname}}">
+                                                        <select name="{{ varname }}">
                                                             <option value="">{{ 'Choisir' | trans }}</option>
                                                             {% for pot_value in option.getAvailableValues() %}
-                                                                <option value="{{ pot_value }}" {% if pot_value == option.getValue() %}selected="selected"{% endif %}>{{ pot_value }}</option>
+                                                                <option value="{{ pot_value }}"
+                                                                        {% if pot_value == option.getValue() %}selected="selected"{% endif %}>{{ pot_value }}</option>
                                                             {% endfor %}
                                                         </select>
                                                         {% elseif option.getType() == constant('\\Alchemy\\Phrasea\\Media\\Subdef\\OptionType\\OptionType::TYPE_BOOLEAN') %}
-                                                    <input name="{{varname}}" type="radio" value="yes" {% if option.getValue() %}checked="checked"{% endif %} /> {{ 'yes' | trans }}
-                                                    <input name="{{varname}}" type="radio" value="no" {% if option.getValue() is empty %}checked="checked"{% endif %}/> {{ 'no' | trans }}
+                                                    <input name="{{ varname }}" type="radio" value="yes"
+                                                           {% if option.getValue() %}checked="checked"{% endif %} /> {{ 'yes' | trans }}
+                                                    <input name="{{ varname }}" type="radio" value="no"
+                                                           {% if option.getValue() is empty %}checked="checked"{% endif %}/> {{ 'no' | trans }}
                                                         {% elseif option.getType() == constant('\\Alchemy\\Phrasea\\Media\\Subdef\\OptionType\\OptionType::TYPE_MULTI') %}
                                                         {% for pot_value, selected in option.Value(true) %}
                                                         <label class="checkbox inline">
-                                                            <input type="checkbox" name="{{varname}}[]" value="{{ pot_value }}" {% if selected %}checked="checked"{% endif %}/>{{ pot_value }}
+                                                            <input type="checkbox" name="{{ varname }}[]"
+                                                                   value="{{ pot_value }}"
+                                                                   {% if selected %}checked="checked"{% endif %}/>{{ pot_value }}
                                                         </label>
                                                         {% endfor %}
                                                     {% endif %}
                                                 </td>
                                                 <td>
                                                     {% if option.type == constant('\\Alchemy\\Phrasea\\Media\\Subdef\\OptionType\\OptionType::TYPE_RANGE') %}
-                                                        <input style="width:35px;" value="{{option.value}}" id="slidervalue{{subdefgroup}}{{subdefname}}{{subdefType.getType()}}{{ option.getName() }}" name="{{varname}}" />
+                                                        <input style="width:35px;" value="{{ option.value }}"
+                                                               id="slidervalue{{ subdefgroup }}{{ subdefname }}{{ subdefType.getType() }}{{ option.getName() }}"
+                                                               name="{{ varname }}"/>
                                                     {% endif %}
                                                 </td>
                                             </tr>
@@ -542,8 +574,8 @@
                         </div>
                         <script>
                             {% set defType = subdef.getSubdefType.getType() %}
-                            jQuery('#box{{subdefgroup}}{{subdefname}}{{ defType }} input, #box{{subdefgroup}}{{subdefname}}{{ defType }} select').change(function(){
-                                jQuery('[name={{subdefgroup}}_{{subdefname}}_presets]').val("custom");
+                            jQuery('#box{{ subdefgroup }}{{ subdefname }}{{ defType }} input, #box{{ subdefgroup }}{{ subdefname }}{{ defType }} select').change(function () {
+                                jQuery('[name={{ subdefgroup }}_{{ subdefname }}_presets]').val("custom");
                             });
                         </script>
                     {% endfor %}
diff --git a/templates/web/common/menubar.html.twig b/templates/web/common/menubar.html.twig
index e33d3dc015..d11781ffa1 100644
--- a/templates/web/common/menubar.html.twig
+++ b/templates/web/common/menubar.html.twig
@@ -138,7 +138,8 @@
           <a target="_blank" href="https://docs.phraseanet.com/4.0/">
             <span>
               {{ 'phraseanet:: aide' | trans }}
-              <span style="display:inline-block;cursor:pointer;padding:0;border:none;padding-right:4px;padding-left:4px;" id="help-trigger"> <i class="icon-caret-down"></i></span>
+                <span style="display:inline-block;cursor:pointer;padding:0;border:none;padding-right:4px;padding-left:4px;"
+                      id="help-trigger"> <i class="icon-caret-down"></i></span>
             </span>
           </a>
           <table cellspacing="0" cellpadding="0" style="display:none;" class="contextMenu helpcontextmenu">
diff --git a/templates/web/prod/Baskets/Reorder.html.twig b/templates/web/prod/Baskets/Reorder.html.twig
index 375062b2f2..e10d2e961f 100644
--- a/templates/web/prod/Baskets/Reorder.html.twig
+++ b/templates/web/prod/Baskets/Reorder.html.twig
@@ -31,8 +31,10 @@
                 <input type="hidden" name="id" value="{{ element.getId() }}"/>
                 <input type="hidden" name="title" value="{{ element.getRecord(app).get_title() }}"/>
                 <input type="hidden" name="default" value="{{ element.getOrd() }}"/>
-                <input type="hidden" name="date_created" value="{{ element.getRecord(app).getCreated() | date('Y-m-dTH:i:s') }}"/>
-                <input type="hidden" name="date_updated" value="{{ element.getRecord(app).getUpdated() | date('Y-m-dTH:i:s') }}"/>
+                <input type="hidden" name="date_created"
+                       value="{{ element.getRecord(app).getCreated() | date('Y-m-dTH:i:s') }}"/>
+                <input type="hidden" name="date_updated"
+                       value="{{ element.getRecord(app).getUpdated() | date('Y-m-dTH:i:s') }}"/>
             </form>
         </div>
     {% endfor %}
diff --git a/templates/web/prod/Share/record.html.twig b/templates/web/prod/Share/record.html.twig
index 477f0fe192..3873e093a3 100644
--- a/templates/web/prod/Share/record.html.twig
+++ b/templates/web/prod/Share/record.html.twig
@@ -1,7 +1,7 @@
 {% if not isAvailable %}
     <p>{{ 'No permalink available.' | trans }}</p>
 {% else %}
-    {%  if subdefList is not empty %}
+    {% if subdefList is not empty %}
         {% set defKey = defaultKey %}
         <div id="share">
         <div id="tweet" class="well-large">
@@ -17,14 +17,18 @@
                     </span>
             </p>
             <p>
-                <a id="twitter-link" href="http://www.twitter.com/home/?status={{ subdefList[defKey].permaviewUrl }}" target="_blank">
-                    <img src="/assets/common/images/icons/twitter.png" title="share this on twitter" style="width:25px;vertical-align:middle;padding:0 5px;"/>
+                <a id="twitter-link" href="http://www.twitter.com/home/?status={{ subdefList[defKey].permaviewUrl }}"
+                   target="_blank">
+                    <img src="/assets/common/images/icons/twitter.png" title="share this on twitter"
+                         style="width:25px;vertical-align:middle;padding:0 5px;"/>
                     {% trans %}Send to Twitter{% endtrans %}
                 </a>
             </p>
             <p>
-                <a id="facebook-link" href="http://www.facebook.com/sharer.php?u={{ subdefList[defKey].permaviewUrl }}" target="_blank">
-                    <img src="/assets/common/images/icons/facebook.png" title="share on facebook" style="width:25px;vertical-align:middle;padding:0 5px;"/>
+                <a id="facebook-link" href="http://www.facebook.com/sharer.php?u={{ subdefList[defKey].permaviewUrl }}"
+                   target="_blank">
+                    <img src="/assets/common/images/icons/facebook.png" title="share on facebook"
+                         style="width:25px;vertical-align:middle;padding:0 5px;"/>
                     {% trans %}Send to Facebook{% endtrans %}
                 </a>
             </p>
@@ -32,19 +36,23 @@
             <form action="#">
                 <div class="form-group clearfix">
                     <label style="display:inline-block;">{% trans %}Resource URL{% endtrans %}</label>
-                    <input class="input-block-level" readonly="readonly" type="text" value="{{ subdefList[defKey].permalinkUrl }}"
+                    <input class="input-block-level" readonly="readonly" type="text"
+                           value="{{ subdefList[defKey].permalinkUrl }}"
                            id="permalinkUrl"/>
 
                     <p class="pull-right">
-                        <a id="permalinkUrl-link" href="{{ subdefList[defKey].permalinkUrl }}" target="_blank">{{ 'previewLinkLabel' | trans }}</a> &nbsp;&nbsp;
+                        <a id="permalinkUrl-link" href="{{ subdefList[defKey].permalinkUrl }}"
+                           target="_blank">{{ 'previewLinkLabel' | trans }}</a> &nbsp;&nbsp;
                         <a href="#" class="" id="permalinkUrlCopy">{{ 'copyClipboardLabel' | trans }}</a>
                     </p>
                 </div>
                 <div class="form-group clearfix">
                     <label>{% trans %}Detailed view URL{% endtrans %}</label>
-                    <input class="input-block-level" readonly="readonly" type="text" value="{{ subdefList[defKey].permaviewUrl }}" id="permaviewUrl"/>
+                    <input class="input-block-level" readonly="readonly" type="text"
+                           value="{{ subdefList[defKey].permaviewUrl }}" id="permaviewUrl"/>
                     <p class="pull-right">
-                        <a id="permaviewUrl-link" href="{{ subdefList[defKey].permaviewUrl }}" target="_blank">{{ 'previewLinkLabel' | trans }}</a> &nbsp;&nbsp;
+                        <a id="permaviewUrl-link" href="{{ subdefList[defKey].permaviewUrl }}"
+                           target="_blank">{{ 'previewLinkLabel' | trans }}</a> &nbsp;&nbsp;
                         <a href="#" class="" id="permaviewUrlCopy">{{ 'copyClipboardLabel' | trans }}</a>
                     </p>
                 </div>
@@ -53,11 +61,14 @@
                     <label>{% trans %}Embed code{% endtrans %}</label>
                     {% spaceless %}
                         <textarea class="input-block-level" rows="4" readonly="true" id="embedRecordUrl">
-                                <iframe width="{{ subdefList[defKey].width }}" height="{{ subdefList[defKey].height }}" src="{{ subdefList[defKey].embedUrl }}" frameborder="0" allowfullscreen></iframe>
+                                <iframe width="{{ subdefList[defKey].width }}" height="{{ subdefList[defKey].height }}"
+                                        src="{{ subdefList[defKey].embedUrl }}" frameborder="0"
+                                        allowfullscreen></iframe>
                             </textarea>
                     {% endspaceless %}
                     <p class="pull-right">
-                        <a id="embedRecordUrl-link" href="{{ subdefList[defKey].embedUrl }}" target="_blank">{{ 'previewLinkLabel' | trans }}</a> &nbsp;&nbsp;
+                        <a id="embedRecordUrl-link" href="{{ subdefList[defKey].embedUrl }}"
+                           target="_blank">{{ 'previewLinkLabel' | trans }}</a> &nbsp;&nbsp;
                         <a href="#" class="" id="embedCopy">{{ 'copyClipboardLabel' | trans }}</a>
                     </p>
                 </div>
@@ -67,31 +78,35 @@
 
         <script language="javascript">
             // var subdefListObj = JSON.parse(subdefList); // to convert json into a javascript object
-            $(document).ready(function(){
+            $(document).ready(function () {
                 var subdefList = JSON.parse('{{ subdefList | json_encode | escape('js') }}');
-                $('#resource_type_sel').on('change', function() {
+                $('#resource_type_sel').on('change', function () {
                     assignPermalinks(this.value);
                 });
                 $('input.ui-state-default').hover(
-                    function(){$(this).addClass('ui-state-hover');},
-                    function(){$(this).removeClass('ui-state-hover');}
+                    function () {
+                        $(this).addClass('ui-state-hover');
+                    },
+                    function () {
+                        $(this).removeClass('ui-state-hover');
+                    }
                 );
-                $('#permalinkUrlCopy').on('click', function(event) {
+                $('#permalinkUrlCopy').on('click', function (event) {
                     event.preventDefault();
                     return copyElContentClipboard('permalinkUrl');
                 });
-                $('#permaviewUrlCopy').on('click', function(event) {
+                $('#permaviewUrlCopy').on('click', function (event) {
                     event.preventDefault();
                     return copyElContentClipboard('permaviewUrl');
                 });
-                $('#embedCopy').on('click', function(event) {
+                $('#embedCopy').on('click', function (event) {
                     event.preventDefault();
                     return copyElContentClipboard('embedRecordUrl');
                 });
-                $('#advance-share').on('click', function() {
+                $('#advance-share').on('click', function () {
                     $('#shared-def').show();
                 });
-                var copyElContentClipboard = function(elId) {
+                var copyElContentClipboard = function (elId) {
                     var copyEl = document.getElementById(elId);
                     copyEl.select();
                     try {
@@ -102,7 +117,7 @@
                         console.log('unable to copy');
                     }
                 }
-                var assignPermalinks = function(resourceType) {
+                var assignPermalinks = function (resourceType) {
                     $('#twitter-link').attr('href', 'http://www.twitter.com/home/?status=' + subdefList[resourceType].permaviewUrl);
                     $('#facebook-link').attr('href', 'http://www.facebook.com/sharer.php?u=' + subdefList[resourceType].permaviewUrl);
                     $('#permalinkUrl').val(subdefList[resourceType].permalinkUrl);
diff --git a/templates/web/prod/Story/Reorder.html.twig b/templates/web/prod/Story/Reorder.html.twig
index b3a9a28958..d8d6e97c38 100644
--- a/templates/web/prod/Story/Reorder.html.twig
+++ b/templates/web/prod/Story/Reorder.html.twig
@@ -6,17 +6,18 @@
           <option value="">{{ 'Choisir' | trans }}</option>
           <option value="default">{{ 'Re-initialiser' | trans }}</option>
           <option value="title">{{ 'Titre' | trans }}</option>
-          <option value="date_created">{{ 'Date de création' | trans }}</option>
-          <option value="date_updated">{{ 'Date de modification' | trans }}</option>
+            <option value="date_created">{{ 'Date de création' | trans }}</option>
+            <option value="date_updated">{{ 'Date de modification' | trans }}</option>
         </select>
         <button type="button" class="autoorder btn btn-inverse">{{ 'Re-ordonner' | trans }}</button>
         <button type="button" class="reverseorder btn btn-inverse">{{ 'Inverser' | trans }}</button>
     </form>
-    <form class="form-inline span2" name="reorder" method="POST" action="{{ path('prod_stories_story_reorder', { 'sbas_id' : story.get_sbas_id(), 'record_id' : story.get_record_id() }) }}">
+    <form class="form-inline span2" name="reorder" method="POST"
+          action="{{ path('prod_stories_story_reorder', { 'sbas_id' : story.get_sbas_id(), 'record_id' : story.get_record_id() }) }}">
         {% for element in story.get_children() %}
             <input type="hidden" name="element[{{ element.get_record_id() }}]" value="{{ element.getNumber() }}"/>
         {% endfor %}
-        <input type="submit" class="btn btn-inverse" value="{{ 'boutton::valider' | trans }}" />
+        <input type="submit" class="btn btn-inverse" value="{{ 'boutton::valider' | trans }}"/>
     </form>
 </div>
 <div style="top:45px;overflow:auto;" id="reorder_box" class="row-fluid">
diff --git a/templates/web/prod/WorkZone/Basket.html.twig b/templates/web/prod/WorkZone/Basket.html.twig
index 31a2b2bceb..a3af72dd17 100644
--- a/templates/web/prod/WorkZone/Basket.html.twig
+++ b/templates/web/prod/WorkZone/Basket.html.twig
@@ -41,9 +41,9 @@
       </button>
       {% endif %}
       {% if app.getAclForUser(app.getAuthenticatedUser()).has_right(constant('\\ACL::BAS_CHUPUB')) %}
-      {#<button class="ui-corner-all TOOL_bridge_btn basket_window" title="{{ 'action : bridge' | trans }}" data-href="{{ path("prod_bridge_manager") }}">#}
-        {#<img src="/assets/common/images/icons/door.png"/>#}
-      {#</button>#}
+          {#<button class="ui-corner-all TOOL_bridge_btn basket_window" title="{{ 'action : bridge' | trans }}" data-href="{{ path("prod_bridge_manager") }}">#}
+          {#<img src="/assets/common/images/icons/door.png"/>#}
+          {#</button>#}
       <button class="ui-corner-all TOOL_publish_btn basket_window" title="{{ 'action : publier' | trans }}" data-selection-source="basket">
         <img src="/assets/common/images/icons/rss16.png"/>
       </button>
diff --git a/templates/web/prod/WorkZone/Story.html.twig b/templates/web/prod/WorkZone/Story.html.twig
index d3c7bced84..54bed30a9a 100644
--- a/templates/web/prod/WorkZone/Story.html.twig
+++ b/templates/web/prod/WorkZone/Story.html.twig
@@ -41,9 +41,9 @@
       </button>
       {% endif %}
       {% if app.getAclForUser(app.getAuthenticatedUser()).has_right(constant('\\ACL::BAS_CHUPUB')) %}
-      {#<button class="ui-corner-all TOOL_bridge_btn story_window" title="{{ 'action : bridge' | trans }}" data-href="{{ path("prod_bridge_manager") }}" data-selection-source="story">#}
-        {#<img src="/assets/common/images/icons/door.png"/>#}
-      {#</button>#}
+          {#<button class="ui-corner-all TOOL_bridge_btn story_window" title="{{ 'action : bridge' | trans }}" data-href="{{ path("prod_bridge_manager") }}" data-selection-source="story">#}
+          {#<img src="/assets/common/images/icons/door.png"/>#}
+          {#</button>#}
       <button class="ui-corner-all TOOL_publish_btn story_window" title="{{ 'action : publier' | trans }}" data-selection-source="story">
         <img src="/assets/common/images/icons/rss16.png"/>
       </button>
diff --git a/templates/web/prod/index.html.twig b/templates/web/prod/index.html.twig
index 724064aac8..cf65d43d1c 100644
--- a/templates/web/prod/index.html.twig
+++ b/templates/web/prod/index.html.twig
@@ -304,7 +304,9 @@
                                     <td style="width:50%; vertical-align:top;">
                                         {% set useTruncation = app['settings'].getUserSetting(app.getAuthenticatedUser(), 'use_truncation') %}
                                         <label class="checkbox inline" for="ADVSRCH_USE_TRUNCATION">
-                                            <input id="ADVSRCH_USE_TRUNCATION" type="checkbox" class="checkbox preferences-options-use-truncation" name="truncation" {% if useTruncation == '1' or useTruncation == NULL %}checked="checked"{% endif %}>
+                                            <input id="ADVSRCH_USE_TRUNCATION" type="checkbox"
+                                                   class="checkbox preferences-options-use-truncation" name="truncation"
+                                                   {% if useTruncation == '1' or useTruncation == NULL %}checked="checked"{% endif %}>
                                             {{ 'index:advanced-preferences:: use truncation' | trans }}
                                         </label>
                                         <div id="ADVSRCH_SBAS_ZONE" class="sbasglob">
@@ -689,9 +691,12 @@
                         {% set order_collection_by = app['settings'].getUserSetting(app.getAuthenticatedUser(), 'order_collection_by') %}
                         <label class="select" for="orderByName">
                             <select class="preferences-options-collection-order" name="orderByName">
-                                <option {% if order_collection_by == constant('Alchemy\\Phrasea\\Core\\Configuration\\DisplaySettingService::ORDER_BY_ADMIN') %} selected="selected" {% endif %} value="{{ constant('Alchemy\\Phrasea\\Core\\Configuration\\DisplaySettingService::ORDER_BY_ADMIN') }}">{{ 'Defined by admin' | trans }}</option>
-                                <option {% if order_collection_by == constant('Alchemy\\Phrasea\\Core\\Configuration\\DisplaySettingService::ORDER_ALPHA_ASC') %} selected="selected" {% endif %} value="{{ constant('Alchemy\\Phrasea\\Core\\Configuration\\DisplaySettingService::ORDER_ALPHA_ASC') }}">{{ 'Alphabetic asc' | trans }}</option>
-                                <option {% if order_collection_by == constant('Alchemy\\Phrasea\\Core\\Configuration\\DisplaySettingService::ORDER_ALPHA_DESC') %} selected="selected" {% endif %} value="{{ constant('Alchemy\\Phrasea\\Core\\Configuration\\DisplaySettingService::ORDER_ALPHA_DESC') }}">{{ 'Alphabetic desc' | trans }}</option>
+                                <option {% if order_collection_by == constant('Alchemy\\Phrasea\\Core\\Configuration\\DisplaySettingService::ORDER_BY_ADMIN') %} selected="selected" {% endif %}
+                                        value="{{ constant('Alchemy\\Phrasea\\Core\\Configuration\\DisplaySettingService::ORDER_BY_ADMIN') }}">{{ 'Defined by admin' | trans }}</option>
+                                <option {% if order_collection_by == constant('Alchemy\\Phrasea\\Core\\Configuration\\DisplaySettingService::ORDER_ALPHA_ASC') %} selected="selected" {% endif %}
+                                        value="{{ constant('Alchemy\\Phrasea\\Core\\Configuration\\DisplaySettingService::ORDER_ALPHA_ASC') }}">{{ 'Alphabetic asc' | trans }}</option>
+                                <option {% if order_collection_by == constant('Alchemy\\Phrasea\\Core\\Configuration\\DisplaySettingService::ORDER_ALPHA_DESC') %} selected="selected" {% endif %}
+                                        value="{{ constant('Alchemy\\Phrasea\\Core\\Configuration\\DisplaySettingService::ORDER_ALPHA_DESC') }}">{{ 'Alphabetic desc' | trans }}</option>
                             </select>
                         </label>
                     </form>
diff --git a/templates/web/prod/toolbar.html.twig b/templates/web/prod/toolbar.html.twig
index dd4dee0230..55a389fb7e 100644
--- a/templates/web/prod/toolbar.html.twig
+++ b/templates/web/prod/toolbar.html.twig
@@ -141,10 +141,10 @@
                     </li>
                     {#<li class="divider"></li>#}
                     {#<li>#}
-                        {#<a class="TOOL_bridge_btn results_window" href="{{ path("prod_bridge_manager") }}"  data-selection-source="search-result">#}
-                            {#<img src="/assets/common/images/icons/door.png" height="16" width="16" class="btn-image"/>#}
-                            {#{{ 'action : bridge' | trans }}#}
-                        {#</a>#}
+                    {#<a class="TOOL_bridge_btn results_window" href="{{ path("prod_bridge_manager") }}"  data-selection-source="search-result">#}
+                    {#<img src="/assets/common/images/icons/door.png" height="16" width="16" class="btn-image"/>#}
+                    {#{{ 'action : bridge' | trans }}#}
+                    {#</a>#}
                     {#</li>#}
                     <li class="divider"></li>
                     <li>
@@ -212,7 +212,7 @@
         <span class="dropdownButton">
             <div class="btn-group">
                 {#<button class="TOOL_pushdoc_btn default_action results_window btn btn-inverse"  data-selection-source="search-result">#}
-                    {#<img src="/assets/common/images/icons/door.png" height="16" width="16" class="btn-image"/> {{ 'action : bridge' | trans }}#}
+                {#<img src="/assets/common/images/icons/door.png" height="16" width="16" class="btn-image"/> {{ 'action : bridge' | trans }}#}
                 {#</button>#}
                 <button class="TOOL_publish_btn results_window btn btn-inverse">
                     <img src="/assets/common/images/icons/rss16.png" height="16" width="16" class="btn-image"/>
@@ -230,7 +230,8 @@
                                 <li>
                                         <a class="results_window {{ action.classes|default('') }}">
                                             {% if action.icon %}
-                                                <img src="{{ plugin_asset(plugin.PluginName, action.icon) }}" height="16" width="16" class="btn-image"/>
+                                                <img src="{{ plugin_asset(plugin.PluginName, action.icon) }}"
+                                                     height="16" width="16" class="btn-image"/>
                                             {% endif %}
 
                                             {% set label = action.label %}
diff --git a/templates/web/prod/upload/upload-flash.html.twig b/templates/web/prod/upload/upload-flash.html.twig
index 020478dd87..43a7939ab0 100644
--- a/templates/web/prod/upload/upload-flash.html.twig
+++ b/templates/web/prod/upload/upload-flash.html.twig
@@ -34,18 +34,19 @@
                                 </span>
                             </td>
                             {#<td class='uploader-icon'>#}
-                                {#<img src='/assets/common/images/icons/logo-flash.png' width="32px" heigh="32px" title="{{ 'You are using the Flash uploader.' | trans }}"/>#}
+                            {#<img src='/assets/common/images/icons/logo-flash.png' width="32px" heigh="32px" title="{{ 'You are using the Flash uploader.' | trans }}"/>#}
                             {#</td>#}
                             {#<td class='uploader-info'>#}
-                                {#<p>#}
-                                    {#{{ 'You are using the Flash uploader.' | trans }}#}
-                                    {#{% if not app['browser'].supportFileAPI() %}#}
-                                        {#{{ 'This version does not allow you to access all the features offered by the HTML5 uploader' | trans }}#}
-                                    {#{% endif %}#}
-                                {#</p>#}
-                                {#{% if app['browser'].supportFileAPI() %}#}
-                            <a style="display: none" id="UPLOAD_HTML5_LINK" href="{{ path('upload_html5_form') }}" class="dialog full-dialog">{{ 'Use the HTML5 uploader' | trans }}</a>
-                                {#{% endif %}#}
+                            {#<p>#}
+                            {#{{ 'You are using the Flash uploader.' | trans }}#}
+                            {#{% if not app['browser'].supportFileAPI() %}#}
+                            {#{{ 'This version does not allow you to access all the features offered by the HTML5 uploader' | trans }}#}
+                            {#{% endif %}#}
+                            {#</p>#}
+                            {#{% if app['browser'].supportFileAPI() %}#}
+                            <a style="display: none" id="UPLOAD_HTML5_LINK" href="{{ path('upload_html5_form') }}"
+                               class="dialog full-dialog">{{ 'Use the HTML5 uploader' | trans }}</a>
+                            {#{% endif %}#}
                             {#</td>#}
                         </tr>
                      </table>
@@ -59,7 +60,9 @@
                             {% for  sbasId, availableCollections in collections %}
                                 <optgroup label="{{ availableCollections['databox'].get_label(app['locale']) }}" class="select-label">
                                 {% for collection in availableCollections['databox_collections'] %}
-                                    <option {% if last_used_collection == collection.get_base_id() %} selected="selected" {% endif %} value="{{ collection.get_base_id() }}" class="select-row">{{ collection.get_label(app['locale']) }}</option>
+                                    <option {% if last_used_collection == collection.get_base_id() %} selected="selected" {% endif %}
+                                            value="{{ collection.get_base_id() }}"
+                                            class="select-row">{{ collection.get_label(app['locale']) }}</option>
                                 {% endfor %}
                                 </optgroup>
                             {% endfor %}
@@ -67,7 +70,8 @@
                             {# collections status #}
                             {% for availableCollections in collections %}
                                 {% for collection in availableCollections['databox_collections'] %}
-                                    <div id="status-{{ collection.get_base_id() }}" class='collection-status' style='{{ last_used_collection == collection.get_base_id() ? "display:block" :"display:none" }}'>
+                                    <div id="status-{{ collection.get_base_id() }}" class='collection-status'
+                                         style='{{ last_used_collection == collection.get_base_id() ? "display:block" :"display:none" }}'>
                                         <h5>{{ 'upload:: Status :' | trans }} :</h5>
                                         <table class="status-tab">
                                             <tbody>
diff --git a/templates/web/prod/upload/upload.html.twig b/templates/web/prod/upload/upload.html.twig
index 7d642a247e..ebb5b73922 100644
--- a/templates/web/prod/upload/upload.html.twig
+++ b/templates/web/prod/upload/upload.html.twig
@@ -37,16 +37,17 @@
                                     </span>
                                 </td>
                                 {#<td class='uploader-icon'>#}
-                                    {#<img src='/assets/common/images/icons/html5-logo.png' width="32px" heigh="32px"  title="{{ 'You are using the HTML5 uploader.' | trans }}"/>#}
+                                {#<img src='/assets/common/images/icons/html5-logo.png' width="32px" heigh="32px"  title="{{ 'You are using the HTML5 uploader.' | trans }}"/>#}
                                 {#</td>#}
                                 {#<td class="uploader-infmaxFileSizeo">#}
-                                    {#<p>#}
-                                        {#{{ 'You are using the HTML5 uploader.' | trans }}#}
-                                        {#{% if not app['browser'].supportFileAPI() %}#}
-                                            {#{{ 'Your browser does not support all HTML5 features properly.' | trans }}#}
-                                        {#{% endif %}#}
-                                    {#</p>#}
-                                <a style="display: none" id="UPLOAD_FLASH_LINK" href="{{ path('upload_flash_form') }}" class="dialog full-dialog">{{ 'Use the Flash uploader' | trans }}</a>
+                                {#<p>#}
+                                {#{{ 'You are using the HTML5 uploader.' | trans }}#}
+                                {#{% if not app['browser'].supportFileAPI() %}#}
+                                {#{{ 'Your browser does not support all HTML5 features properly.' | trans }}#}
+                                {#{% endif %}#}
+                                {#</p>#}
+                                <a style="display: none" id="UPLOAD_FLASH_LINK" href="{{ path('upload_flash_form') }}"
+                                   class="dialog full-dialog">{{ 'Use the Flash uploader' | trans }}</a>
                                 {#</td>#}
                             </tr>
                         </table>
@@ -58,9 +59,12 @@
                             {% set last_used_collection = app['settings'].getUserSetting(app.getAuthenticatedUser(), 'upload_last_used_collection') %}
                             <select name="base_id" class="span3 upload-options-collection" style="margin-left: 10px;">
                                 {% for  sbasId, availableCollections in collections %}
-                                    <optgroup label="{{ availableCollections['databox'].get_label(app['locale']) }}" class="select-label">
+                                    <optgroup label="{{ availableCollections['databox'].get_label(app['locale']) }}"
+                                              class="select-label">
                                         {% for collection in availableCollections['databox_collections'] %}
-                                            <option {% if last_used_collection == collection.get_base_id() %} selected="selected" {% endif %} value="{{ collection.get_base_id() }}" class="select-row">{{ collection.get_label(app['locale']) }}</option>
+                                            <option {% if last_used_collection == collection.get_base_id() %} selected="selected" {% endif %}
+                                                    value="{{ collection.get_base_id() }}"
+                                                    class="select-row">{{ collection.get_label(app['locale']) }}</option>
                                         {% endfor %}
                                     </optgroup>
                                 {% endfor %}
@@ -68,7 +72,8 @@
                             {# collections status #}
                             {% for availableCollections in collections %}
                                 {% for collection in availableCollections['databox_collections'] %}
-                                    <div id="status-{{ collection.get_base_id() }}" class='collection-status' style='{{ last_used_collection == collection.get_base_id() ? "display:block" :"display:none" }}'>
+                                    <div id="status-{{ collection.get_base_id() }}" class='collection-status'
+                                         style='{{ last_used_collection == collection.get_base_id() ? "display:block" :"display:none" }}'>
                                         <h5>{{ 'upload:: Status :' | trans }} :</h5>
                                         <table class="status-tab">
                                             <tbody>
diff --git a/templates/web/thesaurus/thesaurus.html.twig b/templates/web/thesaurus/thesaurus.html.twig
index 3a950ea27e..d20a940d60 100644
--- a/templates/web/thesaurus/thesaurus.html.twig
+++ b/templates/web/thesaurus/thesaurus.html.twig
@@ -270,7 +270,8 @@
                         <tr>
                             <td style="text-align:right; width:80px;"><span class="label"></span> :&nbsp;</td>
                             <td></td>
-                            <td><input type="text" style="width:250px;" name="term" onkeyup="inputChanged();return(false);"></td>
+                            <td><input type="text" style="width:250px;" name="term"
+                                       onkeyup="inputChanged();return(false);"></td>
                         </tr>
                         <tr>
                             <td style="text-align:right">{{ 'thesaurus:: contexte'  | trans }} : </td>
diff --git a/tests/Alchemy/Tests/Phrasea/Controller/Admin/SubdefsTest.php b/tests/Alchemy/Tests/Phrasea/Controller/Admin/SubdefsTest.php
index 54bf3e89b1..506b3c4069 100644
--- a/tests/Alchemy/Tests/Phrasea/Controller/Admin/SubdefsTest.php
+++ b/tests/Alchemy/Tests/Phrasea/Controller/Admin/SubdefsTest.php
@@ -37,9 +37,9 @@ class SubdefsTest extends \PhraseanetAuthenticatedWebTestCase
     {
         $name = $this->getSubdefName();
         self::$DI['client']->request("POST", "/admin/subdefs/" .  $this->databox_id . "/", ['add_subdef' => [
-            'class'  => 'thumbnail',
-            'name'   => $name,
-            'group'  => 'image'
+            'class' => 'thumbnail',
+            'name'  => $name,
+            'group' => 'image'
         ]]);
         $this->assertTrue(self::$DI['client']->getResponse()->isRedirect());
         $app = $this->getApplication();
@@ -65,7 +65,7 @@ class SubdefsTest extends \PhraseanetAuthenticatedWebTestCase
         $name = $this->getSubdefName();
         $subdefs->add_subdef("image", $name, "thumbnail", "image", "1280px JPG (preview Phraseanet)");
         self::$DI['client']->request("POST", "/admin/subdefs/" .  $this->databox_id . "/"
-            , ['subdefs' => [
+            , ['subdefs'                             => [
                 'image_' . $name
             ]
                 , 'image_' . $name . '_class'        => 'thumbnail'
diff --git a/tests/Alchemy/Tests/Phrasea/Controller/Prod/ShareTest.php b/tests/Alchemy/Tests/Phrasea/Controller/Prod/ShareTest.php
index f3163a99ef..c40b7d516d 100644
--- a/tests/Alchemy/Tests/Phrasea/Controller/Prod/ShareTest.php
+++ b/tests/Alchemy/Tests/Phrasea/Controller/Prod/ShareTest.php
@@ -23,17 +23,19 @@ class ShareTest extends \PhraseanetAuthenticatedWebTestCase
      */
     public function testRouteSlashALL()
     {
-        $this->_RouteSlash("all", [0=>true, 1=>true, 2=>true, 3=>true]);
+        $this->_RouteSlash("all", [0 => true, 1 => true, 2 => true, 3 => true]);
     }
 
     public function testRouteSlashPublishers()
     {
-        $this->_RouteSlash("publishers", [0=>false, 1=>true, 2=>false, 3=>true]);
+        $this->_RouteSlash("publishers", [0 => false, 1 => true, 2 => false, 3 => true]);
     }
+
     public function testRouteSlashNone()
     {
-        $this->_RouteSlash("none", [0=>false, 1=>false, 2=>false, 3=>false]);
+        $this->_RouteSlash("none", [0 => false, 1 => false, 2 => false, 3 => false]);
     }
+
     private function _RouteSlash($setting, $expected)
     {
         $app = $this->getApplication();
@@ -49,25 +51,27 @@ class ShareTest extends \PhraseanetAuthenticatedWebTestCase
                     case ['registry', 'actions', 'social-tools']:
                         return $setting;
                 }
+
                 return $_conf->get($param, $default);
             }));
         $result = [];
-        foreach($expected as $flags=>$v) {
+        foreach ($expected as $flags => $v) {
             $stubbedACL = $this->stubACL();
             // "has_right_on_sbas" IS checked by the route->before(), the url will return 403
             $stubbedACL->expects($this->any())
                 ->method('has_right_on_sbas')
-                ->will($this->returnValue(($flags & 1) ? true:false));
+                ->will($this->returnValue(($flags & 1) ? true : false));
             // but "has_access_to_subdef" IS NOT checked (the url will return a 200 with a message "no subdef to share")
             $stubbedACL->expects($this->any())
                 ->method('has_access_to_subdef')
-                ->will($this->returnValue(($flags & 2) ? true:false));
+                ->will($this->returnValue(($flags & 2) ? true : false));
             $url = sprintf('/prod/share/record/%d/%d/', self::$DI['record_1']->get_base_id(), self::$DI['record_1']->get_record_id());
             self::$DI['client']->request('GET', $url);
             $result[$flags] = self::$DI['client']->getResponse()->isOk();
         }
         $this->assertEquals($expected, $result);
     }
+
     /**
      * @covers Alchemy\Phrasea\Controller\Prod\Share::shareRecord
      */