resolve conflict

.bowerrc

@@ -1,3 +1,4 @@
 {
-    "directory" : "www/bower_components"
+    "directory" : "www/bower_components",
+    "timeout": 1200000
 }

lib/Alchemy/Phrasea/Command/Setup/Install.php

@@ -176,6 +176,7 @@ class Install extends Command
     private function getDBConn(InputInterface $input, OutputInterface $output, Connection $abConn, DialogHelper $dialog)
     {
         $dbConn = $template = $info = null;
+        $templates = $this->container['phraseanet.structure-template']->getAvailable();
         if (!$input->getOption('databox')) {
             do {
                 $retry = false;
@@ -196,8 +197,9 @@ class Install extends Command
                         $output->writeln("\n\t<info>Data-Box : Connection successful !</info>\n");
 
                         do {
-                            $template = $dialog->ask($output, 'Choose a language template for metadata structure, available are fr (french) and en (english) (en) : ', 'en');
+                            $template = $dialog->ask($output, "Choose a language template for metadata structure, available are {$templates->__toString()} : ", 'en');
-                        } while (!in_array($template, ['en', 'fr']));
+                        }
+                        while (!in_array($template, array_keys($templates->getTemplates())));
 
                         $output->writeln("\n\tLanguage selected is <info>'$template'</info>\n");
                     } catch (\Exception $e) {

lib/Alchemy/Phrasea/Controller/Admin/SubdefsController.php

@@ -12,8 +12,14 @@ namespace Alchemy\Phrasea\Controller\Admin;
 
 use Alchemy\Phrasea\Controller\Controller;
 use Alchemy\Phrasea\Databox\SubdefGroup;
+use Alchemy\Phrasea\Media\Subdef\Subdef;
+use Alchemy\Phrasea\Media\Type\Type;
 use Symfony\Component\HttpFoundation\Request;
 use Symfony\Component\HttpFoundation\Response;
+use Alchemy\Phrasea\Media\Subdef\Image;
+use Alchemy\Phrasea\Media\Subdef\Video;
+use Alchemy\Phrasea\Media\Subdef\Audio;
+use Alchemy\Phrasea\Media\Subdef\Gif;
 
 class SubdefsController extends Controller
 {
@@ -23,10 +29,14 @@ class SubdefsController extends Controller
      */
     function indexAction($sbas_id) {
         $databox = $this->findDataboxById((int) $sbas_id);
+        $config = $this->getConfiguration();
+        $subviews_mapping = $this->getSubviewsMapping();
 
         return $this->render('admin/subdefs.html.twig', [
             'databox' => $databox,
             'subdefs' => $databox->get_subdef_structure(),
+            'config' => $config,
+            'subviews_mapping' => $subviews_mapping
         ]);
     }
 
@@ -43,7 +53,7 @@ class SubdefsController extends Controller
 
         $databox = $this->findDataboxById((int) $sbas_id);
 
-        $add_subdef = ['class' => null, 'name'  => null, 'group' => 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]);
@@ -58,7 +68,7 @@ class SubdefsController extends Controller
             $name = $delete_subef[1];
             $subdefs = $databox->get_subdef_structure();
             $subdefs->delete_subdef($group, $name);
-        } elseif (count($add_subdef) === 3) {
+        } elseif (count($add_subdef) === 5) {
             $subdefs = $databox->get_subdef_structure();
 
             $group = $add_subdef['group'];
@@ -66,13 +76,85 @@ class SubdefsController extends Controller
             $unicode = $this->app['unicode'];
             $name = $unicode->remove_nonazAZ09($add_subdef['name'], false);
             $class = $add_subdef['class'];
+            $preset = $add_subdef['presets'];
+            $mediatype = $add_subdef['mediaType'];
+
+            $subdefs->add_subdef($group, $name, $class, $mediatype, $preset);
+
+            if ($preset !== "Choose") {
+                $options = [];
+
+                $config = $this->getConfiguration();
+
+                //On applique directement les valeurs du preset à la sous def
+                switch($mediatype) {
+                    case Subdef::TYPE_IMAGE :
+                        $options["path"] = "";
+                        $options["meta"] = true;
+                        $options["mediatype"] = $mediatype;
+                        $options[Image::OPTION_SIZE] = $config["image"]["definitions"][$preset][Image::OPTION_SIZE];
+                        $options["dpi"] = $config["image"]["definitions"][$preset][Image::OPTION_RESOLUTION];
+                        $options[Image::OPTION_STRIP] = $config["image"]["definitions"][$preset][Image::OPTION_STRIP];
+                        $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) {
+                            $options[Subdef::OPTION_DEVICE][] = $devices;
+                        }
+                        break;
+                    case Subdef::TYPE_VIDEO :
+                        $options["path"] = "";
+                        $options["meta"] = true;
+                        $options["mediatype"] = $mediatype;
+                        $options[Video::OPTION_AUDIOBITRATE] = $config["video"]["definitions"][$preset][Video::OPTION_AUDIOBITRATE];
+                        $options[Video::OPTION_AUDIOSAMPLERATE] = $config["video"]["definitions"][$preset][Video::OPTION_AUDIOSAMPLERATE];
+                        $options[Video::OPTION_BITRATE] = $config["video"]["definitions"][$preset][Video::OPTION_BITRATE];
+                        $options[Video::OPTION_GOPSIZE] = $config["video"]["definitions"][$preset][Video::OPTION_GOPSIZE];
+                        $options[Video::OPTION_SIZE] = $config["video"]["definitions"][$preset][Video::OPTION_SIZE];
+                        $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) {
+                            $options[Subdef::OPTION_DEVICE][] = $devices;
+                        }
+                        break;
+                    case Subdef::TYPE_FLEXPAPER :
+                        $options["path"] = "";
+                        $options["meta"] = true;
+                        $options["mediatype"] = $mediatype;
+                        foreach($config["document"]["definitions"][$preset]["devices"] as $devices) {
+                            $options["devices"][] = $devices;
+                        }
+                        break;
+                    case Subdef::TYPE_ANIMATION :
+                        $options["path"] = "";
+                        $options["meta"] = true;
+                        $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) {
+                            $options[Subdef::OPTION_DEVICE][] = $devices;
+                        }
+                        break;
+                    case Subdef::TYPE_AUDIO :
+                        $options["path"] = "";
+                        $options["meta"] = true;
+                        $options["mediatype"] = $mediatype;
+                        $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) {
+                            $options[Subdef::OPTION_DEVICE][] = $devices;
+                        }
+                        break;
+                }
+
+                $subdefs->set_subdef($group, $name, $class, false, $options, [], true, $preset);
+            }
 
-            $subdefs->add_subdef($group, $name, $class);
         } else {
             $subdefs = $databox->get_subdef_structure();
 
-            $this->updateSubdefGroups($subdefs, $request);
-
             foreach ($Parmsubdefs as $post_sub) {
                 $options = [];
 
@@ -81,6 +163,7 @@ class SubdefsController extends Controller
                 $group = $post_sub_ex[0];
                 $name = $post_sub_ex[1];
 
+                $preset = $request->request->get($post_sub . '_presets');
                 $class = $request->request->get($post_sub . '_class');
                 $downloadable = $request->request->get($post_sub . '_downloadable');
                 $orderable = $request->request->get($post_sub . '_orderable');
@@ -96,7 +179,6 @@ class SubdefsController extends Controller
 
                     $options[$def] = $parm_loc;
                 }
-
                 $mediatype = $request->request->get($post_sub . '_mediatype');
                 $media = $request->request->get($post_sub . '_' . $mediatype, []);
 
@@ -110,8 +192,7 @@ class SubdefsController extends Controller
                 }
 
                 $labels = $request->request->get($post_sub . '_label', []);
-
+                $subdefs->set_subdef($group, $name, $class, $downloadable, $options, $labels, $orderable, $preset);
-                $subdefs->set_subdef($group, $name, $class, $downloadable, $options, $labels, $orderable);
             }
         }
 
@@ -121,35 +202,359 @@ class SubdefsController extends Controller
     }
 
     /**
-     * Update Databox subdefsStructure DOM according to defined groups.
+     * @return array
-     *
-     * @param \databox_subdefsStructure $subdefs
-     * @param Request $request
      */
-    private function updateSubdefGroups(\databox_subdefsStructure $subdefs, Request $request)
+    protected function getSubviewsMapping()
     {
-        $subdefsGroups = $request->request->get('subdefsgroups', []);
+        $mapping = array(
-        $changedGroups = [];
+            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)
+        );
 
-        /** @var SubdefGroup $subdefsGroup */
+        return $mapping;
-        foreach ($subdefs as $groupName => $subdefsGroup) {
-            $documentOrderable = isset($subdefsGroups[$groupName]['document_orderable'])
-                ? \p4field::isyes($subdefsGroups[$groupName]['document_orderable'])
-                : false;
-
-            if ($subdefsGroup->isDocumentOrderable() !== $documentOrderable) {
-                if ($documentOrderable) {
-                    $subdefsGroup->allowDocumentOrdering();
-                } else {
-                    $subdefsGroup->disallowDocumentOrdering();
     }
 
-                $changedGroups[] = $subdefsGroup;
+    /**
-            }
+     * @return array
-        }
+     */
+    protected function getConfiguration()
+    {
+        $config = array(
+            Subdef::TYPE_IMAGE => array(
+                "definitions" => array(
+                    "JPG" => null,
+                    "160px JPG" => array(
+                        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(
+                        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(
+                        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(
+                        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(
+                        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(
+                        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(
+                        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(
+                        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(
+                        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(
+                        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(
+                        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(
+                        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(
+                    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(
+                        Video::OPTION_AUDIOBITRATE    => "128",
+                        Video::OPTION_AUDIOSAMPLERATE => "44100",
+                        Video::OPTION_BITRATE         => "128",
+                        Video::OPTION_GOPSIZE         => "25",
+                        Video::OPTION_SIZE            => "256",
+                        Video::OPTION_FRAMERATE       => "25",
+                        Video::OPTION_VCODEC          => "libx264",
+                        Video::OPTION_ACODEC          => "libfaac",
+                        Subdef::OPTION_DEVICE          => ["all"]
+                    ),
+                    "240P H264 256 kbps ACC 128kbps" => array(
+                        Video::OPTION_AUDIOBITRATE    => "128",
+                        Video::OPTION_AUDIOSAMPLERATE => "44100",
+                        Video::OPTION_BITRATE         => "256",
+                        Video::OPTION_GOPSIZE         => "25",
+                        Video::OPTION_SIZE            => "426",
+                        Video::OPTION_FRAMERATE       => "25",
+                        Video::OPTION_VCODEC          => "libx264",
+                        Video::OPTION_ACODEC          => "libfaac",
+                        Subdef::OPTION_DEVICE          => ["all"]
+                    ),
+                    "360P H264 576 kbps ACC 128kbps" => array(
+                        Video::OPTION_AUDIOBITRATE    => "128",
+                        Video::OPTION_AUDIOSAMPLERATE => "44100",
+                        Video::OPTION_BITRATE         => "576",
+                        Video::OPTION_GOPSIZE         => "25",
+                        Video::OPTION_SIZE            => "480",
+                        Video::OPTION_FRAMERATE       => "25",
+                        Video::OPTION_VCODEC          => "libtheora",
+                        Video::OPTION_ACODEC          => "libfaac",
+                        Subdef::OPTION_DEVICE          => ["all"]
+                    ),
+                    "480P H264 750 kbps ACC 128kbps" => array(
+                        Video::OPTION_AUDIOBITRATE    => "128",
+                        Video::OPTION_AUDIOSAMPLERATE => "44100",
+                        Video::OPTION_BITRATE         => "750",
+                        Video::OPTION_GOPSIZE         => "25",
+                        Video::OPTION_SIZE            => "854",
+                        Video::OPTION_FRAMERATE       => "25",
+                        Video::OPTION_VCODEC          => "libx264",
+                        Video::OPTION_ACODEC          => "libfaac",
+                        Subdef::OPTION_DEVICE          => ["all"]
+                    ),
+                    "720P H264 1492 kbps ACC 128kbps" => array(
+                        Video::OPTION_AUDIOBITRATE    => "128",
+                        Video::OPTION_AUDIOSAMPLERATE => "44100",
+                        Video::OPTION_BITRATE         => "1492",
+                        Video::OPTION_GOPSIZE         => "25",
+                        Video::OPTION_SIZE            => "1280",
+                        Video::OPTION_FRAMERATE       => "25",
+                        Video::OPTION_VCODEC          => "libx264",
+                        Video::OPTION_ACODEC          => "libfaac",
+                        Subdef::OPTION_DEVICE          => ["all"]
+                    ),
+                    "1080P H264 2420 kbps ACC 128kbps" => array(
+                        Video::OPTION_AUDIOBITRATE    => "128",
+                        Video::OPTION_AUDIOSAMPLERATE => "44100",
+                        Video::OPTION_BITRATE         => "2420",
+                        Video::OPTION_GOPSIZE         => "25",
+                        Video::OPTION_SIZE            => "1920",
+                        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(
+                        Video::OPTION_AUDIOBITRATE    => "128",
+                        Video::OPTION_AUDIOSAMPLERATE => "44100",
+                        Video::OPTION_BITRATE         => "128",
+                        Video::OPTION_GOPSIZE         => "25",
+                        Video::OPTION_SIZE            => "256",
+                        Video::OPTION_FRAMERATE       => "25",
+                        Video::OPTION_VCODEC          => "libvpx",
+                        Video::OPTION_ACODEC          => "libfaac",
+                        Subdef::OPTION_DEVICE          => ["all"]
+                    ),
+                    "240P webm 256 kbps ACC 128kbps" => array(
+                        Video::OPTION_AUDIOBITRATE    => "128",
+                        Video::OPTION_AUDIOSAMPLERATE => "44100",
+                        Video::OPTION_BITRATE         => "256",
+                        Video::OPTION_GOPSIZE         => "25",
+                        Video::OPTION_SIZE            => "426",
+                        Video::OPTION_FRAMERATE       => "25",
+                        Video::OPTION_VCODEC          => "libvpx",
+                        Video::OPTION_ACODEC          => "libfaac",
+                        Subdef::OPTION_DEVICE          => ["all"]
+                    ),
+                    "360P webm 576 kbps ACC 128kbps" => array(
+                        Video::OPTION_AUDIOBITRATE    => "128",
+                        Video::OPTION_AUDIOSAMPLERATE => "44100",
+                        Video::OPTION_BITRATE         => "576",
+                        Video::OPTION_GOPSIZE         => "25",
+                        Video::OPTION_SIZE            => "480",
+                        Video::OPTION_FRAMERATE       => "25",
+                        Video::OPTION_VCODEC          => "libvpx",
+                        Video::OPTION_ACODEC          => "libfaac",
+                        Subdef::OPTION_DEVICE          => ["all"]
+                    ),
+                    "480P webm 750 kbps ACC 128kbps" => array(
+                        Video::OPTION_AUDIOBITRATE    => "128",
+                        Video::OPTION_AUDIOSAMPLERATE => "44100",
+                        Video::OPTION_BITRATE         => "750",
+                        Video::OPTION_GOPSIZE         => "25",
+                        Video::OPTION_SIZE            => "854",
+                        Video::OPTION_FRAMERATE       => "25",
+                        Video::OPTION_VCODEC          => "libvpx",
+                        Video::OPTION_ACODEC          => "libfaac",
+                        Subdef::OPTION_DEVICE          => ["all"]
+                    ),
+                    "720P webm 1492 kbps ACC 128kbps" => array(
+                        Video::OPTION_AUDIOBITRATE    => "128",
+                        Video::OPTION_AUDIOSAMPLERATE => "44100",
+                        Video::OPTION_BITRATE         => "1492",
+                        Video::OPTION_GOPSIZE         => "25",
+                        Video::OPTION_SIZE            => "1280",
+                        Video::OPTION_FRAMERATE       => "25",
+                        Video::OPTION_VCODEC          => "libvpx",
+                        Video::OPTION_ACODEC          => "libfaac",
+                        Subdef::OPTION_DEVICE          => ["all"]
+                    ),
+                    "1080P webm 2420 kbps ACC 128kbps" => array(
+                        Video::OPTION_AUDIOBITRATE    => "128",
+                        Video::OPTION_AUDIOSAMPLERATE => "44100",
+                        Video::OPTION_BITRATE         => "2420",
+                        Video::OPTION_GOPSIZE         => "25",
+                        Video::OPTION_SIZE            => "1920",
+                        Video::OPTION_FRAMERATE       => "25",
+                        Video::OPTION_VCODEC          => "libvpx",
+                        Video::OPTION_ACODEC          => "libfaac",
+                        Subdef::OPTION_DEVICE          => ["all"]
+                    ),
+                ),
+                "form" => array(
+                    Video::OPTION_AUDIOBITRATE    => "slide",
+                    Video::OPTION_AUDIOSAMPLERATE => "select",
+                    Video::OPTION_BITRATE         => "slide",
+                    Video::OPTION_GOPSIZE         => "slide",
+                    Video::OPTION_SIZE            => "slide",
+                    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(),
+            ),
+        );
 
-        if ($changedGroups) {
+        return $config;
-            $subdefs->updateSubdefGroups($changedGroups);
-        }
     }
 }

lib/Alchemy/Phrasea/Controller/Prod/MoveCollectionController.php

@@ -36,6 +36,31 @@ class MoveCollectionController extends Controller
         } else {
             // is able to move:
             $success = true;
+
+            /** @var DisplaySettingService $settings */
+            $settings = $this->app['settings'];
+            $userOrderSetting = $settings->getUserSetting($this->app->getAuthenticatedUser(), 'order_collection_by');
+            // a temporary array to sort the collections
+            $aName = array();
+            list($ukey, $uorder) = ["order", SORT_ASC];     // default ORDER_BY_ADMIN
+            switch ($userOrderSetting) {
+                case $settings::ORDER_ALPHA_ASC :
+                    list($ukey, $uorder) = ["name", SORT_ASC];
+                    break;
+                case $settings::ORDER_ALPHA_DESC :
+                    list($ukey, $uorder) = ["name", SORT_DESC];
+                    break;
+            }
+            foreach ($collections as $key => $row) {
+                if($ukey == "order") {
+                    $aName[$key] = $row->get_ord();
+                }else {
+                    $aName[$key] = $row->get_name();
+                }
+            }
+            // sort the collections
+            array_multisort($aName, $uorder, SORT_REGULAR, $collections);
+
             $parameters = [
               'records' => $records,
               'message' => '',

lib/Alchemy/Phrasea/Controller/Prod/ShareController.php

@@ -23,43 +23,70 @@ class ShareController extends Controller
      */
     public function shareRecord($base_id, $record_id)
     {
-        $outputVars = [
-            'isAvailable' => false,
-            'preview' => [
-              'permalinkUrl' => '',
-              'permaviewUrl' => '',
-              'embedUrl' => '',
-              'width' => '',
-              'height' => ''
-            ]
-        ];
         $record = new \record_adapter($this->app, \phrasea::sbasFromBas($this->app, $base_id), $record_id);
 
-        if (!$this->getAclForUser()->has_access_to_subdef($record, 'preview')) {
+        //get list of subdefs
-            $this->app->abort(403);
+        $subdefs = $record->get_subdefs();
+
+        $databoxSubdefs = $record->getDatabox()->get_subdef_structure()->getSubdefGroup($record->getType());
+        $acl = $this->getAclForUser();
+        $subdefList = [];
+        $defaultKey =  null;
+        foreach ($subdefs as $subdef) {
+            $subdefName = $subdef->get_name();
+            if ($subdefName == 'document') {
+                if (!$acl->has_right_on_base($record->getBaseId(), \ACL::CANDWNLDHD)) {
+                    continue;
                 }
+                $label = $this->app->trans('prod::tools: document');
+            }
+            elseif ($databoxSubdefs->hasSubdef($subdefName)) {
+                if (!$acl->has_access_to_subdef($record, $subdefName)) {
+                    continue;
+                }
+                $label = $databoxSubdefs->getSubdef($subdefName)->get_label($this->app['locale']);
+            }
+            else {
+                // this subdef does no exists anymore in databox structure ?
+                continue;   // don't publish it
+            }
+            $value = $subdef->get_name();
+            $preview = $record->get_subdef($value);
+            $defaultKey = $value;   // will set a default option if neither preview,thumbnail or document is present
 
-        $preview = $record->get_preview();
 
-        if (null !== $previewLink = $preview->get_permalink()) {
+            if ( ($previewLink = $preview->get_permalink()) !== null ) {
-            $permalinkUrl = $previewLink->get_url();
+                $permalinkUrl = $previewLink->get_url()->__toString();
                 $permaviewUrl = $previewLink->get_page();
                 $previewWidth = $preview->get_width();
                 $previewHeight = $preview->get_height();
-
                 $embedUrl = $this->app->url('alchemy_embed_view', ['url' => (string)$permalinkUrl]);
-
+                $previewData = [
-            $outputVars = [
+                    'label'        => $label,
-                'isAvailable' => true,
-                'preview' => [
                     'permalinkUrl' => $permalinkUrl,
                     'permaviewUrl' => $permaviewUrl,
                     'embedUrl'     => $embedUrl,
                     'width'        => $previewWidth,
                     'height'       => $previewHeight
-                ]
                 ];
+                $subdefList[$value] = $previewData;
             }
+        }
+
+        // candidates as best default selected option
+        foreach(["preview", "thumbnail", "document"] as $k) {
+            if (array_key_exists($k, $subdefList)) {
+                $defaultKey = $k;
+                break;
+            }
+        }
+        // if no subdef was sharable, subdefList is empty and defaultKey is null
+        // the twig MUST handle that
+        $outputVars = [
+            'isAvailable' => !empty($subdefList),
+            'subdefList' => $subdefList,
+            'defaultKey' => $defaultKey
+        ];
 
         return $this->renderResponse('prod/Share/record.html.twig', $outputVars);
     }

lib/Alchemy/Phrasea/Controller/Prod/UploadController.php

@@ -243,20 +243,45 @@ class UploadController extends Controller
     {
         $collections = [];
 
-        foreach ($acl->get_granted_base([\ACL::CANADDRECORD]) as $collection) {
+        foreach ($acl->get_granted_sbas() as $databox) {
+            $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[$databox->get_sbas_id()])) {
                     $collections[$databox->get_sbas_id()] = [
                         'databox'             => $databox,
                         'databox_collections' => []
                     ];
                 }
-
                 $collections[$databox->get_sbas_id()]['databox_collections'][] = $collection;
+                /** @var DisplaySettingService $settings */
+                $settings = $this->app['settings'];
+                $userOrderSetting = $settings->getUserSetting($this->app->getAuthenticatedUser(), 'order_collection_by');
+                // a temporary array to sort the collections
+                $aName = [];
+                list($ukey, $uorder) = ["order", SORT_ASC];     // default ORDER_BY_ADMIN
+                switch ($userOrderSetting) {
+                    case $settings::ORDER_ALPHA_ASC :
+                        list($ukey, $uorder) = ["name", SORT_ASC];
+                        break;
+                    case $settings::ORDER_ALPHA_DESC :
+                        list($ukey, $uorder) = ["name", SORT_DESC];
+                        break;
+                }
+                foreach ($collections[$databox->get_sbas_id()]['databox_collections'] as $key => $row) {
+                    if ($ukey == "order") {
+                        $aName[$key] = $row->get_ord();
+                    }
+                    else {
+                        $aName[$key] = $row->get_name();
+                    }
+                }
+                // sort the collections
+                array_multisort($aName, $uorder, SORT_REGULAR, $collections[$databox->get_sbas_id()]['databox_collections']);
+            }
         }
-
         return $collections;
+
     }
 
     /**

lib/Alchemy/Phrasea/Controller/SetupController.php

@@ -77,7 +77,7 @@ class SetupController extends Controller
         return $this->render('/setup/step2.html.twig', [
             'locale'              => $this->app['locale'],
             'available_locales'   => Application::getAvailableLanguages(),
-            'available_templates' => ['en', 'fr'],
+            'available_templates' => $this->app['phraseanet.structure-template']->getAvailable()->getTemplates(),
             'warnings'            => $warnings,
             'error'               => $request->query->get('error'),
             'current_servername'  => $request->getScheme() . '://' . $request->getHttpHost() . '/',

lib/Alchemy/Phrasea/ControllerProvider/Prod/Share.php

@@ -47,10 +47,22 @@ 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") {
+                    return;
+                }
+                elseif($socialTools === "none") {
+                    $app->abort(403, 'social tools disabled');
+                }
+                elseif($socialTools === "publishers") {
                     $firewall->requireRightOnSbas(
                         \phrasea::sbasFromBas($app, $request->attributes->get('base_id')),
                         \ACL::BAS_CHUPUB
                     );
+                }
+                else {
+                    throw new \Exception("bad value \"" . $socialTools . "\" for social tools");
+                }
             })
             ->bind('share_record');
 

lib/Alchemy/Phrasea/Core/Configuration/DisplaySettingService.php

@@ -15,6 +15,10 @@ use Alchemy\Phrasea\Model\Entities\User;
 
 class DisplaySettingService
 {
+    const ORDER_ALPHA_ASC = "ORDER_ALPHA_ASC";
+    const ORDER_ALPHA_DESC = "ORDER_ALPHA_DESC";
+    const ORDER_BY_ADMIN = "ORDER_BY_ADMIN";
+
     /**
      * The default user settings.
      *
@@ -34,6 +38,7 @@ class DisplaySettingService
         'client_basket_status'    => '1',
         'css'                     => '000000',
         'start_page_query'        => '',
+        'order_collection_by'     => self::ORDER_BY_ADMIN,
         'start_page'              => 'QUERY',
         'rollover_thumbnail'      => 'caption',
         'technical_display'       => '1',

lib/Alchemy/Phrasea/Core/Configuration/StructureTemplate.php

@@ -0,0 +1,93 @@
+<?php
+/*
+ * This file is part of Phraseanet
+ *
+ * (c) 2005-2016 Alchemy
+ *
+ * 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
+ */
+class StructureTemplate
+{
+    const TEMPLATE_EXTENSION = 'xml';
+    private $templates;
+
+    public function __construct(Application $app)
+    {
+        $this->app = $app;
+    }
+    /**
+     * @return $this
+     * @throws \Exception
+     */
+    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');
+        $templates = [];
+        $abbreviationLength = 2;
+        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));
+            }
+            $templates[$abbreviation] = $template->getBasename('.'.self::TEMPLATE_EXTENSION);
+        }
+        $this->templates = $templates;
+        return $this;
+    }
+    /**
+     * @return string
+     */
+    public function __toString()
+    {
+        if(!$this->templates){
+            return '';
+        }
+        $templateToString = '';
+        $cpt = 1;
+        $templateLength = count($this->templates);
+        foreach ($this->templates as $key => $value){
+            if (($templateLength - 1) == $cpt) {
+                $separator = ' and ';
+            }elseif(end($this->templates) == $value){
+                $separator =  '';
+            }else{
+                $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);
+        }
+        return $this->templates[$template];
+    }
+    /**
+     * @return mixed
+     */
+    public function getTemplates()
+    {
+        return $this->templates;
+    }
+}

lib/Alchemy/Phrasea/Core/Provider/ConfigurationServiceProvider.php

@@ -11,6 +11,8 @@
 
 namespace Alchemy\Phrasea\Core\Provider;
 
+use Alchemy\Phrasea\Application;
+use Alchemy\Phrasea\Core\Configuration\StructureTemplate;
 use Alchemy\Phrasea\Core\Configuration\AccessRestriction;
 use Alchemy\Phrasea\Core\Configuration\Configuration;
 use Alchemy\Phrasea\Core\Configuration\DisplaySettingService;
@@ -71,6 +73,10 @@ class ConfigurationServiceProvider implements ServiceProviderInterface
         $app['conf.restrictions'] = $app->share(function (SilexApplication $app) {
             return new AccessRestriction($app['conf'], $app->getApplicationBox(), $app['monolog']);
         });
+
+        $app['phraseanet.structure-template'] = $app->share(function (Application $app) {
+            return new StructureTemplate($app);
+        });
     }
 
     /**

lib/Alchemy/Phrasea/Databox/Subdef/SubdefPreset.php

@@ -0,0 +1,46 @@
+<?php
+
+namespace Alchemy\Phrasea\Databox\Subdef;
+
+class SubdefPreset
+{
+    /**
+     * @var string
+     */
+    private $mediaType;
+    /**
+     * @var string
+     */
+    private $label;
+    /**
+     * @var array
+     */
+    private $definitions;
+    /**
+     * @param string $mediaType
+     * @param array $definitions
+     */
+    public function __construct($mediaType, array $definitions)
+    {
+        foreach ($definitions as $definition) {
+            if (! $definition instanceof Subdef) {
+            }
+        }
+        $this->mediaType = (string) $mediaType;
+        $this->definitions = $definitions;
+    }
+    /**
+     * @return string
+     */
+    public function getMediaType()
+    {
+        return $this->label;
+    }
+    /**
+     * @return array
+     */
+    public function getDefinitions()
+    {
+        return $this->definitions;
+    }
+}

lib/Alchemy/Phrasea/Databox/Subdef/SubdefPresetProvider.php

@@ -0,0 +1,19 @@
+<?php
+
+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])) {
+            throw new \InvalidArgumentException('Invalid type');
+        }
+        return $this->presets[$type];
+    }
+}

lib/Alchemy/Phrasea/Helper/Prod.php

@@ -46,10 +46,34 @@ 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()
+                    'base_id' => $coll->get_base_id(),
+                    'name'    => $coll->get_name(),
+                    'order'   => $coll->get_ord()
                 );
             }
 
+            /** @var DisplaySettingService $settings */
+            $settings = $this->app['settings'];
+            $userOrderSetting = $settings->getUserSetting($this->app->getAuthenticatedUser(), 'order_collection_by');
+
+            // a temporary array to sort the collections
+            $aName = array();
+            list($ukey, $uorder) = ["order", SORT_ASC];     // default ORDER_BY_ADMIN
+            switch ($userOrderSetting) {
+                case $settings::ORDER_ALPHA_ASC :
+                    list($ukey, $uorder) = ["name", SORT_ASC];
+                    break;
+
+                case $settings::ORDER_ALPHA_DESC :
+                    list($ukey, $uorder) = ["name", SORT_DESC];
+                    break;
+            }
+            foreach ($bases[$sbasId]['collections'] as $key => $row) {
+                $aName[$key] = $row[$ukey];
+            }
+            // sort the collections
+            array_multisort($aName, $uorder, SORT_REGULAR, $bases[$sbasId]['collections']);
+
             foreach ($databox->get_meta_structure() as $fieldMeta) {
                 if (!$fieldMeta->is_indexable()) {
                     continue;

lib/Alchemy/Phrasea/Media/Subdef/Subdef.php

@@ -15,6 +15,8 @@ use MediaAlchemyst\Specification\SpecificationInterface;
 
 interface Subdef
 {
+    const OPTION_DEVICE = 'devices';
+
     const TYPE_IMAGE = 'image';
     const TYPE_ANIMATION = 'gif';
     const TYPE_VIDEO = 'video';

lib/Alchemy/Phrasea/Setup/Installer.php

@@ -53,7 +53,7 @@ class Installer
 
     private function createDB(Connection $dbConn = null, $template, User $admin)
     {
-        $template = new \SplFileInfo(__DIR__ . '/../../../conf.d/data_templates/' . $template . '-simple.xml');
+        $template = new \SplFileInfo(__DIR__ . '/../../../conf.d/data_templates/' . $this->app['phraseanet.structure-template']->getAvailable()->getTemplateName($template) . '.xml');
         $databox = \databox::create($this->app, $dbConn, $template);
 
         $this->app->getAclForUser($admin)

lib/classes/databox/subdef.php

@@ -7,40 +7,18 @@
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
  */
-
+use Alchemy\Phrasea\Media\Subdef\Image;
 use Alchemy\Phrasea\Media\Subdef\Audio;
+use Alchemy\Phrasea\Media\Subdef\Video;
 use Alchemy\Phrasea\Media\Subdef\FlexPaper;
 use Alchemy\Phrasea\Media\Subdef\Gif;
-use Alchemy\Phrasea\Media\Subdef\Image;
 use Alchemy\Phrasea\Media\Subdef\Unknown;
 use Alchemy\Phrasea\Media\Subdef\Subdef as SubdefSpecs;
-use Alchemy\Phrasea\Media\Subdef\Video;
 use Alchemy\Phrasea\Media\Type\Type as SubdefType;
 use MediaAlchemyst\Specification\SpecificationInterface;
 use Symfony\Component\Translation\TranslatorInterface;
-
 class databox_subdef
 {
-    const CLASS_THUMBNAIL = 'thumbnail';
-    const CLASS_PREVIEW = 'preview';
-    const CLASS_DOCUMENT = 'document';
-
-    const DEVICE_ALL = 'all';
-    const DEVICE_HANDHELD = 'handheld';
-    const DEVICE_PRINT = 'print';
-    const DEVICE_PROJECTION = 'projection';
-    const DEVICE_SCREEN = 'screen';
-    const DEVICE_TV = 'tv';
-
-    protected static $mediaTypeToSubdefTypes = [
-        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]
-    ];
-
     /**
      * The class type of the subdef
      * Is null or one of the CLASS_* constants
@@ -51,52 +29,61 @@ class databox_subdef
     protected $devices = [];
     protected $name;
     protected $path;
+    protected $preset;
     protected $subdef_group;
     protected $labels = [];
-    protected $downloadable;
-    protected $translator;
-
     /**
      * @var bool
      */
     private $requiresMetadataUpdate;
+    protected $downloadable;
+    protected $translator;
+    protected static $mediaTypeToSubdefTypes = [
+        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],
+    ];
+    const CLASS_THUMBNAIL = 'thumbnail';
+    const CLASS_PREVIEW = 'preview';
+    const CLASS_DOCUMENT = 'document';
+    const DEVICE_ALL = 'all';
+    const DEVICE_HANDHELD = 'handheld';
+    const DEVICE_PRINT = 'print';
+    const DEVICE_PROJECTION = 'projection';
+    const DEVICE_SCREEN = 'screen';
+    const DEVICE_TV = 'tv';
 
     /**
-     * @var bool
+     *
-     */
-    private $orderable;
-
-    /**
      * @param SubdefType $type
      * @param SimpleXMLElement $sd
-     * @param TranslatorInterface $translator
+     *
+     * @return databox_subdef
      */
     public function __construct(SubdefType $type, SimpleXMLElement $sd, TranslatorInterface $translator)
     {
         $this->subdef_group = $type;
-        $this->class = (string) $sd->attributes()->class;
+        $this->class = (string)$sd->attributes()->class;
         $this->translator = $translator;
-
         foreach ($sd->devices as $device) {
-            $this->devices[] = (string) $device;
+            $this->devices[] = (string)$device;
         }
-
         $this->name = strtolower($sd->attributes()->name);
         $this->downloadable = p4field::isyes($sd->attributes()->downloadable);
         $this->orderable = isset($sd->attributes()->orderable) ? p4field::isyes($sd->attributes()->orderable) : true;
         $this->path = trim($sd->path) !== '' ? p4string::addEndSlash(trim($sd->path)) : '';
-
+        $this->preset = $sd->attributes()->presets;
-        $this->requiresMetadataUpdate = p4field::isyes((string) $sd->meta);
+        $this->requiresMetadataUpdate = p4field::isyes((string)$sd->meta);
-
         foreach ($sd->label as $label) {
-            $lang = trim((string) $label->attributes()->lang);
+            $lang = trim((string)$label->attributes()->lang);
-
             if ($lang) {
-                $this->labels[$lang] = (string) $label;
+                $this->labels[$lang] = (string)$label;
             }
         }
-
+        switch ((string)$sd->mediatype) {
-        switch ((string) $sd->mediatype) {
             default:
             case SubdefSpecs::TYPE_IMAGE:
                 $this->subdef_type = $this->buildImageSubdef($sd);
@@ -118,7 +105,6 @@ class databox_subdef
                 break;
         }
     }
-
     /**
      * Build Image Subdef object depending the SimpleXMLElement
      *
@@ -128,7 +114,6 @@ class databox_subdef
     protected function buildImageSubdef(SimpleXMLElement $sd)
     {
         $image = new Image($this->translator);
-
         if ($sd->icodec) {
             $image->setOptionValue(Image::OPTION_ICODEC, (string) $sd->icodec);
         }
@@ -147,10 +132,8 @@ class databox_subdef
         if ($sd->flatten) {
             $image->setOptionValue(Image::OPTION_FLATTEN, p4field::isyes($sd->flatten));
         }
-
         return $image;
     }
-
     /**
      * Build Audio Subdef object depending the SimpleXMLElement
      *
@@ -160,7 +143,6 @@ class databox_subdef
     protected function buildAudioSubdef(SimpleXMLElement $sd)
     {
         $audio = new Audio($this->translator);
-
         if ($sd->acodec) {
             $audio->setOptionValue(Audio::OPTION_ACODEC, (string) $sd->acodec);
         }
@@ -170,10 +152,8 @@ class databox_subdef
         if ($sd->audiosamplerate) {
             $audio->setOptionValue(Audio::OPTION_AUDIOSAMPLERATE, (int) $sd->audiosamplerate);
         }
-
         return $audio;
     }
-
     /**
      * Build Video Subdef object depending the SimpleXMLElement
      *
@@ -183,7 +163,6 @@ class databox_subdef
     protected function buildVideoSubdef(SimpleXMLElement $sd)
     {
         $video = new Video($this->translator);
-
         if ($sd->size) {
             $video->setOptionValue(Video::OPTION_SIZE, (int) $sd->size);
         }
@@ -208,10 +187,8 @@ class databox_subdef
         if ($sd->GOPsize) {
             $video->setOptionValue(Video::OPTION_GOPSIZE, (int) $sd->GOPsize);
         }
-
         return $video;
     }
-
     /**
      * Build GIF Subdef object depending the SimpleXMLElement
      *
@@ -221,17 +198,14 @@ class databox_subdef
     protected function buildGifSubdef(SimpleXMLElement $sd)
     {
         $gif = new Gif($this->translator);
-
         if ($sd->size) {
             $gif->setOptionValue(Gif::OPTION_SIZE, (int) $sd->size);
         }
         if ($sd->delay) {
             $gif->setOptionValue(Gif::OPTION_DELAY, (int) $sd->delay);
         }
-
         return $gif;
     }
-
     /**
      * Build Flexpaper Subdef object depending the SimpleXMLElement
      *
@@ -242,8 +216,8 @@ class databox_subdef
     {
         return new FlexPaper($this->translator);
     }
-
     /**
+     *
      * @return string
      */
     public function get_class()
@@ -252,6 +226,16 @@ class databox_subdef
     }
 
     /**
+     *
+     * @return string
+     */
+    public function get_preset()
+    {
+        return $this->preset;
+    }
+
+    /**
+     *
      * @return string
      */
     public function get_path()
@@ -262,7 +246,7 @@ class databox_subdef
     /**
      * The devices matching this subdefinition
      *
-     * @return array
+     * @return Array
      */
     public function getDevices()
     {
@@ -272,7 +256,7 @@ class databox_subdef
     /**
      * The current SubdefType the subdef converts documents
      *
-     * @return \Alchemy\Phrasea\Media\Subdef\Subdef
+     * @return Alchemy\Phrasea\Media\Subdef\Subdef
      */
     public function getSubdefType()
     {
@@ -292,7 +276,7 @@ class databox_subdef
     /**
      * An associative label ; keys are i18n languages
      *
-     * @return array
+     * @return Array
      */
     public function get_labels()
     {
@@ -306,21 +290,12 @@ class databox_subdef
         } elseif (isset($this->labels[$code])) {
             return $this->labels[$code];
         }
-
         return null;
     }
 
     /**
-     * The name of the subdef
+     * boolean
      *
-     * @return string
-     */
-    public function get_name()
-    {
-        return $this->name;
-    }
-
-    /**
      * @return bool
      */
     public function isDownloadable()
@@ -344,7 +319,6 @@ class databox_subdef
     public function getAvailableSubdefTypes()
     {
         $subdefTypes = [];
-
         $availableDevices = [
             self::DEVICE_ALL,
             self::DEVICE_HANDHELD,
@@ -353,11 +327,8 @@ class databox_subdef
             self::DEVICE_SCREEN,
             self::DEVICE_TV,
         ];
-
         if (isset(self::$mediaTypeToSubdefTypes[$this->subdef_group->getType()])) {
-
             foreach (self::$mediaTypeToSubdefTypes[$this->subdef_group->getType()] as $subdefType) {
-
                 if ($subdefType == $this->subdef_type->getType()) {
                     $mediatype_obj = $this->subdef_type;
                 } else {
@@ -385,13 +356,11 @@ class databox_subdef
                             break;
                     }
                 }
-
+                $mediatype_obj->registerOption(new \Alchemy\Phrasea\Media\Subdef\OptionType\Multi($this->translator->trans('Target Device'),
-                $mediatype_obj->registerOption(new \Alchemy\Phrasea\Media\Subdef\OptionType\Multi($this->translator->trans('Target Device'), 'devices', $availableDevices, $this->devices));
+                    'devices', $availableDevices, $this->devices));
-
                 $subdefTypes[] = $mediatype_obj;
             }
         }
-
         return $subdefTypes;
     }
 
@@ -405,6 +374,16 @@ class databox_subdef
         return $this->requiresMetadataUpdate;
     }
 
+    /**
+     * The name of the subdef
+     *
+     * @return string
+     */
+    public function get_name()
+    {
+        return $this->name;
+    }
+
     /**
      * Get the MediaAlchemyst specs for the current subdef
      *

lib/classes/databox/subdefsStructure.php

@@ -9,8 +9,8 @@
  */
 
 use Alchemy\Phrasea\Databox\SubdefGroup;
-use Alchemy\Phrasea\Media\MediaTypeFactory;
 use Assert\Assertion;
+use Alchemy\Phrasea\Media\MediaTypeFactory;
 use Symfony\Component\Translation\TranslatorInterface;
 
 class databox_subdefsStructure implements IteratorAggregate, Countable
@@ -185,15 +185,19 @@ class databox_subdefsStructure implements IteratorAggregate, Countable
      * @param  string $groupname
      * @param  string $name
      * @param  string $class
+     * @param  string $mediatype
+     * @param  string $preset
      * @return databox_subdefsStructure
      */
-    public function add_subdef($groupname, $name, $class)
+    public function add_subdef($groupname, $name, $class, $mediatype, $preset)
     {
         $dom_struct = $this->databox->get_dom_structure();
 
         $subdef = $dom_struct->createElement('subdef');
         $subdef->setAttribute('class', $class);
         $subdef->setAttribute('name', mb_strtolower($name));
+        $subdef->setAttribute('presets', $preset);
+        $subdef->setAttribute('mediaType', $mediatype);
 
         $dom_xp = $this->databox->get_xpath_structure();
         $query = '//record/subdefs/subdefgroup[@name="' . $groupname . '"]';
@@ -216,25 +220,6 @@ class databox_subdefsStructure implements IteratorAggregate, Countable
         return $this;
     }
 
-    /**
-     * @param SubdefGroup[] $groups
-     */
-    public function updateSubdefGroups($groups)
-    {
-        Assertion::allIsInstanceOf($groups, SubdefGroup::class);
-
-        $dom_xp = $this->databox->get_xpath_structure();
-
-        foreach ($groups as $group) {
-            $nodes = $dom_xp->query('//record/subdefs/subdefgroup[@name="' . $group->getName() . '"]');
-
-            /** @var DOMElement $node */
-            foreach ($nodes as $node) {
-                $node->setAttribute('document_orderable', ($group->isDocumentOrderable() ? 'true' : 'false'));
-            }
-        }
-    }
-
     /**
      * @param string $group
      * @param string $name
@@ -242,11 +227,12 @@ class databox_subdefsStructure implements IteratorAggregate, Countable
      * @param boolean $downloadable
      * @param array $options
      * @param array $labels
-     * @param bool $orderable
+     * @param boolean $orderable
+     * @param string $preset
      * @return databox_subdefsStructure
      * @throws Exception
      */
-    public function set_subdef($group, $name, $class, $downloadable, $options, $labels, $orderable = true)
+    public function set_subdef($group, $name, $class, $downloadable, $options, $labels, $orderable = true, $preset = "Custom")
     {
         $dom_struct = $this->databox->get_dom_structure();
 
@@ -255,6 +241,7 @@ class databox_subdefsStructure implements IteratorAggregate, Countable
         $subdef->setAttribute('name', mb_strtolower($name));
         $subdef->setAttribute('downloadable', ($downloadable ? 'true' : 'false'));
         $subdef->setAttribute('orderable', ($orderable ? 'true' : 'false'));
+        $subdef->setAttribute('presets', $preset);
 
         foreach ($labels as $code => $label) {
             $child = $dom_struct->createElement('label');

lib/classes/record/preview.php

@@ -431,6 +431,7 @@ class record_preview extends record_adapter
             $nbDays--;      // because 0 is included
             for ($d=$nbDays; $d>=0; $d--) {
                 $datetime = new DateTime('-' . $d . ' days');
+                $datetime->modify('+1 day');
                 $date = date_format($datetime, 'Y-m-d');
                 if($d == $nbDays) {
                     $this->statistics['from'] = $date;

resources/ansible/roles/app/templates/configuration.tpl

@@ -12,7 +12,7 @@ main:
         port: 3306
         user: '{{ mariadb.user }}'
         password: '{{ mariadb.password }}'
-        dbname: '{{ mariadb.database }}'
+        dbname: '{{ mariadb.appbox_db }}'
         driver: pdo_mysql
         charset: UTF8
     database-test:

resources/ansible/roles/mariadb/tasks/main.yml

@@ -47,7 +47,7 @@
     - "{{ mariadb.alt_databox_db }}"
 
 - name: mariadb | Import dump
-  mysql_db: name={{ mariadb.database }} state=import login_user=root login_password={{ mariadb.root_password }} target=/vagrant/{{ mariadb.dump }}
+  mysql_db: name={{ mariadb.appbox_db }} state=import login_user=root login_password={{ mariadb.root_password }} target=/vagrant/{{ mariadb.dump }}
   when: mariadb.dump
 
 - name: mariadb | Create users

resources/ansible/roles/php/tasks/pecl.yml

@@ -21,6 +21,6 @@
   when: php.pecl_packages is defined
 
 - name: Enable extension
-  shell: php5enmod {{ item.name }}
+  shell: phpenmod {{ item.name }}
   with_items: '{{ php.pecl_packages }}'
   when: php.pecl_packages is defined

resources/ansible/vars/all.yml

@@ -41,7 +41,7 @@ nginx:
 mariadb:
     install: '1'
     root_password: toor
-    database: ab_master
+    appbox_db: ab_master
     databox_db: db_master
     alt_databox_db: db_alt
     user: phraseanet

resources/locales/messages.de.xlf

@@ -2352,7 +2352,7 @@
       <trans-unit id="ac930a136ebd04a19bc5f2ce1769fc065efb7bdf" resname="Detailed view URL" approved="yes">
         <source>Detailed view URL</source>
         <target state="translated">Detailansicht URL</target>
-        <jms:reference-file line="32">prod/Share/record.html.twig</jms:reference-file>
+        <jms:reference-file line="44">prod/Share/record.html.twig</jms:reference-file>
       </trans-unit>
       <trans-unit id="dc3decbb93847518f1a049dcf49d0d7c6560bcc6" resname="Details" approved="yes">
         <source>Details</source>
@@ -2677,7 +2677,7 @@
       <trans-unit id="7884b9b422d77cabded5da8a9a56524a84481930" resname="Embed code" approved="yes">
         <source>Embed code</source>
         <target state="translated">Embed-Code</target>
-        <jms:reference-file line="41">prod/Share/record.html.twig</jms:reference-file>
+        <jms:reference-file line="53">prod/Share/record.html.twig</jms:reference-file>
       </trans-unit>
       <trans-unit id="e5afbbe7023486a123b45581f49820899571c415" resname="Empty a collection" approved="yes">
         <source>Empty a collection</source>
@@ -4347,7 +4347,7 @@
       <trans-unit id="8c123d8ad43d08cc48c3d6a7676e65f71eea59df" resname="No URL available" approved="yes">
         <source>No URL available</source>
         <target state="translated">keine verfügbare URL</target>
-        <jms:reference-file line="57">prod/Share/record.html.twig</jms:reference-file>
+        <jms:reference-file line="120">prod/Share/record.html.twig</jms:reference-file>
       </trans-unit>
       <trans-unit id="486829367591dc8209f3fc6960814c0bdd8930d1" resname="No account yet?" approved="yes">
         <source>No account yet?</source>
@@ -5563,7 +5563,7 @@
       <trans-unit id="8e78cff6cd2bb8595029060cb53dba7a4ba72b8a" resname="Resource URL" approved="yes">
         <source>Resource URL</source>
         <target state="translated">Resource URL</target>
-        <jms:reference-file line="22">prod/Share/record.html.twig</jms:reference-file>
+        <jms:reference-file line="34">prod/Share/record.html.twig</jms:reference-file>
       </trans-unit>
       <trans-unit id="2479ef7e025d9d4c6e5463dc366c2d6c79aaefbe" resname="Resquest access" approved="yes">
         <source>Resquest access</source>
@@ -5841,12 +5841,12 @@
       <trans-unit id="6ff7a49e36b0e5c8302603f98e4eb1c7dec4a56e" resname="Send to Facebook" approved="yes">
         <source>Send to Facebook</source>
         <target state="translated">Auf Facebook teilen</target>
-        <jms:reference-file line="16">prod/Share/record.html.twig</jms:reference-file>
+        <jms:reference-file line="28">prod/Share/record.html.twig</jms:reference-file>
       </trans-unit>
       <trans-unit id="29f82ee42eeecce87dfe9223d5d7ff716dc68ead" resname="Send to Twitter" approved="yes">
         <source>Send to Twitter</source>
         <target state="translated">Auf Twitter teilen</target>
-        <jms:reference-file line="10">prod/Share/record.html.twig</jms:reference-file>
+        <jms:reference-file line="22">prod/Share/record.html.twig</jms:reference-file>
       </trans-unit>
       <trans-unit id="35f49dcfbfb2e03fdce327671e82bf173b1ccb8b" resname="Sent" approved="yes">
         <source>Sent</source>
@@ -9427,9 +9427,9 @@
       <trans-unit id="a70a59b9120185471e5b45630f8ba24d5516f590" resname="copyClipboardLabel" approved="yes">
         <source>copyClipboardLabel</source>
         <target state="translated">in der Zwischenablage kopieren</target>
-        <jms:reference-file line="28">prod/Share/record.html.twig</jms:reference-file>
+        <jms:reference-file line="40">prod/Share/record.html.twig</jms:reference-file>
-        <jms:reference-file line="36">prod/Share/record.html.twig</jms:reference-file>
+        <jms:reference-file line="48">prod/Share/record.html.twig</jms:reference-file>
-        <jms:reference-file line="49">prod/Share/record.html.twig</jms:reference-file>
+        <jms:reference-file line="61">prod/Share/record.html.twig</jms:reference-file>
       </trans-unit>
       <trans-unit id="fc97186645dc71dae8e3221c8ce53c56e6d611bf" resname="dans %category%" approved="yes">
         <source>dans %category%</source>
@@ -10754,9 +10754,9 @@
       <trans-unit id="7ac5447a13806c0a2e2602b51644729fe8464e0e" resname="previewLinkLabel" approved="yes">
         <source>previewLinkLabel</source>
         <target state="translated">ansichten</target>
-        <jms:reference-file line="27">prod/Share/record.html.twig</jms:reference-file>
+        <jms:reference-file line="39">prod/Share/record.html.twig</jms:reference-file>
-        <jms:reference-file line="35">prod/Share/record.html.twig</jms:reference-file>
+        <jms:reference-file line="47">prod/Share/record.html.twig</jms:reference-file>
-        <jms:reference-file line="48">prod/Share/record.html.twig</jms:reference-file>
+        <jms:reference-file line="60">prod/Share/record.html.twig</jms:reference-file>
       </trans-unit>
       <trans-unit id="6f25fd9ac189dce63bc51d1eccc253051ada2bf4" resname="print:: image de choix et description" approved="yes">
         <source>print:: image de choix et description</source>
@@ -11069,6 +11069,7 @@
       <trans-unit id="6ad73c8fd370f62ccd3bf50cd9cc3563aed5273c" resname="prod::tools: document" approved="yes">
         <source>prod::tools: document</source>
         <target state="translated">Dokument</target>
+        <jms:reference-file line="41">Controller/Prod/ShareController.php</jms:reference-file>
         <jms:reference-file line="70">Controller/Prod/ToolsController.php</jms:reference-file>
       </trans-unit>
       <trans-unit id="61c9b2b17db77a27841bbeeabff923448b0f6388" resname="public" approved="yes">
@@ -12269,6 +12270,15 @@
         <source>setup::custom-link:title-custom-link</source>
         <target state="new">setup::custom-link:title-custom-link</target>
         <jms:reference-file line="56">web/admin/setup.html.twig</jms:reference-file>
+      <trans-unit id="5107f9819cd4c0812c1d78cc07d24aff304c58fa" resname="share::share-record: advance">
+        <source>share::share-record: advance</source>
+        <target state="new">share::share-record: advance</target>
+        <jms:reference-file line="9">prod/Share/record.html.twig</jms:reference-file>
+      </trans-unit>
+      <trans-unit id="f51d8ca24dc67572beccf115c79671ba1c3f545a" resname="share::share-record: select-shared-def">
+        <source>share::share-record: select-shared-def</source>
+        <target state="new">share::share-record: select-shared-def</target>
+        <jms:reference-file line="11">prod/Share/record.html.twig</jms:reference-file>
       </trans-unit>
       <trans-unit id="8ab6a8a0cf069e3783c6f59163ad03a051310556" resname="sport" approved="yes">
         <source>sport</source>

resources/locales/messages.en.xlf

@@ -2352,7 +2352,7 @@
       <trans-unit id="ac930a136ebd04a19bc5f2ce1769fc065efb7bdf" resname="Detailed view URL" approved="yes">
         <source>Detailed view URL</source>
         <target state="translated">URL of the detailed view</target>
-        <jms:reference-file line="32">prod/Share/record.html.twig</jms:reference-file>
+        <jms:reference-file line="44">prod/Share/record.html.twig</jms:reference-file>
       </trans-unit>
       <trans-unit id="dc3decbb93847518f1a049dcf49d0d7c6560bcc6" resname="Details" approved="yes">
         <source>Details</source>
@@ -2677,7 +2677,7 @@
       <trans-unit id="7884b9b422d77cabded5da8a9a56524a84481930" resname="Embed code" approved="yes">
         <source>Embed code</source>
         <target state="translated">Embed code</target>
-        <jms:reference-file line="41">prod/Share/record.html.twig</jms:reference-file>
+        <jms:reference-file line="53">prod/Share/record.html.twig</jms:reference-file>
       </trans-unit>
       <trans-unit id="e5afbbe7023486a123b45581f49820899571c415" resname="Empty a collection" approved="yes">
         <source>Empty a collection</source>
@@ -4347,7 +4347,7 @@
       <trans-unit id="8c123d8ad43d08cc48c3d6a7676e65f71eea59df" resname="No URL available" approved="yes">
         <source>No URL available</source>
         <target state="translated">No URL available</target>
-        <jms:reference-file line="57">prod/Share/record.html.twig</jms:reference-file>
+        <jms:reference-file line="120">prod/Share/record.html.twig</jms:reference-file>
       </trans-unit>
       <trans-unit id="486829367591dc8209f3fc6960814c0bdd8930d1" resname="No account yet?" approved="yes">
         <source>No account yet?</source>
@@ -5563,7 +5563,7 @@
       <trans-unit id="8e78cff6cd2bb8595029060cb53dba7a4ba72b8a" resname="Resource URL" approved="yes">
         <source>Resource URL</source>
         <target state="translated">Resource URL</target>
-        <jms:reference-file line="22">prod/Share/record.html.twig</jms:reference-file>
+        <jms:reference-file line="34">prod/Share/record.html.twig</jms:reference-file>
       </trans-unit>
       <trans-unit id="2479ef7e025d9d4c6e5463dc366c2d6c79aaefbe" resname="Resquest access" approved="yes">
         <source>Resquest access</source>
@@ -5841,12 +5841,12 @@
       <trans-unit id="6ff7a49e36b0e5c8302603f98e4eb1c7dec4a56e" resname="Send to Facebook" approved="yes">
         <source>Send to Facebook</source>
         <target state="translated">Send to Facebook</target>
-        <jms:reference-file line="16">prod/Share/record.html.twig</jms:reference-file>
+        <jms:reference-file line="28">prod/Share/record.html.twig</jms:reference-file>
       </trans-unit>
       <trans-unit id="29f82ee42eeecce87dfe9223d5d7ff716dc68ead" resname="Send to Twitter" approved="yes">
         <source>Send to Twitter</source>
         <target state="translated">Send to Twitter</target>
-        <jms:reference-file line="10">prod/Share/record.html.twig</jms:reference-file>
+        <jms:reference-file line="22">prod/Share/record.html.twig</jms:reference-file>
       </trans-unit>
       <trans-unit id="35f49dcfbfb2e03fdce327671e82bf173b1ccb8b" resname="Sent" approved="yes">
         <source>Sent</source>
@@ -9428,9 +9428,9 @@
       <trans-unit id="a70a59b9120185471e5b45630f8ba24d5516f590" resname="copyClipboardLabel" approved="yes">
         <source>copyClipboardLabel</source>
         <target state="translated">Copy to clipboard</target>
-        <jms:reference-file line="28">prod/Share/record.html.twig</jms:reference-file>
+        <jms:reference-file line="40">prod/Share/record.html.twig</jms:reference-file>
-        <jms:reference-file line="36">prod/Share/record.html.twig</jms:reference-file>
+        <jms:reference-file line="48">prod/Share/record.html.twig</jms:reference-file>
-        <jms:reference-file line="49">prod/Share/record.html.twig</jms:reference-file>
+        <jms:reference-file line="61">prod/Share/record.html.twig</jms:reference-file>
       </trans-unit>
       <trans-unit id="fc97186645dc71dae8e3221c8ce53c56e6d611bf" resname="dans %category%" approved="yes">
         <source>dans %category%</source>
@@ -10755,9 +10755,9 @@
       <trans-unit id="7ac5447a13806c0a2e2602b51644729fe8464e0e" resname="previewLinkLabel" approved="yes">
         <source>previewLinkLabel</source>
         <target state="translated">Preview</target>
-        <jms:reference-file line="27">prod/Share/record.html.twig</jms:reference-file>
+        <jms:reference-file line="39">prod/Share/record.html.twig</jms:reference-file>
-        <jms:reference-file line="35">prod/Share/record.html.twig</jms:reference-file>
+        <jms:reference-file line="47">prod/Share/record.html.twig</jms:reference-file>
-        <jms:reference-file line="48">prod/Share/record.html.twig</jms:reference-file>
+        <jms:reference-file line="60">prod/Share/record.html.twig</jms:reference-file>
       </trans-unit>
       <trans-unit id="6f25fd9ac189dce63bc51d1eccc253051ada2bf4" resname="print:: image de choix et description" approved="yes">
         <source>print:: image de choix et description</source>
@@ -11070,6 +11070,7 @@
       <trans-unit id="6ad73c8fd370f62ccd3bf50cd9cc3563aed5273c" resname="prod::tools: document" approved="yes">
         <source>prod::tools: document</source>
         <target state="translated">Document</target>
+        <jms:reference-file line="41">Controller/Prod/ShareController.php</jms:reference-file>
         <jms:reference-file line="70">Controller/Prod/ToolsController.php</jms:reference-file>
       </trans-unit>
       <trans-unit id="61c9b2b17db77a27841bbeeabff923448b0f6388" resname="public" approved="yes">
@@ -12270,6 +12271,15 @@
         <source>setup::custom-link:title-custom-link</source>
         <target state="new">setup::custom-link:title-custom-link</target>
         <jms:reference-file line="56">web/admin/setup.html.twig</jms:reference-file>
+      <trans-unit id="5107f9819cd4c0812c1d78cc07d24aff304c58fa" resname="share::share-record: advance">
+        <source>share::share-record: advance</source>
+        <target state="new">share::share-record: advance</target>
+        <jms:reference-file line="9">prod/Share/record.html.twig</jms:reference-file>
+      </trans-unit>
+      <trans-unit id="f51d8ca24dc67572beccf115c79671ba1c3f545a" resname="share::share-record: select-shared-def">
+        <source>share::share-record: select-shared-def</source>
+        <target state="new">share::share-record: select-shared-def</target>
+        <jms:reference-file line="11">prod/Share/record.html.twig</jms:reference-file>
       </trans-unit>
       <trans-unit id="8ab6a8a0cf069e3783c6f59163ad03a051310556" resname="sport" approved="yes">
         <source>sport</source>

resources/locales/messages.fr.xlf

@@ -2352,7 +2352,7 @@
       <trans-unit id="ac930a136ebd04a19bc5f2ce1769fc065efb7bdf" resname="Detailed view URL" approved="yes">
         <source>Detailed view URL</source>
         <target state="translated">URL de la vue détaillée</target>
-        <jms:reference-file line="32">prod/Share/record.html.twig</jms:reference-file>
+        <jms:reference-file line="44">prod/Share/record.html.twig</jms:reference-file>
       </trans-unit>
       <trans-unit id="dc3decbb93847518f1a049dcf49d0d7c6560bcc6" resname="Details" approved="yes">
         <source>Details</source>
@@ -2677,7 +2677,7 @@
       <trans-unit id="7884b9b422d77cabded5da8a9a56524a84481930" resname="Embed code" approved="yes">
         <source>Embed code</source>
         <target state="translated">Code d'intégration (Embed code)</target>
-        <jms:reference-file line="41">prod/Share/record.html.twig</jms:reference-file>
+        <jms:reference-file line="53">prod/Share/record.html.twig</jms:reference-file>
       </trans-unit>
       <trans-unit id="e5afbbe7023486a123b45581f49820899571c415" resname="Empty a collection" approved="yes">
         <source>Empty a collection</source>
@@ -4347,7 +4347,7 @@
       <trans-unit id="8c123d8ad43d08cc48c3d6a7676e65f71eea59df" resname="No URL available" approved="yes">
         <source>No URL available</source>
         <target state="translated">Aucune URL de disponible</target>
-        <jms:reference-file line="57">prod/Share/record.html.twig</jms:reference-file>
+        <jms:reference-file line="120">prod/Share/record.html.twig</jms:reference-file>
       </trans-unit>
       <trans-unit id="486829367591dc8209f3fc6960814c0bdd8930d1" resname="No account yet?" approved="yes">
         <source>No account yet?</source>
@@ -5565,7 +5565,7 @@ Pour les utilisateurs authentifiés, la demande de validation est également dis
       <trans-unit id="8e78cff6cd2bb8595029060cb53dba7a4ba72b8a" resname="Resource URL" approved="yes">
         <source>Resource URL</source>
         <target state="translated">URL de la ressource</target>
-        <jms:reference-file line="22">prod/Share/record.html.twig</jms:reference-file>
+        <jms:reference-file line="34">prod/Share/record.html.twig</jms:reference-file>
       </trans-unit>
       <trans-unit id="2479ef7e025d9d4c6e5463dc366c2d6c79aaefbe" resname="Resquest access" approved="yes">
         <source>Resquest access</source>
@@ -5843,12 +5843,12 @@ Pour les utilisateurs authentifiés, la demande de validation est également dis
       <trans-unit id="6ff7a49e36b0e5c8302603f98e4eb1c7dec4a56e" resname="Send to Facebook" approved="yes">
         <source>Send to Facebook</source>
         <target state="translated">Envoyer vers Facebook</target>
-        <jms:reference-file line="16">prod/Share/record.html.twig</jms:reference-file>
+        <jms:reference-file line="28">prod/Share/record.html.twig</jms:reference-file>
       </trans-unit>
       <trans-unit id="29f82ee42eeecce87dfe9223d5d7ff716dc68ead" resname="Send to Twitter" approved="yes">
         <source>Send to Twitter</source>
         <target state="translated">Envoyer vers Twitter</target>
-        <jms:reference-file line="10">prod/Share/record.html.twig</jms:reference-file>
+        <jms:reference-file line="22">prod/Share/record.html.twig</jms:reference-file>
       </trans-unit>
       <trans-unit id="35f49dcfbfb2e03fdce327671e82bf173b1ccb8b" resname="Sent" approved="yes">
         <source>Sent</source>
@@ -9431,9 +9431,9 @@ Si vous recevez cet e-mail sans l'avoir sollicité, merci de l'ignorer ou de le
       <trans-unit id="a70a59b9120185471e5b45630f8ba24d5516f590" resname="copyClipboardLabel" approved="yes">
         <source>copyClipboardLabel</source>
         <target state="translated">Copier dans le presse-papier</target>
-        <jms:reference-file line="28">prod/Share/record.html.twig</jms:reference-file>
+        <jms:reference-file line="40">prod/Share/record.html.twig</jms:reference-file>
-        <jms:reference-file line="36">prod/Share/record.html.twig</jms:reference-file>
+        <jms:reference-file line="48">prod/Share/record.html.twig</jms:reference-file>
-        <jms:reference-file line="49">prod/Share/record.html.twig</jms:reference-file>
+        <jms:reference-file line="61">prod/Share/record.html.twig</jms:reference-file>
       </trans-unit>
       <trans-unit id="fc97186645dc71dae8e3221c8ce53c56e6d611bf" resname="dans %category%" approved="yes">
         <source>dans %category%</source>
@@ -10758,9 +10758,9 @@ Si vous recevez cet e-mail sans l'avoir sollicité, merci de l'ignorer ou de le
       <trans-unit id="7ac5447a13806c0a2e2602b51644729fe8464e0e" resname="previewLinkLabel" approved="yes">
         <source>previewLinkLabel</source>
         <target state="translated">Prévisualiser</target>
-        <jms:reference-file line="27">prod/Share/record.html.twig</jms:reference-file>
+        <jms:reference-file line="39">prod/Share/record.html.twig</jms:reference-file>
-        <jms:reference-file line="35">prod/Share/record.html.twig</jms:reference-file>
+        <jms:reference-file line="47">prod/Share/record.html.twig</jms:reference-file>
-        <jms:reference-file line="48">prod/Share/record.html.twig</jms:reference-file>
+        <jms:reference-file line="60">prod/Share/record.html.twig</jms:reference-file>
       </trans-unit>
       <trans-unit id="6f25fd9ac189dce63bc51d1eccc253051ada2bf4" resname="print:: image de choix et description" approved="yes">
         <source>print:: image de choix et description</source>
@@ -11073,6 +11073,7 @@ Si vous recevez cet e-mail sans l'avoir sollicité, merci de l'ignorer ou de le
       <trans-unit id="6ad73c8fd370f62ccd3bf50cd9cc3563aed5273c" resname="prod::tools: document" approved="yes">
         <source>prod::tools: document</source>
         <target state="translated">Document</target>
+        <jms:reference-file line="41">Controller/Prod/ShareController.php</jms:reference-file>
         <jms:reference-file line="70">Controller/Prod/ToolsController.php</jms:reference-file>
       </trans-unit>
       <trans-unit id="61c9b2b17db77a27841bbeeabff923448b0f6388" resname="public" approved="yes">
@@ -12273,6 +12274,15 @@ Si vous recevez cet e-mail sans l'avoir sollicité, merci de l'ignorer ou de le
         <source>setup::custom-link:title-custom-link</source>
         <target state="new">setup::custom-link:title-custom-link</target>
         <jms:reference-file line="56">web/admin/setup.html.twig</jms:reference-file>
+      <trans-unit id="5107f9819cd4c0812c1d78cc07d24aff304c58fa" resname="share::share-record: advance">
+        <source>share::share-record: advance</source>
+        <target state="new">share::share-record: advance</target>
+        <jms:reference-file line="9">prod/Share/record.html.twig</jms:reference-file>
+      </trans-unit>
+      <trans-unit id="f51d8ca24dc67572beccf115c79671ba1c3f545a" resname="share::share-record: select-shared-def">
+        <source>share::share-record: select-shared-def</source>
+        <target state="new">share::share-record: select-shared-def</target>
+        <jms:reference-file line="11">prod/Share/record.html.twig</jms:reference-file>
       </trans-unit>
       <trans-unit id="8ab6a8a0cf069e3783c6f59163ad03a051310556" resname="sport" approved="yes">
         <source>sport</source>

resources/locales/messages.nl.xlf

@@ -2356,7 +2356,7 @@
       <trans-unit id="ac930a136ebd04a19bc5f2ce1769fc065efb7bdf" resname="Detailed view URL" approved="yes">
         <source>Detailed view URL</source>
         <target state="translated">Gedetailleerde weergave URL</target>
-        <jms:reference-file line="32">prod/Share/record.html.twig</jms:reference-file>
+        <jms:reference-file line="44">prod/Share/record.html.twig</jms:reference-file>
       </trans-unit>
       <trans-unit id="dc3decbb93847518f1a049dcf49d0d7c6560bcc6" resname="Details">
         <source>Details</source>
@@ -2681,7 +2681,7 @@
       <trans-unit id="7884b9b422d77cabded5da8a9a56524a84481930" resname="Embed code" approved="yes">
         <source>Embed code</source>
         <target state="translated">Sluit de code in</target>
-        <jms:reference-file line="41">prod/Share/record.html.twig</jms:reference-file>
+        <jms:reference-file line="53">prod/Share/record.html.twig</jms:reference-file>
       </trans-unit>
       <trans-unit id="e5afbbe7023486a123b45581f49820899571c415" resname="Empty a collection">
         <source>Empty a collection</source>
@@ -4351,7 +4351,7 @@
       <trans-unit id="8c123d8ad43d08cc48c3d6a7676e65f71eea59df" resname="No URL available" approved="yes">
         <source>No URL available</source>
         <target state="translated">Geen URL beschikbaar</target>
-        <jms:reference-file line="57">prod/Share/record.html.twig</jms:reference-file>
+        <jms:reference-file line="120">prod/Share/record.html.twig</jms:reference-file>
       </trans-unit>
       <trans-unit id="486829367591dc8209f3fc6960814c0bdd8930d1" resname="No account yet?" approved="yes">
         <source>No account yet?</source>
@@ -5567,7 +5567,7 @@
       <trans-unit id="8e78cff6cd2bb8595029060cb53dba7a4ba72b8a" resname="Resource URL" approved="yes">
         <source>Resource URL</source>
         <target state="translated">Bron URL</target>
-        <jms:reference-file line="22">prod/Share/record.html.twig</jms:reference-file>
+        <jms:reference-file line="34">prod/Share/record.html.twig</jms:reference-file>
       </trans-unit>
       <trans-unit id="2479ef7e025d9d4c6e5463dc366c2d6c79aaefbe" resname="Resquest access" approved="yes">
         <source>Resquest access</source>
@@ -5845,12 +5845,12 @@
       <trans-unit id="6ff7a49e36b0e5c8302603f98e4eb1c7dec4a56e" resname="Send to Facebook" approved="yes">
         <source>Send to Facebook</source>
         <target state="translated">Verstuur naar Facebook</target>
-        <jms:reference-file line="16">prod/Share/record.html.twig</jms:reference-file>
+        <jms:reference-file line="28">prod/Share/record.html.twig</jms:reference-file>
       </trans-unit>
       <trans-unit id="29f82ee42eeecce87dfe9223d5d7ff716dc68ead" resname="Send to Twitter" approved="yes">
         <source>Send to Twitter</source>
         <target state="translated">Verstuur naar Twitter</target>
-        <jms:reference-file line="10">prod/Share/record.html.twig</jms:reference-file>
+        <jms:reference-file line="22">prod/Share/record.html.twig</jms:reference-file>
       </trans-unit>
       <trans-unit id="35f49dcfbfb2e03fdce327671e82bf173b1ccb8b" resname="Sent" approved="yes">
         <source>Sent</source>
@@ -9431,9 +9431,9 @@
       <trans-unit id="a70a59b9120185471e5b45630f8ba24d5516f590" resname="copyClipboardLabel">
         <source>copyClipboardLabel</source>
         <target state="new">copyClipboardLabel</target>
-        <jms:reference-file line="28">prod/Share/record.html.twig</jms:reference-file>
+        <jms:reference-file line="40">prod/Share/record.html.twig</jms:reference-file>
-        <jms:reference-file line="36">prod/Share/record.html.twig</jms:reference-file>
+        <jms:reference-file line="48">prod/Share/record.html.twig</jms:reference-file>
-        <jms:reference-file line="49">prod/Share/record.html.twig</jms:reference-file>
+        <jms:reference-file line="61">prod/Share/record.html.twig</jms:reference-file>
       </trans-unit>
       <trans-unit id="fc97186645dc71dae8e3221c8ce53c56e6d611bf" resname="dans %category%" approved="yes">
         <source>dans %category%</source>
@@ -10758,9 +10758,9 @@
       <trans-unit id="7ac5447a13806c0a2e2602b51644729fe8464e0e" resname="previewLinkLabel">
         <source>previewLinkLabel</source>
         <target state="new">previewLinkLabel</target>
-        <jms:reference-file line="27">prod/Share/record.html.twig</jms:reference-file>
+        <jms:reference-file line="39">prod/Share/record.html.twig</jms:reference-file>
-        <jms:reference-file line="35">prod/Share/record.html.twig</jms:reference-file>
+        <jms:reference-file line="47">prod/Share/record.html.twig</jms:reference-file>
-        <jms:reference-file line="48">prod/Share/record.html.twig</jms:reference-file>
+        <jms:reference-file line="60">prod/Share/record.html.twig</jms:reference-file>
       </trans-unit>
       <trans-unit id="6f25fd9ac189dce63bc51d1eccc253051ada2bf4" resname="print:: image de choix et description" approved="yes">
         <source>print:: image de choix et description</source>
@@ -11073,6 +11073,7 @@
       <trans-unit id="6ad73c8fd370f62ccd3bf50cd9cc3563aed5273c" resname="prod::tools: document">
         <source>prod::tools: document</source>
         <target state="new">prod::tools: document</target>
+        <jms:reference-file line="41">Controller/Prod/ShareController.php</jms:reference-file>
         <jms:reference-file line="70">Controller/Prod/ToolsController.php</jms:reference-file>
       </trans-unit>
       <trans-unit id="61c9b2b17db77a27841bbeeabff923448b0f6388" resname="public" approved="yes">
@@ -12273,6 +12274,15 @@
         <source>setup::custom-link:title-custom-link</source>
         <target state="new">setup::custom-link:title-custom-link</target>
         <jms:reference-file line="56">web/admin/setup.html.twig</jms:reference-file>
+      <trans-unit id="5107f9819cd4c0812c1d78cc07d24aff304c58fa" resname="share::share-record: advance">
+        <source>share::share-record: advance</source>
+        <target state="new">share::share-record: advance</target>
+        <jms:reference-file line="9">prod/Share/record.html.twig</jms:reference-file>
+      </trans-unit>
+      <trans-unit id="f51d8ca24dc67572beccf115c79671ba1c3f545a" resname="share::share-record: select-shared-def">
+        <source>share::share-record: select-shared-def</source>
+        <target state="new">share::share-record: select-shared-def</target>
+        <jms:reference-file line="11">prod/Share/record.html.twig</jms:reference-file>
       </trans-unit>
       <trans-unit id="8ab6a8a0cf069e3783c6f59163ad03a051310556" resname="sport">
         <source>sport</source>

resources/www/admin/styles/main.scss

@@ -336,6 +336,93 @@ div.switch_right.unchecked {
   margin-top: 5px;
 }
 
+.alert .close {
+  text-decoration: none;
+}
+
+.subdefs [id^="box"] {
+  display: none;
+}
+
+.subdefs .subviews-submit {
+  position: fixed;
+  top: 75px;
+  right: 40px;
+  z-index: 1;
+}
+h2.subdefName {
+  display: inline-block;
+  margin-right: 1.5rem;
+}
+
+.reload, .loader, .status {
+  display: inline-block;
+}
+
+.langTab {
+  display: inline-block;
+  vertical-align: top;
+}
+
+.langTab h3{
+  font-weight: 700;
+  font-size: 13px;
+  margin: 4px 0;
+  line-height: 11px;
+  text-align: center;
+}
+
+.toggle{
+  display: block;
+  margin: 15px 0;
+  color: #08c;
+  cursor: pointer;
+}
+.subdefTab input, .langTab input{
+  margin: 0;
+}
+
+label[for="elasticsearch_settings_highlight"] {
+  display: inline-block;
+  margin-left: 0.5rem;
+  margin-bottom: 1rem;
+}
+input[id="elasticsearch_settings_highlight"] {
+  float: left;
+}
+
+#downbutton {
+  margin: 1rem 0;
+}
+#upbutton {
+  width: 100%;
+  text-align: left;
+}
+
+#upbutton i {
+  position: relative;
+  left: -5px;
+}
+
+#downbutton i {
+  position: relative;
+  left: -5px;
+}
+
+.form-horizontal .controls + div {
+  margin-left: 180px;
+  font-style: italic;
+}
+
+.ui-dialog .ui-dialog-content {
+  position: relative;
+  border: 0;
+  padding: .5em 1em;
+  background: none;
+  margin-bottom: 7rem;
+  overflow: visible;
+}
+
 /******* SETUP *******************************************************************/
 #custom-link-table {
   width: 100%;
@@ -433,6 +520,12 @@ span.simplecolorpicker.picker {
   background-position: center center;
 }
 
+@media screen and (max-width: 1150px) {
+  .langTab{
+    display: block;
+  }
+}
+
 @import './databases';
 @import './fields';
 @import './tables';

resources/www/common/js/components/common.js

@@ -31,11 +31,11 @@ var commonModule = (function ($, p4) {
             $(this).removeClass('context-menu-item-hover');
         });
 
-        $('#help-trigger').contextMenu('#mainMenu .helpcontextmenu', {openEvt: 'click', dropDown: true, theme: 'vista', dropDown: true,
+        // $('#help-trigger').contextMenu('#mainMenu .helpcontextmenu', {openEvt: 'click', dropDown: true, theme: 'vista', dropDown: true,
-            showTransition: 'slideDown',
+        //     showTransition: 'slideDown',
-            hideTransition: 'hide',
+        //     hideTransition: 'hide',
-            shadow: false
+        //     shadow: false
-        });
+        // });
     });
 
     function showOverlay(n, appendto, callback, zIndex) {

templates/web/account/base.html.twig

@@ -3,6 +3,10 @@
 
 {% extends "common/index_bootstrap.html.twig" %}
 
+{% block icon %}
+    <link rel="shortcut icon" type="image/x-icon" href="/assets/account/images/favicon.ico">
+{% endblock %}
+
 {% block stylesheet %}
     <link type="text/css" rel="stylesheet" href="/assets/account/css/account{% if not app.debug %}.min{% endif %}.css">
     <style type="text/css">

templates/web/admin/subdefs.html.twig

@@ -24,19 +24,176 @@
                     $('.path_testable:visible, .url_testable:visible').trigger('keyup');
                 }
             });
+
+            $(".toggle").on("click", function() {
+                var box = $(this).data("toggle");
+                $(box).toggle("500");
             });
 
-    function select_mediatype(name, selector)
+            $("input, select").one("change", activeSubmit);
-    {
+        });
-      $('.'+name).hide();
+
-      $('#box'+name+$(selector).val()).show();
+        function activeSubmit() {
+            $(".subviews-submit").removeAttr("disabled");
+            $("input, select").off("change", activeSubmit);
         }
+
+        function fillCheckbox(section, name, defType, fieldname, values) {
+
+            $("[name='"+section+"_"+name+"_"+defType+"["+fieldname+"][]']").each(function(){
+                $(this).removeAttr("checked");
+
+                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 );
+        }
+
+        function fillSelect(section, name, defType, fieldname, 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);
+        }
+
+
+        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");
+
+            if(typeof optionValue === 'undefined'){
+
+                return;
+            }
+
+            for (var input in config[defType].form) {
+                if(config[defType].form[input] == "slide"){
+                    fillSlide(section, name, defType, input, config[defType].definitions[preset][input]);
+                }
+                if(config[defType].form[input] == "radio"){
+                    fillRadio(section, name, defType, input, config[defType].definitions[preset][input]);
+                }
+                if(config[defType].form[input] == "select"){
+                    fillSelect(section, name, defType, input, config[defType].definitions[preset][input]);
+                }
+                if(config[defType].form[input] == "checkbox"){
+                    fillCheckbox(section, name, defType, input, config[defType].definitions[preset][input]);
+                }
+                i++;
+            }
+        }
+
+        function select_mediatype(type, name, selector)
+        {
+            var config = JSON.parse('{{ config |json_encode|raw }}'),
+                    inputPresets = '[name="'+type+'_'+name+'_presets"]',
+                    defType = $(selector).val();
+
+
+            $('.'+type+name).hide();
+
+            $('[data-toggle^="#box'+type+name+'"]').hide();
+            $('[data-toggle="#box'+type+name+defType+'"]').show();
+
+            $('#box'+type+name+$(selector).val()).show();
+
+            if(defType == 'flexpaper'){
+                $(inputPresets).closest("tr").hide();
+                return;
+            }else{
+                $(inputPresets).closest("tr").show();
+            }
+
+            $(inputPresets)
+                    .find('option')
+                    .remove()
+                    .end()
+                    .append($("<option value='custom'></option>").text('{{ 'Custom' | trans }}'));
+
+            if(typeof config[defType] === 'undefined'){
+
+                return;
+            }
+
+            for (var key in config[defType].definitions) {
+                if (config[defType].definitions[key] == null){
+                    $(inputPresets).append($("<option></option>")
+                            .attr("disabled", "disabled")
+                            .text(key)
+                    );
+                }else{
+                    $(inputPresets).append($("<option></option>")
+                            .attr("value", key)
+                            .text(key)
+                    );
+                }
+            }
+        }
+
+        function subview_type(selector) {
+            var mapping = JSON.parse('{{ subviews_mapping |json_encode|raw }}'),
+                    subviewType = $(selector).val();
+
+            $("#mediaType")
+                    .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])
+                );
+            }
+        }
+
+        function media_type(selector){
+            var config = JSON.parse('{{ config |json_encode|raw }}'),
+                    defType = $(selector).val();
+
+            $("#presets")
+                    .find('option')
+                    .remove()
+                    .end()
+                    .append($("<option></option>").text('{{ 'Choisir' | trans }}'));
+
+            if(typeof config[defType] === 'undefined'){
+
+                return;
+            }
+
+            for (var key in config[defType].definitions) {
+                if (config[defType].definitions[key] == null){
+                    $("#presets").append($("<option></option>")
+                            .attr("disabled", "disabled")
+                            .text(key)
+                    );
+                }else{
+                    $("#presets").append($('<option></option>')
+                            .attr("value", key)
+                            .text(key)
+                    );
+                }
+            }
+        }
+
         $(function() {
             // a workaround for a flaw in the demo system (http://dev.jqueryui.com/ticket/4375), ignore!
             $( "#dialog:ui-dialog" ).dialog( "destroy" );
 
-      var name = $( "#name" ), accessclass = $( "#accessclass" ),
+            var name = $( "#name" ), accessclass = $( "#accessclass" ), subviewType =$( "#subviewType" ) , mediaType = $( "#mediaType" ), presets = $( "#presets" ),
-      allFields = $( [] ).add( name ).add(accessclass),
+                    allFields = $( [] ).add( name ).add(accessclass).add(subviewType).add(mediaType).add(presets),
                     tips = $( ".validateTips" );
 
             function updateTips( t ) {
@@ -60,14 +217,9 @@
                 }
             }
 
-      function get_current_group()
+            function checkPresence( mediaType, o ) {
-      {
-        return $('.ui-tabs-nav .ui-state-active a').html();
-      }
 
-      function checkPresence( o ) {
+                var el = $('input[name="subdefs[]"][value="'+mediaType+'_'+o.val()+'"]');
-
-        var el = $('input[name="subdefs[]"][value="'+get_current_group()+'_'+o.val()+'"]');
                 if ( el.length !== 0 ) {
                     o.addClass( "ui-state-error" );
                     updateTips( "SubdefName should be unique per group" );
@@ -96,8 +248,8 @@
 
             $( "#dialog-form" ).dialog({
                 autoOpen: false,
-        height: 250,
+                height: 420,
-        width: 350,
+                width: 300,
                 modal: true,
                 buttons: {
                     "Create a Subdef": function() {
@@ -107,14 +259,14 @@
 
                         bValid = bValid && checkLength( name, "subdef name", 3, 16 );
                         bValid = bValid && checkSpecialChar( name );
-            bValid = bValid && checkPresence( name );
+                        bValid = bValid && checkPresence( subviewType.val(), name );
-
-
 
                         if ( bValid ) {
-              $('input[name="add_subdef[group]"]').val(get_current_group());
+                            $('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" );
                             $('form.subdefs').submit();
                         }
@@ -168,17 +320,17 @@
 {% endblock %}
 
 {% block content %}
-<p>
+    <p>
         <button id="create-subdef" class="btn btn-success">{{ 'Create new subdef' | trans }}</button>
-</p>
+    </p>
-<div id="dialog-delete-subdef" title="{{ 'Delete the subdef ?' | trans }}" style="display:none;">
+    <div id="dialog-delete-subdef" title="{{ 'Delete the subdef ?' | trans }}" style="display:none;">
         <p>
             <span class="ui-icon ui-icon-alert" style="float:left; margin:0 7px 20px 0;"></span>
             {{ 'These subdef will be permanently deleted and cannot be recovered. Are you sure?' | trans }}
         </p>
-</div>
+    </div>
 
-<div id="dialog-form" title="Create new subdef">
+    <div id="dialog-form" title="Create new subdef">
         <p class="validateTips"></p>
         <form>
             <fieldset>
@@ -190,62 +342,48 @@
                     <option value="preview" selected="selected">{{ 'preview' | trans }}</option>
                     <option value="thumbnail">{{ 'tout le monde' | trans }}</option>
                 </select>
+                <label for="subviewType">{{ 'subviewType' | trans }}</label>
+                <select name="subviewType" id="subviewType" onchange="subview_type(this)">
+                    <option>{{ 'Choisir' | trans }}</option>
+                    <option value="image">{{ 'image' | trans }}</option>
+                    <option value="video">{{ 'video' | trans }}</option>
+                    <option value="audio">{{ 'audio' | trans }}</option>
+                    <option value="document">{{ 'document' | trans }}</option>
+                    <option value="flash">{{ 'flash' | trans }}</option>
+                </select>
+                <label for="mediaType">{{ 'mediatype' | trans }}</label>
+                <select name="mediaType" id="mediaType" onchange="media_type(this)">
+                    <option>{{ 'Choisir' | trans }}</option>
+                </select>
+                <label for="presets">{{ 'Presets' | trans }}</label>
+                <select name="presets" id="presets">
+                    <option>{{ 'Choisir' | trans }}</option>
+                </select>
             </fieldset>
         </form>
-</div>
+    </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>
                 {% endfor %}
             </ul>
-
+            <button type="submit" disabled="disabled" class="btn btn-primary subviews-submit">{{ 'boutton::valider' | trans }}</button>
             {% for subdefgroup, subdeflist in subdefs %}
                 <div id="{{subdefgroup}}">
-            <div>
-                <table cellspacing="0" cellpading="0" border="0" style="width:500px;">
-                    <tbody>
-                    <tr>
-                        <td style="width:120px;">
-                            <h2>{{ 'subdef.document' | trans }}</h2>
-                        </td>
-                        <td style="width:250px;"></td>
-                        <td></td>
-                    </tr>
-                    <tr>
-                        <td>{{ 'subdef.orderable' | trans }}</td>
-                        <td><input type="checkbox" name="subdefsgroups[{{ subdefgroup }}][document_orderable]" {% if subdeflist.isDocumentOrderable() %}checked="checked" {% endif %}value="1"/></td>
-                        <td></td>
-                    </tr>
-                    </tbody>
-                </table>
-            </div>
                     {% for subdefname , subdef in subdeflist %}
                         <div>
                             <input type="hidden" name="subdefs[]" value="{{subdefgroup}}_{{subdefname}}"/>
-                <table cellspacing="0" cellpading="0" border="0" style="width:500px;">
+                            <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:120px;">
+                                    <td style="width:100px;line-height: 0.9rem;">{{ 'Telechargeable' | trans }}</td>
-                                <h2>{{subdefname}}</h2><button class="subdef_deleter btn btn-danger btn-mini">{{ 'boutton::supprimer' | trans }}</button>
+                                    <td style="width:300px;"><input type="checkbox" name="{{subdefgroup}}_{{subdefname}}_downloadable" {% if subdef.isDownloadable() %}checked="checked"{% endif %} value="1" /></td>
-                                <input type="hidden" name="subdef" value="{{subdefgroup}}_{{subdefname}}"/>
-                            </td>
-                            <td style="width:250px;"></td>
-                            <td></td>
-                        </tr>
-
-                        {% for code, language in app['locales.available'] %}
-                            <tr>
-                                <td>{{ language }}</td>
-                                <td><input type="text" name="{{subdefgroup}}_{{subdefname}}_label[{{ code }}]" value="{{ subdef.get_label(code, false) }}" /></td>
-                                <td></td>
-                            </tr>
-                        {% endfor %}
-                        <tr>
-                            <td>{{ 'Telechargeable' | trans }}</td>
-                            <td><input type="checkbox" name="{{subdefgroup}}_{{subdefname}}_downloadable" {% if subdef.isDownloadable() %}checked="checked"{% endif %} value="1" /></td>
                                     <td></td>
                                 </tr>
                                 <tr>
@@ -267,6 +405,39 @@
                                     </td>
                                     <td></td>
                                 </tr>
+                                <tr>
+                                    <td>
+                                        {{ 'mediatype' | trans }}
+                                    </td>
+                                    <td>
+                                        <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>
+                                            {% endfor %}
+                                        </select>
+                                    </td>
+                                    <td></td>
+                                </tr>
+                                <tr>
+                                    <td>
+                                        {{ 'Presets' | trans }}
+                                    </td>
+                                    <td>
+                                        <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>
+                                                {% endif %}
+                                            {% endfor %}
+                                        </select>
+                                    </td>
+                                    <td></td>
+                                </tr>
                                 <tr>
                                     <td>
                                         Path
@@ -285,23 +456,23 @@
                                     </td>
                                     <td></td>
                                 </tr>
-                        <tr>
-                            <td>
-                                {{ 'mediatype' | trans }}
-                            </td>
-                            <td>
-                                <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>
-                                    {% endfor %}
-                                </select>
-                            </td>
-                            <td></td>
-                        </tr>
                                 </tbody>
                             </table>
+                            <table cellspacing="0" class="langTab" cellpading="0" border="0">
+                                <tr>
+                                    <td colspan="2"><h3>Labels</h3></td>
+                                </tr>
+                                {% 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>
+                                    </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 %}>
+                    {{ 'Advanced settings' | trans }}
+                </span>
                                 <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() %}
@@ -324,6 +495,9 @@
                                                                         {% 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 #}
@@ -366,6 +540,12 @@
                                 </div>
                             {% endfor %}
                         </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");
+                            });
+                        </script>
                     {% endfor %}
                 </div>
             {% endfor %}
@@ -373,14 +553,13 @@
         <input type="hidden" name="delete_subdef" id="delete_subdef" value=""/>
         <input type="hidden" name="add_subdef[group]" value=""/>
         <input type="hidden" name="add_subdef[name]" value=""/>
+        <input type="hidden" name="add_subdef[mediaType]" value=""/>
         <input type="hidden" name="add_subdef[class]" value=""/>
-    <div class="form-actions">
+        <input type="hidden" name="add_subdef[presets]" value=""/>
-        <button type="submit" class="btn btn-primary">{{ 'boutton::valider' | trans }}</button>
+    </form>
-    </div>
-</form>
 
-<div style="display:none;">
+    <div style="display:none;">
         <div id="image_template">
         </div>
-</div>
+    </div>
 {% endblock %}

templates/web/admin/task-manager/index.html.twig

@@ -68,11 +68,10 @@
                 <tr>
                     <td class="menu">
                         <div class="btn-group dropdown">
-                            <a class="btn btn-mini dropdown-toggle disabled" data-toggle="dropdown" href="#">
+                            <a class="btn btn-mini dropdown-toggle" data-toggle="dropdown" href="#">
                                 <span class="caret"></span>
                             </a>
                             <ul class="dropdown-menu">
-                                {% if app['phraseanet.configuration']['main']['task-manager']['enabled'] %}
                                 <li>
                                     <a href="{{ path('admin_tasks_task_show', {"task" : task["id"] }) }}">
                                         {{ 'Edit' | trans }}
@@ -93,7 +92,6 @@
                                         {{ 'Delete' | trans }}
                                     </a>
                                 </li>
-                                {% endif %}
                                 <li>
                                     <a href="{{ path('admin_tasks_task_log', {"task" : task["id"] }) }}">
                                         {{ 'Logs' | trans }}

templates/web/common/menubar.html.twig

@@ -138,7 +138,7 @@
           <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;" 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">

templates/web/prod/Baskets/Reorder.html.twig

@@ -7,6 +7,8 @@
             <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>
         </select>
         <button type="button" class="autoorder btn btn-inverse">{{ 'Re-ordonner' | trans }}</button>
         <button type="button" class="reverseorder btn btn-inverse">{{ 'Inverser' | trans }}</button>
@@ -22,13 +24,15 @@
     {% for element in basket.getElements() %}
         <div id="ORDER_{{ element.getId() }}" class="CHIM diapo" style="height:130px;overflow:hidden;">
             <div class="title" title="{{ element.getRecord(app).get_title() }}" style="position:relative;z-index:1200;height:30px;overflow:hidden;text-align:center;text-overflow: ellipsis; line-height: 15px;">
-                {{ element.getRecord(app).get_title() }} {{ element.getRecord(app).get_title() }}{{ element.getRecord(app).get_title() }}
+                {{ element.getRecord(app).get_title() }}
             </div>
             {{ thumbnail.format(element.getRecord(app).get_thumbnail(), 80, 80, '', false, false) }}
             <form style="display:none;">
                 <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') }}"/>
             </form>
         </div>
     {% endfor %}

templates/web/prod/Share/record.html.twig

@@ -1,17 +1,29 @@
 {% if not isAvailable %}
     <p>{{ 'No permalink available.' | trans }}</p>
 {% else %}
-    {%  if preview.permalinkUrl is not empty %}
+    {%  if subdefList is not empty %}
+        {% set defKey = defaultKey %}
         <div id="share">
         <div id="tweet" class="well-large">
             <p>
-                    <a href="http://www.twitter.com/home/?status={{ preview.permaviewUrl }}" target="_blank">
+                <a href="#" id="advance-share">{{ 'share::share-record: advance' | trans }}</a>
+                <span id="shared-def">
+                        {{ 'share::share-record: select-shared-def' | trans }}
+                    <select name="resource_type" id="resource_type_sel" class="input-small">
+                            {% for key,value in subdefList %}
+                                <option value={{ key }} {% if key == defKey %}selected{% endif %}>{{ value.label }}</option>
+                            {% endfor %}
+                        </select>
+                    </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;"/>
                     {% trans %}Send to Twitter{% endtrans %}
                 </a>
             </p>
             <p>
-                    <a href="http://www.facebook.com/sharer.php?u={{ preview.permaviewUrl }}" target="_blank">
+                <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>
@@ -19,20 +31,20 @@
 
             <form action="#">
                 <div class="form-group clearfix">
-                        <label>{% trans %}Resource URL{% endtrans %}</label>
+                    <label style="display:inline-block;">{% trans %}Resource URL{% endtrans %}</label>
-                        <input class="input-block-level" readonly="readonly" type="text" value="{{ preview.permalinkUrl }}"
+                    <input class="input-block-level" readonly="readonly" type="text" value="{{ subdefList[defKey].permalinkUrl }}"
                            id="permalinkUrl"/>
 
                     <p class="pull-right">
-                            <a href="{{ preview.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="{{ preview.permaviewUrl }}" id="permaviewUrl"/>
+                    <input class="input-block-level" readonly="readonly" type="text" value="{{ subdefList[defKey].permaviewUrl }}" id="permaviewUrl"/>
                     <p class="pull-right">
-                            <a href="{{ preview.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>
@@ -41,18 +53,69 @@
                     <label>{% trans %}Embed code{% endtrans %}</label>
                     {% spaceless %}
                         <textarea class="input-block-level" rows="4" readonly="true" id="embedRecordUrl">
-                                <iframe width="{{ preview.width }}" height="{{ preview.height }}" src="{{ preview.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 href="{{ preview.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>
                 {#{% endif %}#}
             </form>
-            </p>
         </div>
+
+        <script language="javascript">
+            // var subdefListObj = JSON.parse(subdefList); // to convert json into a javascript object
+            $(document).ready(function(){
+                var subdefList = JSON.parse('{{ subdefList | json_encode | escape('js') }}');
+                $('#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');}
+                );
+                $('#permalinkUrlCopy').on('click', function(event) {
+                    event.preventDefault();
+                    return copyElContentClipboard('permalinkUrl');
+                });
+                $('#permaviewUrlCopy').on('click', function(event) {
+                    event.preventDefault();
+                    return copyElContentClipboard('permaviewUrl');
+                });
+                $('#embedCopy').on('click', function(event) {
+                    event.preventDefault();
+                    return copyElContentClipboard('embedRecordUrl');
+                });
+                $('#advance-share').on('click', function() {
+                    $('#shared-def').show();
+                });
+                var copyElContentClipboard = function(elId) {
+                    var copyEl = document.getElementById(elId);
+                    copyEl.select();
+                    try {
+                        var successful = document.execCommand('copy');
+                        var msg = successful ? 'successful' : 'unsuccessful';
+                        console.log('Copying text command was ' + msg);
+                    } catch (err) {
+                        console.log('unable to copy');
+                    }
+                }
+                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);
+                    $('#permalinkUrl-link').attr('href', subdefList[resourceType].permalinkUrl);
+                    $('#permaviewUrl').val(subdefList[resourceType].permaviewUrl);
+                    $('#permaviewUrl-link').attr('href', subdefList[resourceType].permaviewUrl);
+                    var html = '<iframe width="' + subdefList[resourceType].width
+                        + '" height="' + subdefList[resourceType].height + '" src="' + subdefList[resourceType].embedUrl + '" frameborder="0" allowfullscreen></iframe>';
+                    $('#embedRecordUrl').val(html);
+                    $('#embedRecordUrl-link').attr('href', subdefList[resourceType].embedUrl);
+                }
+            });
+        </script>
     {% else %}
         <div>{{ 'No URL available' | trans }}</div>
     {% endif %}

templates/web/prod/Story/Reorder.html.twig

@@ -1,34 +1,38 @@
 {% import 'common/thumbnail.html.twig' as thumbnail %}
-<div id="reorder_options" class="PNB" style="height:30px;bottom:auto;">
+<div id="reorder_options" class="row-fluid" style="height:30px;bottom:auto;">
-    <form id="reorder_options" class="form-inline" style="display:inline-block;">
+    <form id="reorder_options" class="form-inline span10">
         <span>{{ 'Reordonner automatiquement' | trans }}</span>
         <select id="auto_order">
           <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>
         </select>
-        <button type="button" class="autoorder">{{ 'Re-ordonner' | trans }}</button>
+        <button type="button" class="autoorder btn btn-inverse">{{ 'Re-ordonner' | trans }}</button>
-        <button type="button" class="reverseorder">{{ 'Inverser' | trans }}</button>
+        <button type="button" class="reverseorder btn btn-inverse">{{ 'Inverser' | trans }}</button>
     </form>
-    <form  style="display:inline-block;" class="form-inline" 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 %}
-        <button>{{ 'boutton::valider' | trans }}</button>
+        <input type="submit" class="btn btn-inverse" value="{{ 'boutton::valider' | trans }}" />
     </form>
 </div>
-<div style="top:45px;overflow:auto;" id="reorder_box" class="PNB">
+<div style="top:45px;overflow:auto;" id="reorder_box" class="row-fluid">
     <div class="elements">
         {% for element in story.get_children() %}
             <div id="ORDER_{{ element.get_record_id() }}" class="CHIM diapo" style="height:130px;overflow:hidden;">
                 <div class="title" title="{{ element.get_title() }}" style="position:relative;z-index:1200;height:30px;overflow:hidden;text-align:center;text-overflow: ellipsis; line-height: 15px;">
-                    {{ element.get_title() }} {{ element.get_title() }} {{ element.get_title() }}
+                    {{ element.get_title() }}
                 </div>
                 {{ thumbnail.format(element.get_thumbnail(), 80, 80, '', false, false) }}
                 <form style="display:none;">
                     <input type="hidden" name="id" value="{{ element.get_record_id() }}"/>
                     <input type="hidden" name="title" value="{{ element.get_title() }}"/>
                     <input type="hidden" name="default" value="{{ element.getNumber() }}"/>
+                    <input type="hidden" name="date_created" value="{{ element.getCreated() | date('Y-m-dTH:i:s') }}"/>
+                    <input type="hidden" name="date_updated" value="{{ element.getUpdated() | date('Y-m-dTH:i:s') }}"/>
                 </form>
             </div>
         {% endfor %}

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") }}">
+      {#<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"/>
+        {#<img src="/assets/common/images/icons/door.png"/>#}
-      </button>
+      {#</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>

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">
+      {#<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"/>
+        {#<img src="/assets/common/images/icons/door.png"/>#}
-      </button>
+      {#</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>

templates/web/prod/index.html.twig

@@ -200,39 +200,53 @@
                     <li class="context-menu-item">
                         <div class="context-menu-item-inner">
                             <a title="{{ 'action:: nouveau panier' | trans }}" class="basket-create-action" href="#">
-                                <img style="cursor:pointer;" src="/assets/common/images/icons/mtadd_0.gif" title="{{ 'action:: nouveau panier' | trans }}" />
+                                <img style="cursor:pointer;" src="/assets/common/images/icons/new_basket.png"
-                                {{ 'action:: nouveau panier' | trans }}
+                                     title="{{ 'action:: nouveau panier' | trans }}"/>
+                                <span>{{ 'action:: nouveau panier' | trans }}</span>
                             </a>
                         </div>
                         <div class="context-menu-item-inner">
                             <a title="{{ 'Browse Baskets' | trans }}" class="basket-browse-action" href="#">
-                                {{ 'Browse Baskets' | trans }}
+                                <img style="cursor:pointer;" src="/assets/common/images/icons/browse_basket.png"
+                                     title="{{ 'Browse Baskets' | trans }}"/>
+                                <span>{{ 'Browse Baskets' | trans }}</span>
                             </a>
                         </div>
                         {% if app['conf'].get(['registry', 'modules', 'stories']) and app.getAclForUser(app.getAuthenticatedUser()).has_right(constant('\\ACL::CANADDRECORD')) %}
-                            <div class="context-menu-item-inner">
+                            <div class="context-menu-item-inner" style="line-height: 34px;">
+                                <div class="divider"></div>
                                 <a title="{{ 'action:: nouveau reportage' | trans }}" class="story-create-action" href="#">
-                                    <img style="cursor:pointer;" src="/assets/common/images/icons/mtadd_0.gif" title="{{ 'action:: nouveau reportage' | trans }}" />
+                                    <img style="cursor:pointer;" src="/assets/common/images/icons/new_report.png"
-                                    {{ 'action:: nouveau reportage' | trans }}
+                                         title="{{ 'action:: nouveau reportage' | trans }}"/>
+                                    <span>{{ 'action:: nouveau reportage' | trans }}</span>
                                 </a>
+                                <div class="divider"></div>
                             </div>
                        {% endif %}
                     </li>
                     <li class="context-menu-item">
                         <div class="context-menu-item-inner basket-filter-action" data-sort="date">
-                            <img style="cursor:pointer;" src="/assets/common/images/icons/cal.png" title="{{ 'phraseanet:: tri par date' | trans }}" />
+                            <a title="{{ 'phraseanet:: tri par date' | trans }} " href="#">
-                            {{ 'phraseanet:: tri par date' | trans }}
+                                <img style="cursor:pointer;" src="/assets/common/images/icons/sort_date.png"
+                                     title="{{ 'phraseanet:: tri par date' | trans }}"/>
+                                <span>{{ 'phraseanet:: tri par date' | trans }}</span>
+                            </a>
                         </div>
                     </li>
                     <li class="context-menu-item">
                         <div class="context-menu-item-inner basket-filter-action" data-sort="name">
-                            <img style="cursor:pointer;" src="/assets/common/images/icons/alpha.png" title="{{ 'phraseanet:: tri par nom' | trans }}" />
+                            <a title="{{ 'phraseanet:: tri par nom' | trans }} " href="#">
-                            {{ 'phraseanet:: tri par nom' | trans }}
+                                <img style="cursor:pointer;" src="/assets/common/images/icons/sort_alpha.png"
+                                     title="{{ 'phraseanet:: tri par nom' | trans }}"/>
+                                <span>{{ 'phraseanet:: tri par nom' | trans }}</span>
+                            </a>
                         </div>
                     </li>
                     <li class="context-menu-item">
                         <div class="context-menu-item-inner basket-preferences-action">
-                            {{ 'Preferences' | trans }}
+                            <a title="{{ 'Preferences' | trans }} " href="#">
+                                <span>{{ 'Preferences' | trans }}</span>
+                            </a>
                         </div>
                     </li>
                 </ul>
@@ -288,6 +302,11 @@
                             <table style="width:100%; table-layout:fixed;">
                                 <tr>
                                     <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 %}>
+                                            {{ 'index:advanced-preferences:: use truncation' | trans }}
+                                        </label>
                                         <div id="ADVSRCH_SBAS_ZONE" class="sbasglob">
                                             <div class="btn-toolbar">
                                                 <input class="btn btn-inverse toggle-database" type="button"
@@ -664,6 +683,19 @@
                         </form>
                     </div>
                 </div>
+                <div class="box">
+                    <h1>{{ 'Collection order' | trans }}</h1>
+                    <form class="form-inline">
+                        {% 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>
+                            </select>
+                        </label>
+                    </form>
+                </div>
                 <div class="box">
                     <h1>{{ 'index::advance_search: facet' | trans }}</h1>
                     {% set facetFilter = app['settings'].getUserSetting(app.getAuthenticatedUser(), 'facet') %}

templates/web/prod/toolbar.html.twig

@@ -139,13 +139,13 @@
                             {{ 'Feedback' | trans }}
                         </a>
                     </li>
-                    <li class="divider"></li>
+                    {#<li class="divider"></li>#}
-                    <li>
+                    {#<li>#}
-                        <a class="TOOL_bridge_btn results_window" href="{{ path("prod_bridge_manager") }}"  data-selection-source="search-result">
+                        {#<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"/>
+                            {#<img src="/assets/common/images/icons/door.png" height="16" width="16" class="btn-image"/>#}
-                            {{ 'action : bridge' | trans }}
+                            {#{{ 'action : bridge' | trans }}#}
-                        </a>
+                        {#</a>#}
-                    </li>
+                    {#</li>#}
                     <li class="divider"></li>
                     <li>
                         <a class="TOOL_publish_btn results_window"  data-selection-source="search-result">
@@ -211,24 +211,24 @@
     {% elseif acl.has_right(constant('\\ACL::BAS_CHUPUB')) %}
         <span class="dropdownButton">
             <div class="btn-group">
-                <button class="TOOL_pushdoc_btn default_action results_window btn btn-inverse"  data-selection-source="search-result">
+                {#<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"/>
+                    {{ 'action : publier' | trans }}
                 </button>
                 <button class="trigger btn btn-inverse dropdown-toggle" data-toggle="dropdown"><span
                             class="caret"></span></button>
-                <ul class="submenu dropdown-menu">
-                    <li>
-                        <a class="TOOL_publish_btn results_window"  data-selection-source="search-result">
-                            <img src="/assets/common/images/icons/rss16.png" height="16" width="16" class="btn-image"/>
-                            {{ 'action : publier' | trans }}
-                        </a>
-                    </li>
                 {% if plugins.actionbar is not empty %}
+                    <button class="trigger btn btn-inverse dropdown-toggle" data-toggle="dropdown"><span
+                                class="caret"></span></button>
+                    <ul class="submenu dropdown-menu">
                             {% for plugin in plugins.actionbar %}
                                 <li class="divider"></li>
                                 {% for key, action in plugin.getActionBar().push|default([]) %}
                                 <li>
-                                    <a class="results_window {{ action.classes|default('') }}"  data-selection-source="search-result">
+                                        <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"/>
                                             {% endif %}
@@ -239,8 +239,8 @@
                                     </li>
                             {% endfor %}
                             {% endfor %}
-                    {% endif %}
                     </ul>
+                {% endif %}
             </div>
         </span>
     {% elseif plugins.actionbar is not empty %}

templates/web/prod/upload/upload-flash.html.twig

@@ -33,20 +33,20 @@
                                     ({% trans with {'%maxFileSizeReadable%' : maxFileSizeReadable} %}maximum : %maxFileSizeReadable%{% endtrans %})
                                 </span>
                             </td>
-                            <td class='uploader-icon'>
+                            {#<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>#}
-                            <td class='uploader-info'>
+                            {#<td class='uploader-info'>#}
-                                <p>
+                                {#<p>#}
-                                    {{ 'You are using the Flash uploader.' | trans }}
+                                    {#{{ 'You are using the Flash uploader.' | trans }}#}
-                                    {% if not app['browser'].supportFileAPI() %}
+                                    {#{% if not app['browser'].supportFileAPI() %}#}
-                                        {{ 'This version does not allow you to access all the features offered by the HTML5 uploader' | trans }}
+                                        {#{{ 'This version does not allow you to access all the features offered by the HTML5 uploader' | trans }}#}
-                                    {% endif %}
+                                    {#{% endif %}#}
-                                </p>
+                                {#</p>#}
-                                {% if app['browser'].supportFileAPI() %}
+                                {#{% if app['browser'].supportFileAPI() %}#}
-                                <a id="UPLOAD_HTML5_LINK" href="{{ path('upload_html5_form') }}" class="dialog full-dialog">{{ 'Use the HTML5 uploader' | trans }}</a>
+                            <a style="display: none" id="UPLOAD_HTML5_LINK" href="{{ path('upload_html5_form') }}" class="dialog full-dialog">{{ 'Use the HTML5 uploader' | trans }}</a>
-                                {% endif %}
+                                {#{% endif %}#}
-                            </td>
+                            {#</td>#}
                         </tr>
                      </table>
                     {# settings box #}
@@ -54,11 +54,12 @@
                         <h5>{{ 'upload:: Destination (collection) :' | trans }} :</h5>
                         {# collections list #}
                         {% if collections|length > 0 %}
-                            <select name="base_id" class="span3" style="margin-left: 10px;">
+                            {% 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">
                                 {% for collection in availableCollections['databox_collections'] %}
-                                    <option 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 %}
@@ -66,7 +67,7 @@
                             {# collections status #}
                             {% for availableCollections in collections %}
                                 {% for collection in availableCollections['databox_collections'] %}
-                                    <div id="status-{{ collection.get_base_id() }}" class='collection-status' style='{{ loop.parent.loop.first and loop.first ? "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>
@@ -121,6 +122,12 @@
                 </div>
 
             </form>
+            <div>
+                <select name="upload_type" id="upload_type" class="input-large" style="width: 200px; float:right">
+                    <option value="html">{{ 'Use the HTML5 uploader' | trans }}</option>
+                    <option value="flash" selected>{{ 'Use the Flash uploader' | trans }}</option>
+                </select>
+            </div>
          </div>
     </div>
 </div>

templates/web/prod/upload/upload.html.twig

@@ -36,18 +36,18 @@
                                         ({% trans with {'%maxFileSizeReadable%' : maxFileSizeReadable} %}maximum : %maxFileSizeReadable%{% endtrans %})
                                     </span>
                                 </td>
-                                <td class='uploader-icon'>
+                                {#<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>#}
-                                <td class="uploader-infmaxFileSizeo">
+                                {#<td class="uploader-infmaxFileSizeo">#}
-                                    <p>
+                                    {#<p>#}
-                                        {{ 'You are using the HTML5 uploader.' | trans }}
+                                        {#{{ 'You are using the HTML5 uploader.' | trans }}#}
-                                        {% if not app['browser'].supportFileAPI() %}
+                                        {#{% if not app['browser'].supportFileAPI() %}#}
-                                            {{ 'Your browser does not support all HTML5 features properly.' | trans }}
+                                            {#{{ 'Your browser does not support all HTML5 features properly.' | trans }}#}
-                                        {% endif %}
+                                        {#{% endif %}#}
-                                    </p>
+                                    {#</p>#}
-                                    <a id="UPLOAD_FLASH_LINK" href="{{ path('upload_flash_form') }}" class="dialog full-dialog">{{ 'Use the Flash uploader' | trans }}</a>
+                                <a style="display: none" id="UPLOAD_FLASH_LINK" href="{{ path('upload_flash_form') }}" class="dialog full-dialog">{{ 'Use the Flash uploader' | trans }}</a>
-                                </td>
+                                {#</td>#}
                             </tr>
                         </table>
 
@@ -55,11 +55,12 @@
                         <div class='settings-box'>
                             <h5>{{ 'upload:: Destination (collection) :' | trans }} :</h5>
                             {# collections list #}
-                            <select name="base_id" class="span3" style="margin-left: 10px;">
+                            {% 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">
                                         {% for collection in availableCollections['databox_collections'] %}
-                                    <option 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 +68,7 @@
                             {# collections status #}
                             {% for availableCollections in collections %}
                                 {% for collection in availableCollections['databox_collections'] %}
-                                    <div id="status-{{ collection.get_base_id() }}" class='collection-status' style='{{ loop.parent.loop.first and loop.first ? "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>
@@ -131,6 +132,12 @@
                     </div>
 
                 </form>
+                <div>
+                    <select name="upload_type" id="upload_type" class="input-large" style="width: 200px; float:right">
+                        <option value="html" selected>{{ 'Use the HTML5 uploader' | trans }}</option>
+                        <option value="flash">{{ 'Use the Flash uploader' | trans }}</option>
+                    </select>
+                </div>
             {% else %}
                 {{ 'You can not upload files' | trans }}
             {% endif %}

templates/web/setup/step2.html.twig

@@ -738,8 +738,8 @@
                                         <td><label>{{ 'Modele de donnees' | trans }}</label></td>
                                         <td>
                                             <select name="db_template" class="databox_creation_input">
-                                                {% for template in available_templates %}
+                                                {% for key,template in available_templates %}
-                                                    <option value="{{ template }}">{{ template }}</option>
+                                                    <option value="{{ key }}">{{ template }}</option>
                                                 {% endfor %}
                                             </select>
                                         </td>

templates/web/thesaurus/thesaurus.html.twig

@@ -39,6 +39,14 @@
                 self.location.replace("thesaurus.php?piv={{ piv }}&bid={{ bid }}") ;
             }
 
+            function inputChanged() {
+                if ($("[name=term]").val().length > 0) {
+                    $("[name=term]").css('border-color', '');
+                } else {
+                    $("[name=term]").css('border-color', '#F00');
+                }
+            }
+
             function test(div)
             {
                 t = document.getElementById(div).innerHTML;
@@ -262,7 +270,7 @@
                         <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"></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>
@@ -976,6 +984,10 @@
                                                             var myObj = { "win":window };
 
                                                             var t = zdialog.find("[name=term]").val();
+                                                            if (t.length == 0) {
+                                                                zdialog.find("[name=term]").css('border-color', '#F00');
+                                                                return;
+                                                            }
                                                             var k = zdialog.find("[name=context]").val();
                                                             if(k != "") {
                                                                 t += " (" + k + ")";

tests/Alchemy/Tests/Phrasea/Controller/Admin/SubdefsTest.php

@@ -3,7 +3,6 @@
 namespace Alchemy\Tests\Phrasea\Controller\Admin;
 
 use Alchemy\Phrasea\Media\Subdef\Image;
-
 /**
  * @group functional
  * @group legacy
@@ -13,9 +12,7 @@ use Alchemy\Phrasea\Media\Subdef\Image;
 class SubdefsTest extends \PhraseanetAuthenticatedWebTestCase
 {
     protected $client;
-
     protected $databox_id;
-
     public function setUp()
     {
         parent::setUp();
@@ -24,12 +21,10 @@ class SubdefsTest extends \PhraseanetAuthenticatedWebTestCase
         $databox = array_shift($databoxes);
         $this->databox_id = $databox->get_sbas_id();
     }
-
     public function getSubdefName()
     {
         return 'testname' . time() . mt_rand(10000, 99999);
     }
-
     /**
      * Default route test
      */
@@ -38,7 +33,6 @@ class SubdefsTest extends \PhraseanetAuthenticatedWebTestCase
         self::$DI['client']->request("GET", "/admin/subdefs/" .  $this->databox_id . "/");
         $this->assertTrue(self::$DI['client']->getResponse()->isOk());
     }
-
     public function testPostRouteAddSubdef()
     {
         $name = $this->getSubdefName();
@@ -48,32 +42,28 @@ class SubdefsTest extends \PhraseanetAuthenticatedWebTestCase
             'group'  => 'image'
         ]]);
         $this->assertTrue(self::$DI['client']->getResponse()->isRedirect());
-
         $app = $this->getApplication();
         $subdefs = new \databox_subdefsStructure($app->findDataboxById($this->databox_id), $app['translator']);
         $subdefs->delete_subdef('image', $name);
     }
-
     public function testPostRouteDeleteSubdef()
     {
         $subdefs =  $this->getApplication()->findDataboxById($this->databox_id)->get_subdef_structure();
         $name = $this->getSubdefName();
-        $subdefs->add_subdef("image", $name, "thumbnail");
+        $subdefs->add_subdef("image", $name, "thumbnail", "image", "1280px JPG (preview Phraseanet)");
         self::$DI['client']->request("POST", "/admin/subdefs/" .  $this->databox_id . "/", ['delete_subdef' => 'image_' . $name]);
         $this->assertTrue(self::$DI['client']->getResponse()->isRedirect());
         try {
             $subdefs->get_subdef("image", $name);
             $this->fail("should raise an exception");
         } catch (\Exception $e) {
-
         }
     }
-
     public function testPostRouteAddSubdefWithNoParams()
     {
         $subdefs =  $this->getApplication()->findDataboxById($this->databox_id)->get_subdef_structure();
         $name = $this->getSubdefName();
-        $subdefs->add_subdef("image", $name, "thumbnail");
+        $subdefs->add_subdef("image", $name, "thumbnail", "image", "1280px JPG (preview Phraseanet)");
         self::$DI['client']->request("POST", "/admin/subdefs/" .  $this->databox_id . "/"
             , ['subdefs' => [
                 'image_' . $name
@@ -88,23 +78,18 @@ class SubdefsTest extends \PhraseanetAuthenticatedWebTestCase
                     'quality'    => 90,
                 ]]
         );
-
         $this->assertTrue(self::$DI['client']->getResponse()->isRedirect());
         $app = $this->getApplication();
         $subdefs = new \databox_subdefsStructure($app->findDataboxById($this->databox_id), $app['translator']);
         $subdef = $subdefs->get_subdef("image", $name);
-
+        /* @var $subdef \databox_subdef */
         $this->assertFalse($subdef->isDownloadable());
-
         $options = $subdef->getOptions();
-
         $this->assertTrue(is_array($options));
-
         $this->assertEquals(400, $options[Image::OPTION_SIZE]->getValue());
         $this->assertEquals(83, $options[Image::OPTION_RESOLUTION]->getValue());
         $this->assertEquals(90, $options[Image::OPTION_QUALITY]->getValue());
         $this->assertFalse($options[Image::OPTION_STRIP]->getValue());
-
         $subdefs->delete_subdef("image", $name);
     }
 }

tests/Alchemy/Tests/Phrasea/Controller/Prod/ShareTest.php

@@ -2,6 +2,7 @@
 
 namespace Alchemy\Tests\Phrasea\Controller\Prod;
 
+use Alchemy\Phrasea\Application;
 use Alchemy\Phrasea\Controller\Prod\ShareController;
 use Alchemy\Phrasea\ControllerProvider\Prod\Share;
 use Symfony\Component\HttpKernel\Exception\HttpException;
@@ -19,86 +20,63 @@ class ShareTest extends \PhraseanetAuthenticatedWebTestCase
     /**
      * @covers Alchemy\Phrasea\Controller\Prod\Share::shareRecord
      * @covers Alchemy\Phrasea\Controller\Prod\Share::connect
-     * @covers Alchemy\Phrasea\Controller\Prod\Share::call
      */
-    public function testMountedRouteSlash()
+    public function testRouteSlashALL()
     {
-        $url = sprintf('/prod/share/record/%d/%d/', self::$DI['record_1']->get_base_id(), self::$DI['record_1']->get_record_id());
+        $this->_RouteSlash("all", [0=>true, 1=>true, 2=>true, 3=>true]);
-        self::$DI['client']->request('GET', $url);
-        $this->assertTrue(self::$DI['client']->getResponse()->isOk());
     }
 
-    /**
+    public function testRouteSlashPublishers()
-     * @covers Alchemy\Phrasea\Controller\Prod\Share::shareRecord
-     * @covers Alchemy\Phrasea\Controller\Prod\Share::connect
-     */
-    public function testRouteSlash()
     {
+        $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]);
+    }
+    private function _RouteSlash($setting, $expected)
+    {
+        $app = $this->getApplication();
+        $_conf = $app['conf'];
+        $app['conf'] = $this->getMockBuilder('Alchemy\Phrasea\Core\Configuration\PropertyAccess')
+            ->disableOriginalConstructor()
+            ->getMock();
+        $app['conf']
+            ->expects($this->any())
+            ->method('get')
+            ->will($this->returnCallback(function ($param, $default) use ($_conf, $setting) {
+                switch ($param) {
+                    case ['registry', 'actions', 'social-tools']:
+                        return $setting;
+                }
+                return $_conf->get($param, $default);
+            }));
+        $result = [];
+        foreach($expected as $flags=>$v) {
             $stubbedACL = $this->stubACL();
-
+            // "has_right_on_sbas" IS checked by the route->before(), the url will return 403
-        //has_right_on_base return true
+            $stubbedACL->expects($this->any())
-        $stubbedACL->expects($this->once())
                 ->method('has_right_on_sbas')
-            ->will($this->returnValue(true));
+                ->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")
-        //has_access_to_subdef return true
+            $stubbedACL->expects($this->any())
-        $stubbedACL->expects($this->once())
                 ->method('has_access_to_subdef')
-            ->will($this->returnValue(true));
+                ->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);
-        $this->assertTrue(self::$DI['client']->getResponse()->isOk());
+            $result[$flags] = self::$DI['client']->getResponse()->isOk();
+        }
+        $this->assertEquals($expected, $result);
     }
-
     /**
      * @covers Alchemy\Phrasea\Controller\Prod\Share::shareRecord
      */
     public function testShareRecord()
     {
         $share = new ShareController(self::$DI['app']);
-
         /** @var \record_adapter $record_1 */
         $record_1 = self::$DI['record_1'];
-
         $response = $share->shareRecord($record_1->getBaseId(), $record_1->getRecordId());
         $this->assertTrue($response->isOk());
     }
-
-    /**
-     * @covers Alchemy\Phrasea\Controller\Prod\Share::shareRecord
-     */
-    public function testShareRecordBadAccess()
-    {
-        $share = new ShareController(self::$DI['app']);
-
-        $stubbedACL = $this->getMockBuilder('\ACL')
-            ->disableOriginalConstructor()
-            ->getMock();
-
-        //has_access_to_subdef return false
-        $stubbedACL->expects($this->once())
-            ->method('has_access_to_subdef')
-            ->will($this->returnValue(false));
-
-        $aclProvider = $this->getMockBuilder('Alchemy\Phrasea\Authentication\ACLProvider')
-            ->disableOriginalConstructor()
-            ->getMock();
-        $aclProvider->expects($this->any())
-            ->method('get')
-            ->will($this->returnValue($stubbedACL));
-
-        self::$DI['app']['acl'] = $aclProvider;
-
-        try {
-            $share->shareRecord(self::$DI['record_1']->get_base_id(), self::$DI['record_1']->get_record_id());
-        } catch (HttpException $exception) {
-            $this->assertEquals(403, $exception->getStatusCode());
-
-            return;
-        }
-
-        $this->fail('An access denied exception should have been thrown.');
-    }
 }