diff --git a/.bowerrc b/.bowerrc
index 764e156e8a..db7db5ca95 100644
--- a/.bowerrc
+++ b/.bowerrc
@@ -1,3 +1,3 @@
{
- "directory" : "www/bower_components"
+ "directory": "www/bower_components"
}
diff --git a/bower.json b/bower.json
index aa528e4c43..8d8660055f 100644
--- a/bower.json
+++ b/bower.json
@@ -28,7 +28,8 @@
"jquery.lazyload": "~1.9.7",
"jquery-treeview": "~1.4.2",
"alchemy-embed-medias": "~0.3.4",
- "html5shiv": "^3.7.3"
+ "html5shiv": "^3.7.3",
+ "jquery-simplecolorpicker": "^0.3.1"
},
"devDependencies": {
"mocha": "latest",
diff --git a/cache/.gitkeep b/cache/.gitkeep
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/lib/Alchemy/Phrasea/Command/Setup/Install.php b/lib/Alchemy/Phrasea/Command/Setup/Install.php
index f5a7ccf817..071baf5bb2 100644
--- a/lib/Alchemy/Phrasea/Command/Setup/Install.php
+++ b/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\tData-Box : Connection successful !\n");
do {
- $template = $dialog->ask($output, 'Choose a language template for metadata structure, available are fr (french) and en (english) (en) : ', 'en');
- } while (!in_array($template, ['en', 'fr']));
+ $template = $dialog->ask($output, "Choose a language template for metadata structure, available are {$templates->__toString()} : ", 'en');
+ }
+ while (!in_array($template, array_keys($templates->getTemplates())));
$output->writeln("\n\tLanguage selected is '$template'\n");
} catch (\Exception $e) {
diff --git a/lib/Alchemy/Phrasea/Controller/Admin/SetupController.php b/lib/Alchemy/Phrasea/Controller/Admin/SetupController.php
index 0ca5c9f262..a8e585d88a 100644
--- a/lib/Alchemy/Phrasea/Controller/Admin/SetupController.php
+++ b/lib/Alchemy/Phrasea/Controller/Admin/SetupController.php
@@ -38,7 +38,12 @@ class SetupController extends Controller
public function submitGlobalsAction(Request $request)
{
- $form = $this->registryFormManipulator->createForm();
+ if (null !== $this->configuration->get('registry')) {
+ $form = $this->registryFormManipulator->createForm($this->configuration);
+ }
+ else {
+ $form = $this->registryFormManipulator->createForm();
+ }
if ('POST' === $request->getMethod()) {
$form->submit($request->request->all());
diff --git a/lib/Alchemy/Phrasea/Controller/Admin/SubdefsController.php b/lib/Alchemy/Phrasea/Controller/Admin/SubdefsController.php
index 166ee61c56..d9f0e778ce 100644
--- a/lib/Alchemy/Phrasea/Controller/Admin/SubdefsController.php
+++ b/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(),
+ '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,8 @@ 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 +77,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 +164,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 +180,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 +193,7 @@ class SubdefsController extends Controller
}
$labels = $request->request->get($post_sub . '_label', []);
-
- $subdefs->set_subdef($group, $name, $class, $downloadable, $options, $labels, $orderable);
+ $subdefs->set_subdef($group, $name, $class, $downloadable, $options, $labels, $orderable, $preset);
}
}
@@ -121,35 +203,359 @@ class SubdefsController extends Controller
}
/**
- * Update Databox subdefsStructure DOM according to defined groups.
- *
- * @param \databox_subdefsStructure $subdefs
- * @param Request $request
+ * @return array
*/
- private function updateSubdefGroups(\databox_subdefsStructure $subdefs, Request $request)
+ protected function getSubviewsMapping()
{
- $subdefsGroups = $request->request->get('subdefsgroups', []);
- $changedGroups = [];
+ $mapping = [
+ Type::TYPE_IMAGE => [Subdef::TYPE_IMAGE],
+ Type::TYPE_VIDEO => [Subdef::TYPE_IMAGE, Subdef::TYPE_VIDEO, Subdef::TYPE_ANIMATION],
+ Type::TYPE_AUDIO => [Subdef::TYPE_IMAGE, Subdef::TYPE_AUDIO],
+ Type::TYPE_DOCUMENT => [Subdef::TYPE_IMAGE, Subdef::TYPE_FLEXPAPER],
+ Type::TYPE_FLASH => [Subdef::TYPE_IMAGE]
+ ];
- /** @var SubdefGroup $subdefsGroup */
- foreach ($subdefs as $groupName => $subdefsGroup) {
- $documentOrderable = isset($subdefsGroups[$groupName]['document_orderable'])
- ? \p4field::isyes($subdefsGroups[$groupName]['document_orderable'])
- : false;
+ return $mapping;
+ }
- if ($subdefsGroup->isDocumentOrderable() !== $documentOrderable) {
- if ($documentOrderable) {
- $subdefsGroup->allowDocumentOrdering();
- } else {
- $subdefsGroup->disallowDocumentOrdering();
- }
+ /**
+ * @return array
+ */
+ protected function getConfiguration()
+ {
+ $config = [
+ Subdef::TYPE_IMAGE => [
+ "definitions" => [
+ "JPG" => null,
+ "160px JPG" => [
+ Image::OPTION_SIZE => "160",
+ Image::OPTION_RESOLUTION => "75",
+ Image::OPTION_STRIP => "yes",
+ Image::OPTION_FLATTEN => "yes",
+ Image::OPTION_QUALITY => "75",
+ Image::OPTION_ICODEC => "jpeg",
+ Subdef::OPTION_DEVICE => ["all"]
+ ],
+ "320 px JPG (thumbnail Phraseanet)" => [
+ 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" => [
+ 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)" => [
+ 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" => [
+ 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" => [
+ 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" => [
+ 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" => [
+ 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" => [
+ 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" => [
+ 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" => [
+ 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" => [
+ 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" => [
+ 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 => [
+ "definitions" => [
+ "video codec H264" => null,
+ "144P H264 128 kbps ACC 128kbps" => [
+ 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" => [
+ 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" => [
+ 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" => [
+ 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" => [
+ 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" => [
+ 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" => [
+ 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" => [
+ 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" => [
+ 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" => [
+ 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" => [
+ 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" => [
+ 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" => [
+ 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 => [
+ "definitions" => [
+ "256 px fast 200 ms" => [
+ Gif::OPTION_SIZE => "256",
+ Gif::OPTION_DELAY => "200",
+ Subdef::OPTION_DEVICE => ["all"]
+ ],
+ "256 px very fast 120 ms" => [
+ Gif::OPTION_SIZE => "256",
+ Gif::OPTION_DELAY => "120",
+ Subdef::OPTION_DEVICE => ["all"]
+ ],
+ "320 px fast 200 ms" => [
+ Gif::OPTION_SIZE => "320",
+ Gif::OPTION_DELAY => "200",
+ Subdef::OPTION_DEVICE => ["all"]
+ ],
+ ],
+ "form" => [
+ Gif::OPTION_SIZE => "slide",
+ Gif::OPTION_DELAY => "slide",
+ Subdef::OPTION_DEVICE => "checkbox",
+ ],
+ ],
+ Subdef::TYPE_AUDIO => [
+ "definitions" => [
+ "Low AAC 96 kbit/s" => [
+ Audio::OPTION_AUDIOBITRATE => "100",
+ Audio::OPTION_AUDIOSAMPLERATE => "8000",
+ Audio::OPTION_ACODEC => "libmp3lame",
+ Subdef::OPTION_DEVICE => ["all"]
+ ],
+ "Normal AAC 128 kbit/s" => [
+ Audio::OPTION_AUDIOBITRATE => "180",
+ Audio::OPTION_AUDIOSAMPLERATE => "44100",
+ Audio::OPTION_ACODEC => "libmp3lame",
+ Subdef::OPTION_DEVICE => ["all"]
+ ],
+ "High AAC 320 kbit/s" => [
+ Audio::OPTION_AUDIOBITRATE => "230",
+ Audio::OPTION_AUDIOSAMPLERATE => "50000",
+ Audio::OPTION_ACODEC => "libmp3lame",
+ Subdef::OPTION_DEVICE => ["all"]
+ ],
+ ],
+ "form" => [
+ Audio::OPTION_AUDIOBITRATE => "slide",
+ Audio::OPTION_AUDIOSAMPLERATE => "select",
+ Audio::OPTION_ACODEC => "select",
+ Subdef::OPTION_DEVICE => "checkbox",
+ ],
+ ],
+ Subdef::TYPE_FLEXPAPER => [
+ "definitions" => [
+ ],
+ "form" => [],
+ ],
+ ];
- $changedGroups[] = $subdefsGroup;
- }
- }
-
- if ($changedGroups) {
- $subdefs->updateSubdefGroups($changedGroups);
- }
+ return $config;
}
}
diff --git a/lib/Alchemy/Phrasea/Controller/Api/V1Controller.php b/lib/Alchemy/Phrasea/Controller/Api/V1Controller.php
index 7358539cbe..a3022272c2 100644
--- a/lib/Alchemy/Phrasea/Controller/Api/V1Controller.php
+++ b/lib/Alchemy/Phrasea/Controller/Api/V1Controller.php
@@ -376,6 +376,7 @@ class V1Controller extends Controller
'password' => $conf->get(['registry', 'email', 'smtp-password']),
],
],
+ 'custom-links' => $conf->get(['registry', 'custom-links']),
'ftp' => [
'active' => $conf->get(['registry', 'ftp', 'ftp-enabled']),
'activeForUser' => $conf->get(['registry', 'ftp', 'ftp-user-access']),
diff --git a/lib/Alchemy/Phrasea/Controller/Prod/ExportController.php b/lib/Alchemy/Phrasea/Controller/Prod/ExportController.php
index 7cd11305b6..df6f2a9f19 100644
--- a/lib/Alchemy/Phrasea/Controller/Prod/ExportController.php
+++ b/lib/Alchemy/Phrasea/Controller/Prod/ExportController.php
@@ -168,11 +168,11 @@ class ExportController extends Controller
$request->request->get('businessfields')
);
- $separator = preg_split('//', ' ;,', -1, PREG_SPLIT_NO_EMPTY | PREG_SPLIT_DELIM_CAPTURE);
- $separator = '/\\' . implode('|\\', $separator) . '/';
-
$list['export_name'] = sprintf("%s.zip", $download->getExportName());
- $list['email'] = implode(';', preg_split($separator, $request->request->get("destmail", "")));
+
+ $separator = '/\ |\;|\,/';
+ // add PREG_SPLIT_NO_EMPTY to only return non-empty values
+ $list['email'] = implode(';', preg_split($separator, $request->request->get("destmail", ""), -1, PREG_SPLIT_NO_EMPTY));
$destMails = [];
//get destination mails
diff --git a/lib/Alchemy/Phrasea/Controller/Prod/MoveCollectionController.php b/lib/Alchemy/Phrasea/Controller/Prod/MoveCollectionController.php
index e838b61d5f..0c540b4c4d 100644
--- a/lib/Alchemy/Phrasea/Controller/Prod/MoveCollectionController.php
+++ b/lib/Alchemy/Phrasea/Controller/Prod/MoveCollectionController.php
@@ -36,6 +36,32 @@ 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 = [];
+ 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' => '',
diff --git a/lib/Alchemy/Phrasea/Controller/Prod/ShareController.php b/lib/Alchemy/Phrasea/Controller/Prod/ShareController.php
index 85df3351cf..8aa6323348 100644
--- a/lib/Alchemy/Phrasea/Controller/Prod/ShareController.php
+++ b/lib/Alchemy/Phrasea/Controller/Prod/ShareController.php
@@ -23,44 +23,71 @@ 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')) {
- $this->app->abort(403);
- }
+ //get list of subdefs
+ $subdefs = $record->get_subdefs();
- $preview = $record->get_preview();
+ $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
- if (null !== $previewLink = $preview->get_permalink()) {
- $permalinkUrl = $previewLink->get_url();
- $permaviewUrl = $previewLink->get_page();
- $previewWidth = $preview->get_width();
- $previewHeight = $preview->get_height();
- $embedUrl = $this->app->url('alchemy_embed_view', ['url' => (string)$permalinkUrl]);
-
- $outputVars = [
- 'isAvailable' => true,
- 'preview' => [
+ if (($previewLink = $preview->get_permalink()) !== null) {
+ $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 = [
+ 'label' => $label,
'permalinkUrl' => $permalinkUrl,
'permaviewUrl' => $permaviewUrl,
- 'embedUrl' => $embedUrl,
- 'width' => $previewWidth,
- 'height' => $previewHeight
- ]
- ];
+ '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);
}
}
diff --git a/lib/Alchemy/Phrasea/Controller/Prod/UploadController.php b/lib/Alchemy/Phrasea/Controller/Prod/UploadController.php
index 846b934fd7..a42ba5145c 100644
--- a/lib/Alchemy/Phrasea/Controller/Prod/UploadController.php
+++ b/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) {
- $databox = $collection->get_databox();
-
- if ( ! isset($collections[$databox->get_sbas_id()])) {
- $collections[$databox->get_sbas_id()] = [
- 'databox' => $databox,
- 'databox_collections' => []
- ];
+ 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])) {
+ $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']);
}
-
- $collections[$databox->get_sbas_id()]['databox_collections'][] = $collection;
}
-
return $collections;
+
}
/**
diff --git a/lib/Alchemy/Phrasea/Controller/SetupController.php b/lib/Alchemy/Phrasea/Controller/SetupController.php
index b18dd7965b..36eaaae141 100644
--- a/lib/Alchemy/Phrasea/Controller/SetupController.php
+++ b/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() . '/',
diff --git a/lib/Alchemy/Phrasea/ControllerProvider/Prod/Share.php b/lib/Alchemy/Phrasea/ControllerProvider/Prod/Share.php
index e4e58e53b2..dddcb6e61d 100644
--- a/lib/Alchemy/Phrasea/ControllerProvider/Prod/Share.php
+++ b/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) {
- $firewall->requireRightOnSbas(
- \phrasea::sbasFromBas($app, $request->attributes->get('base_id')),
- \ACL::BAS_CHUPUB
- );
+ $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');
diff --git a/lib/Alchemy/Phrasea/Core/Configuration/DisplaySettingService.php b/lib/Alchemy/Phrasea/Core/Configuration/DisplaySettingService.php
index b82b3501e0..532c8cf247 100644
--- a/lib/Alchemy/Phrasea/Core/Configuration/DisplaySettingService.php
+++ b/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',
diff --git a/lib/Alchemy/Phrasea/Core/Configuration/RegistryFormManipulator.php b/lib/Alchemy/Phrasea/Core/Configuration/RegistryFormManipulator.php
index 9543cbbc6d..a0eb3f01a2 100644
--- a/lib/Alchemy/Phrasea/Core/Configuration/RegistryFormManipulator.php
+++ b/lib/Alchemy/Phrasea/Core/Configuration/RegistryFormManipulator.php
@@ -110,7 +110,7 @@ class RegistryFormManipulator
'thumb-substitution' => true,
'anonymous-report' => false,
],
- 'actions' => [
+ 'actions' => [
'download-max-size' => 120,
'validation-reminder-days' => 2,
'validation-expiration-days' => 10,
@@ -123,7 +123,7 @@ class RegistryFormManipulator
'force-push-authentication' => false,
'enable-feed-notification' => true,
],
- 'ftp' => [
+ 'ftp' => [
'ftp-enabled' => false,
'ftp-user-access' => false,
],
@@ -131,23 +131,23 @@ class RegistryFormManipulator
'auto-select-collections' => true,
'auto-register-enabled' => false,
],
- 'maintenance' => [
+ 'maintenance' => [
'message' => 'The application is down for maintenance',
'enabled' => false,
],
- 'api-clients' => [
+ 'api-clients' => [
'api-enabled' => true,
'navigator-enabled' => true,
'office-enabled' => true,
],
- 'webservices' => [
+ 'webservices' => [
'google-charts-enabled' => true,
'geonames-server' => 'http://geonames.alchemyasp.com/',
'captchas-enabled' => false,
'recaptcha-public-key' => '',
'recaptcha-private-key' => '',
],
- 'executables' => [
+ 'executables' => [
'h264-streaming-enabled' => false,
'auth-token-directory' => null,
'auth-token-directory-path' => null,
@@ -162,7 +162,7 @@ class RegistryFormManipulator
'default-query' => '',
'default-query-type' => 0,
],
- 'email' => [
+ 'email' => [
'emitter-email' => 'phraseanet@example.com',
'prefix' => null,
'smtp-enabled' => false,
@@ -173,6 +173,22 @@ class RegistryFormManipulator
'smtp-user' => null,
'smtp-password' => isset($config['email']['smtp-password']) ? $config['email']['smtp-password'] : null,
],
+ 'custom-links' => [
+ [
+ 'linkName' => 'Phraseanet store',
+ 'linkLanguage' => 'fr',
+ 'linkUrl' => 'https://alchemy.odoo.com/shop',
+ 'linkLocation' => 'help-menu',
+ 'linkOrder' => '1',
+ ],
+ [
+ 'linkName' => 'Phraseanet store',
+ 'linkLanguage' => 'en',
+ 'linkUrl' => 'https://alchemy.odoo.com/en_US/shop',
+ 'linkLocation' => 'help-menu',
+ 'linkOrder' => '1',
+ ],
+ ]
];
}
}
diff --git a/lib/Alchemy/Phrasea/Core/Configuration/StructureTemplate.php b/lib/Alchemy/Phrasea/Core/Configuration/StructureTemplate.php
new file mode 100644
index 0000000000..075fbf89e1
--- /dev/null
+++ b/lib/Alchemy/Phrasea/Core/Configuration/StructureTemplate.php
@@ -0,0 +1,109 @@
+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;
+ }
+}
\ No newline at end of file
diff --git a/lib/Alchemy/Phrasea/Core/Provider/ConfigurationServiceProvider.php b/lib/Alchemy/Phrasea/Core/Provider/ConfigurationServiceProvider.php
index 55623e0081..c7cec0227e 100644
--- a/lib/Alchemy/Phrasea/Core/Provider/ConfigurationServiceProvider.php
+++ b/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);
+ });
}
/**
diff --git a/lib/Alchemy/Phrasea/Databox/Subdef/SubdefPreset.php b/lib/Alchemy/Phrasea/Databox/Subdef/SubdefPreset.php
new file mode 100644
index 0000000000..5e16a08fde
--- /dev/null
+++ b/lib/Alchemy/Phrasea/Databox/Subdef/SubdefPreset.php
@@ -0,0 +1,49 @@
+mediaType = (string)$mediaType;
+ $this->definitions = $definitions;
+ }
+
+ /**
+ * @return string
+ */
+ public function getMediaType()
+ {
+ return $this->label;
+ }
+
+ /**
+ * @return array
+ */
+ public function getDefinitions()
+ {
+ return $this->definitions;
+ }
+}
\ No newline at end of file
diff --git a/lib/Alchemy/Phrasea/Databox/Subdef/SubdefPresetProvider.php b/lib/Alchemy/Phrasea/Databox/Subdef/SubdefPresetProvider.php
new file mode 100644
index 0000000000..f7b90d283f
--- /dev/null
+++ b/lib/Alchemy/Phrasea/Databox/Subdef/SubdefPresetProvider.php
@@ -0,0 +1,21 @@
+presets[$type])) {
+ throw new \InvalidArgumentException('Invalid type');
+ }
+
+ return $this->presets[$type];
+ }
+}
\ No newline at end of file
diff --git a/lib/Alchemy/Phrasea/Form/Configuration/CustomLinkFormType.php b/lib/Alchemy/Phrasea/Form/Configuration/CustomLinkFormType.php
new file mode 100644
index 0000000000..d57a25efc2
--- /dev/null
+++ b/lib/Alchemy/Phrasea/Form/Configuration/CustomLinkFormType.php
@@ -0,0 +1,94 @@
+add('linkName', 'text', [
+ 'label' => false,
+ 'attr' => [
+ 'placeholder' => 'setup::custom-link:name-link',
+ 'required' => true,
+ 'maxlength' => "30"
+ ]
+ ]);
+ $builder->add('linkLanguage', 'choice', [
+ 'label' => false,
+ 'attr' => [
+ 'required' => true
+ ],
+ 'choices' => [
+ '' => 'setup::custom-link:select-language',
+ 'all' => 'All',
+ 'fr' => 'FR',
+ 'en' => 'EN',
+ 'es' => 'ES',
+ 'ar' => 'AR',
+ 'de' => 'DE',
+ 'du' => 'DU'
+ ]
+ ]);
+ $builder->add('linkUrl', 'url', [
+ 'label' => false,
+ 'attr' => [
+ 'placeholder' => 'setup::custom-link:placeholder-link-url',
+ 'required' => true
+ ]
+ ]);
+ $builder->add('linkLocation', 'choice', [
+ 'label' => false,
+ 'attr' => [
+ 'required' => true
+ ],
+ 'choices' => [
+ '' => 'setup::custom-link:location',
+ 'help-menu' => 'setup::custom-link:help-menu',
+ 'navigation-bar' => 'setup::custom-link:navigation-bar',
+ ]
+ ]);
+ $builder->add('linkOrder', 'integer', [
+ 'label' => false,
+ ]);
+ $builder->add('linkBold', 'checkbox', [
+ 'label' => false,
+ ]);
+ $builder->add('linkColor', 'choice', [
+ 'label' => false,
+ 'choices' => [
+ '' => '#ad0800',
+ '#ad0800' => '#ad0800',
+ '#f06006' => '#f06006',
+ '#f5842b' => '#f5842b',
+ '#ffc322' => '#ffc322',
+ '#f4ea5b' => '#f4ea5b',
+ '#b8d84e' => '#b8d84e',
+ '#5aa53b' => '#5aa53b',
+ '#a1d0d0' => '#a1d0d0',
+ '#4497d5' => '#4497d5',
+ '#3567c6' => '#3567c6',
+ '#b151ee' => '#b151ee',
+ '#c875ea' => '#c875ea',
+ '#e46990' => '#e46990',
+ '#ffccd7' => '#ffccd7'
+ ]
+ ]);
+ }
+
+ public function getName()
+ {
+ return null;
+ }
+}
\ No newline at end of file
diff --git a/lib/Alchemy/Phrasea/Form/Configuration/MainConfigurationFormType.php b/lib/Alchemy/Phrasea/Form/Configuration/MainConfigurationFormType.php
index d16e09c2ad..2d3fed341e 100644
--- a/lib/Alchemy/Phrasea/Form/Configuration/MainConfigurationFormType.php
+++ b/lib/Alchemy/Phrasea/Form/Configuration/MainConfigurationFormType.php
@@ -15,6 +15,7 @@ use Symfony\Component\Form\AbstractType;
use Symfony\Component\Form\FormBuilderInterface;
use Symfony\Component\OptionsResolver\OptionsResolverInterface;
use Symfony\Component\Translation\TranslatorInterface;
+use Symfony\Component\Form\Extension\Core\Type\CollectionType;
class MainConfigurationFormType extends AbstractType
{
@@ -62,12 +63,19 @@ class MainConfigurationFormType extends AbstractType
$builder->add('email', new EmailFormType(), [
'label' => 'Emails',
]);
+ $builder->add('custom-links', CollectionType::class, [
+ 'entry_type' => CustomLinkFormType::class,
+ 'entry_options' => ['label' => false],
+ 'allow_add' => true,
+ 'allow_delete' => true,
+ ]);
}
public function setDefaultOptions(OptionsResolverInterface $resolver)
{
$resolver->setDefaults([
- 'required' => false,
+ 'required' => false,
+ 'allow_extra_fields' => true
]);
}
diff --git a/lib/Alchemy/Phrasea/Helper/Prod.php b/lib/Alchemy/Phrasea/Helper/Prod.php
index 3537b367c0..3e2a97b179 100644
--- a/lib/Alchemy/Phrasea/Helper/Prod.php
+++ b/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 = [];
+ 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;
diff --git a/lib/Alchemy/Phrasea/Media/Subdef/Subdef.php b/lib/Alchemy/Phrasea/Media/Subdef/Subdef.php
index 339d50002f..3853958f4c 100644
--- a/lib/Alchemy/Phrasea/Media/Subdef/Subdef.php
+++ b/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';
diff --git a/lib/Alchemy/Phrasea/Setup/Installer.php b/lib/Alchemy/Phrasea/Setup/Installer.php
index 2868f79835..0700eb1907 100644
--- a/lib/Alchemy/Phrasea/Setup/Installer.php
+++ b/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)
diff --git a/lib/classes/databox/subdef.php b/lib/classes/databox/subdef.php
index 1cac20b970..a0f4228b5c 100644
--- a/lib/classes/databox/subdef.php
+++ b/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->requiresMetadataUpdate = p4field::isyes((string) $sd->meta);
-
+ $this->preset = $sd->attributes()->presets;
+ $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'), 'devices', $availableDevices, $this->devices));
-
+ $mediatype_obj->registerOption(new \Alchemy\Phrasea\Media\Subdef\OptionType\Multi($this->translator->trans('Target Device'),
+ '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
*
@@ -424,4 +403,4 @@ class databox_subdef
{
return $this->subdef_type->getOptions();
}
-}
+}
\ No newline at end of file
diff --git a/lib/classes/databox/subdefsStructure.php b/lib/classes/databox/subdefsStructure.php
index 1f856f5bf3..9afd912e36 100644
--- a/lib/classes/databox/subdefsStructure.php
+++ b/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');
diff --git a/lib/classes/record/preview.php b/lib/classes/record/preview.php
index 8712b0c1fe..dd0ae0fe43 100644
--- a/lib/classes/record/preview.php
+++ b/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;
diff --git a/resources/ansible/roles/app/templates/configuration.tpl b/resources/ansible/roles/app/templates/configuration.tpl
index bf39dd9a68..905c19b731 100644
--- a/resources/ansible/roles/app/templates/configuration.tpl
+++ b/resources/ansible/roles/app/templates/configuration.tpl
@@ -12,7 +12,7 @@ main:
port: 3306
user: '{{ mariadb.user }}'
password: '{{ mariadb.password }}'
- dbname: '{{ mariadb.appbox_db }}'
+dbname: '{{ mariadb.appbox_db }}'
driver: pdo_mysql
charset: UTF8
database-test:
diff --git a/resources/ansible/roles/php/tasks/pecl.yml b/resources/ansible/roles/php/tasks/pecl.yml
index 5f72cce3df..d8edc0fcc2 100644
--- a/resources/ansible/roles/php/tasks/pecl.yml
+++ b/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
diff --git a/resources/gulp/build.js b/resources/gulp/build.js
index 63dc8beba8..ac19e96789 100644
--- a/resources/gulp/build.js
+++ b/resources/gulp/build.js
@@ -48,5 +48,7 @@ gulp.task('build-vendors', [
'build-requirejs',
'build-jquery-treeview',
'build-jquery-lazyload',
- 'build-jquery-test-paths'
- ], function() {});
+ 'build-jquery-test-paths',
+ 'build-simple-colorpicker'
+], function () {
+});
diff --git a/resources/gulp/components/vendors/simple-colorpicker.js b/resources/gulp/components/vendors/simple-colorpicker.js
new file mode 100644
index 0000000000..0013cbb212
--- /dev/null
+++ b/resources/gulp/components/vendors/simple-colorpicker.js
@@ -0,0 +1,12 @@
+var gulp = require('gulp');
+var config = require('../../config.js');
+var utils = require('../../utils.js');
+
+gulp.task('build-simple-colorpicker', function () {
+ gulp.start('copy-simple-colorpicker');
+});
+
+gulp.task('copy-simple-colorpicker', function () {
+ return gulp.src(config.paths.vendors + 'jquery-simplecolorpicker/*')
+ .pipe(gulp.dest(config.paths.build + 'vendors/jquery-simplecolorpicker'));
+});
\ No newline at end of file
diff --git a/resources/locales/messages.de.xlf b/resources/locales/messages.de.xlf
index 489587d909..584c2387e8 100644
--- a/resources/locales/messages.de.xlf
+++ b/resources/locales/messages.de.xlf
@@ -1,6 +1,6 @@
-
+
The source node in most cases contains the sample message as written by the developer. If it looks like a dot-delimitted string such as "form.label.firstname", then the developer has not provided a default message.
@@ -21,6 +21,77 @@
Parameter "Authentifizierung erzwingen" erzwingt den Push Empfänger, ein Phraseanet Konto zu haben, um den Inhalt anzuschauen. Es vermeidet, unautorisierte Benutzer dem Push Inhalt zuzugreifen, falls sie die URL bekämen (Email wurde weitergeleitet, zum Beispiel).
prod/templates/push.html.twig
+
+ #3567c6
+ #3567c6
+ Form/Configuration/CustomLinkFormType.php
+
+
+ #4497d5
+ #4497d5
+ Form/Configuration/CustomLinkFormType.php
+
+
+ #5aa53b
+ #5aa53b
+ Form/Configuration/CustomLinkFormType.php
+
+
+ #a1d0d0
+ #a1d0d0
+ Form/Configuration/CustomLinkFormType.php
+
+
+ #ad0800
+ #ad0800
+ Form/Configuration/CustomLinkFormType.php
+ Form/Configuration/CustomLinkFormType.php
+
+
+ #b151ee
+ #b151ee
+ Form/Configuration/CustomLinkFormType.php
+
+
+ #b8d84e
+ #b8d84e
+ Form/Configuration/CustomLinkFormType.php
+
+
+ #c875ea
+ #c875ea
+ Form/Configuration/CustomLinkFormType.php
+
+
+ #e46990
+ #e46990
+ Form/Configuration/CustomLinkFormType.php
+
+
+ #f06006
+ #f06006
+ Form/Configuration/CustomLinkFormType.php
+
+
+ #f4ea5b
+ #f4ea5b
+ Form/Configuration/CustomLinkFormType.php
+
+
+ #f5842b
+ #f5842b
+ Form/Configuration/CustomLinkFormType.php
+
+
+ #ffc322
+ #ffc322
+ Form/Configuration/CustomLinkFormType.php
+
+
+ #ffccd7
+ #ffccd7
+ Form/Configuration/CustomLinkFormType.php
+
%ElementsCount% records
%ElementsCount% Datensätze
@@ -181,7 +252,7 @@
%quantity% selected files
%quantity% ausgewählte Dateien
- prod/upload/upload.html.twig
+ prod/upload/upload.html.twig
%quantity_records% records have been sent for validation to %quantity_users% users
@@ -461,6 +532,11 @@
API Webhook
TaskManager/Job/WebhookJob.php
+
+ AR
+ AR
+ Form/Configuration/CustomLinkFormType.php
+
About Roles :
Über die Funktionen :
@@ -469,7 +545,7 @@
Acces
Zugriff
- web/account/base.html.twig
+ web/account/base.html.twig
Access
@@ -645,7 +721,7 @@
Additionnal modules
Zusatzmodule
- Form/Configuration/MainConfigurationFormType.php
+ Form/Configuration/MainConfigurationFormType.php
Adds an option to the push form submission to restrict push recipient(s) to Phraseanet users only.
@@ -665,47 +741,52 @@
Adresse email du nouvel utilisateur
Email Adresse des neuen Benutzers
- web/admin/index.html.twig
+ web/admin/index.html.twig
Advanced Search
Erweiterte Suche
- web/prod/index.html.twig
+ web/prod/index.html.twig
+
+
+ Advanced settings
+ Advanced settings
+ web/admin/subdefs.html.twig
Affichage
Anzeige
- web/prod/index.html.twig
+ web/prod/index.html.twig
Affichage au demarrage
beim Start anzeigen
- web/prod/index.html.twig
+ web/prod/index.html.twig
Afficher la fiche descriptive
das beschriftliche Blatt anzeigen
- web/prod/index.html.twig
+ web/prod/index.html.twig
Afficher le titre
den Titel anzeigen
- web/prod/index.html.twig
+ web/prod/index.html.twig
Afficher les status
die Status anzeigen
- web/prod/index.html.twig
+ web/prod/index.html.twig
Afficher une icone
eine Ikone anzeigen
- web/prod/index.html.twig
+ web/prod/index.html.twig
After metadata
Nach Metadaten
- web/prod/index.html.twig
+ web/prod/index.html.twig
Aggregation
@@ -715,7 +796,7 @@
Aide
Hilfe
- web/prod/index.html.twig
+ web/prod/index.html.twig
Aide sur les expressions regulieres
@@ -739,7 +820,7 @@
Ajouter un nouvel utilisateur
einen neuen Benutzer hinzufügen
- web/admin/index.html.twig
+ web/admin/index.html.twig
Ajouter un publisher
@@ -754,6 +835,7 @@
All
Alle
+ Form/Configuration/CustomLinkFormType.php
actions/Feedback/list.html.twig
actions/Feedback/list.html.twig
actions/Feedback/list.html.twig
@@ -831,6 +913,16 @@
Push wird erlaubt
web/admin/editusers.html.twig
+
+ Alphabetic asc
+ Alphabetic asc
+ web/prod/index.html.twig
+
+
+ Alphabetic desc
+ Alphabetic desc
+ web/prod/index.html.twig
+
Also delete records that rely on groupings.
Auch Datensätze löschen, die auf Berichte angewiesen sind
@@ -863,7 +955,7 @@
Controller/Admin/DataboxesController.php
Controller/Prod/BasketController.php
Controller/Prod/LazaretController.php
- Controller/Prod/MoveCollectionController.php
+ Controller/Prod/MoveCollectionController.php
Controller/Prod/StoryController.php
Controller/Prod/ToolsController.php
Model/Manipulator/LazaretManipulator.php
@@ -912,8 +1004,8 @@
Controller/Admin/CollectionController.php
Controller/Admin/DataboxController.php
Controller/Admin/SearchEngineController.php
- Controller/Api/V1Controller.php
- Controller/Api/V1Controller.php
+ Controller/Api/V1Controller.php
+ Controller/Api/V1Controller.php
Controller/Prod/BasketController.php
Order/Controller/ProdOrderController.php
web/admin/statusbit.html.twig
@@ -997,7 +1089,7 @@
Applications
Anwendungen
- web/account/base.html.twig
+ web/account/base.html.twig
Apply a model
@@ -1024,7 +1116,7 @@
Apply template
Vorlage anwenden
- web/admin/index.html.twig
+ web/admin/index.html.twig
Apply to all selected documents
@@ -1066,7 +1158,7 @@
Attention
Vorsicht
Controller/Prod/LanguageController.php
- web/admin/index.html.twig
+ web/admin/index.html.twig
prod/results/help.html.twig
@@ -1143,7 +1235,7 @@
Audio
Audio
- web/prod/index.html.twig
+ web/prod/index.html.twig
Audio Birate
@@ -1289,7 +1381,7 @@
Bad request, please contact an admin
Bad Request. Bitte kontaktieren Sie einen Administrator.
- prod/upload/upload-flash.html.twig
+ prod/upload/upload-flash.html.twig
Base
@@ -1376,8 +1468,9 @@
Browse Baskets
Sammelkörbe durchsuchen
- web/prod/index.html.twig
web/prod/index.html.twig
+ web/prod/index.html.twig
+ web/prod/index.html.twig
Browser
@@ -1405,7 +1498,7 @@
By field
By field
- web/prod/index.html.twig
+ web/prod/index.html.twig
C dans l'air
@@ -1443,13 +1536,13 @@
Cancel all
Alle abbrechen
- prod/upload/upload-flash.html.twig
- prod/upload/upload.html.twig
+ prod/upload/upload-flash.html.twig
+ prod/upload/upload.html.twig
Cannot upload Zero Byte files
Kann nicht Null-Byte Dateien hochladen
- prod/upload/upload-flash.html.twig
+ prod/upload/upload-flash.html.twig
Caption
@@ -1604,13 +1697,18 @@
Chercher
Suchen
- web/thesaurus/thesaurus.html.twig
+ web/thesaurus/thesaurus.html.twig
Choisir
wählen
- web/admin/subdefs.html.twig
- web/admin/subdefs.html.twig
+ web/admin/subdefs.html.twig
+ web/admin/subdefs.html.twig
+ web/admin/subdefs.html.twig
+ web/admin/subdefs.html.twig
+ web/admin/subdefs.html.twig
+ web/admin/subdefs.html.twig
+ web/admin/subdefs.html.twig
prod/Baskets/Reorder.html.twig
prod/Story/Reorder.html.twig
@@ -1644,8 +1742,8 @@
Clear list
Liste löschen
- prod/upload/upload-flash.html.twig
- prod/upload/upload.html.twig
+ prod/upload/upload-flash.html.twig
+ prod/upload/upload.html.twig
Client application
@@ -1665,7 +1763,7 @@
Cocher toute la colonne
die ganze Spalte markieren
- web/admin/index.html.twig
+ web/admin/index.html.twig
Cochez les cases correspondantes aux colonnes que vous desirez voire apparaitre dans le report
@@ -1706,6 +1804,11 @@
Die Leerung der Kollektion wurde erfolgreich abgeschlossen
Controller/Admin/CollectionController.php
+
+ Collection order
+ Collection order
+ web/prod/index.html.twig
+
Color Depth
Farbtiefe
@@ -1735,7 +1838,7 @@
Commandes
Bestellungen
- web/common/menubar.html.twig
+ web/common/menubar.html.twig
Company
@@ -1775,7 +1878,7 @@
Configuration
Konfiguration
- web/prod/index.html.twig
+ web/prod/index.html.twig
Confirm new email address
@@ -1785,7 +1888,7 @@
Confirm reset users rights before applying template
Zurücksetzung von Benutzerrechten bestätigen, bevor Sie die Vorlage anwenden
- web/admin/index.html.twig
+ web/admin/index.html.twig
Confirmation de votre mot de passe
@@ -1816,7 +1919,7 @@
Connection terminates unexpetecdly, please retry
Verbindung beendet unerwartet. Bitte wiederholen.
- prod/upload/upload-flash.html.twig
+ prod/upload/upload-flash.html.twig
Connection to FTP succeed
@@ -1861,7 +1964,7 @@
Could not initiate upload, please retry
Upload konnte nicht initialisieren werden. Bitte wiederholen.
- prod/upload/upload-flash.html.twig
+ prod/upload/upload-flash.html.twig
Could not perform request, please contact an administrator.
@@ -1871,7 +1974,7 @@
Could not retrieve the file ID, please retry or contact an admin if problem persist
Datei-ID konnte nicht abgerufen werden. Bitte versuchen Sie es einmal oder kontaktieren Sierneinen Administrator, wenn das Problem bestehen bleibt.
- prod/upload/upload-flash.html.twig
+ prod/upload/upload-flash.html.twig
Could not send email
@@ -1881,7 +1984,7 @@
Couleur de selection
Farbauswahl
- web/prod/index.html.twig
+ web/prod/index.html.twig
Country
@@ -1902,7 +2005,7 @@
Create new subdef
Neue Unterauflösung erstellen
- web/admin/subdefs.html.twig
+ web/admin/subdefs.html.twig
Creation date
@@ -1949,17 +2052,17 @@
Creer un model
eine Vorlage erstellen
- web/admin/index.html.twig
+ web/admin/index.html.twig
Creer un modele
eine Vorlage erstellen
- web/admin/index.html.twig
+ web/admin/index.html.twig
Creer un utilisateur
einen Benutzer erstellen
- web/admin/index.html.twig
+ web/admin/index.html.twig
Creer une nouvelle applications
@@ -2007,11 +2110,27 @@
Aktuelle Sitzung
web/account/sessions.html.twig
+
+ Custom
+ Custom
+ web/admin/subdefs.html.twig
+ web/admin/subdefs.html.twig
+
DCES
DCES
admin/fields/templates.html.twig
+
+ DE
+ DE
+ Form/Configuration/CustomLinkFormType.php
+
+
+ DU
+ DU
+ Form/Configuration/CustomLinkFormType.php
+
Danger zone !
Danger zone !
@@ -2077,7 +2196,7 @@
Date Added
Hinzufügungsdatum
- web/prod/index.html.twig
+ web/prod/index.html.twig
Date Creation
@@ -2089,6 +2208,12 @@
Verbindungsdatum
web/account/sessions.html.twig
+
+ Date de création
+ Date de création
+ prod/Baskets/Reorder.html.twig
+ prod/Story/Reorder.html.twig
+
Date de demande
Abfrage Datum
@@ -2096,6 +2221,12 @@
prod/orders/order_box.html.twig
prod/orders/order_item.html.twig
+
+ Date de modification
+ Date de modification
+ prod/Baskets/Reorder.html.twig
+ prod/Story/Reorder.html.twig
+
De
von
@@ -2117,7 +2248,7 @@
Decocher toute la colonne
die ganze Spalte unmarkieren
- web/admin/index.html.twig
+ web/admin/index.html.twig
Deconnexion
@@ -2169,6 +2300,11 @@
Eine Webhook URL festlegen
web/developers/application.html.twig
+
+ Defined by admin
+ Defined by admin
+ web/prod/index.html.twig
+
Defined in Apache configuration
in der Apache Konfiguration definiert
@@ -2187,7 +2323,7 @@
Delete
Löschen
- admin/task-manager/index.html.twig
+ admin/task-manager/index.html.twig
admin/task-manager/templates.html.twig
prod/actions/delete_records_confirm.html.twig
actions/Feedback/list.html.twig
@@ -2218,7 +2354,7 @@
Delete the subdef ?
Unterauflösung löschen?
- web/admin/subdefs.html.twig
+ web/admin/subdefs.html.twig
Demarrer avec l'API Phraseanet
@@ -2283,7 +2419,7 @@
Detailed view URL
Detailansicht URL
- prod/Share/record.html.twig
+ prod/Share/record.html.twig
Details
@@ -2294,7 +2430,7 @@
Developpeur
Entwickler
- web/account/base.html.twig
+ web/account/base.html.twig
Developpeurs
@@ -2331,7 +2467,7 @@
Display technical data
Technische Informationen anzeigen
- web/prod/index.html.twig
+ web/prod/index.html.twig
Display thumbnails
@@ -2341,7 +2477,7 @@
Do not display
Nicht anzeigen
- web/prod/index.html.twig
+ web/prod/index.html.twig
Do not forget to restart the tasks scheduler
@@ -2373,7 +2509,7 @@
Document
Dokument
- web/prod/index.html.twig
+ web/prod/index.html.twig
Document Type Sharing
@@ -2459,6 +2595,11 @@
Form/Login/PhraseaForgotPasswordForm.php
Form/Login/PhraseaRegisterForm.php
+
+ EN
+ EN
+ Form/Configuration/CustomLinkFormType.php
+
ERREUR : La classe de subdef est necessaire et egal a "thumbnail","preview" ou "document"
FEHLER : Unterauflösung Kategorie ist erforderlich und ist gleich "Miniaturansicht","Voransicht" oder "Dokument"
@@ -2474,10 +2615,15 @@
FEHLER : Alle "subdefgroup" tags brauchen ein "name" Attribut
lib/classes/databox.php
+
+ ES
+ ES
+ Form/Configuration/CustomLinkFormType.php
+
Edit
Bearbeiten
- admin/task-manager/index.html.twig
+ admin/task-manager/index.html.twig
admin/task-manager/templates.html.twig
actions/Feedback/list.html.twig
@@ -2593,12 +2739,12 @@
Emails
E-Mail Adressen
- Form/Configuration/MainConfigurationFormType.php
+ Form/Configuration/MainConfigurationFormType.php
Embed code
Embed-Code
- prod/Share/record.html.twig
+ prod/Share/record.html.twig
Empty a collection
@@ -2883,7 +3029,7 @@
Error while uploading
Fehler beim Hochladen
- prod/upload/upload-flash.html.twig
+ prod/upload/upload-flash.html.twig
Et Dieu créa la femme
@@ -2926,7 +3072,7 @@
Executables settings
Einstellungen von ausführbaren Programme
- Form/Configuration/MainConfigurationFormType.php
+ Form/Configuration/MainConfigurationFormType.php
Export
@@ -2945,6 +3091,11 @@
Export in der Warteschlange gespeichert
Controller/Prod/ExportController.php
+
+ FR
+ FR
+ Form/Configuration/CustomLinkFormType.php
+
FTP
FTP
@@ -2953,7 +3104,7 @@
FTP Export
FTP Export
- Form/Configuration/MainConfigurationFormType.php
+ Form/Configuration/MainConfigurationFormType.php
Fail
@@ -3041,22 +3192,22 @@
File upload has been cancelled
Datei-Upload wurde abgebrochen
- prod/upload/upload-flash.html.twig
+ prod/upload/upload-flash.html.twig
File upload has been stopped
Datei-Upload wurde gestoppt
- prod/upload/upload-flash.html.twig
+ prod/upload/upload-flash.html.twig
File upload limit (%maxFileSizeReadable%) has been reached
Datei-Upload Begrenzung (%maxFileSizeReadable%) wurde erreicht.
- prod/upload/upload-flash.html.twig
+ prod/upload/upload-flash.html.twig
File validation failed
Dateivalidierung ist fehlgeschlagen
- prod/upload/upload-flash.html.twig
+ prod/upload/upload-flash.html.twig
Filename
@@ -3105,7 +3256,7 @@
Flash
Flash
web/common/technical_datas.html.twig
- web/prod/index.html.twig
+ web/prod/index.html.twig
FlashFired
@@ -3194,7 +3345,7 @@
General configuration
Allgemeine Einstellungen
- Form/Configuration/MainConfigurationFormType.php
+ Form/Configuration/MainConfigurationFormType.php
General settings
@@ -3240,7 +3391,7 @@
Geo Search
Geo Search
- web/prod/index.html.twig
+ web/prod/index.html.twig
Geonames server address
@@ -3315,7 +3466,7 @@
Graphiste (preview au rollover)
Grafiker (Voransicht mit Rollover)
- web/prod/index.html.twig
+ web/prod/index.html.twig
Great
@@ -3341,7 +3492,7 @@
Guest
Gast
- web/common/menubar.html.twig
+ web/common/menubar.html.twig
Guest access
@@ -3421,7 +3572,7 @@
Iconographe (description au rollover)
Bildredakteur (Beschreibung mit Rollover)
- web/prod/index.html.twig
+ web/prod/index.html.twig
Id
@@ -3466,7 +3617,7 @@
Image
Bild
- web/prod/index.html.twig
+ web/prod/index.html.twig
ImageMagick
@@ -3492,7 +3643,7 @@
In the answer grid
In einem Tooltip
- web/prod/index.html.twig
+ web/prod/index.html.twig
Include Business-fields in caption
@@ -3524,7 +3675,7 @@
Informations
Informationen
- web/account/base.html.twig
+ web/account/base.html.twig
web/admin/dashboard.html.twig
admin/user/registrations.html.twig
@@ -3569,7 +3720,7 @@
Invalid file type
Ungültiger Dateityp
admin/collection/collection.html.twig
- prod/upload/upload-flash.html.twig
+ prod/upload/upload-flash.html.twig
Invalid file type, only (%supported_file_types%) file formats are supported
@@ -3602,7 +3753,7 @@
Invalid target collection
ungültige Zielkollektion
- Controller/Prod/MoveCollectionController.php
+ Controller/Prod/MoveCollectionController.php
Invalid unlock link.
@@ -3613,8 +3764,8 @@
Inverser
umkehren
- prod/Baskets/Reorder.html.twig
- prod/Story/Reorder.html.twig
+ prod/Baskets/Reorder.html.twig
+ prod/Story/Reorder.html.twig
It is not recommended to install Phraseanet without HTTPS support
@@ -3858,7 +4009,7 @@
Les termes apparaissent dans le(s) champs
Die Begriffe befinden sich in Feld(er):
- web/prod/index.html.twig
+ web/prod/index.html.twig
Light Value
@@ -3978,14 +4129,14 @@
Logs
Logs
admin/task-manager/index.html.twig
- admin/task-manager/index.html.twig
+ admin/task-manager/index.html.twig
admin/task-manager/templates.html.twig
admin/task-manager/templates.html.twig
Ma derniere question
meine letzte Suchabfrage
- web/prod/index.html.twig
+ web/prod/index.html.twig
Mail line %line% is empty
@@ -4005,7 +4156,7 @@
Maintenance state
Wartungszustand
- Form/Configuration/MainConfigurationFormType.php
+ Form/Configuration/MainConfigurationFormType.php
Manage DB fields
@@ -4127,7 +4278,7 @@
Missing target collection
Zielkollektion fehlt
- Controller/Prod/MoveCollectionController.php
+ Controller/Prod/MoveCollectionController.php
Missing tests parameter
@@ -4142,7 +4293,7 @@
Mode de presentation
Anzeigemodus
- web/prod/index.html.twig
+ web/prod/index.html.twig
Modele de donnees
@@ -4271,7 +4422,7 @@
New task
Neue Aufgabe
- admin/task-manager/index.html.twig
+ admin/task-manager/index.html.twig
Next
@@ -4288,7 +4439,7 @@
No URL available
keine verfügbare URL
- prod/Share/record.html.twig
+ prod/Share/record.html.twig
No account yet?
@@ -4389,7 +4540,7 @@
Nom du nouveau modele
Name der neue Vorlage
- web/admin/index.html.twig
+ web/admin/index.html.twig
Nom du nouveau panier
@@ -4448,7 +4599,7 @@
Notifications
Benachrichtigungen
- web/common/menubar.html.twig
+ web/common/menubar.html.twig
Notifications globales
@@ -4586,7 +4737,7 @@
Orders manager
Bestellungen Manager
eventsmanager/notify/order.php
- web/common/menubar.html.twig
+ web/common/menubar.html.twig
Ordinary
@@ -4717,7 +4868,7 @@
Phraseanet client API
Phraseanet Kunde API
- Form/Configuration/MainConfigurationFormType.php
+ Form/Configuration/MainConfigurationFormType.php
Phraseanet embarque un moteur de taches pour la lecture / ecriture des metadonnes, et autre operations
@@ -4839,7 +4990,7 @@
Please select at least one valid file
Bitte wählen Sie mindestens eine gültige Datei aus.
- prod/upload/upload-flash.html.twig
+ prod/upload/upload-flash.html.twig
Please select one record
@@ -4875,9 +5026,10 @@
Preferences
Einstellungen
- web/prod/index.html.twig
- web/prod/index.html.twig
- web/prod/index.html.twig
+ web/prod/index.html.twig
+ web/prod/index.html.twig
+ web/prod/index.html.twig
+ web/prod/index.html.twig
Prefix for notification emails
@@ -4892,12 +5044,18 @@
Presentation de vignettes
Miniaturansichten
- web/prod/index.html.twig
+ web/prod/index.html.twig
Presentation de vignettes de panier
Vorstellung der Voransichten des Sammelkorbes
- web/prod/index.html.twig
+ web/prod/index.html.twig
+
+
+ Presets
+ Presets
+ web/admin/subdefs.html.twig
+ web/admin/subdefs.html.twig
Previous
@@ -4946,8 +5104,8 @@
Veröffentlichungen
admin/publications/wrapper.html.twig
web/admin/tree.html.twig
- web/common/menubar.html.twig
- web/prod/index.html.twig
+ web/common/menubar.html.twig
+ web/prod/index.html.twig
Publier
@@ -4974,7 +5132,7 @@
Push configuration
Push Konfiguration
- Form/Configuration/MainConfigurationFormType.php
+ Form/Configuration/MainConfigurationFormType.php
Push from %user%
@@ -5056,80 +5214,80 @@
Raccourcis claviers de la zone des paniers :
Sammelkörbe und Funktionen Abkürzungen
- web/prod/index.html.twig
+ web/prod/index.html.twig
Raccourcis claviers en cours de editing :
Fenster Abkürzungen bearbeiten
- web/prod/index.html.twig
+ web/prod/index.html.twig
Raccourcis claviers en cours de preview :
Fenster Abkürzungen, Detailansicht
- web/prod/index.html.twig
+ web/prod/index.html.twig
Raccourcis claviers en cours de recherche :
Hauptfenster Abkürzungen
- web/prod/index.html.twig
+ web/prod/index.html.twig
Raccourcis:: ctrl-a : tout selectionner
ctrl-a : alles auswählen
- web/prod/index.html.twig
- web/prod/index.html.twig
+ web/prod/index.html.twig
+ web/prod/index.html.twig
Raccourcis:: ctrl-e : editer la selection
ctrl-e : Auswahl bearbeiten
- web/prod/index.html.twig
- web/prod/index.html.twig
+ web/prod/index.html.twig
+ web/prod/index.html.twig
Raccourcis:: ctrl-p : imprimer la selection
ctrl-p : drucken
- web/prod/index.html.twig
- web/prod/index.html.twig
+ web/prod/index.html.twig
+ web/prod/index.html.twig
Raccourcis::espace : arreter/demarrer le diaporama
Dia-Schau starten
- web/prod/index.html.twig
+ web/prod/index.html.twig
Raccourcis::fleche bas : scroll vertical
Abwärtspfeil: vertikal scrollen
- web/prod/index.html.twig
+ web/prod/index.html.twig
Raccourcis::fleche droite : page suivante
Rechtspfeil: nächste Seite
- web/prod/index.html.twig
+ web/prod/index.html.twig
Raccourcis::fleche gauche : en arriere
Abwärtspfeil: letztes Dokument
- web/prod/index.html.twig
+ web/prod/index.html.twig
Raccourcis::fleche gauche : en avant
Rechtspfeil: nächstes Dokument
- web/prod/index.html.twig
+ web/prod/index.html.twig
Raccourcis::fleche gauche : page precedente
Linkspfeil: vorherige Seite
- web/prod/index.html.twig
+ web/prod/index.html.twig
Raccourcis::fleche haut : scroll vertical
Pfeil oben: vertikal scrollen
- web/prod/index.html.twig
+ web/prod/index.html.twig
Raccourcis::tab/shift-tab se ballade dans les champs
tab/shift-tab : Feld ändern
- web/prod/index.html.twig
+ web/prod/index.html.twig
Rappel : Il vous reste %number% jours pour valider %title% de %user%
@@ -5150,14 +5308,14 @@
Re-initialiser
Zurücksetzen
prod/Baskets/Reorder.html.twig
- web/prod/index.html.twig
+ web/prod/index.html.twig
prod/Story/Reorder.html.twig
Re-ordonner
wieder ordnen
- prod/Baskets/Reorder.html.twig
- prod/Story/Reorder.html.twig
+ prod/Baskets/Reorder.html.twig
+ prod/Story/Reorder.html.twig
prod/WorkZone/Macros.html.twig
prod/WorkZone/Macros.html.twig
prod/WorkZone/Macros.html.twig
@@ -5262,7 +5420,7 @@
Rechercher dans un champ date
im Feld "Datum" suchen
- web/prod/index.html.twig
+ web/prod/index.html.twig
Recommendations
@@ -5282,7 +5440,7 @@
Record Not Found
Datensatz wurde nicht gefunden
- Controller/Api/V1Controller.php
+ Controller/Api/V1Controller.php
Record removed from basket
@@ -5307,7 +5465,7 @@
Records have been successfuly moved
Datensätze wurden erfolgreich bewegt
- Controller/Prod/MoveCollectionController.php
+ Controller/Prod/MoveCollectionController.php
Records type
@@ -5341,7 +5499,7 @@
Registration
Anmeldung
- Form/Configuration/MainConfigurationFormType.php
+ Form/Configuration/MainConfigurationFormType.php
Reglages:: reglages d acces guest
@@ -5363,7 +5521,7 @@
Relevance
Relevanz
- web/prod/index.html.twig
+ web/prod/index.html.twig
Remember me
@@ -5463,7 +5621,7 @@
Require email validation to activate the account
Email Validierung erfordern, um Konto zu aktivieren
- web/admin/index.html.twig
+ web/admin/index.html.twig
Required
@@ -5483,12 +5641,12 @@
Reset and apply
Zurücksetzen und Vorlage anwenden
- web/admin/index.html.twig
+ web/admin/index.html.twig
Reset and apply template
Zurücksetzen und Vorlage anwenden
- web/admin/index.html.twig
+ web/admin/index.html.twig
Reset cache
@@ -5498,7 +5656,7 @@
Reset rights before applying template?
Möchten Sie die Benutzerrechte zurücksetzen, bevor Sie die Vorlage anwenden?
- web/admin/index.html.twig
+ web/admin/index.html.twig
Resolution
@@ -5509,7 +5667,7 @@
Resource URL
Resource URL
- prod/Share/record.html.twig
+ prod/Share/record.html.twig
Resquest access
@@ -5585,7 +5743,7 @@
Rights will be erased before applying template, do you confirm?
Benutzerrechte werden gelöscht, bevor Sie die Vorlage anwenden. Bestätigen?
- web/admin/index.html.twig
+ web/admin/index.html.twig
Role
@@ -5687,7 +5845,7 @@
Search engine
Suchmaschine
- Form/Configuration/MainConfigurationFormType.php
+ Form/Configuration/MainConfigurationFormType.php
SearchEngine settings
@@ -5761,13 +5919,13 @@
admin/statusbit/edit.html.twig
admin/statusbit/edit.html.twig
user/import/file.html.twig
- prod/upload/upload-flash.html.twig
+ prod/upload/upload-flash.html.twig
prod/upload/upload.html.twig
Selected files
ausgewählte Dateien
- prod/upload/upload-flash.html.twig
+ prod/upload/upload-flash.html.twig
Send
@@ -5778,23 +5936,23 @@
prod/actions/Push.html.twig
prod/orders/order_item.html.twig
prod/orders/order_item.html.twig
- prod/upload/upload-flash.html.twig
- prod/upload/upload.html.twig
+ prod/upload/upload-flash.html.twig
+ prod/upload/upload.html.twig
Send an email to the user to setup his password
Eine Email zum Benutzer senden, um sein Passwort festzulegen
- web/admin/index.html.twig
+ web/admin/index.html.twig
Send to Facebook
Auf Facebook teilen
- prod/Share/record.html.twig
+ prod/Share/record.html.twig
Send to Twitter
Auf Twitter teilen
- prod/Share/record.html.twig
+ prod/Share/record.html.twig
Sent
@@ -5830,7 +5988,7 @@
Sessions
Sitzungen
- web/account/base.html.twig
+ web/account/base.html.twig
Set download quotas
@@ -6010,7 +6168,7 @@
Start
Start
admin/task-manager/index.html.twig
- admin/task-manager/index.html.twig
+ admin/task-manager/index.html.twig
admin/task-manager/templates.html.twig
admin/task-manager/templates.html.twig
@@ -6038,7 +6196,7 @@
Status des documents a rechercher
Zustand der Dokumente zu suchen
- web/prod/index.html.twig
+ web/prod/index.html.twig
Status edition
@@ -6059,7 +6217,7 @@
Stop
Stop
admin/task-manager/index.html.twig
- admin/task-manager/index.html.twig
+ admin/task-manager/index.html.twig
admin/task-manager/templates.html.twig
admin/task-manager/templates.html.twig
prod/upload/lazaret.html.twig
@@ -6078,7 +6236,7 @@
Story Not Found
Bericht wurde nicht gefunden
- Controller/Api/V1Controller.php
+ Controller/Api/V1Controller.php
Story created
@@ -6128,7 +6286,7 @@
Subdef name
Subdef Name
- web/admin/subdefs.html.twig
+ web/admin/subdefs.html.twig
Submit
@@ -6155,7 +6313,7 @@
Successful install
Erfolgreiche Installation
- web/admin/index.html.twig
+ web/admin/index.html.twig
Successful removal
@@ -6277,7 +6435,7 @@
Target Device
Zielgerät
- classes/databox/subdef.php
+ classes/databox/subdef.php
Task Edition
@@ -6309,7 +6467,7 @@
Telechargeable
Herunterladbar
- web/admin/subdefs.html.twig
+ web/admin/subdefs.html.twig
Template
@@ -6472,7 +6630,7 @@
The upload violates a security restriction, please retry
Upload verletzt eine Sicherheitseinschränkung, bitte wiederholen.
- prod/upload/upload-flash.html.twig
+ prod/upload/upload-flash.html.twig
The user has been created.
@@ -6482,7 +6640,7 @@
Theme
Thema
- web/prod/index.html.twig
+ web/prod/index.html.twig
There is no one to validate orders, please contact an administrator
@@ -6527,7 +6685,7 @@
These subdef will be permanently deleted and cannot be recovered. Are you sure?
Diese subdef wird entgültig gelöscht und kann nicht wiederhergestellt werden. Fortfahren?
- web/admin/subdefs.html.twig
+ web/admin/subdefs.html.twig
Third-party applications
@@ -6548,7 +6706,7 @@
This field is required
Dieses Feld ist erforderlich
- web/admin/index.html.twig
+ web/admin/index.html.twig
This field represents the title of the document
@@ -6559,7 +6717,7 @@
This file is too big
Datei ist zu gross
Controller/Prod/LanguageController.php
- web/admin/index.html.twig
+ web/admin/index.html.twig
This is a template
@@ -6586,11 +6744,6 @@
Dieser Benutzer besitzt keine Rechte
web/admin/users.html.twig
-
- This version does not allow you to access all the features offered by the HTML5 uploader
- Diese Version erlaubt nicht einen Zugriff auf alle HTML5 Uploader Funktionen.
- prod/upload/upload-flash.html.twig
-
This year
In diesem Jahr
@@ -6668,7 +6821,7 @@
Tout type
Bildschirmtyp
- web/prod/index.html.twig
+ web/prod/index.html.twig
Toutes les publications
@@ -6688,8 +6841,8 @@
Transmited files
Übermittelte Dateien
- prod/upload/upload-flash.html.twig
- prod/upload/upload.html.twig
+ prod/upload/upload-flash.html.twig
+ prod/upload/upload.html.twig
Trier
@@ -6700,7 +6853,7 @@
Trier par
Sortieren nach
- web/prod/index.html.twig
+ web/prod/index.html.twig
Try to extract embedded thumbnails
@@ -6725,7 +6878,7 @@
Type de documents
Dokumenttyp
- web/prod/index.html.twig
+ web/prod/index.html.twig
Type nombre
@@ -6846,7 +6999,7 @@
Une question personnelle
eine persönliche Frage
- web/prod/index.html.twig
+ web/prod/index.html.twig
Une selection
@@ -6859,17 +7012,17 @@
Unhandled Error
Unbehandelte Fehler
- prod/upload/upload-flash.html.twig
+ prod/upload/upload-flash.html.twig
Unknow Error
Unbekannter Fehler
- prod/upload/upload-flash.html.twig
+ prod/upload/upload-flash.html.twig
Unknow reason
Unbekannter Grund
- prod/upload/upload-flash.html.twig
+ prod/upload/upload-flash.html.twig
Unknown user %user_id%
@@ -6904,7 +7057,7 @@
Upload
upload
- web/common/menubar.html.twig
+ web/common/menubar.html.twig
Bridge/Dailymotion/upload.html.twig
Bridge/Dailymotion/upload.html.twig
Bridge/Flickr/upload.html.twig
@@ -6918,7 +7071,7 @@
Upload URL is not set, please contact an admin
Upload URL wurde nicht gesetzt, bitte kontaktieren Sie einen Administrator.
- prod/upload/upload-flash.html.twig
+ prod/upload/upload-flash.html.twig
Upload a csv file for users creation
@@ -6953,7 +7106,7 @@
Use latest search settings on Production loading
die letzte gestellte Frage in Prod benutzen
- web/prod/index.html.twig
+ web/prod/index.html.twig
Use my Phraseanet account
@@ -6968,12 +7121,16 @@
Use the Flash uploader
Benutzen Sie den Flash Uploader
- prod/upload/upload.html.twig
+ prod/upload/upload-flash.html.twig
+ prod/upload/upload.html.twig
+ prod/upload/upload.html.twig
Use the HTML5 uploader
Benutzen Sie den HTML5 Uploader
- prod/upload/upload-flash.html.twig
+ prod/upload/upload-flash.html.twig
+ prod/upload/upload-flash.html.twig
+ prod/upload/upload.html.twig
Use with mod_token. Attention requires the apache modules and mod_h264_streaming mod_auth_token
@@ -7124,7 +7281,7 @@
Video
Video
- web/prod/index.html.twig
+ web/prod/index.html.twig
Video Codec
@@ -7346,7 +7503,7 @@
Vous pouvez quitter la plupart des fenetres survolantes via la touche echap
esc : Sie können die meiste Teile der Overlay Fenster schliessen
- web/prod/index.html.twig
+ web/prod/index.html.twig
Warning !
@@ -7382,7 +7539,7 @@
Webservices connectivity
Webservices Konnektivität
- Form/Configuration/MainConfigurationFormType.php
+ Form/Configuration/MainConfigurationFormType.php
Weight
@@ -7430,19 +7587,19 @@
Would you like to reset rights before applying the template?
Möchten Sie die Benutzerrechte zurücksetzen, bevor Sie die Vorlage anwenden?
- web/admin/index.html.twig
web/admin/index.html.twig
+ web/admin/index.html.twig
Write Metas
Meta schreiben
- web/admin/subdefs.html.twig
+ web/admin/subdefs.html.twig
YYYY/MM/DD
YYYY/MM/DD
- web/prod/index.html.twig
- web/prod/index.html.twig
+ web/prod/index.html.twig
+ web/prod/index.html.twig
Yes
@@ -7507,18 +7664,6 @@
Sie sind nicht der Besitzer dieses Feeds: Sie können ihn deshalb nicht bearbeiten.
Controller/Admin/FeedController.php
-
- You are using the Flash uploader.
- Sie benutzen den Flash Uploader
- prod/upload/upload-flash.html.twig
- prod/upload/upload-flash.html.twig
-
-
- You are using the HTML5 uploader.
- Sie benutzen den HTML5 Uploader
- prod/upload/upload.html.twig
- prod/upload/upload.html.twig
-
You can download an example by clicking here
Sie können ein Vorbild hier herunterladen
@@ -7552,8 +7697,8 @@
You can not upload files
Sie dürfen Dateien nicht hochladen
- prod/upload/upload-flash.html.twig
- prod/upload/upload.html.twig
+ prod/upload/upload-flash.html.twig
+ prod/upload/upload.html.twig
You do not enough rights to update status
@@ -7588,7 +7733,7 @@
You do not have the permission to move records to %collection%
Sie dürfen nicht, Datensätze zu %collection% zu bewegen
- Controller/Prod/MoveCollectionController.php
+ Controller/Prod/MoveCollectionController.php
You have %quantity% days to validate the selection.
@@ -7603,7 +7748,7 @@
You have attempted to queue too many files
Sie haben versucht, zuviele Dateien anzustehen
- prod/upload/upload-flash.html.twig
+ prod/upload/upload-flash.html.twig
You have not access to this basket
@@ -7701,11 +7846,6 @@
Ihr Konto mit Benutzername %login% wurde erfolgreich erstellt
Notification/Mail/MailRequestPasswordSetup.php
-
- Your browser does not support all HTML5 features properly.
- Ihr Browser unterstützt nicht alle HTML5 Funktionen richtig.
- prod/upload/upload.html.twig
-
Your configuration has been successfuly saved.
Ihre Konfiguration wurde erfolgreich gespeichert
@@ -7772,11 +7912,7 @@
action : bridge
Bridge
- web/prod/index.html.twig
- web/prod/toolbar.html.twig
- web/prod/toolbar.html.twig
- prod/WorkZone/Basket.html.twig
- prod/WorkZone/Story.html.twig
+ web/prod/index.html.twig
action : collection
@@ -7800,7 +7936,7 @@
lightbox/IE6/feed.html.twig
lightbox/IE6/validate.html.twig
web/lightbox/validate.html.twig
- web/prod/index.html.twig
+ web/prod/index.html.twig
prod/preview/tools.html.twig
prod/results/record.html.twig
web/prod/toolbar.html.twig
@@ -7810,7 +7946,7 @@
action : outils
Werkzeuge
- web/prod/toolbar.html.twig
+ web/prod/toolbar.html.twig
prod/WorkZone/Basket.html.twig
prod/WorkZone/Story.html.twig
@@ -7826,9 +7962,9 @@
action : publier
Veröffentlichen
- web/prod/index.html.twig
+ web/prod/index.html.twig
web/prod/toolbar.html.twig
- web/prod/toolbar.html.twig
+ web/prod/toolbar.html.twig
prod/WorkZone/Basket.html.twig
prod/WorkZone/Story.html.twig
@@ -7850,7 +7986,7 @@
action : supprimer
Löschen
- web/prod/toolbar.html.twig
+ web/prod/toolbar.html.twig
prod/WorkZone/Basket.html.twig
prod/WorkZone/Macros.html.twig
prod/WorkZone/Story.html.twig
@@ -7859,15 +7995,15 @@
action:: nouveau panier
Neuer
web/prod/index.html.twig
- web/prod/index.html.twig
web/prod/index.html.twig
+ web/prod/index.html.twig
action:: nouveau reportage
Neuer Bericht
- web/prod/index.html.twig
- web/prod/index.html.twig
- web/prod/index.html.twig
+ web/prod/index.html.twig
+ web/prod/index.html.twig
+ web/prod/index.html.twig
action::Valider
@@ -8565,7 +8701,7 @@
Controller/Admin/ConnectedUsersController.php
lib/classes/phrasea.php
web/admin/connected-users.html.twig
- web/common/menubar.html.twig
+ web/common/menubar.html.twig
admin::monitor: module client
@@ -8573,8 +8709,8 @@
Controller/Admin/ConnectedUsersController.php
lib/classes/phrasea.php
classes/record/preview.php
- classes/record/preview.php
- classes/record/preview.php
+ classes/record/preview.php
+ classes/record/preview.php
web/admin/connected-users.html.twig
@@ -8595,8 +8731,8 @@
Controller/Admin/ConnectedUsersController.php
lib/classes/phrasea.php
classes/record/preview.php
- classes/record/preview.php
- classes/record/preview.php
+ classes/record/preview.php
+ classes/record/preview.php
web/admin/connected-users.html.twig
@@ -8605,7 +8741,7 @@
Controller/Admin/ConnectedUsersController.php
lib/classes/phrasea.php
web/admin/connected-users.html.twig
- web/common/menubar.html.twig
+ web/common/menubar.html.twig
admin::monitor: module thesaurus
@@ -8613,14 +8749,14 @@
Controller/Admin/ConnectedUsersController.php
lib/classes/phrasea.php
web/admin/connected-users.html.twig
- web/common/menubar.html.twig
+ web/common/menubar.html.twig
admin::monitor: module upload
Upload
Controller/Admin/ConnectedUsersController.php
lib/classes/phrasea.php
- web/common/menubar.html.twig
+ web/common/menubar.html.twig
admin::monitor: module validation
@@ -8630,7 +8766,7 @@
Phrasea/Controller/LightboxController.php
Phrasea/Controller/LightboxController.php
lib/classes/phrasea.php
- web/common/menubar.html.twig
+ web/common/menubar.html.twig
admin::monitor: modules
@@ -8640,7 +8776,7 @@
admin::monitor: production
Prod
- web/common/menubar.html.twig
+ web/common/menubar.html.twig
admin::monitor: total des utilisateurs uniques :
@@ -8857,6 +8993,7 @@
audio
Audio
Phrasea/Twig/PhraseanetExtension.php
+ web/admin/subdefs.html.twig
task-manager/task-editor/subdefs.html.twig
@@ -8902,12 +9039,12 @@
boutton:: selectionner aucune base
Keine
- web/prod/index.html.twig
+ web/prod/index.html.twig
boutton:: selectionner toutes les bases
Alle
- web/prod/index.html.twig
+ web/prod/index.html.twig
boutton::ajouter
@@ -8923,7 +9060,7 @@
Controller/Prod/LanguageController.php
web/account/reset-email.html.twig
admin/collection/create.html.twig
- web/admin/index.html.twig
+ web/admin/index.html.twig
admin/publications/fiche.html.twig
web/common/dialog_export.html.twig
web/common/dialog_export.html.twig
@@ -8947,9 +9084,9 @@
web/thesaurus/link-field-step2.html.twig
web/thesaurus/new-term.html.twig
web/thesaurus/new-term.html.twig
- web/thesaurus/thesaurus.html.twig
- web/thesaurus/thesaurus.html.twig
- web/thesaurus/thesaurus.html.twig
+ web/thesaurus/thesaurus.html.twig
+ web/thesaurus/thesaurus.html.twig
+ web/thesaurus/thesaurus.html.twig
boutton::appliquer
@@ -8962,8 +9099,8 @@
web/admin/users.html.twig
actions/Feedback/list.html.twig
web/prod/index.html.twig
- web/thesaurus/thesaurus.html.twig
- web/thesaurus/thesaurus.html.twig
+ web/thesaurus/thesaurus.html.twig
+ web/thesaurus/thesaurus.html.twig
boutton::choisir
@@ -9077,7 +9214,7 @@
boutton::rechercher
suchen
Controller/Prod/LanguageController.php
- web/prod/index.html.twig
+ web/prod/index.html.twig
boutton::refresh
@@ -9152,7 +9289,7 @@
admin/collection/suggested_value.html.twig
admin/publications/fiche.html.twig
admin/publications/list.html.twig
- web/admin/subdefs.html.twig
+ web/admin/subdefs.html.twig
Bridge/Dailymotion/actioncontainers.html.twig
Bridge/Dailymotion/actionelements.html.twig
actions/Bridge/disconnected.html.twig
@@ -9201,10 +9338,10 @@
web/admin/editusers.html.twig
admin/publications/fiche.html.twig
admin/publications/list.html.twig
- web/admin/setup.html.twig
+ web/admin/setup.html.twig
admin/statusbit/edit.html.twig
web/admin/structure.html.twig
- web/admin/subdefs.html.twig
+ web/admin/subdefs.html.twig
user/import/view.html.twig
admin/user/registrations.html.twig
web/developers/application_form.html.twig
@@ -9225,10 +9362,10 @@
Bridge/Youtube/video_moveinto_playlist.html.twig
prod/actions/edit_default.html.twig
prod/actions/edit_default.html.twig
- prod/Baskets/Reorder.html.twig
+ prod/Baskets/Reorder.html.twig
prod/Baskets/Update.html.twig
- web/prod/index.html.twig
- prod/Story/Reorder.html.twig
+ web/prod/index.html.twig
+ prod/Story/Reorder.html.twig
web/report/all_content.html.twig
web/thesaurus/accept.html.twig
web/thesaurus/export-text-dialog.html.twig
@@ -9239,7 +9376,7 @@
web/thesaurus/link-field-step2.html.twig
web/thesaurus/new-term.html.twig
web/thesaurus/new-term.html.twig
- web/thesaurus/thesaurus.html.twig
+ web/thesaurus/thesaurus.html.twig
boutton::vue graphique
@@ -9343,18 +9480,18 @@
wählen
admin/collection/create.html.twig
admin/databox/databox.html.twig
- web/prod/index.html.twig
+ web/prod/index.html.twig
classe
Klasse
- web/admin/subdefs.html.twig
- web/admin/subdefs.html.twig
+ web/admin/subdefs.html.twig
+ web/admin/subdefs.html.twig
classe d'acces
Zugriff Klasse
- web/admin/subdefs.html.twig
+ web/admin/subdefs.html.twig
cocher tout
@@ -9386,9 +9523,9 @@
copyClipboardLabel
in der Zwischenablage kopieren
- prod/Share/record.html.twig
- prod/Share/record.html.twig
- prod/Share/record.html.twig
+ prod/Share/record.html.twig
+ prod/Share/record.html.twig
+ prod/Share/record.html.twig
dans %category%
@@ -9430,8 +9567,9 @@
document
Dokument
Phrasea/Twig/PhraseanetExtension.php
- web/admin/subdefs.html.twig
- web/admin/subdefs.html.twig
+ web/admin/subdefs.html.twig
+ web/admin/subdefs.html.twig
+ web/admin/subdefs.html.twig
task-manager/task-editor/subdefs.html.twig
@@ -9536,6 +9674,11 @@
web/common/dialog_export.html.twig
web/common/dialog_export.html.twig
+
+ export::export-email: email-invalid
+ export::export-email: email-invalid
+ web/common/dialog_export.html.twig
+
export::ftp: reglages manuels
manuelle Einstellungen
@@ -9597,6 +9740,7 @@
flash
Flash
Phrasea/Twig/PhraseanetExtension.php
+ web/admin/subdefs.html.twig
task-manager/task-editor/subdefs.html.twig
@@ -9671,6 +9815,7 @@
image
Bild
Phrasea/Twig/PhraseanetExtension.php
+ web/admin/subdefs.html.twig
task-manager/task-editor/subdefs.html.twig
@@ -9686,12 +9831,17 @@
index::advance_search: disable-facet
index::advance_search: disable-facet
- web/prod/index.html.twig
+ web/prod/index.html.twig
index::advance_search: facet
index::advance_search: facet
- web/prod/index.html.twig
+ web/prod/index.html.twig
+
+
+ index:advanced-preferences:: use truncation
+ index:advanced-preferences:: use truncation
+ web/prod/index.html.twig
invite:: Redirection vers la zone d'authentification, cliquez sur OK pour continuer ou annulez
@@ -9753,7 +9903,7 @@
login:: Mon compte
Mein Benutzerkonto
web/account/account.html.twig
- web/common/menubar.html.twig
+ web/common/menubar.html.twig
login:: Visitez le lien suivant et suivez les instructions pour continuer, sinon ignorez cet email et il ne se passera rien
@@ -9874,7 +10024,8 @@
mediatype
Media Typ
- web/admin/subdefs.html.twig
+ web/admin/subdefs.html.twig
+ web/admin/subdefs.html.twig
meta-datas
@@ -9900,7 +10051,7 @@
no
Nein
web/account/sessions.html.twig
- web/admin/subdefs.html.twig
+ web/admin/subdefs.html.twig
user/import/view.html.twig
web/common/technical_datas.html.twig
@@ -10316,7 +10467,7 @@
phraseanet:: a propos
Über
- web/common/menubar.html.twig
+ web/common/menubar.html.twig
phraseanet:: adresse
@@ -10330,7 +10481,7 @@
phraseanet:: aide
Hilfe
- web/common/menubar.html.twig
+ web/common/menubar.html.twig
phraseanet:: choisir
@@ -10351,7 +10502,7 @@
phraseanet:: deconnection
Abmeldung
- web/common/menubar.html.twig
+ web/common/menubar.html.twig
actions/Bridge/wrapper.html.twig
@@ -10369,7 +10520,7 @@
phraseanet:: language
Sprache
- web/thesaurus/thesaurus.html.twig
+ web/thesaurus/thesaurus.html.twig
phraseanet:: password
@@ -10414,7 +10565,7 @@
phraseanet:: raccourcis clavier
Abkürzungen
- web/common/menubar.html.twig
+ web/common/menubar.html.twig
phraseanet:: sous definition
@@ -10432,7 +10583,7 @@
web/thesaurus/load-thesaurus.html.twig
web/thesaurus/load-thesaurus.html.twig
web/thesaurus/thesaurus.html.twig
- web/thesaurus/thesaurus.html.twig
+ web/thesaurus/thesaurus.html.twig
phraseanet:: tri
@@ -10442,15 +10593,17 @@
phraseanet:: tri par date
nach Datum sortieren
- web/prod/index.html.twig
- web/prod/index.html.twig
+ web/prod/index.html.twig
+ web/prod/index.html.twig
+ web/prod/index.html.twig
web/thesaurus/export-topics-dialog.html.twig
phraseanet:: tri par nom
alphabetische Sortierung
- web/prod/index.html.twig
- web/prod/index.html.twig
+ web/prod/index.html.twig
+ web/prod/index.html.twig
+ web/prod/index.html.twig
phraseanet:: user
@@ -10474,26 +10627,26 @@
Controller/Prod/LanguageController.php
admin/collection/suggested_value.html.twig
prod/actions/edit_default.html.twig
- web/thesaurus/thesaurus.html.twig
+ web/thesaurus/thesaurus.html.twig
phraseanet::erreur: La connection au serveur Phraseanet semble etre indisponible
Die Verbindung mit Phraseanet Server ist derzeit nich verfügbar
Controller/Prod/LanguageController.php
- web/admin/index.html.twig
+ web/admin/index.html.twig
phraseanet::erreur: Une erreur est survenue, si ce probleme persiste, contactez le support technique
Leider ist ein Fehler aufgetreten. Sollte sich dieser Fehler wiederholen kontaktieren Sie bitte den Administrator
Controller/Prod/LanguageController.php
- web/admin/index.html.twig
+ web/admin/index.html.twig
phraseanet::erreur: Votre session est fermee, veuillez vous re-authentifier
Sie sind nun abgemeldet. Bitte loggen Sie sich wieder ein
Controller/Prod/LanguageController.php
- web/admin/index.html.twig
- web/thesaurus/thesaurus.html.twig
+ web/admin/index.html.twig
+ web/thesaurus/thesaurus.html.twig
phraseanet::erreur: echec du serveur de mail
@@ -10583,12 +10736,12 @@
phraseanet::time:: a
zu
- web/prod/index.html.twig
+ web/prod/index.html.twig
phraseanet::time:: de
von
- web/prod/index.html.twig
+ web/prod/index.html.twig
phraseanet::type:: audios
@@ -10598,7 +10751,7 @@
phraseanet::type:: documents
Dokumente
- web/prod/index.html.twig
+ web/prod/index.html.twig
web/prod/toolbar.html.twig
@@ -10609,7 +10762,7 @@
phraseanet::type:: reportages
Berichte
- web/prod/index.html.twig
+ web/prod/index.html.twig
phraseanet::type:: videos
@@ -10644,23 +10797,23 @@
preview
Voransicht
- web/admin/subdefs.html.twig
- web/admin/subdefs.html.twig
+ web/admin/subdefs.html.twig
+ web/admin/subdefs.html.twig
preview:: Description
Beschreibung
- web/prod/index.html.twig
+ web/prod/index.html.twig
preview:: Historique
Historie
- web/prod/index.html.twig
+ web/prod/index.html.twig
preview:: Popularite
Beliebtheit
- web/prod/index.html.twig
+ web/prod/index.html.twig
preview:: arreter le diaporama
@@ -10713,9 +10866,9 @@
previewLinkLabel
ansichten
- prod/Share/record.html.twig
- prod/Share/record.html.twig
- prod/Share/record.html.twig
+ prod/Share/record.html.twig
+ prod/Share/record.html.twig
+ prod/Share/record.html.twig
print:: image de choix et description
@@ -11028,6 +11181,7 @@
prod::tools: document
Dokument
+ Controller/Prod/ShareController.php
Controller/Prod/ToolsController.php
@@ -11104,12 +11258,12 @@
raccourci :: a propos des raccourcis claviers
Über Abkürzungen
- web/prod/index.html.twig
+ web/prod/index.html.twig
raccourcis :: ne plus montrer cette aide
diese Hilfe nicht mehr anzeigen
- web/prod/index.html.twig
+ web/prod/index.html.twig
rafraichir
@@ -11123,7 +11277,7 @@
rechercher dans tous les champs
Alle Felder
- web/prod/index.html.twig
+ web/prod/index.html.twig
recordtype
@@ -11153,17 +11307,17 @@
reponses:: images par pages :
Suchergebnisse nach Seite
- web/prod/index.html.twig
+ web/prod/index.html.twig
reponses:: mode liste
Liste
- web/prod/index.html.twig
+ web/prod/index.html.twig
reponses:: mode vignettes
Miniaturansichten
- web/prod/index.html.twig
+ web/prod/index.html.twig
reponses:: partager
@@ -11183,7 +11337,7 @@
reponses:: taille des images :
Miniaturansichtengrösse
- web/prod/index.html.twig
+ web/prod/index.html.twig
reponses::document sans titre
@@ -11634,8 +11788,8 @@
report:: page d'accueil
Hautpseite
classes/record/preview.php
- classes/record/preview.php
- classes/record/preview.php
+ classes/record/preview.php
+ classes/record/preview.php
report:: par %user_infos%
@@ -11883,8 +12037,8 @@
report:: visualiseur cooliris
Cooliris Viewer
classes/record/preview.php
- classes/record/preview.php
- classes/record/preview.php
+ classes/record/preview.php
+ classes/record/preview.php
report::Changement de collection vers : %coll_name%
@@ -11971,12 +12125,12 @@
report::acces direct
Direkt Zugriff
classes/record/preview.php
- classes/record/preview.php
- classes/record/preview.php
- classes/record/preview.php
- classes/record/preview.php
- classes/record/preview.php
- classes/record/preview.php
+ classes/record/preview.php
+ classes/record/preview.php
+ classes/record/preview.php
+ classes/record/preview.php
+ classes/record/preview.php
+ classes/record/preview.php
report::activite
@@ -12168,6 +12322,77 @@
Test E-Mail Überprüfungen
web/admin/dashboard.html.twig
+
+ setup::custom-link:add-link
+ setup::custom-link:add-link
+ web/admin/setup.html.twig
+
+
+ setup::custom-link:help-menu
+ setup::custom-link:help-menu
+ Form/Configuration/CustomLinkFormType.php
+
+
+ setup::custom-link:language-link
+ setup::custom-link:language-link
+ web/admin/setup.html.twig
+
+
+ setup::custom-link:link-url
+ setup::custom-link:link-url
+ web/admin/setup.html.twig
+
+
+ setup::custom-link:location
+ setup::custom-link:location
+ Form/Configuration/CustomLinkFormType.php
+
+
+ setup::custom-link:location-link
+ setup::custom-link:location-link
+ web/admin/setup.html.twig
+
+
+ setup::custom-link:name-link
+ setup::custom-link:name-link
+ Form/Configuration/CustomLinkFormType.php
+ web/admin/setup.html.twig
+
+
+ setup::custom-link:navigation-bar
+ setup::custom-link:navigation-bar
+ Form/Configuration/CustomLinkFormType.php
+
+
+ setup::custom-link:order-link
+ setup::custom-link:order-link
+ web/admin/setup.html.twig
+
+
+ setup::custom-link:placeholder-link-url
+ setup::custom-link:placeholder-link-url
+ Form/Configuration/CustomLinkFormType.php
+
+
+ setup::custom-link:select-language
+ setup::custom-link:select-language
+ Form/Configuration/CustomLinkFormType.php
+
+
+ setup::custom-link:title-custom-link
+ setup::custom-link:title-custom-link
+ web/admin/setup.html.twig
+
+
+ share::share-record: advance
+ share::share-record: advance
+ prod/Share/record.html.twig
+
+
+ share::share-record: select-shared-def
+ share::share-record: select-shared-def
+ prod/Share/record.html.twig
+
sport
Sport
@@ -12204,16 +12429,10 @@
Status Suche in der erweiterten Suche aktivieren
admin/statusbit/edit.html.twig
-
- subdef.document
- subdef.document
- web/admin/subdefs.html.twig
-
subdef.orderable
subdef.orderable
- web/admin/subdefs.html.twig
- web/admin/subdefs.html.twig
+ web/admin/subdefs.html.twig
substitution
@@ -12230,6 +12449,11 @@
SD Ersetzung
actions/Tools/index.html.twig
+
+ subviewType
+ subviewType
+ web/admin/subdefs.html.twig
+
take a screenshot
einen Screenshot erstellen
@@ -12494,12 +12718,12 @@
thesaurus:: Nouveau synonyme
Neuer Synonym
web/thesaurus/new-term.html.twig
- web/thesaurus/thesaurus.html.twig
+ web/thesaurus/thesaurus.html.twig
thesaurus:: Nouveau terme
Neuer Begriff
- web/thesaurus/thesaurus.html.twig
+ web/thesaurus/thesaurus.html.twig
thesaurus:: Nouveau terme specifique
@@ -12514,7 +12738,7 @@
- web/thesaurus/thesaurus.html.twig
+ web/thesaurus/thesaurus.html.twig
thesaurus:: Vous n'avez acces a aucune base
@@ -12529,7 +12753,7 @@
thesaurus:: afficher les termes refuses
abgelehnte Begriffe anzeigen
- web/thesaurus/thesaurus.html.twig
+ web/thesaurus/thesaurus.html.twig
thesaurus:: ce champ doit etre lie au thesaurus. La reindexation de la base est necessaire
@@ -12555,17 +12779,17 @@
thesaurus:: commence par
beginnt mit
- web/thesaurus/thesaurus.html.twig
+ web/thesaurus/thesaurus.html.twig
thesaurus:: contexte
Kontext
- web/thesaurus/thesaurus.html.twig
+ web/thesaurus/thesaurus.html.twig
thesaurus:: contient
beinhaltet
- web/thesaurus/thesaurus.html.twig
+ web/thesaurus/thesaurus.html.twig
thesaurus:: corbeille
@@ -12577,7 +12801,7 @@
thesaurus:: deplacer le terme dans la corbeille ?
Begriffe zum Stock verschieben
- web/thesaurus/thesaurus.html.twig
+ web/thesaurus/thesaurus.html.twig
thesaurus:: enregistrement de la liste modifiee des mots candidats.
@@ -12607,7 +12831,7 @@
thesaurus:: est egal a
gleicht
- web/thesaurus/thesaurus.html.twig
+ web/thesaurus/thesaurus.html.twig
thesaurus:: example
@@ -12705,7 +12929,7 @@
thesaurus:: le terme
Begriff
- web/thesaurus/thesaurus.html.twig
+ web/thesaurus/thesaurus.html.twig
thesaurus:: le terme %term% avec contexte %context%
@@ -12730,12 +12954,12 @@
thesaurus:: onglet stock
mögliche Begriffe
- web/thesaurus/thesaurus.html.twig
+ web/thesaurus/thesaurus.html.twig
thesaurus:: onglet thesaurus
Thesaurus
- web/thesaurus/thesaurus.html.twig
+ web/thesaurus/thesaurus.html.twig
thesaurus:: options d'export :
@@ -12842,7 +13066,7 @@
thesaurus:: synonyme
Synonym
- web/thesaurus/thesaurus.html.twig
+ web/thesaurus/thesaurus.html.twig
thesaurus:: synonymes
@@ -12852,7 +13076,7 @@
thesaurus:: terme
Begriff
- web/thesaurus/thesaurus.html.twig
+ web/thesaurus/thesaurus.html.twig
thesaurus:: tout deployer - refermable
@@ -12872,62 +13096,62 @@
thesaurus::menu: Nouveau synonyme
Neuer Synonym
- web/thesaurus/thesaurus.html.twig
+ web/thesaurus/thesaurus.html.twig
thesaurus::menu: Nouveau terme
Neuer Begriff
- web/thesaurus/thesaurus.html.twig
+ web/thesaurus/thesaurus.html.twig
thesaurus::menu: accepter
annehmen
- web/thesaurus/thesaurus.html.twig
+ web/thesaurus/thesaurus.html.twig
thesaurus::menu: chercher
suchen
- web/thesaurus/thesaurus.html.twig
- web/thesaurus/thesaurus.html.twig
+ web/thesaurus/thesaurus.html.twig
+ web/thesaurus/thesaurus.html.twig
thesaurus::menu: export topics
Exportieren als Themen
- web/thesaurus/thesaurus.html.twig
+ web/thesaurus/thesaurus.html.twig
thesaurus::menu: exporter
Exportieren
- web/thesaurus/thesaurus.html.twig
- web/thesaurus/thesaurus.html.twig
+ web/thesaurus/thesaurus.html.twig
+ web/thesaurus/thesaurus.html.twig
thesaurus::menu: importer
Importieren
- web/thesaurus/thesaurus.html.twig
+ web/thesaurus/thesaurus.html.twig
thesaurus::menu: lier au champ
mit dem Feld verbinden
- web/thesaurus/thesaurus.html.twig
+ web/thesaurus/thesaurus.html.twig
thesaurus::menu: proprietes
Eigenschaften
- web/thesaurus/thesaurus.html.twig
- web/thesaurus/thesaurus.html.twig
+ web/thesaurus/thesaurus.html.twig
+ web/thesaurus/thesaurus.html.twig
thesaurus::menu: refuser
ablehnen
- web/thesaurus/thesaurus.html.twig
+ web/thesaurus/thesaurus.html.twig
thesaurus::menu: supprimer
Löschen
web/thesaurus/properties.html.twig
- web/thesaurus/thesaurus.html.twig
- web/thesaurus/thesaurus.html.twig
+ web/thesaurus/thesaurus.html.twig
+ web/thesaurus/thesaurus.html.twig
thumbnail validation
@@ -12948,8 +13172,8 @@
tout le monde
Alle
- web/admin/subdefs.html.twig
- web/admin/subdefs.html.twig
+ web/admin/subdefs.html.twig
+ web/admin/subdefs.html.twig
tout le sport
@@ -12984,14 +13208,14 @@
upload:: Destination (collection) :
Kollektion
- prod/upload/upload-flash.html.twig
- prod/upload/upload.html.twig
+ prod/upload/upload-flash.html.twig
+ prod/upload/upload.html.twig
upload:: Status :
Status
- prod/upload/upload-flash.html.twig
- prod/upload/upload.html.twig
+ prod/upload/upload-flash.html.twig
+ prod/upload/upload.html.twig
users rights have been reseted
@@ -13055,6 +13279,7 @@
video
Video
+ web/admin/subdefs.html.twig
task-manager/task-editor/subdefs.html.twig
@@ -13072,7 +13297,7 @@
yes
Ja
web/account/sessions.html.twig
- web/admin/subdefs.html.twig
+ web/admin/subdefs.html.twig
web/common/technical_datas.html.twig
diff --git a/resources/locales/messages.en.xlf b/resources/locales/messages.en.xlf
index b257d182d3..e6a2c679ff 100644
--- a/resources/locales/messages.en.xlf
+++ b/resources/locales/messages.en.xlf
@@ -1,6 +1,6 @@
-
+
The source node in most cases contains the sample message as written by the developer. If it looks like a dot-delimitted string such as "form.label.firstname", then the developer has not provided a default message.
@@ -21,6 +21,77 @@
Check the force authentication checkbox to constrain users to authenticate to access content of Push and Feedbacks. This feature can avoid divulging connection parameters contained in given links in e-mails notifications.
prod/templates/push.html.twig
+
+ #3567c6
+ #3567c6
+ Form/Configuration/CustomLinkFormType.php
+
+
+ #4497d5
+ #4497d5
+ Form/Configuration/CustomLinkFormType.php
+
+
+ #5aa53b
+ #5aa53b
+ Form/Configuration/CustomLinkFormType.php
+
+
+ #a1d0d0
+ #a1d0d0
+ Form/Configuration/CustomLinkFormType.php
+
+
+ #ad0800
+ #ad0800
+ Form/Configuration/CustomLinkFormType.php
+ Form/Configuration/CustomLinkFormType.php
+
+
+ #b151ee
+ #b151ee
+ Form/Configuration/CustomLinkFormType.php
+
+
+ #b8d84e
+ #b8d84e
+ Form/Configuration/CustomLinkFormType.php
+
+
+ #c875ea
+ #c875ea
+ Form/Configuration/CustomLinkFormType.php
+
+
+ #e46990
+ #e46990
+ Form/Configuration/CustomLinkFormType.php
+
+
+ #f06006
+ #f06006
+ Form/Configuration/CustomLinkFormType.php
+
+
+ #f4ea5b
+ #f4ea5b
+ Form/Configuration/CustomLinkFormType.php
+
+
+ #f5842b
+ #f5842b
+ Form/Configuration/CustomLinkFormType.php
+
+
+ #ffc322
+ #ffc322
+ Form/Configuration/CustomLinkFormType.php
+
+
+ #ffccd7
+ #ffccd7
+ Form/Configuration/CustomLinkFormType.php
+
%ElementsCount% records
%ElementsCount% records
@@ -181,7 +252,7 @@
%quantity% selected files
%quantity% selected files
- prod/upload/upload.html.twig
+ prod/upload/upload.html.twig
%quantity_records% records have been sent for validation to %quantity_users% users
@@ -461,6 +532,11 @@
API Webhook
TaskManager/Job/WebhookJob.php
+
+ AR
+ AR
+ Form/Configuration/CustomLinkFormType.php
+
About Roles :
About roles:
@@ -469,7 +545,7 @@
Acces
Access
- web/account/base.html.twig
+ web/account/base.html.twig
Access
@@ -645,7 +721,7 @@
Additionnal modules
Additional modules
- Form/Configuration/MainConfigurationFormType.php
+ Form/Configuration/MainConfigurationFormType.php
Adds an option to the push form submission to restrict push recipient(s) to Phraseanet users only.
@@ -665,47 +741,52 @@
Adresse email du nouvel utilisateur
New user e-mail address
- web/admin/index.html.twig
+ web/admin/index.html.twig
Advanced Search
Advanced search
- web/prod/index.html.twig
+ web/prod/index.html.twig
+
+
+ Advanced settings
+ Advanced settings
+ web/admin/subdefs.html.twig
Affichage
Display
- web/prod/index.html.twig
+ web/prod/index.html.twig
Affichage au demarrage
Display On startup
- web/prod/index.html.twig
+ web/prod/index.html.twig
Afficher la fiche descriptive
Show Caption
- web/prod/index.html.twig
+ web/prod/index.html.twig
Afficher le titre
Show Title
- web/prod/index.html.twig
+ web/prod/index.html.twig
Afficher les status
Show Status
- web/prod/index.html.twig
+ web/prod/index.html.twig
Afficher une icone
Display an Icon
- web/prod/index.html.twig
+ web/prod/index.html.twig
After metadata
After captions
- web/prod/index.html.twig
+ web/prod/index.html.twig
Aggregation
@@ -715,7 +796,7 @@
Aide
Help
- web/prod/index.html.twig
+ web/prod/index.html.twig
Aide sur les expressions regulieres
@@ -739,7 +820,7 @@
Ajouter un nouvel utilisateur
Add a new user
- web/admin/index.html.twig
+ web/admin/index.html.twig
Ajouter un publisher
@@ -754,6 +835,7 @@
All
All
+ Form/Configuration/CustomLinkFormType.php
actions/Feedback/list.html.twig
actions/Feedback/list.html.twig
actions/Feedback/list.html.twig
@@ -831,6 +913,16 @@
Allow to push
web/admin/editusers.html.twig
+
+ Alphabetic asc
+ Alphabetic asc
+ web/prod/index.html.twig
+
+
+ Alphabetic desc
+ Alphabetic desc
+ web/prod/index.html.twig
+
Also delete records that rely on groupings.
Also delete records that rely on stories.
@@ -863,7 +955,7 @@
Controller/Admin/DataboxesController.php
Controller/Prod/BasketController.php
Controller/Prod/LazaretController.php
- Controller/Prod/MoveCollectionController.php
+ Controller/Prod/MoveCollectionController.php
Controller/Prod/StoryController.php
Controller/Prod/ToolsController.php
Model/Manipulator/LazaretManipulator.php
@@ -912,8 +1004,8 @@
Controller/Admin/CollectionController.php
Controller/Admin/DataboxController.php
Controller/Admin/SearchEngineController.php
- Controller/Api/V1Controller.php
- Controller/Api/V1Controller.php
+ Controller/Api/V1Controller.php
+ Controller/Api/V1Controller.php
Controller/Prod/BasketController.php
Order/Controller/ProdOrderController.php
web/admin/statusbit.html.twig
@@ -997,7 +1089,7 @@
Applications
Applications
- web/account/base.html.twig
+ web/account/base.html.twig
Apply a model
@@ -1024,7 +1116,7 @@
Apply template
Apply template
- web/admin/index.html.twig
+ web/admin/index.html.twig
Apply to all selected documents
@@ -1066,7 +1158,7 @@
Attention
Warning
Controller/Prod/LanguageController.php
- web/admin/index.html.twig
+ web/admin/index.html.twig
prod/results/help.html.twig
@@ -1143,7 +1235,7 @@
Audio
Audio
- web/prod/index.html.twig
+ web/prod/index.html.twig
Audio Birate
@@ -1289,7 +1381,7 @@
Bad request, please contact an admin
Bad request. Please contact your administrator
- prod/upload/upload-flash.html.twig
+ prod/upload/upload-flash.html.twig
Base
@@ -1376,8 +1468,9 @@
Browse Baskets
Browse baskets
- web/prod/index.html.twig
web/prod/index.html.twig
+ web/prod/index.html.twig
+ web/prod/index.html.twig
Browser
@@ -1405,7 +1498,7 @@
By field
By field
- web/prod/index.html.twig
+ web/prod/index.html.twig
C dans l'air
@@ -1443,13 +1536,13 @@
Cancel all
Cancel all
- prod/upload/upload-flash.html.twig
- prod/upload/upload.html.twig
+ prod/upload/upload-flash.html.twig
+ prod/upload/upload.html.twig
Cannot upload Zero Byte files
Cannot upload zero byte files
- prod/upload/upload-flash.html.twig
+ prod/upload/upload-flash.html.twig
Caption
@@ -1604,13 +1697,18 @@
Chercher
Search
- web/thesaurus/thesaurus.html.twig
+ web/thesaurus/thesaurus.html.twig
Choisir
Choose
- web/admin/subdefs.html.twig
- web/admin/subdefs.html.twig
+ web/admin/subdefs.html.twig
+ web/admin/subdefs.html.twig
+ web/admin/subdefs.html.twig
+ web/admin/subdefs.html.twig
+ web/admin/subdefs.html.twig
+ web/admin/subdefs.html.twig
+ web/admin/subdefs.html.twig
prod/Baskets/Reorder.html.twig
prod/Story/Reorder.html.twig
@@ -1644,8 +1742,8 @@
Clear list
Clear list
- prod/upload/upload-flash.html.twig
- prod/upload/upload.html.twig
+ prod/upload/upload-flash.html.twig
+ prod/upload/upload.html.twig
Client application
@@ -1665,7 +1763,7 @@
Cocher toute la colonne
Check all boxes from column
- web/admin/index.html.twig
+ web/admin/index.html.twig
Cochez les cases correspondantes aux colonnes que vous desirez voire apparaitre dans le report
@@ -1706,6 +1804,11 @@
Collection successfully emptied
Controller/Admin/CollectionController.php
+
+ Collection order
+ Collection order
+ web/prod/index.html.twig
+
Color Depth
Color depth
@@ -1735,7 +1838,7 @@
Commandes
Orders
- web/common/menubar.html.twig
+ web/common/menubar.html.twig
Company
@@ -1775,7 +1878,7 @@
Configuration
Configuration
- web/prod/index.html.twig
+ web/prod/index.html.twig
Confirm new email address
@@ -1785,7 +1888,7 @@
Confirm reset users rights before applying template
Confirm the reset of selected users' rights before applying the template
- web/admin/index.html.twig
+ web/admin/index.html.twig
Confirmation de votre mot de passe
@@ -1816,7 +1919,7 @@
Connection terminates unexpetecdly, please retry
Connexion terminated unexpectedly. Please retry
- prod/upload/upload-flash.html.twig
+ prod/upload/upload-flash.html.twig
Connection to FTP succeed
@@ -1861,7 +1964,7 @@
Could not initiate upload, please retry
Unable to initiate the upload. Please retry
- prod/upload/upload-flash.html.twig
+ prod/upload/upload-flash.html.twig
Could not perform request, please contact an administrator.
@@ -1871,7 +1974,7 @@
Could not retrieve the file ID, please retry or contact an admin if problem persist
Cannot retrieve the file ID. Please retry or contact an administrator if problem persists
- prod/upload/upload-flash.html.twig
+ prod/upload/upload-flash.html.twig
Could not send email
@@ -1881,7 +1984,7 @@
Couleur de selection
Selection color
- web/prod/index.html.twig
+ web/prod/index.html.twig
Country
@@ -1902,7 +2005,7 @@
Create new subdef
Create new subview
- web/admin/subdefs.html.twig
+ web/admin/subdefs.html.twig
Creation date
@@ -1949,17 +2052,17 @@
Creer un model
Create a template user
- web/admin/index.html.twig
+ web/admin/index.html.twig
Creer un modele
Create a template
- web/admin/index.html.twig
+ web/admin/index.html.twig
Creer un utilisateur
Create a new user
- web/admin/index.html.twig
+ web/admin/index.html.twig
Creer une nouvelle applications
@@ -2007,11 +2110,27 @@
Current session
web/account/sessions.html.twig
+
+ Custom
+ Custom
+ web/admin/subdefs.html.twig
+ web/admin/subdefs.html.twig
+
DCES
Dublin Core Input/Output
admin/fields/templates.html.twig
+
+ DE
+ DE
+ Form/Configuration/CustomLinkFormType.php
+
+
+ DU
+ DU
+ Form/Configuration/CustomLinkFormType.php
+
Danger zone !
Danger zone !
@@ -2077,7 +2196,7 @@
Date Added
Date added
- web/prod/index.html.twig
+ web/prod/index.html.twig
Date Creation
@@ -2089,6 +2208,12 @@
Login date
web/account/sessions.html.twig
+
+ Date de création
+ Date de création
+ prod/Baskets/Reorder.html.twig
+ prod/Story/Reorder.html.twig
+
Date de demande
Request date
@@ -2096,6 +2221,12 @@
prod/orders/order_box.html.twig
prod/orders/order_item.html.twig
+
+ Date de modification
+ Date de modification
+ prod/Baskets/Reorder.html.twig
+ prod/Story/Reorder.html.twig
+
De
From
@@ -2117,7 +2248,7 @@
Decocher toute la colonne
Uncheck all boxes from column
- web/admin/index.html.twig
+ web/admin/index.html.twig
Deconnexion
@@ -2169,6 +2300,11 @@
Define a Webhook URL
web/developers/application.html.twig
+
+ Defined by admin
+ Defined by admin
+ web/prod/index.html.twig
+
Defined in Apache configuration
Defined in Apache configuration.
@@ -2187,7 +2323,7 @@
Delete
Delete
- admin/task-manager/index.html.twig
+ admin/task-manager/index.html.twig
admin/task-manager/templates.html.twig
prod/actions/delete_records_confirm.html.twig
actions/Feedback/list.html.twig
@@ -2218,7 +2354,7 @@
Delete the subdef ?
Delete the subview?
- web/admin/subdefs.html.twig
+ web/admin/subdefs.html.twig
Demarrer avec l'API Phraseanet
@@ -2283,7 +2419,7 @@
Detailed view URL
URL of the detailed view
- prod/Share/record.html.twig
+ prod/Share/record.html.twig
Details
@@ -2294,7 +2430,7 @@
Developpeur
Developer
- web/account/base.html.twig
+ web/account/base.html.twig
Developpeurs
@@ -2331,7 +2467,7 @@
Display technical data
Display technical data
- web/prod/index.html.twig
+ web/prod/index.html.twig
Display thumbnails
@@ -2341,7 +2477,7 @@
Do not display
Do not display
- web/prod/index.html.twig
+ web/prod/index.html.twig
Do not forget to restart the tasks scheduler
@@ -2373,7 +2509,7 @@
Document
Document
- web/prod/index.html.twig
+ web/prod/index.html.twig
Document Type Sharing
@@ -2459,6 +2595,11 @@
Form/Login/PhraseaForgotPasswordForm.php
Form/Login/PhraseaRegisterForm.php
+
+ EN
+ EN
+ Form/Configuration/CustomLinkFormType.php
+
ERREUR : La classe de subdef est necessaire et egal a "thumbnail","preview" ou "document"
Error: Class attribute is mandatory and must be Thumbnail, Preview or Document
@@ -2474,10 +2615,15 @@
Error : All "subdefgroup" tags must have an attribute "name"
lib/classes/databox.php
+
+ ES
+ ES
+ Form/Configuration/CustomLinkFormType.php
+
Edit
Edit
- admin/task-manager/index.html.twig
+ admin/task-manager/index.html.twig
admin/task-manager/templates.html.twig
actions/Feedback/list.html.twig
@@ -2593,12 +2739,12 @@
Emails
E-mail configuration
- Form/Configuration/MainConfigurationFormType.php
+ Form/Configuration/MainConfigurationFormType.php
Embed code
Embed code
- prod/Share/record.html.twig
+ prod/Share/record.html.twig
Empty a collection
@@ -2883,7 +3029,7 @@
Error while uploading
Error while uploading
- prod/upload/upload-flash.html.twig
+ prod/upload/upload-flash.html.twig
Et Dieu créa la femme
@@ -2926,7 +3072,7 @@
Executables settings
Executables setting
- Form/Configuration/MainConfigurationFormType.php
+ Form/Configuration/MainConfigurationFormType.php
Export
@@ -2945,6 +3091,11 @@
Export saved in the waiting queue.
Controller/Prod/ExportController.php
+
+ FR
+ FR
+ Form/Configuration/CustomLinkFormType.php
+
FTP
FTP
@@ -2953,7 +3104,7 @@
FTP Export
FTP Export
- Form/Configuration/MainConfigurationFormType.php
+ Form/Configuration/MainConfigurationFormType.php
Fail
@@ -3041,22 +3192,22 @@
File upload has been cancelled
File upload has been cancelled
- prod/upload/upload-flash.html.twig
+ prod/upload/upload-flash.html.twig
File upload has been stopped
File upload has been interrupted
- prod/upload/upload-flash.html.twig
+ prod/upload/upload-flash.html.twig
File upload limit (%maxFileSizeReadable%) has been reached
File upload limit has been reached (%maxFileSizeReadable%)
- prod/upload/upload-flash.html.twig
+ prod/upload/upload-flash.html.twig
File validation failed
Unable to retrieve the file ID. Please retry or contact an Administrator if problem persist
- prod/upload/upload-flash.html.twig
+ prod/upload/upload-flash.html.twig
Filename
@@ -3105,7 +3256,7 @@
Flash
Flash
web/common/technical_datas.html.twig
- web/prod/index.html.twig
+ web/prod/index.html.twig
FlashFired
@@ -3194,7 +3345,7 @@
General configuration
General configuration
- Form/Configuration/MainConfigurationFormType.php
+ Form/Configuration/MainConfigurationFormType.php
General settings
@@ -3240,7 +3391,7 @@
Geo Search
Geo Search
- web/prod/index.html.twig
+ web/prod/index.html.twig
Geonames server address
@@ -3315,7 +3466,7 @@
Graphiste (preview au rollover)
Graphist (preview on rollover)
- web/prod/index.html.twig
+ web/prod/index.html.twig
Great
@@ -3341,7 +3492,7 @@
Guest
Guest
- web/common/menubar.html.twig
+ web/common/menubar.html.twig
Guest access
@@ -3421,7 +3572,7 @@
Iconographe (description au rollover)
Iconograph (caption on rollover)
- web/prod/index.html.twig
+ web/prod/index.html.twig
Id
@@ -3466,7 +3617,7 @@
Image
Image
- web/prod/index.html.twig
+ web/prod/index.html.twig
ImageMagick
@@ -3492,7 +3643,7 @@
In the answer grid
In the answer grid
- web/prod/index.html.twig
+ web/prod/index.html.twig
Include Business-fields in caption
@@ -3524,7 +3675,7 @@
Informations
Info
- web/account/base.html.twig
+ web/account/base.html.twig
web/admin/dashboard.html.twig
admin/user/registrations.html.twig
@@ -3569,7 +3720,7 @@
Invalid file type
Invalid file type
admin/collection/collection.html.twig
- prod/upload/upload-flash.html.twig
+ prod/upload/upload-flash.html.twig
Invalid file type, only (%supported_file_types%) file formats are supported
@@ -3602,7 +3753,7 @@
Invalid target collection
Invalid target collection
- Controller/Prod/MoveCollectionController.php
+ Controller/Prod/MoveCollectionController.php
Invalid unlock link.
@@ -3613,8 +3764,8 @@
Inverser
Reverse
- prod/Baskets/Reorder.html.twig
- prod/Story/Reorder.html.twig
+ prod/Baskets/Reorder.html.twig
+ prod/Story/Reorder.html.twig
It is not recommended to install Phraseanet without HTTPS support
@@ -3858,7 +4009,7 @@
Les termes apparaissent dans le(s) champs
Word(s) from field(s)
- web/prod/index.html.twig
+ web/prod/index.html.twig
Light Value
@@ -3978,14 +4129,14 @@
Logs
Logs
admin/task-manager/index.html.twig
- admin/task-manager/index.html.twig
+ admin/task-manager/index.html.twig
admin/task-manager/templates.html.twig
admin/task-manager/templates.html.twig
Ma derniere question
My last query
- web/prod/index.html.twig
+ web/prod/index.html.twig
Mail line %line% is empty
@@ -4005,7 +4156,7 @@
Maintenance state
Maintenance state
- Form/Configuration/MainConfigurationFormType.php
+ Form/Configuration/MainConfigurationFormType.php
Manage DB fields
@@ -4127,7 +4278,7 @@
Missing target collection
Missing target collection
- Controller/Prod/MoveCollectionController.php
+ Controller/Prod/MoveCollectionController.php
Missing tests parameter
@@ -4142,7 +4293,7 @@
Mode de presentation
Display mode
- web/prod/index.html.twig
+ web/prod/index.html.twig
Modele de donnees
@@ -4271,7 +4422,7 @@
New task
New task
- admin/task-manager/index.html.twig
+ admin/task-manager/index.html.twig
Next
@@ -4288,7 +4439,7 @@
No URL available
No URL available
- prod/Share/record.html.twig
+ prod/Share/record.html.twig
No account yet?
@@ -4389,7 +4540,7 @@
Nom du nouveau modele
New template name
- web/admin/index.html.twig
+ web/admin/index.html.twig
Nom du nouveau panier
@@ -4448,7 +4599,7 @@
Notifications
Notifications
- web/common/menubar.html.twig
+ web/common/menubar.html.twig
Notifications globales
@@ -4586,7 +4737,7 @@
Orders manager
Orders manager
eventsmanager/notify/order.php
- web/common/menubar.html.twig
+ web/common/menubar.html.twig
Ordinary
@@ -4717,7 +4868,7 @@
Phraseanet client API
Phraseanet client API
- Form/Configuration/MainConfigurationFormType.php
+ Form/Configuration/MainConfigurationFormType.php
Phraseanet embarque un moteur de taches pour la lecture / ecriture des metadonnes, et autre operations
@@ -4839,7 +4990,7 @@
Please select at least one valid file
Please select at least one valid file
- prod/upload/upload-flash.html.twig
+ prod/upload/upload-flash.html.twig
Please select one record
@@ -4875,9 +5026,10 @@
Preferences
Settings
- web/prod/index.html.twig
- web/prod/index.html.twig
- web/prod/index.html.twig
+ web/prod/index.html.twig
+ web/prod/index.html.twig
+ web/prod/index.html.twig
+ web/prod/index.html.twig
Prefix for notification emails
@@ -4892,12 +5044,18 @@
Presentation de vignettes
Thumbnails
- web/prod/index.html.twig
+ web/prod/index.html.twig
Presentation de vignettes de panier
Basket display setup
- web/prod/index.html.twig
+ web/prod/index.html.twig
+
+
+ Presets
+ Presets
+ web/admin/subdefs.html.twig
+ web/admin/subdefs.html.twig
Previous
@@ -4946,8 +5104,8 @@
Publications
admin/publications/wrapper.html.twig
web/admin/tree.html.twig
- web/common/menubar.html.twig
- web/prod/index.html.twig
+ web/common/menubar.html.twig
+ web/prod/index.html.twig
Publier
@@ -4974,7 +5132,7 @@
Push configuration
Push configuration
- Form/Configuration/MainConfigurationFormType.php
+ Form/Configuration/MainConfigurationFormType.php
Push from %user%
@@ -5056,80 +5214,80 @@
Raccourcis claviers de la zone des paniers :
- web/prod/index.html.twig
+ web/prod/index.html.twig
Raccourcis claviers en cours de editing :
Edit window shortcuts
- web/prod/index.html.twig
+ web/prod/index.html.twig
Raccourcis claviers en cours de preview :
Detailed View window shortcut
- web/prod/index.html.twig
+ web/prod/index.html.twig
Raccourcis claviers en cours de recherche :
Main windows shortcuts
- web/prod/index.html.twig
+ web/prod/index.html.twig
Raccourcis:: ctrl-a : tout selectionner
ctrl-a : select all
- web/prod/index.html.twig
- web/prod/index.html.twig
+ web/prod/index.html.twig
+ web/prod/index.html.twig
Raccourcis:: ctrl-e : editer la selection
ctrl-e : edit selection
- web/prod/index.html.twig
- web/prod/index.html.twig
+ web/prod/index.html.twig
+ web/prod/index.html.twig
Raccourcis:: ctrl-p : imprimer la selection
ctrl-p : print selected
- web/prod/index.html.twig
- web/prod/index.html.twig
+ web/prod/index.html.twig
+ web/prod/index.html.twig
Raccourcis::espace : arreter/demarrer le diaporama
space : start/stop diaporama
- web/prod/index.html.twig
+ web/prod/index.html.twig
Raccourcis::fleche bas : scroll vertical
down arrow : vertical scroll
- web/prod/index.html.twig
+ web/prod/index.html.twig
Raccourcis::fleche droite : page suivante
right arrow : next page
- web/prod/index.html.twig
+ web/prod/index.html.twig
Raccourcis::fleche gauche : en arriere
left arrow : previous document
- web/prod/index.html.twig
+ web/prod/index.html.twig
Raccourcis::fleche gauche : en avant
right arrow : next document
- web/prod/index.html.twig
+ web/prod/index.html.twig
Raccourcis::fleche gauche : page precedente
left arrow : previous page
- web/prod/index.html.twig
+ web/prod/index.html.twig
Raccourcis::fleche haut : scroll vertical
up arrow : vertical scroll
- web/prod/index.html.twig
+ web/prod/index.html.twig
Raccourcis::tab/shift-tab se ballade dans les champs
tab/shift-tab : change field
- web/prod/index.html.twig
+ web/prod/index.html.twig
Rappel : Il vous reste %number% jours pour valider %title% de %user%
@@ -5150,14 +5308,14 @@
Re-initialiser
Reset
prod/Baskets/Reorder.html.twig
- web/prod/index.html.twig
+ web/prod/index.html.twig
prod/Story/Reorder.html.twig
Re-ordonner
Set order
- prod/Baskets/Reorder.html.twig
- prod/Story/Reorder.html.twig
+ prod/Baskets/Reorder.html.twig
+ prod/Story/Reorder.html.twig
prod/WorkZone/Macros.html.twig
prod/WorkZone/Macros.html.twig
prod/WorkZone/Macros.html.twig
@@ -5262,7 +5420,7 @@
Rechercher dans un champ date
In a date field
- web/prod/index.html.twig
+ web/prod/index.html.twig
Recommendations
@@ -5282,7 +5440,7 @@
Record Not Found
Record not found
- Controller/Api/V1Controller.php
+ Controller/Api/V1Controller.php
Record removed from basket
@@ -5307,7 +5465,7 @@
Records have been successfuly moved
Records have been successfuly moved
- Controller/Prod/MoveCollectionController.php
+ Controller/Prod/MoveCollectionController.php
Records type
@@ -5341,7 +5499,7 @@
Registration
Registration
- Form/Configuration/MainConfigurationFormType.php
+ Form/Configuration/MainConfigurationFormType.php
Reglages:: reglages d acces guest
@@ -5363,7 +5521,7 @@
Relevance
Relevance
- web/prod/index.html.twig
+ web/prod/index.html.twig
Remember me
@@ -5463,7 +5621,7 @@
Require email validation to activate the account
Require e-mail validation to activate the account.
- web/admin/index.html.twig
+ web/admin/index.html.twig
Required
@@ -5483,12 +5641,12 @@
Reset and apply
Reset and apply
- web/admin/index.html.twig
+ web/admin/index.html.twig
Reset and apply template
Reset and apply template
- web/admin/index.html.twig
+ web/admin/index.html.twig
Reset cache
@@ -5498,7 +5656,7 @@
Reset rights before applying template?
Reset rights before applying template?
- web/admin/index.html.twig
+ web/admin/index.html.twig
Resolution
@@ -5509,7 +5667,7 @@
Resource URL
Resource URL
- prod/Share/record.html.twig
+ prod/Share/record.html.twig
Resquest access
@@ -5585,7 +5743,7 @@
Rights will be erased before applying template, do you confirm?
Rights will be erased before applying template, do you confirm?
- web/admin/index.html.twig
+ web/admin/index.html.twig
Role
@@ -5687,7 +5845,7 @@
Search engine
Search engine
- Form/Configuration/MainConfigurationFormType.php
+ Form/Configuration/MainConfigurationFormType.php
SearchEngine settings
@@ -5761,13 +5919,13 @@
admin/statusbit/edit.html.twig
admin/statusbit/edit.html.twig
user/import/file.html.twig
- prod/upload/upload-flash.html.twig
+ prod/upload/upload-flash.html.twig
prod/upload/upload.html.twig
Selected files
Selected files
- prod/upload/upload-flash.html.twig
+ prod/upload/upload-flash.html.twig
Send
@@ -5778,23 +5936,23 @@
prod/actions/Push.html.twig
prod/orders/order_item.html.twig
prod/orders/order_item.html.twig
- prod/upload/upload-flash.html.twig
- prod/upload/upload.html.twig
+ prod/upload/upload-flash.html.twig
+ prod/upload/upload.html.twig
Send an email to the user to setup his password
Send user an e-mail for password setup.
- web/admin/index.html.twig
+ web/admin/index.html.twig
Send to Facebook
Send to Facebook
- prod/Share/record.html.twig
+ prod/Share/record.html.twig
Send to Twitter
Send to Twitter
- prod/Share/record.html.twig
+ prod/Share/record.html.twig
Sent
@@ -5830,7 +5988,7 @@
Sessions
Sessions
- web/account/base.html.twig
+ web/account/base.html.twig
Set download quotas
@@ -6010,7 +6168,7 @@
Start
Start
admin/task-manager/index.html.twig
- admin/task-manager/index.html.twig
+ admin/task-manager/index.html.twig
admin/task-manager/templates.html.twig
admin/task-manager/templates.html.twig
@@ -6038,7 +6196,7 @@
Status des documents a rechercher
Document status
- web/prod/index.html.twig
+ web/prod/index.html.twig
Status edition
@@ -6059,7 +6217,7 @@
Stop
Stop
admin/task-manager/index.html.twig
- admin/task-manager/index.html.twig
+ admin/task-manager/index.html.twig
admin/task-manager/templates.html.twig
admin/task-manager/templates.html.twig
prod/upload/lazaret.html.twig
@@ -6078,7 +6236,7 @@
Story Not Found
Story not found
- Controller/Api/V1Controller.php
+ Controller/Api/V1Controller.php
Story created
@@ -6128,7 +6286,7 @@
Subdef name
Subview name
- web/admin/subdefs.html.twig
+ web/admin/subdefs.html.twig
Submit
@@ -6155,7 +6313,7 @@
Successful install
Successful installation
- web/admin/index.html.twig
+ web/admin/index.html.twig
Successful removal
@@ -6277,7 +6435,7 @@
Target Device
Target device
- classes/databox/subdef.php
+ classes/databox/subdef.php
Task Edition
@@ -6309,7 +6467,7 @@
Telechargeable
Downloadable
- web/admin/subdefs.html.twig
+ web/admin/subdefs.html.twig
Template
@@ -6472,7 +6630,7 @@
The upload violates a security restriction, please retry
The upload violates a security restriction. Please retry
- prod/upload/upload-flash.html.twig
+ prod/upload/upload-flash.html.twig
The user has been created.
@@ -6482,7 +6640,7 @@
Theme
Skin
- web/prod/index.html.twig
+ web/prod/index.html.twig
There is no one to validate orders, please contact an administrator
@@ -6527,7 +6685,7 @@
These subdef will be permanently deleted and cannot be recovered. Are you sure?
These subdef will be permanently deleted, recovery will be impossible. Are you sure?
- web/admin/subdefs.html.twig
+ web/admin/subdefs.html.twig
Third-party applications
@@ -6548,7 +6706,7 @@
This field is required
This field is required
- web/admin/index.html.twig
+ web/admin/index.html.twig
This field represents the title of the document
@@ -6559,7 +6717,7 @@
This file is too big
This file is too big
Controller/Prod/LanguageController.php
- web/admin/index.html.twig
+ web/admin/index.html.twig
This is a template
@@ -6586,11 +6744,6 @@
This user has no rights
web/admin/users.html.twig
-
- This version does not allow you to access all the features offered by the HTML5 uploader
- This version does not allow the full features offered by the HTML5 uploader
- prod/upload/upload-flash.html.twig
-
This year
This year
@@ -6668,7 +6821,7 @@
Tout type
All types
- web/prod/index.html.twig
+ web/prod/index.html.twig
Toutes les publications
@@ -6688,8 +6841,8 @@
Transmited files
Transmitted files
- prod/upload/upload-flash.html.twig
- prod/upload/upload.html.twig
+ prod/upload/upload-flash.html.twig
+ prod/upload/upload.html.twig
Trier
@@ -6700,7 +6853,7 @@
Trier par
Sort by
- web/prod/index.html.twig
+ web/prod/index.html.twig
Try to extract embedded thumbnails
@@ -6725,7 +6878,7 @@
Type de documents
Document(s) Type
- web/prod/index.html.twig
+ web/prod/index.html.twig
Type nombre
@@ -6846,7 +6999,7 @@
Une question personnelle
The query
- web/prod/index.html.twig
+ web/prod/index.html.twig
Une selection
@@ -6859,17 +7012,17 @@
Unhandled Error
Unhandled error
- prod/upload/upload-flash.html.twig
+ prod/upload/upload-flash.html.twig
Unknow Error
Unknown error
- prod/upload/upload-flash.html.twig
+ prod/upload/upload-flash.html.twig
Unknow reason
Unknown reason
- prod/upload/upload-flash.html.twig
+ prod/upload/upload-flash.html.twig
Unknown user %user_id%
@@ -6904,7 +7057,7 @@
Upload
Upload
- web/common/menubar.html.twig
+ web/common/menubar.html.twig
Bridge/Dailymotion/upload.html.twig
Bridge/Dailymotion/upload.html.twig
Bridge/Flickr/upload.html.twig
@@ -6918,7 +7071,7 @@
Upload URL is not set, please contact an admin
Upload URL is not set. Please contact your administrator
- prod/upload/upload-flash.html.twig
+ prod/upload/upload-flash.html.twig
Upload a csv file for users creation
@@ -6953,7 +7106,7 @@
Use latest search settings on Production loading
Use latest search settings on Production when loading
- web/prod/index.html.twig
+ web/prod/index.html.twig
Use my Phraseanet account
@@ -6968,12 +7121,16 @@
Use the Flash uploader
Use the Flash uploader version
- prod/upload/upload.html.twig
+ prod/upload/upload-flash.html.twig
+ prod/upload/upload.html.twig
+ prod/upload/upload.html.twig
Use the HTML5 uploader
Switch to HTML5 uploader
- prod/upload/upload-flash.html.twig
+ prod/upload/upload-flash.html.twig
+ prod/upload/upload-flash.html.twig
+ prod/upload/upload.html.twig
Use with mod_token. Attention requires the apache modules and mod_h264_streaming mod_auth_token
@@ -7124,7 +7281,7 @@
Video
Video
- web/prod/index.html.twig
+ web/prod/index.html.twig
Video Codec
@@ -7346,7 +7503,7 @@
Vous pouvez quitter la plupart des fenetres survolantes via la touche echap
esc : close most of overlayed windows
- web/prod/index.html.twig
+ web/prod/index.html.twig
Warning !
@@ -7383,7 +7540,7 @@
Webservices connectivity
Webservices connectivity
- Form/Configuration/MainConfigurationFormType.php
+ Form/Configuration/MainConfigurationFormType.php
Weight
@@ -7431,19 +7588,19 @@
Would you like to reset rights before applying the template?
Reset rights before applying the template?
- web/admin/index.html.twig
web/admin/index.html.twig
+ web/admin/index.html.twig
Write Metas
Write Metadatas
- web/admin/subdefs.html.twig
+ web/admin/subdefs.html.twig
YYYY/MM/DD
YYYY/MM/DD
- web/prod/index.html.twig
- web/prod/index.html.twig
+ web/prod/index.html.twig
+ web/prod/index.html.twig
Yes
@@ -7508,18 +7665,6 @@
You are not the owner of this feed, you cannot edit it
Controller/Admin/FeedController.php
-
- You are using the Flash uploader.
- You are using the Flash uploader
- prod/upload/upload-flash.html.twig
- prod/upload/upload-flash.html.twig
-
-
- You are using the HTML5 uploader.
- You are using the HTML5 uploader
- prod/upload/upload.html.twig
- prod/upload/upload.html.twig
-
You can download an example by clicking here
Download an example file
@@ -7553,8 +7698,8 @@
You can not upload files
You are not allowed to upload files
- prod/upload/upload-flash.html.twig
- prod/upload/upload.html.twig
+ prod/upload/upload-flash.html.twig
+ prod/upload/upload.html.twig
You do not enough rights to update status
@@ -7589,7 +7734,7 @@
You do not have the permission to move records to %collection%
You do not have the permission to move records to %collection%
- Controller/Prod/MoveCollectionController.php
+ Controller/Prod/MoveCollectionController.php
You have %quantity% days to validate the selection.
@@ -7604,7 +7749,7 @@
You have attempted to queue too many files
You have attempted to queue too many files
- prod/upload/upload-flash.html.twig
+ prod/upload/upload-flash.html.twig
You have not access to this basket
@@ -7702,11 +7847,6 @@
Your account with the login %login% as been created
Notification/Mail/MailRequestPasswordSetup.php
-
- Your browser does not support all HTML5 features properly.
- Your browser does not support all HTML5 features.
- prod/upload/upload.html.twig
-
Your configuration has been successfuly saved.
Your configuration has been successfuly saved.
@@ -7773,11 +7913,7 @@
action : bridge
Bridge
- web/prod/index.html.twig
- web/prod/toolbar.html.twig
- web/prod/toolbar.html.twig
- prod/WorkZone/Basket.html.twig
- prod/WorkZone/Story.html.twig
+ web/prod/index.html.twig
action : collection
@@ -7801,7 +7937,7 @@
lightbox/IE6/feed.html.twig
lightbox/IE6/validate.html.twig
web/lightbox/validate.html.twig
- web/prod/index.html.twig
+ web/prod/index.html.twig
prod/preview/tools.html.twig
prod/results/record.html.twig
web/prod/toolbar.html.twig
@@ -7811,7 +7947,7 @@
action : outils
Tools
- web/prod/toolbar.html.twig
+ web/prod/toolbar.html.twig
prod/WorkZone/Basket.html.twig
prod/WorkZone/Story.html.twig
@@ -7827,9 +7963,9 @@
action : publier
Publish
- web/prod/index.html.twig
+ web/prod/index.html.twig
web/prod/toolbar.html.twig
- web/prod/toolbar.html.twig
+ web/prod/toolbar.html.twig
prod/WorkZone/Basket.html.twig
prod/WorkZone/Story.html.twig
@@ -7851,7 +7987,7 @@
action : supprimer
Delete
- web/prod/toolbar.html.twig
+ web/prod/toolbar.html.twig
prod/WorkZone/Basket.html.twig
prod/WorkZone/Macros.html.twig
prod/WorkZone/Story.html.twig
@@ -7860,15 +7996,15 @@
action:: nouveau panier
New basket
web/prod/index.html.twig
- web/prod/index.html.twig
web/prod/index.html.twig
+ web/prod/index.html.twig
action:: nouveau reportage
New Story
- web/prod/index.html.twig
- web/prod/index.html.twig
- web/prod/index.html.twig
+ web/prod/index.html.twig
+ web/prod/index.html.twig
+ web/prod/index.html.twig
action::Valider
@@ -8566,7 +8702,7 @@
Controller/Admin/ConnectedUsersController.php
lib/classes/phrasea.php
web/admin/connected-users.html.twig
- web/common/menubar.html.twig
+ web/common/menubar.html.twig
admin::monitor: module client
@@ -8574,8 +8710,8 @@
Controller/Admin/ConnectedUsersController.php
lib/classes/phrasea.php
classes/record/preview.php
- classes/record/preview.php
- classes/record/preview.php
+ classes/record/preview.php
+ classes/record/preview.php
web/admin/connected-users.html.twig
@@ -8596,8 +8732,8 @@
Controller/Admin/ConnectedUsersController.php
lib/classes/phrasea.php
classes/record/preview.php
- classes/record/preview.php
- classes/record/preview.php
+ classes/record/preview.php
+ classes/record/preview.php
web/admin/connected-users.html.twig
@@ -8606,7 +8742,7 @@
Controller/Admin/ConnectedUsersController.php
lib/classes/phrasea.php
web/admin/connected-users.html.twig
- web/common/menubar.html.twig
+ web/common/menubar.html.twig
admin::monitor: module thesaurus
@@ -8614,14 +8750,14 @@
Controller/Admin/ConnectedUsersController.php
lib/classes/phrasea.php
web/admin/connected-users.html.twig
- web/common/menubar.html.twig
+ web/common/menubar.html.twig
admin::monitor: module upload
Upload
Controller/Admin/ConnectedUsersController.php
lib/classes/phrasea.php
- web/common/menubar.html.twig
+ web/common/menubar.html.twig
admin::monitor: module validation
@@ -8631,7 +8767,7 @@
Phrasea/Controller/LightboxController.php
Phrasea/Controller/LightboxController.php
lib/classes/phrasea.php
- web/common/menubar.html.twig
+ web/common/menubar.html.twig
admin::monitor: modules
@@ -8641,7 +8777,7 @@
admin::monitor: production
Prod
- web/common/menubar.html.twig
+ web/common/menubar.html.twig
admin::monitor: total des utilisateurs uniques :
@@ -8858,6 +8994,7 @@
audio
audio
Phrasea/Twig/PhraseanetExtension.php
+ web/admin/subdefs.html.twig
task-manager/task-editor/subdefs.html.twig
@@ -8903,12 +9040,12 @@
boutton:: selectionner aucune base
None
- web/prod/index.html.twig
+ web/prod/index.html.twig
boutton:: selectionner toutes les bases
All
- web/prod/index.html.twig
+ web/prod/index.html.twig
boutton::ajouter
@@ -8924,7 +9061,7 @@
Controller/Prod/LanguageController.php
web/account/reset-email.html.twig
admin/collection/create.html.twig
- web/admin/index.html.twig
+ web/admin/index.html.twig
admin/publications/fiche.html.twig
web/common/dialog_export.html.twig
web/common/dialog_export.html.twig
@@ -8948,9 +9085,9 @@
web/thesaurus/link-field-step2.html.twig
web/thesaurus/new-term.html.twig
web/thesaurus/new-term.html.twig
- web/thesaurus/thesaurus.html.twig
- web/thesaurus/thesaurus.html.twig
- web/thesaurus/thesaurus.html.twig
+ web/thesaurus/thesaurus.html.twig
+ web/thesaurus/thesaurus.html.twig
+ web/thesaurus/thesaurus.html.twig
boutton::appliquer
@@ -8963,8 +9100,8 @@
web/admin/users.html.twig
actions/Feedback/list.html.twig
web/prod/index.html.twig
- web/thesaurus/thesaurus.html.twig
- web/thesaurus/thesaurus.html.twig
+ web/thesaurus/thesaurus.html.twig
+ web/thesaurus/thesaurus.html.twig
boutton::choisir
@@ -9078,7 +9215,7 @@
boutton::rechercher
Search
Controller/Prod/LanguageController.php
- web/prod/index.html.twig
+ web/prod/index.html.twig
boutton::refresh
@@ -9153,7 +9290,7 @@
admin/collection/suggested_value.html.twig
admin/publications/fiche.html.twig
admin/publications/list.html.twig
- web/admin/subdefs.html.twig
+ web/admin/subdefs.html.twig
Bridge/Dailymotion/actioncontainers.html.twig
Bridge/Dailymotion/actionelements.html.twig
actions/Bridge/disconnected.html.twig
@@ -9202,10 +9339,10 @@
web/admin/editusers.html.twig
admin/publications/fiche.html.twig
admin/publications/list.html.twig
- web/admin/setup.html.twig
+ web/admin/setup.html.twig
admin/statusbit/edit.html.twig
web/admin/structure.html.twig
- web/admin/subdefs.html.twig
+ web/admin/subdefs.html.twig
user/import/view.html.twig
admin/user/registrations.html.twig
web/developers/application_form.html.twig
@@ -9226,10 +9363,10 @@
Bridge/Youtube/video_moveinto_playlist.html.twig
prod/actions/edit_default.html.twig
prod/actions/edit_default.html.twig
- prod/Baskets/Reorder.html.twig
+ prod/Baskets/Reorder.html.twig
prod/Baskets/Update.html.twig
- web/prod/index.html.twig
- prod/Story/Reorder.html.twig
+ web/prod/index.html.twig
+ prod/Story/Reorder.html.twig
web/report/all_content.html.twig
web/thesaurus/accept.html.twig
web/thesaurus/export-text-dialog.html.twig
@@ -9240,7 +9377,7 @@
web/thesaurus/link-field-step2.html.twig
web/thesaurus/new-term.html.twig
web/thesaurus/new-term.html.twig
- web/thesaurus/thesaurus.html.twig
+ web/thesaurus/thesaurus.html.twig
boutton::vue graphique
@@ -9344,18 +9481,18 @@
Select
admin/collection/create.html.twig
admin/databox/databox.html.twig
- web/prod/index.html.twig
+ web/prod/index.html.twig
classe
Class
- web/admin/subdefs.html.twig
- web/admin/subdefs.html.twig
+ web/admin/subdefs.html.twig
+ web/admin/subdefs.html.twig
classe d'acces
Access Class
- web/admin/subdefs.html.twig
+ web/admin/subdefs.html.twig
cocher tout
@@ -9387,9 +9524,9 @@
copyClipboardLabel
Copy to clipboard
- prod/Share/record.html.twig
- prod/Share/record.html.twig
- prod/Share/record.html.twig
+ prod/Share/record.html.twig
+ prod/Share/record.html.twig
+ prod/Share/record.html.twig
dans %category%
@@ -9431,8 +9568,9 @@
document
document
Phrasea/Twig/PhraseanetExtension.php
- web/admin/subdefs.html.twig
- web/admin/subdefs.html.twig
+ web/admin/subdefs.html.twig
+ web/admin/subdefs.html.twig
+ web/admin/subdefs.html.twig
task-manager/task-editor/subdefs.html.twig
@@ -9537,6 +9675,11 @@
web/common/dialog_export.html.twig
web/common/dialog_export.html.twig
+
+ export::export-email: email-invalid
+ export::export-email: email-invalid
+ web/common/dialog_export.html.twig
+
export::ftp: reglages manuels
Manual settings
@@ -9598,6 +9741,7 @@
flash
flash
Phrasea/Twig/PhraseanetExtension.php
+ web/admin/subdefs.html.twig
task-manager/task-editor/subdefs.html.twig
@@ -9672,6 +9816,7 @@
image
Image
Phrasea/Twig/PhraseanetExtension.php
+ web/admin/subdefs.html.twig
task-manager/task-editor/subdefs.html.twig
@@ -9687,12 +9832,17 @@
index::advance_search: disable-facet
Hide facets with 1 result (experimental)
- web/prod/index.html.twig
+ web/prod/index.html.twig
index::advance_search: facet
Facets Preferences
- web/prod/index.html.twig
+ web/prod/index.html.twig
+
+
+ index:advanced-preferences:: use truncation
+ index:advanced-preferences:: use truncation
+ web/prod/index.html.twig
invite:: Redirection vers la zone d'authentification, cliquez sur OK pour continuer ou annulez
@@ -9754,7 +9904,7 @@
login:: Mon compte
My account
web/account/account.html.twig
- web/common/menubar.html.twig
+ web/common/menubar.html.twig
login:: Visitez le lien suivant et suivez les instructions pour continuer, sinon ignorez cet email et il ne se passera rien
@@ -9875,7 +10025,8 @@
mediatype
Media type
- web/admin/subdefs.html.twig
+ web/admin/subdefs.html.twig
+ web/admin/subdefs.html.twig
meta-datas
@@ -9901,7 +10052,7 @@
no
No
web/account/sessions.html.twig
- web/admin/subdefs.html.twig
+ web/admin/subdefs.html.twig
user/import/view.html.twig
web/common/technical_datas.html.twig
@@ -10317,7 +10468,7 @@
phraseanet:: a propos
About
- web/common/menubar.html.twig
+ web/common/menubar.html.twig
phraseanet:: adresse
@@ -10331,7 +10482,7 @@
phraseanet:: aide
Help
- web/common/menubar.html.twig
+ web/common/menubar.html.twig
phraseanet:: choisir
@@ -10352,7 +10503,7 @@
phraseanet:: deconnection
Sign out
- web/common/menubar.html.twig
+ web/common/menubar.html.twig
actions/Bridge/wrapper.html.twig
@@ -10370,7 +10521,7 @@
phraseanet:: language
Language
- web/thesaurus/thesaurus.html.twig
+ web/thesaurus/thesaurus.html.twig
phraseanet:: password
@@ -10415,7 +10566,7 @@
phraseanet:: raccourcis clavier
Shortcuts
- web/common/menubar.html.twig
+ web/common/menubar.html.twig
phraseanet:: sous definition
@@ -10433,7 +10584,7 @@
web/thesaurus/load-thesaurus.html.twig
web/thesaurus/load-thesaurus.html.twig
web/thesaurus/thesaurus.html.twig
- web/thesaurus/thesaurus.html.twig
+ web/thesaurus/thesaurus.html.twig
phraseanet:: tri
@@ -10443,15 +10594,17 @@
phraseanet:: tri par date
Sort by date
- web/prod/index.html.twig
- web/prod/index.html.twig
+ web/prod/index.html.twig
+ web/prod/index.html.twig
+ web/prod/index.html.twig
web/thesaurus/export-topics-dialog.html.twig
phraseanet:: tri par nom
Sort by name
- web/prod/index.html.twig
- web/prod/index.html.twig
+ web/prod/index.html.twig
+ web/prod/index.html.twig
+ web/prod/index.html.twig
phraseanet:: user
@@ -10475,26 +10628,26 @@
Controller/Prod/LanguageController.php
admin/collection/suggested_value.html.twig
prod/actions/edit_default.html.twig
- web/thesaurus/thesaurus.html.twig
+ web/thesaurus/thesaurus.html.twig
phraseanet::erreur: La connection au serveur Phraseanet semble etre indisponible
Server connection is not available
Controller/Prod/LanguageController.php
- web/admin/index.html.twig
+ web/admin/index.html.twig
phraseanet::erreur: Une erreur est survenue, si ce probleme persiste, contactez le support technique
An error occurred. If this problem happens again, please contact technical support
Controller/Prod/LanguageController.php
- web/admin/index.html.twig
+ web/admin/index.html.twig
phraseanet::erreur: Votre session est fermee, veuillez vous re-authentifier
Your session is closed, please re-authentificate
Controller/Prod/LanguageController.php
- web/admin/index.html.twig
- web/thesaurus/thesaurus.html.twig
+ web/admin/index.html.twig
+ web/thesaurus/thesaurus.html.twig
phraseanet::erreur: echec du serveur de mail
@@ -10584,12 +10737,12 @@
phraseanet::time:: a
To
- web/prod/index.html.twig
+ web/prod/index.html.twig
phraseanet::time:: de
From
- web/prod/index.html.twig
+ web/prod/index.html.twig
phraseanet::type:: audios
@@ -10599,7 +10752,7 @@
phraseanet::type:: documents
Documents
- web/prod/index.html.twig
+ web/prod/index.html.twig
web/prod/toolbar.html.twig
@@ -10610,7 +10763,7 @@
phraseanet::type:: reportages
Stories
- web/prod/index.html.twig
+ web/prod/index.html.twig
phraseanet::type:: videos
@@ -10645,23 +10798,23 @@