diff --git a/.circleci/config.yml b/.circleci/config.yml index 6ab1d246b2..76f7c42a12 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -37,7 +37,8 @@ jobs: - run: git clone https://github.com/alanxz/rabbitmq-c - run: cd rabbitmq-c && git checkout 2ca1774489328cde71195f5fa95e17cf3a80cb8a - run: cd rabbitmq-c && git submodule init && git submodule update && autoreconf -i && ./configure && make && sudo make install - - run: pecl channel-update pear.php.net + # disabled because pear.php.net is down cause of security failure + #- run: pecl channel-update pear.php.net - run: yes '' | pecl install amqp-1.9.3 - run: yes '' | pecl install imagick - run: sudo apt-get install libzmq-dev diff --git a/AUTHORS b/AUTHORS index d749eb8fcf..759fbbde75 100644 --- a/AUTHORS +++ b/AUTHORS @@ -1,28 +1,40 @@ ** Phraseanet is written and maintained by the Phraseanet Developer Team ** - Benoît Burnichon - Jean-Yves Gaulier - Andrey Kalinovsky - Nicolas Legoff - Romain Neutron + - Jean-Yves Gaulier + - Milos M + - Mike NG + - Xavier Rousset + - Aina Sitraka + - Filip Vilic + ** Proudly Powered by Alchemy ** - Nicolas Amendola - Nathanaël Attar - Aurélie Bachelet - Anthony Cabot - Moctar Diouf - Jennifer Guérin - Nicolas Honoré - Nicolas Maillat - Guillaume Maubert - Jonathan Schneider + - Aurélie Bachelet + - Laetitia Bianchi + - Anthony Cabot + - Moctar Diouf + - Jennifer Guérin + - Félix Noir + - Nicolas Maillat + - Guillaume Maubert + ** They gave some love to Phraseanet ** - Ysoline Gresille + - Nicolas Amendola + - Nathanaël Attar + - Florian Blouet + - Benoît Burnichon + - Thibaud Fabre + - Ysoline Gresille + - Nicolas Honoré + - Andrey Kalinovsky + - Nicolas Legoff + - Romain Neutron + - Jonathan Schneider + Phraseanet c/o Alchemy 30 Place Saint Georges 75009 Paris - France diff --git a/CONTRIBUTORS b/CONTRIBUTORS index 4c9772eaed..794f49dee1 100644 --- a/CONTRIBUTORS +++ b/CONTRIBUTORS @@ -1,3 +1,7 @@ +#version 4.0 + - Krzysztof Szulski Security + - Ideepix Docker Deploiement + #version 3.7 - Pieter Demonie (Dutch localization) diff --git a/Makefile b/Makefile index f8a5978138..b66b5a375e 100644 --- a/Makefile +++ b/Makefile @@ -5,7 +5,7 @@ install: make install_assets install_composer: - composer install + composer install --ignore-platform-reqs install_asset_dependencies: yarn upgrade diff --git a/Vagrantfile b/Vagrantfile index 863b1be769..4e71464ef1 100644 --- a/Vagrantfile +++ b/Vagrantfile @@ -35,7 +35,7 @@ else if which('ifconfig') end $php = [ "5.6", "7.0", "7.1", "7.2" ] -$phpVersion = ENV['phpversion'] ? ENV['phpversion'] : "5.6"; +$phpVersion = ENV['phpversion'] ? ENV['phpversion'] : "7.0"; unless Vagrant.has_plugin?('vagrant-hostmanager') raise "vagrant-hostmanager is not installed! Please run\n vagrant plugin install vagrant-hostmanager\n\n" @@ -70,6 +70,9 @@ def config_net(config) vb.customize ["setextradata", :id, "VBoxInternal2/SharedFoldersEnableSymlinksCreate/vagrant", "1"] end end + + config.vm.network :public_network, bridge:"en0: Ethernet" + config.hostmanager.ip_resolver = proc do |vm, resolving_vm| if vm.id if $env == "mac" || $env == "linux" @@ -163,4 +166,4 @@ Vagrant.configure("2") do |config| config.vm.synced_folder "./", "/vagrant" end -end \ No newline at end of file +end diff --git a/composer.json b/composer.json index bd39a204e7..98a77a6f1a 100644 --- a/composer.json +++ b/composer.json @@ -50,7 +50,7 @@ "alchemy/embed-bundle": "^0.3.4", "alchemy/geonames-api-consumer": "~0.1.0", "alchemy/mediavorus": "^0.4.4", - "alchemy/oauth2php": "1.0.0", + "alchemy/oauth2php": "1.1.0", "alchemy/phlickr": "0.2.9", "alchemy/phpexiftool": "^0.7.0", "alchemy/rest-bundle": "^0.0.5", diff --git a/composer.lock b/composer.lock index 9745425f25..d9eae9b3ee 100644 --- a/composer.lock +++ b/composer.lock @@ -1,10 +1,10 @@ { "_readme": [ "This file locks the dependencies of your project to a known state", - "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#composer-lock-the-lock-file", + "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies", "This file is @generated automatically" ], - "content-hash": "253990d4c81f9ae5f78c6c1221d6cf29", + "content-hash": "adf4074eb26ea80d414430d4f7b61311", "packages": [ { "name": "alchemy-fr/tcpdf-clone", @@ -131,16 +131,16 @@ }, { "name": "alchemy/embed-bundle", - "version": "0.3.7", + "version": "0.3.8", "source": { "type": "git", "url": "https://github.com/alchemy-fr/embed-bundle.git", - "reference": "ce7408c7a47387eed3df2a743577d6e0e25f991f" + "reference": "8a9699bc51e2b2997ccfd357bb2892f3702c33ef" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/alchemy-fr/embed-bundle/zipball/ce7408c7a47387eed3df2a743577d6e0e25f991f", - "reference": "ce7408c7a47387eed3df2a743577d6e0e25f991f", + "url": "https://api.github.com/repos/alchemy-fr/embed-bundle/zipball/8a9699bc51e2b2997ccfd357bb2892f3702c33ef", + "reference": "8a9699bc51e2b2997ccfd357bb2892f3702c33ef", "shasum": "" }, "require-dev": { @@ -178,10 +178,10 @@ ], "description": "Embed resources bundle", "support": { - "source": "https://github.com/alchemy-fr/embed-bundle/tree/0.3.7", + "source": "https://github.com/alchemy-fr/embed-bundle/tree/0.3.8", "issues": "https://github.com/alchemy-fr/embed-bundle/issues" }, - "time": "2017-05-30T13:18:21+00:00" + "time": "2019-01-11T10:35:41+00:00" }, { "name": "alchemy/geonames-api-consumer", @@ -275,16 +275,16 @@ }, { "name": "alchemy/mediavorus", - "version": "0.4.8", + "version": "0.4.9", "source": { "type": "git", "url": "https://github.com/alchemy-fr/MediaVorus.git", - "reference": "6a50c397211dfdf6da108ea1ebc7527c37419ab7" + "reference": "1a96dc4142ff8474c11285cab9eab11df9683255" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/alchemy-fr/MediaVorus/zipball/6a50c397211dfdf6da108ea1ebc7527c37419ab7", - "reference": "6a50c397211dfdf6da108ea1ebc7527c37419ab7", + "url": "https://api.github.com/repos/alchemy-fr/MediaVorus/zipball/1a96dc4142ff8474c11285cab9eab11df9683255", + "reference": "1a96dc4142ff8474c11285cab9eab11df9683255", "shasum": "" }, "require": { @@ -333,20 +333,20 @@ "keywords": [ "metadata" ], - "time": "2018-05-03T14:17:10+00:00" + "time": "2019-01-22T11:23:34+00:00" }, { "name": "alchemy/oauth2php", - "version": "1.0.0", + "version": "1.1.0", "source": { "type": "git", "url": "https://github.com/alchemy-fr/oauth2-php.git", - "reference": "cb4fcb73e30ab54e0fb85a65b4d57147f7a0df15" + "reference": "801510972240555fa182813851efd96659d37a68" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/alchemy-fr/oauth2-php/zipball/cb4fcb73e30ab54e0fb85a65b4d57147f7a0df15", - "reference": "cb4fcb73e30ab54e0fb85a65b4d57147f7a0df15", + "url": "https://api.github.com/repos/alchemy-fr/oauth2-php/zipball/801510972240555fa182813851efd96659d37a68", + "reference": "801510972240555fa182813851efd96659d37a68", "shasum": "" }, "type": "library", @@ -356,7 +356,7 @@ ] }, "notification-url": "https://packagist.org/downloads/", - "time": "2013-07-01T09:46:59+00:00" + "time": "2019-01-17T14:34:10+00:00" }, { "name": "alchemy/phlickr", @@ -1898,12 +1898,12 @@ "version": "v2.5.6", "source": { "type": "git", - "url": "https://github.com/doctrine/doctrine2.git", + "url": "https://github.com/doctrine/orm.git", "reference": "e6c434196c8ef058239aaa0724b4aadb0107940b" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/doctrine/doctrine2/zipball/e6c434196c8ef058239aaa0724b4aadb0107940b", + "url": "https://api.github.com/repos/doctrine/orm/zipball/e6c434196c8ef058239aaa0724b4aadb0107940b", "reference": "e6c434196c8ef058239aaa0724b4aadb0107940b", "shasum": "" }, @@ -2304,12 +2304,12 @@ "version": "v2.2.1", "source": { "type": "git", - "url": "https://github.com/google/google-api-php-client.git", + "url": "https://github.com/googleapis/google-api-php-client.git", "reference": "b69b8ac4bf6501793c389d4e013a79d09c85c5f2" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/google/google-api-php-client/zipball/b69b8ac4bf6501793c389d4e013a79d09c85c5f2", + "url": "https://api.github.com/repos/googleapis/google-api-php-client/zipball/b69b8ac4bf6501793c389d4e013a79d09c85c5f2", "reference": "b69b8ac4bf6501793c389d4e013a79d09c85c5f2", "shasum": "" }, @@ -2363,12 +2363,12 @@ "version": "v0.36", "source": { "type": "git", - "url": "https://github.com/google/google-api-php-client-services.git", + "url": "https://github.com/googleapis/google-api-php-client-services.git", "reference": "2fd7d2876fbc0174faddba3241956a1393536159" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/google/google-api-php-client-services/zipball/2fd7d2876fbc0174faddba3241956a1393536159", + "url": "https://api.github.com/repos/googleapis/google-api-php-client-services/zipball/2fd7d2876fbc0174faddba3241956a1393536159", "reference": "2fd7d2876fbc0174faddba3241956a1393536159", "shasum": "" }, @@ -2400,12 +2400,12 @@ "version": "v1.1.0", "source": { "type": "git", - "url": "https://github.com/google/google-auth-library-php.git", + "url": "https://github.com/googleapis/google-auth-library-php.git", "reference": "548d27d670f0236dc5258fa4cdde6e7b63464cfd" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/google/google-auth-library-php/zipball/548d27d670f0236dc5258fa4cdde6e7b63464cfd", + "url": "https://api.github.com/repos/googleapis/google-auth-library-php/zipball/548d27d670f0236dc5258fa4cdde6e7b63464cfd", "reference": "548d27d670f0236dc5258fa4cdde6e7b63464cfd", "shasum": "" }, @@ -4334,16 +4334,16 @@ }, { "name": "media-alchemyst/media-alchemyst", - "version": "0.5.1", + "version": "0.5.2", "source": { "type": "git", "url": "https://github.com/alchemy-fr/Media-Alchemyst.git", - "reference": "b82bb891640cb1ce5d5523235047c34c64194514" + "reference": "5d2fe6dd95215804202ecf0466fd9cfaeedd0140" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/alchemy-fr/Media-Alchemyst/zipball/b82bb891640cb1ce5d5523235047c34c64194514", - "reference": "b82bb891640cb1ce5d5523235047c34c64194514", + "url": "https://api.github.com/repos/alchemy-fr/Media-Alchemyst/zipball/5d2fe6dd95215804202ecf0466fd9cfaeedd0140", + "reference": "5d2fe6dd95215804202ecf0466fd9cfaeedd0140", "shasum": "" }, "require": { @@ -4404,7 +4404,7 @@ "video", "video processing" ], - "time": "2016-03-16T13:11:52+00:00" + "time": "2019-01-25T12:09:11+00:00" }, { "name": "monolog/monolog", @@ -5766,17 +5766,6 @@ { "name": "roave/security-advisories", "version": "dev-master", - "source": { - "type": "git", - "url": "https://github.com/Roave/SecurityAdvisories.git", - "reference": "3db4b0df21d1f527304650e717c66af48981f1c4" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/Roave/SecurityAdvisories/zipball/3db4b0df21d1f527304650e717c66af48981f1c4", - "reference": "3db4b0df21d1f527304650e717c66af48981f1c4", - "shasum": "" - }, "conflict": { "adodb/adodb-php": "<5.20.6", "amphp/artax": ">=2,<2.0.4|>0.7.1,<1.0.4", @@ -6015,6 +6004,7 @@ "keywords": [ "microframework" ], + "abandoned": "symfony/flex", "time": "2016-01-06T14:59:35+00:00" }, { @@ -6060,6 +6050,7 @@ ], "description": "A WebProfiler for Silex", "homepage": "http://silex.sensiolabs.org/", + "abandoned": true, "time": "2016-01-10T11:39:13+00:00" }, { diff --git a/config/configuration.sample.yml b/config/configuration.sample.yml index 5ae54d2134..050b6562c1 100644 --- a/config/configuration.sample.yml +++ b/config/configuration.sample.yml @@ -7,6 +7,7 @@ main: languages: [] key: '' api_require_ssl: true + api_token_header: false database: host: 127.0.0.1 port: 3306 diff --git a/lib/Alchemy/Phrasea/Application/RouteLoader.php b/lib/Alchemy/Phrasea/Application/RouteLoader.php index 6e313b6b37..2542ff25d1 100644 --- a/lib/Alchemy/Phrasea/Application/RouteLoader.php +++ b/lib/Alchemy/Phrasea/Application/RouteLoader.php @@ -65,8 +65,6 @@ class RouteLoader '/prod/upload/' => Providers\Prod\Upload::class, '/prod/WorkZone' => Providers\Prod\WorkZone::class, '/prod/' => Providers\Prod\Root::class, - '/report/activity' => Providers\Report\Activity::class, - '/report/informations' => Providers\Report\Information::class, '/report/' => Providers\Report\Root::class, '/session/' => Providers\Root\Session::class, '/setup' => Providers\Setup::class, diff --git a/lib/Alchemy/Phrasea/Controller/Admin/SubdefsController.php b/lib/Alchemy/Phrasea/Controller/Admin/SubdefsController.php index 6b938cb569..e30aa03946 100644 --- a/lib/Alchemy/Phrasea/Controller/Admin/SubdefsController.php +++ b/lib/Alchemy/Phrasea/Controller/Admin/SubdefsController.php @@ -145,6 +145,7 @@ class SubdefsController extends Controller $options[Audio::OPTION_AUDIOBITRATE] = $config["audio"]["definitions"][$preset][Audio::OPTION_AUDIOBITRATE]; $options[Audio::OPTION_AUDIOSAMPLERATE] = $config["audio"]["definitions"][$preset][Audio::OPTION_AUDIOSAMPLERATE]; $options[Audio::OPTION_ACODEC] = $config["audio"]["definitions"][$preset][Audio::OPTION_ACODEC]; + $options[Audio::OPTION_AUDIOCHANNEL] = $config["audio"]["definitions"][$preset][Audio::OPTION_AUDIOCHANNEL]; foreach ($config["audio"]["definitions"][$preset][Subdef::OPTION_DEVICE] as $devices) { $options[Subdef::OPTION_DEVICE][] = $devices; } @@ -211,7 +212,7 @@ class SubdefsController extends Controller { $mapping = [ Type::TYPE_IMAGE => [Subdef::TYPE_IMAGE, Subdef::TYPE_PDF], - Type::TYPE_VIDEO => [Subdef::TYPE_IMAGE, Subdef::TYPE_VIDEO, Subdef::TYPE_ANIMATION], + Type::TYPE_VIDEO => [Subdef::TYPE_IMAGE, Subdef::TYPE_VIDEO, Subdef::TYPE_ANIMATION, Subdef::TYPE_AUDIO], Type::TYPE_AUDIO => [Subdef::TYPE_IMAGE, Subdef::TYPE_AUDIO], Type::TYPE_DOCUMENT => [Subdef::TYPE_IMAGE, Subdef::TYPE_FLEXPAPER, Subdef::TYPE_PDF], Type::TYPE_FLASH => [Subdef::TYPE_IMAGE] @@ -525,29 +526,44 @@ class SubdefsController extends Controller ], Subdef::TYPE_AUDIO => [ "definitions" => [ - "Low AAC 96 kbit/s" => [ + "Low MP3 96 kbit/s" => [ Audio::OPTION_AUDIOBITRATE => "100", Audio::OPTION_AUDIOSAMPLERATE => "8000", Audio::OPTION_ACODEC => "libmp3lame", Subdef::OPTION_DEVICE => ["all"] ], - "Normal AAC 128 kbit/s" => [ + "Normal MP3 128 kbit/s" => [ Audio::OPTION_AUDIOBITRATE => "180", Audio::OPTION_AUDIOSAMPLERATE => "44100", Audio::OPTION_ACODEC => "libmp3lame", Subdef::OPTION_DEVICE => ["all"] ], - "High AAC 320 kbit/s" => [ + "High MP3 320 kbit/s" => [ Audio::OPTION_AUDIOBITRATE => "230", Audio::OPTION_AUDIOSAMPLERATE => "50000", Audio::OPTION_ACODEC => "libmp3lame", Subdef::OPTION_DEVICE => ["all"] ], + "Wave Mono 16 kHz" => [ + Audio::OPTION_AUDIOBITRATE => "256", + Audio::OPTION_AUDIOSAMPLERATE => "16000", + Audio::OPTION_ACODEC => "pcm_s16le", + Audio::OPTION_AUDIOCHANNEL => "mono", + Subdef::OPTION_DEVICE => ["all"] + ], + "Wave Mono 8 kHz" => [ + Audio::OPTION_AUDIOBITRATE => "128", + Audio::OPTION_AUDIOSAMPLERATE => "8000", + Audio::OPTION_ACODEC => "pcm_s16le", + Audio::OPTION_AUDIOCHANNEL => "mono", + Subdef::OPTION_DEVICE => ["all"] + ], ], "form" => [ Audio::OPTION_AUDIOBITRATE => "slide", Audio::OPTION_AUDIOSAMPLERATE => "select", Audio::OPTION_ACODEC => "select", + Audio::OPTION_AUDIOCHANNEL => "select", Subdef::OPTION_DEVICE => "checkbox", ], ], diff --git a/lib/Alchemy/Phrasea/Controller/Prod/QueryController.php b/lib/Alchemy/Phrasea/Controller/Prod/QueryController.php index c3056c8899..2ff89422e1 100644 --- a/lib/Alchemy/Phrasea/Controller/Prod/QueryController.php +++ b/lib/Alchemy/Phrasea/Controller/Prod/QueryController.php @@ -323,9 +323,14 @@ class QueryController extends Controller // add technical fields - $fieldLabels = []; + $fieldsInfosByName = []; foreach(ElasticsearchOptions::getAggregableTechnicalFields() as $k => $f) { - $fieldLabels[$k] = $this->app->trans($f['label']); + $fieldsInfosByName[$k] = $f; + $fieldsInfosByName[$k]['trans_label'] = $this->app->trans($f['label']); + $fieldsInfosByName[$k]['labels'] = []; + foreach($this->app->getAvailableLanguages() as $locale => $lng) { + $fieldsInfosByName[$k]['labels'][$locale] = $this->app->trans($f['label'], [], "messages", $locale); + } } // add databox fields @@ -337,13 +342,25 @@ class QueryController extends Controller foreach ($databox->get_meta_structure() as $field) { $name = $field->get_name(); $fieldsInfos[$sbasId][$name] = [ - 'label' => $field->get_label($this->app['locale']), - 'type' => $field->get_type(), + 'label' => $field->get_label($this->app['locale']), + 'labels' => $field->get_labels(), + 'type' => $field->get_type(), 'business' => $field->isBusiness(), - 'multi' => $field->is_multi(), + 'multi' => $field->is_multi(), ]; - if (!isset($fieldLabels[$name])) { - $fieldLabels[$name] = $field->get_label($this->app['locale']); + + // infos on the "same" field (by name) on multiple databoxes !!! + // label(s) can be inconsistants : the first databox wins + if (!isset($fieldsInfosByName[$name])) { + $fieldsInfosByName[$name] = [ + 'label' => $field->get_label($this->app['locale']), + 'labels' => $field->get_labels(), + 'type' => $field->get_type(), + 'field' => $field->get_name(), + 'query' => "field." . $field->get_name() . ":%s", + 'trans_label' => $field->get_label($this->app['locale']), + ]; + $field->get_label($this->app['locale']); } } } @@ -382,14 +399,29 @@ class QueryController extends Controller // populates facets (aggregates) $facets = []; + // $facetClauses = []; foreach ($result->getFacets() as $facet) { $facetName = $facet['name']; - $facet['label'] = isset($fieldLabels[$facetName]) ? $fieldLabels[$facetName] : $facetName; + if(array_key_exists($facetName, $fieldsInfosByName)) { - $facets[] = $facet; + $f = $fieldsInfosByName[$facetName]; + + $facet['label'] = $f['trans_label']; + $facet['labels'] = $f['labels']; + $facet['type'] = strtoupper($f['type']) . "-AGGREGATE"; + $facets[] = $facet; + + // $facetClauses[] = [ + // 'type' => strtoupper($f['type']) . "-AGGREGATE", + // 'field' => $f['field'], + // 'facet' => $facet + // ]; + } } + // $json['jsq'] = $facetClauses; + $json['facets'] = $facets; $json['phrasea_props'] = $proposals; $json['total_answers'] = (int) $result->getAvailable(); diff --git a/lib/Alchemy/Phrasea/Controller/Report/ActivityController.php b/lib/Alchemy/Phrasea/Controller/Report/ActivityController.php deleted file mode 100644 index ca00f5871f..0000000000 --- a/lib/Alchemy/Phrasea/Controller/Report/ActivityController.php +++ /dev/null @@ -1,802 +0,0 @@ -app, - $request->request->get('dmin'), - $request->request->get('dmax'), - $request->request->get('sbasid'), - $request->request->get('collection') - ); - - $activity->setConfig(false); - $activity->setBound("user", true); - - //set Limit - if ($activity->getEnableLimit() - && ('' !== $page = $request->request->get('page', '')) - && ('' !== $limit = $request->request->get('limit', ''))) { - $activity->setLimit($page, $limit); - } else { - $activity->setLimit(false, false); - } - - if ($request->request->get('printcsv') == 'on') { - $activity->setHasLimit(false); - $activity->getConnexionBase(false, $request->request->get('on', 'user')); - - return $this->getCSVResponse($activity, 'activity_connection_base'); - } - - $report = $activity->getConnexionBase(false, $request->request->get('on', 'user')); - - return $this->app->json([ - 'rs' => $this->render('report/ajax_data_content.html.twig', [ - 'result' => isset($report['report']) ? $report['report'] : $report, - 'is_infouser' => false, - 'is_nav' => false, - 'is_groupby' => false, - 'is_plot' => false, - 'is_doc' => false, - ]), - 'display_nav' => false, - 'title' => false, - ]); - } - - /** - * Display download report group by user - * - * @param Request $request - * @return JsonResponse - */ - public function doReportDownloadsByUsers(Request $request) - { - $conf = [ - 'user' => [$this->app->trans('report:: utilisateur'), 0, 1, 0, 0], - 'nbdoc' => [$this->app->trans('report:: nombre de documents'), 0, 0, 0, 0], - 'nbprev' => [$this->app->trans('report:: nombre de preview'), 0, 0, 0, 0], - ]; - - $activity = new \module_report_activity( - $this->app, - $request->request->get('dmin'), - $request->request->get('dmax'), - $request->request->get('sbasid'), - $request->request->get('collection') - ); - - $activity->setConfig(false); - - //set Limit - if ($activity->getEnableLimit() - && ('' !== $page = $request->request->get('page', '')) - && ('' !== $limit = $request->request->get('limit', ''))) { - $activity->setLimit($page, $limit); - } else { - $activity->setLimit(false, false); - } - - $report = $activity->getDetailDownload($conf, $request->request->get('on')); - - if ($request->request->get('printcsv') == 'on') { - $activity->setHasLimit(false); - - return $this->getCSVResponse($activity, 'activity_detail_download'); - } - - return $this->app->json([ - 'rs' => $this->render('report/ajax_data_content.html.twig', [ - 'result' => isset($report['report']) ? $report['report'] : $report, - 'is_infouser' => false, - 'is_nav' => false, - 'is_groupby' => false, - 'is_plot' => false, - 'is_doc' => false, - ]), - 'display_nav' => false, - 'title' => false, - ]); - } - - /** - * Display the most asked question - * - * @param Request $request - * @return JsonResponse - */ - public function doReportBestOfQuestions(Request $request) - { - $conf = [ - 'search' => [$this->app->trans('report:: question'), 0, 0, 0, 0], - 'nb' => [$this->app->trans('report:: nombre'), 0, 0, 0, 0], - 'nb_rep' => [$this->app->trans('report:: nombre de reponses'), 0, 0, 0, 0] - ]; - - $activity = new \module_report_activity( - $this->app, - $request->request->get('dmin'), - $request->request->get('dmax'), - $request->request->get('sbasid'), - $request->request->get('collection') - ); - - $activity->setLimit(1, $request->request->get('limit', 20)); - $activity->setTop(20); - $activity->setConfig(false); - - if ($request->request->get('printcsv') == 'on') { - $activity->setHasLimit(false); - $activity->setPrettyString(false); - - $activity->getTopQuestion($conf); - - return $this->getCSVResponse($activity, 'activity_questions_best_of'); - } - - $report = $activity->getTopQuestion($conf); - - return $this->app->json([ - 'rs' => $this->render('report/ajax_data_content.html.twig', [ - 'result' => isset($report['report']) ? $report['report'] : $report, - 'is_infouser' => false, - 'is_nav' => false, - 'is_groupby' => false, - 'is_plot' => false, - 'is_doc' => false - ]), - 'display_nav' => false, - 'title' => false - ]); - } - - /** - * Display report about questions that return no result - * - * @param Request $request - * @return JsonResponse - */ - public function doReportNoBestOfQuestions(Request $request) - { - $conf = [ - 'search' => [$this->app->trans('report:: question'), 0, 0, 0, 0], - 'nb' => [$this->app->trans('report:: nombre'), 0, 0, 0, 0], - 'nb_rep' => [$this->app->trans('report:: nombre de reponses'), 0, 0, 0, 0] - ]; - - $activity = new \module_report_activity( - $this->app, - $request->request->get('dmin'), - $request->request->get('dmax'), - $request->request->get('sbasid'), - $request->request->get('collection') - ); - - //set Limit - if ($activity->getEnableLimit() - && ('' !== $page = $request->request->get('page', '')) - && ('' !== $limit = $request->request->get('limit', ''))) { - $activity->setLimit($page, $limit); - } else { - $activity->setLimit(false, false); - } - - $activity->setConfig(false); - - if ($request->request->get('printcsv') == 'on') { - $activity->setHasLimit(false); - $activity->setPrettyString(false); - - $activity->getTopQuestion($conf, true); - - return $this->getCSVResponse($activity, 'activity_top_ten_questions'); - } - - $report = $activity->getTopQuestion($conf, true); - - return $this->app->json([ - 'rs' => $this->render('report/ajax_data_content.html.twig', [ - 'result' => isset($report['report']) ? $report['report'] : $report, - 'is_infouser' => false, - 'is_nav' => false, - 'is_groupby' => false, - 'is_plot' => false, - 'is_doc' => false - ]), - 'display_nav' => false, - 'title' => false - ]); - } - - /** - * Display an overview of connexion among hours of the da - * - * @param Request $request - * @return JsonResponse - */ - public function doReportSiteActiviyPerHours(Request $request) - { - $activity = new \module_report_activity( - $this->app, - $request->request->get('dmin'), - $request->request->get('dmax'), - $request->request->get('sbasid'), - $request->request->get('collection') - ); - - $activity->setConfig(false); - - if ($request->request->get('printcsv') == 'on') { - $activity->setHasLimit(false); - $activity->setPrettyString(false); - - $activity->getActivityPerHours(); - - return $this->getCSVResponse($activity, 'activity_per_hours'); - } - - $report = $activity->getActivityPerHours(); - - return $this->app->json([ - 'rs' => $this->render('report/ajax_data_content.html.twig', [ - 'result' => isset($report['report']) ? $report['report'] : $report, - 'is_infouser' => false, - 'is_nav' => false, - 'is_groupby' => false, - 'is_plot' => true, - 'is_doc' => false - ]), - 'display_nav' => false, - 'title' => false - ]); - } - - /** - * Display an overview of downloaded document grouped by day - * - * @param Request $request - * @return JsonResponse - */ - public function doReportSiteActivityPerDays(Request $request) - { - $conf = [ - 'ddate' => [$this->app->trans('report:: jour'), 0, 0, 0, 0], - 'total' => [$this->app->trans('report:: total des telechargements'), 0, 0, 0, 0], - 'preview' => [$this->app->trans('report:: preview'), 0, 0, 0, 0], - 'document' => [$this->app->trans('report:: document'), 0, 0, 0, 0] - ]; - - $activity = new \module_report_activity( - $this->app, - $request->request->get('dmin'), - $request->request->get('dmax'), - $request->request->get('sbasid'), - $request->request->get('collection') - ); - - //set Limit - if ($activity->getEnableLimit() - && ('' !== $page = $request->request->get('page', '')) - && ('' !== $limit = $request->request->get('limit', ''))) { - $activity->setLimit($page, $limit); - } else { - $activity->setLimit(false, false); - } - - $activity->setConfig(false); - - if ($request->request->get('printcsv') == 'on') { - $activity->setHasLimit(false); - $activity->setPrettyString(false); - - $activity->getDownloadByBaseByDay($conf); - - return $this->getCSVResponse($activity, 'activity_db_by_base_by_day'); - } - - $report = $activity->getDownloadByBaseByDay($conf); - - return $this->app->json([ - 'rs' => $this->render('report/ajax_data_content.html.twig', [ - 'result' => isset($report['report']) ? $report['report'] : $report, - 'is_infouser' => false, - 'is_nav' => false, - 'is_groupby' => false, - 'is_plot' => false, - 'is_doc' => false, - ]), - 'display_nav' => false, - 'title' => false, - ]); - } - - /** - * Display report about pushed documents - * - * @param Request $request - * @return JsonResponse - */ - public function doReportPushedDocuments(Request $request) - { - $conf = [ - 'user' => ['', 1, 0, 1, 1], - 'getter' => ["Destinataire", 1, 0, 1, 1], - 'date' => ['', 1, 0, 1, 1], - 'record_id' => ['', 1, 1, 1, 1], - 'file' => ['', 1, 0, 1, 1], - 'mime' => ['', 1, 0, 1, 1], - ]; - - $activity = new \module_report_push( - $this->app, - $request->request->get('dmin'), - $request->request->get('dmax'), - $request->request->get('sbasid'), - $request->request->get('collection') - ); - - $activity->setConfig(false); - - if ($request->request->get('printcsv') == 'on') { - $activity->setHasLimit(false); - $activity->setPrettyString(false); - - $this->doReport($request, $activity, $conf); - - return $this->getCSVResponse($activity, 'activity_pushed_documents'); - } - - $report = $this->doReport($request, $activity, $conf); - - if ($report instanceof Response) { - return $report; - } - - return $this->app->json([ - 'rs' => $this->render('report/ajax_data_content.html.twig', [ - 'result' => isset($report['report']) ? $report['report'] : $report, - 'is_infouser' => false, - 'is_nav' => false, - 'is_groupby' => false, - 'is_plot' => false, - 'is_doc' => false, - ]), - 'display_nav' => $report['display_nav'], // do we display the prev and next button ? - 'next' => $report['next_page'], //Number of the next page - 'prev' => $report['previous_page'], //Number of the previoous page - 'page' => $report['page'], //The current page - 'filter' => ((sizeof($report['filter']) > 0) ? serialize($report['filter']) : ''), //the serialized filters - 'col' => $report['active_column'], //all the columns where a filter is applied - 'limit' => $report['nb_record'], - ]); - } - - /** - * Display report about added documents - * - * @param Request $request - * @return JsonResponse - */ - public function doReportAddedDocuments(Request $request) - { - $conf = [ - 'user' => ['', 1, 0, 1, 1], - 'date' => ['', 1, 0, 1, 1], - 'record_id' => ['', 1, 1, 1, 1], - 'file' => ['', 1, 0, 1, 1], - 'mime' => ['', 1, 0, 1, 1], - ]; - - $activity = new \module_report_add( - $this->app, - $request->request->get('dmin'), - $request->request->get('dmax'), - $request->request->get('sbasid'), - $request->request->get('collection') - ); - - $activity->setConfig(false); - - if ($request->request->get('printcsv') == 'on') { - $activity->setHasLimit(false); - $activity->setPrettyString(false); - - $this->doReport($request, $activity, $conf); - - return $this->getCSVResponse($activity, 'activity_added_documents'); - } - - $report = $this->doReport($request, $activity, $conf); - - if ($report instanceof Response) { - return $report; - } - - return $this->app->json([ - 'rs' => $this->render('report/ajax_data_content.html.twig', [ - 'result' => isset($report['report']) ? $report['report'] : $report, - 'is_infouser' => false, - 'is_nav' => false, - 'is_groupby' => false, - 'is_plot' => false, - 'is_doc' => false, - ]), - 'display_nav' => $report['display_nav'], // do we display the prev and next button ? - 'next' => $report['next_page'], //Number of the next page - 'prev' => $report['previous_page'], //Number of the previoous page - 'page' => $report['page'], //The current page - 'filter' => ((sizeof($report['filter']) > 0) ? serialize($report['filter']) : ''), //the serialized filters - 'col' => $report['active_column'], //all the columns where a filter is applied - 'limit' => $report['nb_record'], - ]); - } - - /** - * Display report about edited documents - * - * @param Request $request - * @return JsonResponse - */ - public function doReportEditedDocuments(Request $request) - { - $conf = [ - 'user' => ['', 1, 0, 1, 1], - 'date' => ['', 1, 0, 1, 1], - 'record_id' => ['', 1, 1, 1, 1], - 'file' => ['', 1, 0, 1, 1], - 'mime' => ['', 1, 0, 1, 1], - ]; - - $activity = new \module_report_edit( - $this->app, - $request->request->get('dmin'), - $request->request->get('dmax'), - $request->request->get('sbasid'), - $request->request->get('collection') - ); - - $activity->setConfig(false); - - if ($request->request->get('printcsv') == 'on') { - $activity->setHasLimit(false); - $activity->setPrettyString(false); - - $this->doReport($request, $activity, $conf); - - return $this->getCSVResponse($activity, 'activity_edited_documents'); - } - - $report = $this->doReport($request, $activity, $conf); - - if ($report instanceof Response) { - return $report; - } - - return $this->app->json([ - 'rs' => $this->render('report/ajax_data_content.html.twig', [ - 'result' => isset($report['report']) ? $report['report'] : $report, - 'is_infouser' => false, - 'is_nav' => false, - 'is_groupby' => false, - 'is_plot' => false, - 'is_doc' => false, - ]), - 'display_nav' => $report['display_nav'], // do we display the prev and next button ? - 'next' => $report['next_page'], //Number of the next page - 'prev' => $report['previous_page'], //Number of the previoous page - 'page' => $report['page'], //The current page - 'filter' => ((sizeof($report['filter']) > 0) ? serialize($report['filter']) : ''), //the serialized filters - 'col' => $report['active_column'], //all the columns where a filter is applied - 'limit' => $report['nb_record'], - ]); - } - - /** - * Display report about validated documents - * - * @param Request $request - * @return JsonResponse - */ - public function doReportValidatedDocuments(Request $request) - { - $conf = [ - 'user' => ['', 1, 0, 1, 1], - 'getter' => ["Destinataire", 1, 0, 1, 1], - 'date' => ['', 1, 0, 1, 1], - 'record_id' => ['', 1, 1, 1, 1], - 'file' => ['', 1, 0, 1, 1], - 'mime' => ['', 1, 0, 1, 1], - ]; - - $activity = new \module_report_validate( - $this->app, - $request->request->get('dmin'), - $request->request->get('dmax'), - $request->request->get('sbasid'), - $request->request->get('collection') - ); - - $activity->setConfig(false); - - if ($request->request->get('printcsv') == 'on') { - $activity->setHasLimit(false); - $activity->setPrettyString(false); - - $this->doReport($request, $activity, $conf); - - return $this->getCSVResponse($activity, 'activity_validated_documents'); - } - - $report = $this->doReport($request, $activity, $conf); - - if ($report instanceof Response) { - return $report; - } - - return $this->app->json([ - 'rs' => $this->render('report/ajax_data_content.html.twig', [ - 'result' => isset($report['report']) ? $report['report'] : $report, - 'is_infouser' => false, - 'is_nav' => false, - 'is_groupby' => false, - 'is_plot' => false, - 'is_doc' => false, - ]), - 'display_nav' => $report['display_nav'], // do we display the prev and next button ? - 'next' => $report['next_page'], //Number of the next page - 'prev' => $report['previous_page'], //Number of the previoous page - 'page' => $report['page'], //The current page - 'filter' => ((sizeof($report['filter']) > 0) ? serialize($report['filter']) : ''), //the serialized filters - 'col' => $report['active_column'], //all the columns where a filter is applied - 'limit' => $report['nb_record'], - ]); - } - - /** - * Display report about documents sent by mail - * - * @param Request $request - * @return JsonResponse - */ - public function doReportSentDocuments(Request $request) - { - $conf = [ - 'user' => ['', 1, 0, 1, 1], - 'date' => ['', 1, 0, 1, 1], - 'record_id' => ['', 1, 1, 1, 1], - 'file' => ['', 1, 0, 1, 1], - 'mime' => ['', 1, 0, 1, 1], - 'comment' => [$this->app->trans('Receiver'), 1, 0, 1, 1], - ]; - - $activity = new \module_report_sent( - $this->app, - $request->request->get('dmin'), - $request->request->get('dmax'), - $request->request->get('sbasid'), - $request->request->get('collection') - ); - - $activity->setConfig(false); - - if ($request->request->get('printcsv') == 'on') { - $activity->setHasLimit(false); - $activity->setPrettyString(false); - - $this->doReport($request, $activity, $conf); - - return $this->getCSVResponse($activity, 'activity_send_documents'); - } - - $report = $this->doReport($request, $activity, $conf); - - if ($report instanceof Response) { - return $report; - } - - return $this->app->json([ - 'rs' => $this->render('report/ajax_data_content.html.twig', [ - 'result' => isset($report['report']) ? $report['report'] : $report, - 'is_infouser' => false, - 'is_nav' => false, - 'is_groupby' => false, - 'is_plot' => false, - 'is_doc' => false, - ]), - 'display_nav' => $report['display_nav'], // do we display the prev and next button ? - 'next' => $report['next_page'], //Number of the next page - 'prev' => $report['previous_page'], //Number of the previoous page - 'page' => $report['page'], //The current page - 'filter' => ((sizeof($report['filter']) > 0) ? serialize($report['filter']) : ''), //the serialized filters - 'col' => $report['active_column'], //all the columns where a filter is applied - 'limit' => $report['nb_record'], - ]); - } - - /** - * Set Report configuration according to request parameters - * - * @param Request $request A request instance - * @param \module_report $report A report instance - * @param Array $conf A report column configuration - * @param Boolean $what Whether to group on a particular field or not - * @return Array - */ - private function doReport(Request $request, \module_report $report, $conf, $what = false) - { - if ($this->getConf()->get(['registry', 'modules', 'anonymous-report'])) { - if (isset($conf['user'])) { - unset($conf['user']); - } - - if (isset($conf['ip'])) { - unset($conf['ip']); - } - } - //save initial conf - $base_conf = $conf; - //format conf according user preferences - if ('' !== $columnsList = $request->request->get('list_column', '')) { - $new_conf = $conf; - $columns = explode(",", $columnsList); - - foreach (array_keys($conf) as $col) { - if (!in_array($col, $columns)) { - unset($new_conf[$col]); - } - } - - $conf = $new_conf; - } - - //display content of a table column when user click on it - if ($request->request->get('conf') == 'on') { - return $this->app->json(['liste' => $this->render('report/listColumn.html.twig', [ - 'conf' => $base_conf - ]), "title" => $this->app->trans("configuration")]); - } - - //set order - if (('' !== $order = $request->request->get('order', '')) && ('' !== $field = $request->request->get('champ', ''))) { - $report->setOrder($field, $order); - } - - //work on filters - $mapColumnTitleToSqlField = $report->getTransQueryString(); - - $currentfilter = []; - - if ('' !== $serializedFilter = $request->request->get('liste_filter', '')) { - $currentfilter = @unserialize(urldecode($serializedFilter)); - } - - $filter = new \module_report_filter($this->app, $currentfilter, $mapColumnTitleToSqlField); - - if ('' !== $filterColumn = $request->request->get('filter_column', '')) { - $field = current(explode(' ', $filterColumn)); - $value = $request->request->get('filter_value', ''); - - if ($request->request->get('liste') == 'on') { - return $this->app->json(['diag' => $this->render('report/colFilter.html.twig', [ - 'result' => $report->colFilter($field), - 'field' => $field - ]), "title" => $this->app->trans('filtrer les resultats sur la colonne %colonne%', ['%colonne%' => $field])]); - } - - if ($field === $value) { - $filter->removeFilter($field); - } else { - $filter->addFilter($field, '=', $value); - } - } - - //set new request filter if user asking for them - if ($request->request->get('precise') == 1) { - $filter->addFilter('xml', 'LIKE', $request->request->get('word', '')); - } elseif ($request->request->get('precise') == 2) { - $filter->addFilter('record_id', '=', $request->request->get('word', '')); - } - - //set filters to current report - $report->setFilter($filter->getTabFilter()); - $report->setActiveColumn($filter->getActiveColumn()); - $report->setPostingFilter($filter->getPostingFilter()); - - // display a new arraywhere results are group - if ('' !== $groupby = $request->request->get('groupby', '')) { - $report->setConfig(false); - $groupby = current(explode(' ', $groupby)); - - $reportArray = $report->buildReport(false, $groupby); - - if (count($reportArray['allChamps']) > 0 && count($reportArray['display']) > 0) { - $groupField = isset($reportArray['display'][$reportArray['allChamps'][0]]['title']) ? $reportArray['display'][$reportArray['allChamps'][0]]['title'] : ''; - } else { - $groupField = isset($conf[strtolower($groupby)]['title']) ? $conf[strtolower($groupby)]['title'] : ''; - } - - return $this->app->json([ - 'rs' => $this->render('report/ajax_data_content.html.twig', [ - 'result' => isset($reportArray['report']) ? $reportArray['report'] : $reportArray, - 'is_infouser' => false, - 'is_nav' => false, - 'is_groupby' => true, - 'is_plot' => false, - 'is_doc' => false, - ]), - 'display_nav' => false, - 'title' => $this->app->trans('Groupement des resultats sur le champ %name%', ['%name%' => $groupField]), - ]); - } - - //set Limit - if ($report->getEnableLimit() - && ('' !== $page = $request->request->get('page', '')) - && ('' !== $limit = $request->request->get('limit', ''))) { - $report->setLimit($page, $limit); - } else { - $report->setLimit(false, false); - } - - //time to build our report - if (false === $what) { - $reportArray = $report->buildReport($conf); - } else { - $reportArray = $report->buildReport($conf, $what, $request->request->get('tbl', false)); - } - - return $reportArray; - } - - private function getCSVResponse(\module_report $report, $type) - { - // set headers - $headers = []; - foreach (array_keys($report->getDisplay()) as $k) { - $headers[$k] = $k; - } - // set headers as first row - $result = $report->getResult(); - array_unshift($result, $headers); - - $collection = new CallbackCollection($result, function ($row) use ($report) { - // restrict to displayed fields - return array_map('strip_tags', array_intersect_key($row, $report->getDisplay())); - }); - - $filename = sprintf('report_export_%s_%s.csv', $type, date('Ymd')); - /** @var Exporter $exporter */ - $exporter = $this->app['csv.exporter']; - $response = new CSVFileResponse($filename, function () use ($exporter, $collection) { - $exporter->export('php://output', $collection); - }); - - return $response; - } -} diff --git a/lib/Alchemy/Phrasea/Controller/Report/InformationController.php b/lib/Alchemy/Phrasea/Controller/Report/InformationController.php deleted file mode 100644 index 6868292743..0000000000 --- a/lib/Alchemy/Phrasea/Controller/Report/InformationController.php +++ /dev/null @@ -1,502 +0,0 @@ - [ - 'photo' => [$this->app->trans('report:: document'), 0, 0, 0, 0], - 'record_id' => [$this->app->trans('report:: record id'), 0, 0, 0, 0], - 'date' => [$this->app->trans('report:: date'), 0, 0, 0, 0], - 'type' => [$this->app->trans('phrseanet:: sous definition'), 0, 0, 0, 0], - 'titre' => [$this->app->trans('report:: titre'), 0, 0, 0, 0], - 'taille' => [$this->app->trans('report:: poids'), 0, 0, 0, 0] - ], - 'conf' => [ - 'identifiant' => [$this->app->trans('report:: identifiant'), 0, 0, 0, 0], - 'nom' => [$this->app->trans('report:: nom'), 0, 0, 0, 0], - 'mail' => [$this->app->trans('report:: email'), 0, 0, 0, 0], - 'adresse' => [$this->app->trans('report:: adresse'), 0, 0, 0, 0], - 'tel' => [$this->app->trans('report:: telephone'), 0, 0, 0, 0] - ], - 'config_cnx' => [ - 'ddate' => [$this->app->trans('report:: date'), 0, 0, 0, 0], - 'appli' => [$this->app->trans('report:: modules'), 0, 0, 0, 0], - ], - 'config_dl' => [ - 'ddate' => [$this->app->trans('report:: date'), 0, 0, 0, 0], - 'record_id' => [$this->app->trans('report:: record id'), 0, 1, 0, 0], - 'final' => [$this->app->trans('phrseanet:: sous definition'), 0, 0, 0, 0], - 'coll_id' => [$this->app->trans('report:: collections'), 0, 0, 0, 0], - 'comment' => [$this->app->trans('report:: commentaire'), 0, 0, 0, 0], - ], - 'config_ask' => [ - 'search' => [$this->app->trans('report:: question'), 0, 0, 0, 0], - 'ddate' => [$this->app->trans('report:: date'), 0, 0, 0, 0] - ] - ]; - - $report = null; - $html = $html_info = ''; - $from = $request->request->get('from', ''); - $on = $request->request->get('on', ''); - $selectValue = $request->request->get('user', ''); - - if ('' === $selectValue) { - $this->app->abort(400); - } - - if ('' !== $on && $this->getConf()->get(['registry', 'modules', 'anonymous-report']) == true) { - $conf['conf'] = [ - $on => [$on, 0, 0, 0, 0], - 'nb' => [$this->app->trans('report:: nombre'), 0, 0, 0, 0] - ]; - } - - if ($from == 'CNXU' || $from == 'CNX') { - $report = new \module_report_connexion( - $this->app, - $request->request->get('dmin'), - $request->request->get('dmax'), - $request->request->get('sbasid'), - $request->request->get('collection') - ); - $conf_array = $conf['config_cnx']; - $title = $this->app->trans('report:: historique des connexions'); - } elseif ($from == 'USR' || $from == 'GEN') { - $report = new \module_report_download( - $this->app, - $request->request->get('dmin'), - $request->request->get('dmax'), - $request->request->get('sbasid'), - $request->request->get('collection') - ); - $conf_array = $conf['config_dl']; - $title = $this->app->trans('report:: historique des telechargements'); - } elseif ($from == 'ASK') { - $report = new \module_report_question( - $this->app, - $request->request->get('dmin'), - $request->request->get('dmax'), - $request->request->get('sbasid'), - $request->request->get('collection') - ); - $conf_array = $conf['config_ask']; - $title = $this->app->trans('report:: historique des questions'); - } - - if ($report) { - $mapColumnTitleToSqlField = $report->getTransQueryString(); - - $currentfilter = []; - - if ('' !== $serializedFilter = $request->request->get('liste_filter', '')) { - $currentfilter = @unserialize(urldecode($serializedFilter)); - } - - $filter = new \module_report_filter($this->app, $currentfilter, $mapColumnTitleToSqlField); - - if ('' !== $filterColumn = $request->request->get('filter_column', '')) { - $field = current(explode(' ', $filterColumn)); - $value = $request->request->get('filter_value', ''); - - if ($request->request->get('liste') == 'on') { - return $this->app->json([ - 'diag' => $this->render('report/colFilter.html.twig', [ - 'result' => $report->colFilter($field), - 'field' => $field - ]), - 'title' => $this->app->trans('filtrer les resultats sur la colonne %colonne%', ['%colonne%' => $field])]); - } - - if ($field === $value) { - $filter->removeFilter($field); - } else { - $filter->addFilter($field, '=', $value); - } - } - - if ('' !== $selectValue && '' !== $from) { - $filter->addfilter('usrid', '=', $selectValue); - } elseif ('' !== $on && '' !== $selectValue) { - $filter->addfilter($on, '=', $selectValue); - } - - if ($report instanceof \module_report_download) { - $report->setIsInformative(true); - } - - $report->setFilter($filter->getTabFilter()); - $report->setOrder('ddate', 'DESC'); - $report->setConfig(false); - $report->setTitle($title); - $report->setHasLimit(false); - - $reportArray = $report->buildReport($conf_array); - - if ($request->request->get('printcsv') == 'on') { - $report->setPrettyString(false); - - return $this->getCSVResponse($report, 'info_user'); - } - - $html = $this->render('report/ajax_data_content.html.twig', [ - 'result' => isset($reportArray['report']) ? $reportArray['report'] : $reportArray, - 'is_infouser' => $report instanceof \module_report_download, - 'is_nav' => false, - 'is_groupby' => false, - 'is_plot' => false, - 'is_doc' => false - ]); - } - - $info = new \module_report_nav( - $this->app, - $request->request->get('dmin'), - $request->request->get('dmax'), - $request->request->get('sbasid'), - $request->request->get('collection') - ); - - $info->setPeriode(''); - $info->setCsv(false); - - $infoArray = $info->buildTabGrpInfo( - null !== $report ? $report->getReq() : '', - null !== $report ? $report->getParams() : [], - $selectValue, - $conf['conf'], - $on - ); - - if (false == $this->app['conf']->get(['registry', 'modules', 'anonymous-report'])) { - $html_info = $this->render('report/ajax_data_content.html.twig', [ - 'result' => isset($infoArray['report']) ? $infoArray['report'] : $infoArray, - 'is_infouser' => false, - 'is_nav' => false, - 'is_groupby' => false, - 'is_plot' => false, - 'is_doc' => false - ]); - - $title = ('' === $on && isset($infoArray['result'])) ? $infoArray['result'][0]['identifiant'] : $selectValue; - } else { - $title = $selectValue; - } - - return $this->app->json([ - 'rs' => sprintf('%s%s', $html_info, $html), - 'display_nav' => false, - 'title' => $title - ]); - } - - /** - * Display a browser version - * - * @param Request $request - * @return JsonResponse - */ - public function doReportInformationBrowser(Request $request) - { - $conf = [ - 'version' => [$this->app->trans('report::version'), 0, 0, 0, 0], - 'nb' => [$this->app->trans('report:: nombre'), 0, 0, 0, 0] - ]; - - $info = new \module_report_nav( - $this->app, - $request->request->get('dmin'), - $request->request->get('dmax'), - $request->request->get('sbasid'), - $request->request->get('collection') - ); - - $info->setCsv(false); - $info->setConfig(false); - - if ('' === $browser = $request->request->get('user', '')) { - $this->app->abort(400); - } - - $reportArray = $info->buildTabInfoNav($conf, $browser); - - return $this->app->json([ - 'rs' => $this->render('report/ajax_data_content.html.twig', [ - 'result' => isset($reportArray['report']) ? $reportArray['report'] : $reportArray, - 'is_infouser' => false, - 'is_nav' => false, - 'is_groupby' => false, - 'is_plot' => false, - 'is_doc' => false - ]), - 'display_nav' => false, - 'title' => $browser - ]); - } - - /** - * Display information about a document - * - * @param Request $request - * @return JsonResponse - */ - public function doReportInformationDocument(Request $request) - { - $config = [ - 'photo' => [$this->app->trans('report:: document'), 0, 0, 0, 0], - 'record_id' => [$this->app->trans('report:: record id'), 0, 0, 0, 0], - 'date' => [$this->app->trans('report:: date'), 0, 0, 0, 0], - 'type' => [$this->app->trans('phrseanet:: sous definition'), 0, 0, 0, 0], - 'titre' => [$this->app->trans('report:: titre'), 0, 0, 0, 0], - 'taille' => [$this->app->trans('report:: poids'), 0, 0, 0, 0] - ]; - - $config_dl = [ - 'ddate' => [$this->app->trans('report:: date'), 0, 0, 0, 0], - 'user' => [$this->app->trans('report:: utilisateurs'), 0, 0, 0, 0], - 'final' => [$this->app->trans('phrseanet:: sous definition'), 0, 0, 0, 0], - 'coll_id' => [$this->app->trans('report:: collections'), 0, 0, 0, 0], - 'comment' => [$this->app->trans('report:: commentaire'), 0, 0, 0, 0], - 'fonction' => [$this->app->trans('report:: fonction'), 0, 0, 0, 0], - 'activite' => [$this->app->trans('report:: activite'), 0, 0, 0, 0], - 'pays' => [$this->app->trans('report:: pays'), 0, 0, 0, 0], - 'societe' => [$this->app->trans('report:: societe'), 0, 0, 0, 0] - ]; - - //format conf according user preferences - if ('' !== $columnsList = $request->request->get('list_column', '')) { - $new_conf = $config_dl; - $columns = explode(',', $columnsList); - - foreach (array_keys($config_dl) as $col) { - if (!in_array($col, $columns)) { - unset($new_conf[$col]); - } - } - - $config_dl = $new_conf; - } - - try { - $record = new \record_adapter( - $this->app, - $request->request->get('sbasid'), - $request->request->get('rid') - ); - } catch (\Exception $e) { - $this->app->abort(404); - } - - $what = new \module_report_nav( - $this->app, - $request->request->get('dmin'), - $request->request->get('dmax'), - $request->request->get('sbasid'), - $request->request->get('collection') - ); - - $what->setPeriode(''); - $what->setCsv(false); - $what->setPrint(false); - - /** @var \record_adapter $record */ - $reportArray = $what->buildTabUserWhat( - $record->getBaseId(), - $record->getRecordId(), - $config - ); - - $title = $what->getTitle(); - - $html = $this->render('report/ajax_data_content.html.twig', [ - 'result' => isset($reportArray['report']) ? $reportArray['report'] : $reportArray, - 'is_infouser' => false, - 'is_nav' => false, - 'is_groupby' => false, - 'is_plot' => false, - 'is_doc' => false - ]); - - $from = $request->request->get('from', ''); - - if ('TOOL' === $from) { - $what->setTitle(''); - - return $this->app->json([ - 'rs' => $html, - 'display_nav' => false, - 'title' => $title - ]); - } - - if ('DASH' !== $from && 'PUSHDOC' !== $from) { - $download = new \module_report_download( - $this->app, - $request->request->get('dmin'), - $request->request->get('dmax'), - $request->request->get('sbasid'), - $request->request->get('collection') - ); - - $mapColumnTitleToSqlField = $download->getTransQueryString(); - - $currentfilter = []; - - if ('' !== $serializedFilter = $request->request->get('liste_filter', '')) { - $currentfilter = @unserialize(urldecode($serializedFilter)); - } - - $filter = new \module_report_filter($this->app, $currentfilter, $mapColumnTitleToSqlField); - - if ('' !== $filterColumn = $request->request->get('filter_column', '')) { - $field = current(explode(' ', $filterColumn)); - $value = $request->request->get('filter_value', ''); - - if ($request->request->get('liste') == 'on') { - return $this->app->json([ - 'diag' => $this->render('report/colFilter.html.twig', [ - 'result' => $download->colFilter($field), - 'field' => $field - ]), - 'title' => $this->app->trans('filtrer les resultats sur la colonne %colonne%', ['%colonne%' => $field]) - ]); - } - - if ($field === $value) { - $filter->removeFilter($field); - } else { - $filter->addFilter($field, '=', $value); - } - } - - $filter->addfilter('record_id', '=', $record->getRecordId()); - - $download->setFilter($filter->getTabFilter()); - $download->setOrder('ddate', 'DESC'); - $download->setTitle($this->app->trans('report:: historique des telechargements')); - $download->setConfig(false); - - $reportArray = $download->buildReport($config_dl); - - if ($request->request->get('printcsv') == 'on') { - $download->setPrettyString(false); - - return $this->getCSVResponse($download, 'info_document'); - } - - $html .= $this->render('report/ajax_data_content.html.twig', [ - 'result' => isset($reportArray['report']) ? $reportArray['report'] : $reportArray, - 'is_infouser' => false, - 'is_nav' => false, - 'is_groupby' => false, - 'is_plot' => false, - 'is_doc' => false - ]); - - return $this->app->json([ - 'rs' => $html, - 'display_nav' => false, - 'title' => $title - ]); - } - - if ($this->getConf()->get(['registry', 'modules', 'anonymous-report']) == false && $from !== 'DOC' && $from !== 'DASH' && $from !== 'GEN' && $from !== 'PUSHDOC') { - $conf = [ - 'identifiant' => [$this->app->trans('report:: identifiant'), 0, 0, 0, 0], - 'nom' => [$this->app->trans('report:: nom'), 0, 0, 0, 0], - 'mail' => [$this->app->trans('report:: email'), 0, 0, 0, 0], - 'adresse' => [$this->app->trans('report:: adresse'), 0, 0, 0, 0], - 'tel' => [$this->app->trans('report:: telephone'), 0, 0, 0, 0] - ]; - - $info = new \module_report_nav( - $this->app, - $request->request->get('dmin'), - $request->request->get('dmax'), - $request->request->get('sbasid'), - $request->request->get('collection') - ); - - $info->setPeriode(''); - $info->setConfig(false); - $info->setTitle($this->app->trans('report:: utilisateur')); - - $reportArray = $info->buildTabGrpInfo(false, [], $request->request->get('user'), $conf, false); - - if ($request->request->get('printcsv') == 'on' && isset($download)) { - return $this->getCSVResponse($this->app, $info, 'info_user'); - } - - $html .= $this->render('report/ajax_data_content.html.twig', [ - 'result' => isset($reportArray['report']) ? $reportArray['report'] : $reportArray, - 'is_infouser' => false, - 'is_nav' => false, - 'is_groupby' => false, - 'is_plot' => false, - 'is_doc' => false - ]); - - return $this->app->json([ - 'rs' => $html, - 'display_nav' => false, - 'title' => $title - ]); - } - - return $this->app->json([ - 'rs' => $html, - 'display_nav' => false, - 'title' => $title - ]); - } - - private function getCSVResponse(\module_report $report, $type) - { - // set headers - $headers = []; - foreach (array_keys($report->getDisplay()) as $k) { - $headers[$k] = $k; - } - // set headers as first row - $result = $report->getResult(); - array_unshift($result, $headers); - - $collection = new CallbackCollection($result, function ($row) use ($report) { - // restrict fields to the displayed ones - return array_map('strip_tags', array_intersect_key($row, $report->getDisplay())); - }); - - /** @var Exporter $exporter */ - $exporter = $this->app['csv.exporter']; - $filename = sprintf('report_export_%s_%s.csv', $type, date('Ymd')); - $response = new CSVFileResponse($filename, function () use ($exporter, $collection) { - $exporter->export('php://output', $collection); - }); - - return $response; - } -} diff --git a/lib/Alchemy/Phrasea/Controller/Report/RootController.php b/lib/Alchemy/Phrasea/Controller/Report/RootController.php index 8bb9006402..f212a2fd75 100644 --- a/lib/Alchemy/Phrasea/Controller/Report/RootController.php +++ b/lib/Alchemy/Phrasea/Controller/Report/RootController.php @@ -10,12 +10,8 @@ namespace Alchemy\Phrasea\Controller\Report; use Alchemy\Phrasea\Controller\Controller; -use Alchemy\Phrasea\Core\Response\CSVFileResponse; -use Goodby\CSV\Export\Standard\Collection\CallbackCollection; -use Goodby\CSV\Export\Standard\Exporter; use Symfony\Component\HttpFoundation\JsonResponse; use Symfony\Component\HttpFoundation\Request; -use Symfony\Component\HttpFoundation\Response; class RootController extends Controller { @@ -53,22 +49,34 @@ class RootController extends Controller $granted = []; - foreach ($this->getAclForUser()->get_granted_base([\ACL::CANREPORT]) as $collection) { - if (!isset($granted[$collection->get_sbas_id()])) { - $granted[$collection->get_sbas_id()] = [ - 'id' => $collection->get_sbas_id(), - 'name' => $collection->get_databox()->get_viewname(), - 'collections' => [] + $acl = $this->getAclForUser(); + foreach ($acl->get_granted_base([\ACL::CANREPORT]) as $collection) { + $sbas_id = $collection->get_sbas_id(); + if (!isset($granted[$sbas_id])) { + $granted[$sbas_id] = [ + 'id' => $sbas_id, + 'name' => $collection->get_databox()->get_viewname(), + 'collections' => [], + 'metas' => [] ]; + + foreach ($collection->get_databox()->get_meta_structure() as $meta) { + // skip the fields that can't be reported + if (!$meta->is_report() || ($meta->isBusiness() && !$acl->can_see_business_fields($collection->get_databox()))) { + continue; + } + $granted[$sbas_id]['metas'][] = $meta->get_name(); + } } - $granted[$collection->get_sbas_id()]['collections'][] = [ - 'id' => $collection->get_coll_id(), + $granted[$sbas_id]['collections'][] = [ + 'id' => $collection->get_coll_id(), 'base_id' => $collection->get_base_id(), - 'name' => $collection->get_name() + 'name' => $collection->get_name(), ]; } $conf = $this->getConf(); + return $this->render('report/report_layout_child.html.twig', [ 'ajax_dash' => true, 'dashboard' => null, @@ -82,594 +90,4 @@ class RootController extends Controller 'ajax_chart' => false ]); } - - /** - * Gets available collections where current user can see report and - * format date - * - * @param Request $request - * @return JsonResponse - */ - public function initReport(Request $request) - { - $popbases = $request->request->get('popbases', []); - - if ('' === $dmin = $request->request->get('dmin', '')) { - $dmin = date('Y') . '-' . date('m') . '-01'; - } - - if ('' === $dmax = $request->request->get('dmax', '')) { - $dmax = date('Y') . '-' . date('m') . '-' . date('d'); - } - - $dmin = \DateTime::createFromFormat('Y-m-d H:i:s', sprintf('%s 00:00:00', $dmin)); - $dmax = \DateTime::createFromFormat('Y-m-d H:i:s', sprintf('%s 23:59:59', $dmax)); - - //get user's sbas & collections selection from popbases - $selection = []; - $liste = $id_sbas = ''; - $i = 0; - foreach (array_fill_keys($popbases, 0) as $key => $val) { - $exp = explode('_', $key); - if ($exp[0] != $id_sbas && $i != 0) { - $selection[$id_sbas]['liste'] = $liste; - $liste = ''; - } - $selection[$exp[0]][] = $exp[1]; - $liste .= (empty($liste) ? '' : ',') . $exp[1]; - $id_sbas = $exp[0]; - $i ++; - } - //fill the last entry - $selection[$id_sbas]['liste'] = $liste; - - return $this->render('report/ajax_report_content.html.twig', [ - 'selection' => $selection, - 'anonymous' => $this->getConf()->get(['registry', 'modules', 'anonymous-report']), - 'ajax' => true, - 'dmin' => $dmin->format('Y-m-d H:i:s'), - 'dmax' => $dmax->format('Y-m-d H:i:s'), - ]); - } - - /** - * Display instance connexion report - * - * @param Request $request - * @return JsonResponse - */ - public function doReportConnexions(Request $request) - { - $cnx = new \module_report_connexion( - $this->app, - $request->request->get('dmin'), - $request->request->get('dmax'), - $request->request->get('sbasid'), - $request->request->get('collection') - ); - - $conf = [ - 'user' => [$this->app->trans('phraseanet::utilisateurs'), 1, 1, 1, 1], - 'ddate' => [$this->app->trans('report:: date'), 1, 0, 1, 1], - 'ip' => [$this->app->trans('report:: IP'), 1, 0, 0, 0], - 'appli' => [$this->app->trans('report:: modules'), 1, 0, 0, 0], - 'fonction' => [$this->app->trans('report::fonction'), 1, 1, 1, 1], - 'activite' => [$this->app->trans('report::activite'), 1, 1, 1, 1], - 'pays' => [$this->app->trans('report::pays'), 1, 1, 1, 1], - 'societe' => [$this->app->trans('report::societe'), 1, 1, 1, 1] - ]; - - if ($request->request->get('printcsv') == 'on') { - $cnx->setHasLimit(false); - $cnx->setPrettyString(false); - - $this->doReport($request, $cnx, $conf); - - return $this->getCSVResponse($cnx, 'connections'); - } - - $report = $this->doReport($request, $cnx, $conf); - - if ($report instanceof Response) { - return $report; - } - - return $this->app->json([ - 'rs' => $this->render('report/ajax_data_content.html.twig', [ - 'result' => isset($report['report']) ? $report['report'] : $report, - 'is_infouser' => false, - 'is_nav' => false, - 'is_groupby' => false, - 'is_plot' => false, - 'is_doc' => false - ]), - 'display_nav' => $report['display_nav'], // do we display the prev and next button ? - 'next' => $report['next_page'], //Number of the next page - 'prev' => $report['previous_page'], //Number of the previoous page - 'page' => $report['page'], //The current page - 'filter' => ((sizeof($report['filter']) > 0) ? serialize($report['filter']) : ''), //the serialized filters - 'col' => $report['active_column'], //all the columns where a filter is applied - 'limit' => $report['nb_record'] - ]); - } - - /** - * Display instance questions report - * - * @param Request $request - * @return JsonResponse - */ - public function doReportQuestions(Request $request) - { - $questions = new \module_report_question( - $this->app, - $request->request->get('dmin'), - $request->request->get('dmax'), - $request->request->get('sbasid'), - $request->request->get('collection') - ); - - $conf = [ - 'user' => [$this->app->trans('report:: utilisateur'), 1, 1, 1, 1], - 'search' => [$this->app->trans('report:: question'), 1, 0, 1, 1], - 'ddate' => [$this->app->trans('report:: date'), 1, 0, 1, 1], - 'fonction' => [$this->app->trans('report:: fonction'), 1, 1, 1, 1], - 'activite' => [$this->app->trans('report:: activite'), 1, 1, 1, 1], - 'pays' => [$this->app->trans('report:: pays'), 1, 1, 1, 1], - 'societe' => [$this->app->trans('report:: societe'), 1, 1, 1, 1] - ]; - - if ($request->request->get('printcsv') == 'on') { - $questions->setHasLimit(false); - $questions->setPrettyString(false); - - $this->doReport($request, $questions, $conf); - - return $this->getCSVResponse($questions, 'questions'); - } - - $report = $this->doReport($request, $questions, $conf); - - if ($report instanceof Response) { - return $report; - } - - return $this->app->json([ - 'rs' => $this->render('report/ajax_data_content.html.twig', [ - 'result' => isset($report['report']) ? $report['report'] : $report, - 'is_infouser' => false, - 'is_nav' => false, - 'is_groupby' => false, - 'is_plot' => false, - 'is_doc' => false - ]), - 'display_nav' => $report['display_nav'], // do we display the prev and next button ? - 'next' => $report['next_page'], //Number of the next page - 'prev' => $report['previous_page'], //Number of the previoous page - 'page' => $report['page'], //The current page - 'filter' => ((sizeof($report['filter']) > 0) ? serialize($report['filter']) : ''), //the serialized filters - 'col' => $report['active_column'], //all the columns where a filter is applied - 'limit' => $report['nb_record'] - ]); - } - - /** - * Display instance download report - * - * @param Request $request - * @return JsonResponse - */ - public function doReportDownloads(Request $request) - { - $download = new \module_report_download( - $this->app, - $request->request->get('dmin'), - $request->request->get('dmax'), - $request->request->get('sbasid'), - $request->request->get('collection') - ); - - $conf_pref = []; - - foreach (\module_report::getPreff($this->app, $request->request->get('sbasid')) as $field) { - $conf_pref[strtolower($field)] = [$field, 0, 0, 0, 0]; - } - - $conf = array_merge([ - 'user' => [$this->app->trans('report:: utilisateurs'), 1, 1, 1, 1], - 'ddate' => [$this->app->trans('report:: date'), 1, 0, 1, 1], - 'record_id' => [$this->app->trans('report:: record id'), 1, 1, 1, 1], - 'final' => [$this->app->trans('phrseanet:: sous definition'), 1, 0, 1, 1], - 'coll_id' => [$this->app->trans('report:: collections'), 1, 0, 1, 1], - 'comment' => [$this->app->trans('report:: commentaire'), 1, 0, 0, 0], - 'fonction' => [$this->app->trans('report:: fonction'), 1, 1, 1, 1], - 'activite' => [$this->app->trans('report:: activite'), 1, 1, 1, 1], - 'pays' => [$this->app->trans('report:: pays'), 1, 1, 1, 1], - 'societe' => [$this->app->trans('report:: societe'), 1, 1, 1, 1] - ], $conf_pref); - - if ($request->request->get('printcsv') == 'on') { - $download->setHasLimit(false); - $download->setPrettyString(false); - - $this->doReport($request, $download, $conf); - - $r = $this->getCSVResponse($download, 'download'); - - return $r; - } - - $report = $this->doReport($request, $download, $conf); - - if ($report instanceof Response) { - return $report; - } - - return $this->app->json([ - 'rs' => $this->render('report/ajax_data_content.html.twig', [ - 'result' => isset($report['report']) ? $report['report'] : $report, - 'is_infouser' => false, - 'is_nav' => false, - 'is_groupby' => false, - 'is_plot' => false, - 'is_doc' => false - ]), - 'display_nav' => $report['display_nav'], // do we display the prev and next button ? - 'next' => $report['next_page'], //Number of the next page - 'prev' => $report['previous_page'], //Number of the previoous page - 'page' => $report['page'], //The current page - 'filter' => ((sizeof($report['filter']) > 0) ? serialize($report['filter']) : ''), //the serialized filters - 'col' => $report['active_column'], //all the columns where a filter is applied - 'limit' => $report['nb_record'] - ]); - } - - /** - * Display instance document report - * - * @param Request $request - * @return JsonResponse - */ - public function doReportDocuments(Request $request) - { - $document = new \module_report_download( - $this->app, - $request->request->get('dmin'), - $request->request->get('dmax'), - $request->request->get('sbasid'), - $request->request->get('collection') - ); - - $conf_pref = []; - - foreach (\module_report::getPreff($this->app, $request->request->get('sbasid')) as $field) { - $conf_pref[$field] = array($field, 0, 0, 0, 0); - } - - $conf = array_merge([ - 'telechargement' => [$this->app->trans('report:: telechargements'), 1, 0, 0, 0], - 'record_id' => [$this->app->trans('report:: record id'), 1, 1, 1, 0], - 'final' => [$this->app->trans('phraseanet:: sous definition'), 1, 0, 1, 1], - 'file' => [$this->app->trans('report:: fichier'), 1, 0, 0, 1], - 'mime' => [$this->app->trans('report:: type'), 1, 0, 1, 1], - 'size' => [$this->app->trans('report:: taille'), 1, 0, 1, 1] - ], $conf_pref); - - if ($request->request->get('printcsv') == 'on') { - $document->setHasLimit(false); - $document->setPrettyString(false); - - $this->doReport($request, $document, $conf, 'record_id'); - - $r = $this->getCSVResponse($document, 'documents'); - - return $r; - } - - $report = $this->doReport($request, $document, $conf, 'record_id'); - - if ($report instanceof Response) { - return $report; - } - - return $this->app->json([ - 'rs' => $this->render('report/ajax_data_content.html.twig', [ - 'result' => isset($report['report']) ? $report['report'] : $report, - 'is_infouser' => false, - 'is_nav' => false, - 'is_groupby' => false, - 'is_plot' => false, - 'is_doc' => true - ]), - 'display_nav' => $report['display_nav'], // do we display the prev and next button ? - 'next' => $report['next_page'], //Number of the next page - 'prev' => $report['previous_page'], //Number of the previoous page - 'page' => $report['page'], //The current page - 'filter' => ((sizeof($report['filter']) > 0) ? serialize($report['filter']) : ''), //the serialized filters - 'col' => $report['active_column'], //all the columns where a filter is applied - 'limit' => $report['nb_record'] - ]); - } - - /** - * Display information about client (browser, resolution etc ...) - * - * @param Request $request - * @return JsonResponse - */ - public function doReportClients(Request $request) - { - $nav = new \module_report_nav( - $this->app, - $request->request->get('dmin'), - $request->request->get('dmax'), - $request->request->get('sbasid'), - $request->request->get('collection') - ); - - $conf_nav = [ - 'nav' => [$this->app->trans('report:: navigateur'), 0, 1, 0, 0], - 'nb' => [$this->app->trans('report:: nombre'), 0, 0, 0, 0], - 'pourcent' => [$this->app->trans('report:: pourcentage'), 0, 0, 0, 0] - ]; - - $conf_combo = [ - 'combo' => [$this->app->trans('report:: navigateurs et plateforme'), 0, 0, 0, 0], - 'nb' => [$this->app->trans('report:: nombre'), 0, 0, 0, 0], - 'pourcent' => [$this->app->trans('report:: pourcentage'), 0, 0, 0, 0] - ]; - $conf_os = [ - 'os' => [$this->app->trans('report:: plateforme'), 0, 0, 0, 0], - 'nb' => [$this->app->trans('report:: nombre'), 0, 0, 0, 0], - 'pourcent' => [$this->app->trans('report:: pourcentage'), 0, 0, 0, 0] - ]; - $conf_res = [ - 'res' => [$this->app->trans('report:: resolution'), 0, 0, 0, 0], - 'nb' => [$this->app->trans('report:: nombre'), 0, 0, 0, 0], - 'pourcent' => [$this->app->trans('report:: pourcentage'), 0, 0, 0, 0] - ]; - $conf_mod = [ - 'appli' => [$this->app->trans('report:: module'), 0, 0, 0, 0], - 'nb' => [$this->app->trans('report:: nombre'), 0, 0, 0, 0], - 'pourcent' => [$this->app->trans('report:: pourcentage'), 0, 0, 0, 0] - ]; - - $report = [ - 'nav' => $nav->buildTabNav($conf_nav), - 'os' => $nav->buildTabOs($conf_os), - 'res' => $nav->buildTabRes($conf_res), - 'mod' => $nav->buildTabModule($conf_mod), - 'combo' => $nav->buildTabCombo($conf_combo) - ]; - - if ($request->request->get('printcsv') == 'on') { - $result = []; - - $result[] = array_keys($conf_nav); - foreach ($report['nav']['result'] as $row) { - $result[] = array_values($row); - }; - $result[] = array_keys($conf_os); - foreach ($report['os']['result'] as $row) { - $result[] = array_values($row); - }; - $result[] = array_keys($conf_res); - foreach ($report['res']['result'] as $row) { - $result[] = array_values($row); - }; - $result[] = array_keys($conf_mod); - foreach ($report['mod']['result'] as $row) { - $result[] = array_values($row); - }; - $result[] = array_keys($conf_combo); - foreach ($report['combo']['result'] as $row) { - $result[] = array_values($row); - }; - - /** @var Exporter $exporter */ - $exporter = $this->app['csv.exporter']; - $filename = sprintf('report_export_info_%s.csv', date('Ymd')); - $response = new CSVFileResponse($filename, function () use ($exporter, $result) { - $exporter->export('php://output', $result); - }); - - return $response; - } - - return $this->app->json([ - 'rs' => $this->render('report/ajax_data_content.html.twig', [ - 'result' => isset($report['report']) ? $report['report'] : $report, - 'is_infouser' => false, - 'is_nav' => true, - 'is_groupby' => false, - 'is_plot' => false, - 'is_doc' => false - ]), - 'display_nav' => false, - 'title' => false - ]); - } - - /** - * Set Report configuration according to request parameters - * - * @param Request $request A request instance - * @param \module_report $report A report instance - * @param Array $conf A report column configuration - * @param Boolean $what Whether to group on a particular field or not - * @return Array - */ - private function doReport(Request $request, \module_report $report, $conf, $what = false) - { - if ($this->getConf()->get(['registry', 'modules', 'anonymous-report']) == true) { - if (isset($conf['user'])) { - unset($conf['user']); - } - - if (isset($conf['ip'])) { - unset($conf['ip']); - } - } - - //save initial conf - $base_conf = $conf; - //format conf according user preferences - if ('' !== $columnsList = $request->request->get('list_column', '')) { - $new_conf = $conf; - $columns = explode(',', $columnsList); - - foreach (array_keys($conf) as $col) { - if (!in_array($col, $columns)) { - unset($new_conf[$col]); - } - } - - $conf = $new_conf; - } - - //display content of a table column when user click on it - if ($request->request->get('conf') == 'on') { - return $this->app->json(['liste' => $this->render('report/listColumn.html.twig', [ - 'conf' => $base_conf - ]), 'title' => $this->app->trans('configuration')]); - } - - //set order - if (('' !== $order = $request->request->get('order', '')) && ('' !== $field = $request->request->get('champ', ''))) { - $report->setOrder($field, $order); - } - - //work on filters - $mapColumnTitleToSqlField = $report->getTransQueryString(); - - $currentfilter = []; - - if ('' !== $serializedFilter = $request->request->get('liste_filter', '')) { - $currentfilter = @unserialize(urldecode($serializedFilter)); - } - - $filter = new \module_report_filter($this->app, $currentfilter, $mapColumnTitleToSqlField); - - if ('' !== $filterColumn = $request->request->get('filter_column', '')) { - $field = current(explode(' ', $filterColumn)); - $value = $request->request->get('filter_value', ''); - - if ($request->request->get('liste') == 'on') { - return $this->app->json(['diag' => $this->render('report/colFilter.html.twig', [ - 'result' => $report->colFilter($field), - 'field' => $field - ]), 'title' => $this->app->trans('filtrer les resultats sur la colonne %colonne%', ['%colonne%' => $field])]); - } - - if ($field === $value) { - $filter->removeFilter($field); - } else { - $filter->addFilter($field, '=', $value); - } - } - - //set new request filter if user asking for them - if ($request->request->get('precise') == 1) { - $filter->addFilter('xml', 'LIKE', $request->request->get('word', '')); - } elseif ($request->request->get('precise') == 2) { - $filter->addFilter('record_id', '=', $request->request->get('word', '')); - } - - //set filters to current report - $report->setFilter($filter->getTabFilter()); - $report->setActiveColumn($filter->getActiveColumn()); - $report->setPostingFilter($filter->getPostingFilter()); - - // display a new arraywhere results are group - if ('' !== $groupby = $request->request->get('groupby', '')) { - - $report->setConfig(false); - $groupby = current(explode(' ', $groupby)); - - $reportArray = $report->buildReport(false, $groupby); - - if (count($reportArray['allChamps']) > 0 && count($reportArray['display']) > 0) { - $groupField = isset($reportArray['display'][$reportArray['allChamps'][0]]['title']) ? $reportArray['display'][$reportArray['allChamps'][0]]['title'] : ''; - } else { - $groupField = isset($conf[strtolower($groupby)]['title']) ? $conf[strtolower($groupby)]['title'] : ''; - } - - return $this->app->json([ - 'rs' => $this->render('report/ajax_data_content.html.twig', [ - 'result' => isset($reportArray['report']) ? $reportArray['report'] : $reportArray, - 'is_infouser' => false, - 'is_nav' => false, - 'is_groupby' => true, - 'is_plot' => false, - 'is_doc' => false - ]), - 'display_nav' => false, - 'title' => $this->app->trans('Groupement des resultats sur le champ %name%', ['%name%' => $groupField]) - ]); - } - - //set Limit - if ($report->getEnableLimit() - && ('' !== $page = $request->request->get('page', '')) - && ('' !== $limit = $request->request->get('limit', ''))) { - $report->setLimit($page, $limit); - } else { - $report->setLimit(false, false); - } - - //time to build our report - if (false === $what) { - $reportArray = $report->buildReport($conf); - } else { - $reportArray = $report->buildReport($conf, $what, $request->request->get('tbl', false)); - } - - return $reportArray; - } - - /** - * Prefix the method to call with the controller class name - * - * @param string $method The method to call - * @return string - */ - private function call($method) - { - return sprintf('%s::%s', __CLASS__, $method); - } - - private function getCSVResponse(\module_report $report, $type) - { - // set headers - $headers = []; - foreach (array_keys($report->getDisplay()) as $k) { - $headers[$k] = $k; - } - // set headers as first row - $result = $report->getResult(); - - array_unshift($result, $headers); - - $collection = new CallbackCollection($result, function ($row) use ($headers) { - // restrict fields to the displayed ones - // return array_map("strip_tags", array_intersect_key($row, $report->getDisplay())); - $ret = array(); - foreach($headers as $f) { - $ret[$f] = array_key_exists($f, $row) ? strip_tags($row[$f]) : ''; - } - return $ret; - }); - - $filename = sprintf('report_export_%s_%s.csv', $type, date('Ymd')); - - /** @var Exporter $exporter */ - $exporter = $this->app['csv.exporter']; - $cb = function () use ($exporter, $collection) { - $exporter->export('php://output', $collection); - }; - - $response = new CSVFileResponse($filename, $cb); - - return $response; - } } diff --git a/lib/Alchemy/Phrasea/Controller/Thesaurus/ThesaurusXmlHttpController.php b/lib/Alchemy/Phrasea/Controller/Thesaurus/ThesaurusXmlHttpController.php index 8662681991..e7b844297f 100644 --- a/lib/Alchemy/Phrasea/Controller/Thesaurus/ThesaurusXmlHttpController.php +++ b/lib/Alchemy/Phrasea/Controller/Thesaurus/ThesaurusXmlHttpController.php @@ -1426,12 +1426,7 @@ class ThesaurusXmlHttpController extends Controller public function searchTermJson(Request $request) { - if (null === $lng = $request->get('lng')) { - $data = explode('_', $this->app['locale']); - if (count($data) > 0) { - $lng = $data[0]; - } - } + $lng = $request->get('lng'); $html = ''; $sbid = (int) $request->get('sbid'); @@ -1485,7 +1480,10 @@ class ThesaurusXmlHttpController extends Controller $q2 .= ' and starts-with(@k, \'' . \thesaurus::xquery_escape($unicode->remove_indexer_chars($t[1])) . '\')'; } - $q2 .= ' and @lng=\'' . \thesaurus::xquery_escape($lng) . '\''; + if($lng != null){ + $q2 .= ' and @lng=\'' . \thesaurus::xquery_escape($lng) . '\''; + } + $q .= ('//sy[' . $q2 . ']'); $nodes = $xpath->query($q); diff --git a/lib/Alchemy/Phrasea/ControllerProvider/ControllerProviderServiceProvider.php b/lib/Alchemy/Phrasea/ControllerProvider/ControllerProviderServiceProvider.php index 4b325ec3c3..4cbec52624 100644 --- a/lib/Alchemy/Phrasea/ControllerProvider/ControllerProviderServiceProvider.php +++ b/lib/Alchemy/Phrasea/ControllerProvider/ControllerProviderServiceProvider.php @@ -88,8 +88,6 @@ class ControllerProviderServiceProvider implements ServiceProviderInterface Prod\Upload::class => [], Prod\UsrLists::class => [], Prod\WorkZone::class => [], - Report\Activity::class => [], - Report\Information::class => [], Report\Root::class => [], Root\Account::class => [], Root\Developers::class => [], diff --git a/lib/Alchemy/Phrasea/ControllerProvider/Report/Activity.php b/lib/Alchemy/Phrasea/ControllerProvider/Report/Activity.php deleted file mode 100644 index 5baf14bf2a..0000000000 --- a/lib/Alchemy/Phrasea/ControllerProvider/Report/Activity.php +++ /dev/null @@ -1,81 +0,0 @@ -share(function (PhraseaApplication $app) { - return new ActivityController($app); - }); - } - - public function boot(Application $app) - { - // no-op - } - - public function connect(Application $app) - { - $controllers = $this->createAuthenticatedCollection($app); - $firewall = $this->getFirewall($app); - - $controllers->before(function () use ($firewall) { - $firewall->requireAccessToModule('report'); - }); - - $controllers->post('/users/connexions', 'controller.report.activity:doReportConnexionsByUsers') - ->bind('report_activity_users_connexions'); - - $controllers->post('/users/downloads', 'controller.report.activity:doReportDownloadsByUsers') - ->bind('report_activity_users_downloads');; - - $controllers->post('/questions/best-of', 'controller.report.activity:doReportBestOfQuestions') - ->bind('report_activity_questions_bestof'); - - $controllers->post('/questions/no-best-of', 'controller.report.activity:doReportNoBestOfQuestions') - ->bind('report_activity_questions_nobestof'); - - $controllers->post('/instance/hours', 'controller.report.activity:doReportSiteActiviyPerHours') - ->bind('report_activity_instance_hours'); - - $controllers->post('/instance/days', 'controller.report.activity:doReportSiteActivityPerDays') - ->bind('report_activity_instance_days'); - - $controllers->post('/documents/pushed', 'controller.report.activity:doReportPushedDocuments') - ->bind('report_activity_documents_pushed'); - - $controllers->post('/documents/added', 'controller.report.activity:doReportAddedDocuments') - ->bind('report_activity_documents_added'); - - $controllers->post('/documents/edited', 'controller.report.activity:doReportEditedDocuments') - ->bind('report_activity_documents_edited'); - - $controllers->post('/documents/validated', 'controller.report.activity:doReportValidatedDocuments') - ->bind('report_activity_documents_validated'); - - $controllers->post('/documents/sent', 'controller.report.activity:doReportSentDocuments') - ->bind('report_activity_documents_sent'); - - return $controllers; - } -} diff --git a/lib/Alchemy/Phrasea/ControllerProvider/Report/Information.php b/lib/Alchemy/Phrasea/ControllerProvider/Report/Information.php deleted file mode 100644 index e52ee37ea1..0000000000 --- a/lib/Alchemy/Phrasea/ControllerProvider/Report/Information.php +++ /dev/null @@ -1,57 +0,0 @@ -share(function (PhraseaApplication $app) { - return new InformationController($app); - }); - } - - public function boot(Application $app) - { - // no-op - } - - public function connect(Application $app) - { - $controllers = $this->createAuthenticatedCollection($app); - $firewall = $this->getFirewall($app); - - $controllers->before(function () use ($firewall) { - $firewall->requireAccessToModule('report'); - }); - - $controllers->post('/user', 'controller.report.information:doReportInformationUser') - ->bind('report_infomations_user'); - - $controllers->post('/browser', 'controller.report.information:doReportInformationBrowser') - ->bind('report_infomations_browser'); - - $controllers->post('/document', 'controller.report.information:doReportInformationDocument') - ->bind('report_infomations_document'); - - return $controllers; - } -} diff --git a/lib/Alchemy/Phrasea/Core/Version.php b/lib/Alchemy/Phrasea/Core/Version.php index 9d397d453e..b2bf620798 100644 --- a/lib/Alchemy/Phrasea/Core/Version.php +++ b/lib/Alchemy/Phrasea/Core/Version.php @@ -16,7 +16,7 @@ class Version /** * @var string */ - private $number = '4.1.0-alpha.13'; + private $number = '4.1.0-alpha.14a'; /** * @var string diff --git a/lib/Alchemy/Phrasea/Filesystem/FilesystemService.php b/lib/Alchemy/Phrasea/Filesystem/FilesystemService.php index fe2ac305c9..8da30984f0 100644 --- a/lib/Alchemy/Phrasea/Filesystem/FilesystemService.php +++ b/lib/Alchemy/Phrasea/Filesystem/FilesystemService.php @@ -201,6 +201,8 @@ class FilesystemService return 'ogg'; case 'libmp3lame': return 'mp3'; + case 'pcm_s16le': + return 'wav'; } return null; diff --git a/lib/Alchemy/Phrasea/Media/Subdef/Audio.php b/lib/Alchemy/Phrasea/Media/Subdef/Audio.php index ac50940dc1..2551669dd1 100644 --- a/lib/Alchemy/Phrasea/Media/Subdef/Audio.php +++ b/lib/Alchemy/Phrasea/Media/Subdef/Audio.php @@ -19,6 +19,7 @@ class Audio extends Provider const OPTION_THREADS = 'threads'; const OPTION_ACODEC = 'acodec'; const OPTION_AUDIOSAMPLERATE = 'audiosamplerate'; + const OPTION_AUDIOCHANNEL = 'audiochannel'; public function __construct(TranslatorInterface $translator) { @@ -29,9 +30,12 @@ class Audio extends Provider 47250, 48000, 50000, 50400, 88200, 96000 ]; + $audioChannel = ['mono', 'stereo']; + $this->registerOption(new OptionType\Range($this->translator->trans('Audio Birate'), self::OPTION_AUDIOBITRATE, 32, 320, 128, 32)); $this->registerOption(new OptionType\Enum($this->translator->trans('AudioSamplerate'), self::OPTION_AUDIOSAMPLERATE, $AVaudiosamplerate)); - $this->registerOption(new OptionType\Enum($this->translator->trans('Audio Codec'), self::OPTION_ACODEC, ['libmp3lame', 'flac'], 'libmp3lame')); + $this->registerOption(new OptionType\Enum($this->translator->trans('Audio Codec'), self::OPTION_ACODEC, ['libmp3lame', 'flac', 'pcm_s16le'], 'libmp3lame')); + $this->registerOption(new OptionType\Enum($this->translator->trans('Audio channel'), self::OPTION_AUDIOCHANNEL, $audioChannel)); } public function getType() @@ -53,7 +57,21 @@ class Audio extends Provider $this->spec->setAudioCodec($this->getOption(self::OPTION_ACODEC)->getValue()); $this->spec->setAudioSampleRate($this->getOption(self::OPTION_AUDIOSAMPLERATE)->getValue()); $this->spec->setAudioKiloBitrate($this->getOption(self::OPTION_AUDIOBITRATE)->getValue()); + $this->spec->setAudioChannels($this->getChannelNumber($this->getOption(self::OPTION_AUDIOCHANNEL)->getValue())); return $this->spec; } + + private function getChannelNumber($audioChannel) + { + switch($audioChannel) + { + case 'mono': + return 1; + case 'stereo': + return 2; + default: + return null; + } + } } diff --git a/lib/Alchemy/Phrasea/Report/Controller/ProdReportController.php b/lib/Alchemy/Phrasea/Report/Controller/ProdReportController.php index fdd4ec2b67..90e9aa807a 100644 --- a/lib/Alchemy/Phrasea/Report/Controller/ProdReportController.php +++ b/lib/Alchemy/Phrasea/Report/Controller/ProdReportController.php @@ -9,6 +9,7 @@ */ namespace Alchemy\Phrasea\Report\Controller; +use Alchemy\Phrasea\Controller\Controller; use Alchemy\Phrasea\Report\Report; use Alchemy\Phrasea\Report\ReportConnections; use Alchemy\Phrasea\Report\ReportDownloads; @@ -16,10 +17,11 @@ use Alchemy\Phrasea\Report\ReportFactory; use Alchemy\Phrasea\Report\ReportRecords; use Doctrine\Common\Collections\ArrayCollection; use Symfony\Component\HttpFoundation\Request; +use Symfony\Component\HttpFoundation\Response; use Symfony\Component\HttpFoundation\StreamedResponse; -class ProdReportController +class ProdReportController extends Controller { private static $mapFromExtension = [ 'csv' => [ @@ -55,6 +57,19 @@ class ProdReportController $this->acl = $acl; } + /** + * route prod/report/connections + * + * @param Request $request + * @return Response + */ + public function indexAction(Request $request) + { + return new Response($this->render('prod/report/index.html.twig', [ + 'truc' => "hello" + ])); + } + /** * route prod/report/connections * diff --git a/lib/Alchemy/Phrasea/Report/ControllerProvider/ApiReportControllerProvider.php b/lib/Alchemy/Phrasea/Report/ControllerProvider/ApiReportControllerProvider.php index 71134c7845..321f7f7897 100644 --- a/lib/Alchemy/Phrasea/Report/ControllerProvider/ApiReportControllerProvider.php +++ b/lib/Alchemy/Phrasea/Report/ControllerProvider/ApiReportControllerProvider.php @@ -85,22 +85,26 @@ class ApiReportControllerProvider extends Api implements ControllerProviderInter $controllers->before(new OAuthListener()); $controllers - ->get('/', 'controller.api.v2.report:rootAction') + ->match('/', 'controller.api.v2.report:rootAction') + ->method('GET|POST') ; $controllers - ->get('/connections/{sbasId}/', 'controller.api.v2.report:connectionsAction') + ->match('/connections/{sbasId}/', 'controller.api.v2.report:connectionsAction') ->assert('sbasId', '\d+') + ->method('GET|POST') ; $controllers - ->get('/downloads/{sbasId}/', 'controller.api.v2.report:downloadsAction') + ->match('/downloads/{sbasId}/', 'controller.api.v2.report:downloadsAction') ->assert('sbasId', '\d+') + ->method('GET|POST') ; $controllers - ->get('/records/{sbasId}/', 'controller.api.v2.report:recordsAction') + ->match('/records/{sbasId}/', 'controller.api.v2.report:recordsAction') ->assert('sbasId', '\d+') + ->method('GET|POST') ; return $controllers; diff --git a/lib/Alchemy/Phrasea/Report/ControllerProvider/ProdReportControllerProvider.php b/lib/Alchemy/Phrasea/Report/ControllerProvider/ProdReportControllerProvider.php index 4a1a208b00..12c7710fac 100644 --- a/lib/Alchemy/Phrasea/Report/ControllerProvider/ProdReportControllerProvider.php +++ b/lib/Alchemy/Phrasea/Report/ControllerProvider/ProdReportControllerProvider.php @@ -58,20 +58,26 @@ class ProdReportControllerProvider implements ControllerProviderInterface, Servi public function connect(Application $app) { $controllers = $this->createAuthenticatedCollection($app); - + $controllers - ->get('/connections/{sbasId}/', 'controller.prod.report:connectionsAction') + ->match('/connections/{sbasId}/', 'controller.prod.report:connectionsAction') ->assert('sbasId', '\d+') + ->bind('report2_connections') + ->method('GET|POST') ; $controllers - ->get('/downloads/{sbasId}/', 'controller.prod.report:downloadsAction') + ->match('/downloads/{sbasId}/', 'controller.prod.report:downloadsAction') ->assert('sbasId', '\d+') + ->bind('report2_downloads') + ->method('GET|POST') ; $controllers - ->get('/records/{sbasId}/', 'controller.prod.report:recordsAction') + ->match('/records/{sbasId}/', 'controller.prod.report:recordsAction') ->assert('sbasId', '\d+') + ->bind('report2_records') + ->method('GET|POST') ; return $controllers; diff --git a/lib/Alchemy/Phrasea/Report/ReportRecords.php b/lib/Alchemy/Phrasea/Report/ReportRecords.php index b100281c4e..7e4eb1c7d7 100644 --- a/lib/Alchemy/Phrasea/Report/ReportRecords.php +++ b/lib/Alchemy/Phrasea/Report/ReportRecords.php @@ -72,8 +72,6 @@ class ReportRecords extends Report . " AND r.record_id >= " . $row['from'] . " AND r.record_id <= " . $row['to'] . "\n" . "GROUP BY `record_id`\n"; - // file_put_contents("/tmp/phraseanet-log.txt", sprintf("%s (%d) %s\n", __FILE__, __LINE__, var_export($sql, true)), FILE_APPEND); - $stmt = $this->databox->get_connection()->executeQuery($sql, []); $rows = $stmt->fetchAll(); $stmt->closeCursor(); diff --git a/lib/Alchemy/Phrasea/SearchEngine/Elastic/ElasticSearchEngine.php b/lib/Alchemy/Phrasea/SearchEngine/Elastic/ElasticSearchEngine.php index 4a7e039f01..ed9d3ceeed 100644 --- a/lib/Alchemy/Phrasea/SearchEngine/Elastic/ElasticSearchEngine.php +++ b/lib/Alchemy/Phrasea/SearchEngine/Elastic/ElasticSearchEngine.php @@ -619,6 +619,8 @@ class ElasticSearchEngine implements SearchEngineInterface foreach ($context->getHighlightedFields() as $field) { switch ($field->getType()) { case FieldMapping::TYPE_STRING: + case FieldMapping::TYPE_DOUBLE: + case FieldMapping::TYPE_DATE: $index_field = $field->getIndexField(); $raw_index_field = $field->getIndexField(true); $highlighted_fields[$index_field . ".light"] = [ @@ -628,13 +630,10 @@ class ElasticSearchEngine implements SearchEngineInterface ]; break; case FieldMapping::TYPE_FLOAT: - case FieldMapping::TYPE_DOUBLE: case FieldMapping::TYPE_INTEGER: case FieldMapping::TYPE_LONG: case FieldMapping::TYPE_SHORT: case FieldMapping::TYPE_BYTE: - continue; - case FieldMapping::TYPE_DATE: default: continue; } @@ -660,7 +659,7 @@ class ElasticSearchEngine implements SearchEngineInterface } $agg = [ 'terms' => [ - 'field' => $f['field'], + 'field' => $f['esfield'], 'size' => $size ] ]; diff --git a/lib/Alchemy/Phrasea/SearchEngine/Elastic/ElasticsearchOptions.php b/lib/Alchemy/Phrasea/SearchEngine/Elastic/ElasticsearchOptions.php index 7b2bc94453..87d54c5b71 100644 --- a/lib/Alchemy/Phrasea/SearchEngine/Elastic/ElasticsearchOptions.php +++ b/lib/Alchemy/Phrasea/SearchEngine/Elastic/ElasticsearchOptions.php @@ -256,42 +256,56 @@ class ElasticsearchOptions { return [ 'base_aggregate' => [ - 'label' => 'prod::facet:base_label', - 'field' => 'databox_name', - 'query' => 'database:%s', + 'type' => 'string', + 'label' => 'prod::facet:base_label', + 'field' => "database", + 'esfield' => 'databox_name', + 'query' => 'database:%s', ], 'collection_aggregate' => [ - 'label' => 'prod::facet:collection_label', - 'field' => 'collection_name', - 'query' => 'collection:%s', + 'type' => 'string', + 'label' => 'prod::facet:collection_label', + 'field' => "collection", + 'esfield' => 'collection_name', + 'query' => 'collection:%s', ], 'doctype_aggregate' => [ - 'label' => 'prod::facet:doctype_label', - 'field' => 'type', - 'query' => 'type:%s', + 'type' => 'string', + 'label' => 'prod::facet:doctype_label', + 'field' => "type", + 'esfield' => 'type', + 'query' => 'type:%s', ], 'camera_model_aggregate' => [ - 'label' => 'Camera Model', - 'field' => 'metadata_tags.CameraModel', - 'query' => 'meta.CameraModel:%s', + 'type' => 'string', + 'label' => 'Camera Model', + 'field' => "meta.CameraModel", + 'esfield' => 'metadata_tags.CameraModel', + 'query' => 'meta.CameraModel:%s', ], 'iso_aggregate' => [ - 'label' => 'ISO', - 'field' => 'metadata_tags.ISO', - 'query' => 'meta.ISO=%s', + 'type' => 'number', + 'label' => 'ISO', + 'field' => "meta.ISO", + 'esfield' => 'metadata_tags.ISO', + 'query' => 'meta.ISO=%s', ], 'aperture_aggregate' => [ - 'label' => 'Aperture', - 'field' => 'metadata_tags.Aperture', - 'query' => 'meta.Aperture=%s', + 'type' => 'number', + 'label' => 'Aperture', + 'field' => "meta.Aperture", + 'esfield' => 'metadata_tags.Aperture', + 'query' => 'meta.Aperture=%s', 'output_formatter' => function($value) { return round($value, 1); }, ], 'shutterspeed_aggregate' => [ - 'label' => 'Shutter speed', - 'field' => 'metadata_tags.ShutterSpeed', - 'query' => 'meta.ShutterSpeed=%s', + 'type' => 'number', + 'label' => 'Shutter speed', + 'field' => "meta.ShutterSpeed", + 'esfield' => 'metadata_tags.ShutterSpeed', + 'query' => 'meta.ShutterSpeed=%s', 'output_formatter' => function($value) { if($value < 1.0 && $value != 0) { $value = '1/' . round(1.0 / $value); @@ -300,9 +314,11 @@ class ElasticsearchOptions }, ], 'flashfired_aggregate' => [ - 'label' => 'FlashFired', - 'field' => 'metadata_tags.FlashFired', - 'query' => 'meta.FlashFired=%s', + 'type' => 'boolean', + 'label' => 'FlashFired', + 'field' => "meta.FlashFired", + 'esfield' => 'metadata_tags.FlashFired', + 'query' => 'meta.FlashFired=%s', 'choices' => [ "aggregated (2 values: fired = 0 or 1)" => -1, ], @@ -312,39 +328,53 @@ class ElasticsearchOptions }, ], 'framerate_aggregate' => [ - 'label' => 'FrameRate', - 'field' => 'metadata_tags.FrameRate', - 'query' => 'meta.FrameRate=%s', + 'type' => 'number', + 'label' => 'FrameRate', + 'field' => "meta.FrameRate", + 'esfield' => 'metadata_tags.FrameRate', + 'query' => 'meta.FrameRate=%s', ], 'audiosamplerate_aggregate' => [ - 'label' => 'Audio Samplerate', - 'field' => 'metadata_tags.AudioSamplerate', - 'query' => 'meta.AudioSamplerate=%s', + 'type' => 'number', + 'label' => 'Audio Samplerate', + 'field' => "meta.AudioSamplerate", + 'esfield' => 'metadata_tags.AudioSamplerate', + 'query' => 'meta.AudioSamplerate=%s', ], 'videocodec_aggregate' => [ - 'label' => 'Video codec', - 'field' => 'metadata_tags.VideoCodec', - 'query' => 'meta.VideoCodec:%s', + 'type' => 'string', + 'label' => 'Video codec', + 'field' => "meta.VideoCodec", + 'esfield' => 'metadata_tags.VideoCodec', + 'query' => 'meta.VideoCodec:%s', ], 'audiocodec_aggregate' => [ - 'label' => 'Audio codec', - 'field' => 'metadata_tags.AudioCodec', - 'query' => 'meta.AudioCodec:%s', + 'type' => 'string', + 'label' => 'Audio codec', + 'field' => "meta.AudioCodec", + 'esfield' => 'metadata_tags.AudioCodec', + 'query' => 'meta.AudioCodec:%s', ], 'orientation_aggregate' => [ - 'label' => 'Orientation', - 'field' => 'metadata_tags.Orientation', - 'query' => 'meta.Orientation=%s', + 'type' => 'string', + 'label' => 'Orientation', + 'field' => "meta.Orientation", + 'esfield' => 'metadata_tags.Orientation', + 'query' => 'meta.Orientation=%s', ], 'colorspace_aggregate' => [ - 'label' => 'Colorspace', - 'field' => 'metadata_tags.ColorSpace', - 'query' => 'meta.ColorSpace:%s', + 'type' => 'string', + 'label' => 'Colorspace', + 'field' => "meta.ColorSpace", + 'esfield' => 'metadata_tags.ColorSpace', + 'query' => 'meta.ColorSpace:%s', ], 'mimetype_aggregate' => [ - 'label' => 'MimeType', - 'field' => 'metadata_tags.MimeType', - 'query' => 'meta.MimeType:%s', + 'type' => 'string', + 'label' => 'MimeType', + 'field' => "meta.MimeType", + 'esfield' => 'metadata_tags.MimeType', + 'query' => 'meta.MimeType:%s', ], ]; } diff --git a/lib/Alchemy/Phrasea/SearchEngine/Elastic/Indexer/Record/Fetcher.php b/lib/Alchemy/Phrasea/SearchEngine/Elastic/Indexer/Record/Fetcher.php index 52ae4401c1..8a379b6269 100644 --- a/lib/Alchemy/Phrasea/SearchEngine/Elastic/Indexer/Record/Fetcher.php +++ b/lib/Alchemy/Phrasea/SearchEngine/Elastic/Indexer/Record/Fetcher.php @@ -127,20 +127,21 @@ class Fetcher private function getExecutedStatement() { if (!$this->statement) { - $sql = "SELECT r.record_id" - . ", r.coll_id AS collection_id" - . ", c.asciiname AS collection_name" - . ", r.uuid" - . ", r.status AS flags_bitfield" - . ", r.sha256" // -- TODO rename in "hash" - . ", r.originalname AS original_name" - . ", r.mime, r.type, r.parent_record_id, r.credate AS created_on, r.moddate AS updated_on" - . ", subdef.width, subdef.height, subdef.size" - . " FROM (record r INNER JOIN coll c ON (c.coll_id = r.coll_id))" - . " LEFT JOIN subdef ON subdef.record_id=r.record_id AND subdef.name='document'" - . " -- WHERE" - . " ORDER BY " . $this->options->getPopulateOrderAsSQL() . " " . $this->options->getPopulateDirectionAsSQL() - . " LIMIT :offset, :limit"; + $sql = "SELECT r.*, c.asciiname AS collection_name, subdef.width, subdef.height, subdef.size\n" + . " FROM ((\n" + . " SELECT r.record_id, r.coll_id AS collection_id, r.uuid, r.status AS flags_bitfield, r.sha256,\n" + . " r.originalname AS original_name, r.mime, r.type, r.parent_record_id,\n" + . " r.credate AS created_on, r.moddate AS updated_on, r.coll_id\n" + . " FROM record r\n" + . " -- WHERE\n" + . " ORDER BY " . $this->options->getPopulateOrderAsSQL() . " " . $this->options->getPopulateDirectionAsSQL() . "\n" + . " LIMIT :offset, :limit\n" + . " ) AS r\n" + . " INNER JOIN coll c ON (c.coll_id = r.coll_id)\n" + . " )\n" + . " LEFT JOIN\n" + . " subdef ON subdef.record_id=r.record_id AND subdef.name='document'\n" + . " ORDER BY " . $this->options->getPopulateOrderAsSQL() . " " . $this->options->getPopulateDirectionAsSQL() . ""; $where = $this->delegate->buildWhereClause(); $sql = str_replace('-- WHERE', $where, $sql); diff --git a/lib/Alchemy/Phrasea/SearchEngine/Elastic/Mapping/DoubleFieldMapping.php b/lib/Alchemy/Phrasea/SearchEngine/Elastic/Mapping/DoubleFieldMapping.php new file mode 100644 index 0000000000..ee2ba12c93 --- /dev/null +++ b/lib/Alchemy/Phrasea/SearchEngine/Elastic/Mapping/DoubleFieldMapping.php @@ -0,0 +1,75 @@ + + * + * For the full copyright and license information, please view the LICENSE + * file that was distributed with this source code. + */ + +namespace Alchemy\Phrasea\SearchEngine\Elastic\Mapping; + +class DoubleFieldMapping extends ComplexFieldMapping +{ + /** + * @var bool + */ + private $enableAnalysis = true; + + /** + * @var string|null + */ + private $analyzer = null; + + /** + * @var string|null + */ + private $termVector = null; + + /** + * @param string $name + */ + public function __construct($name) + { + parent::__construct($name, self::TYPE_DOUBLE); + } + + + public function disableAnalysis() + { + $this->enableAnalysis = false; + + return $this; + } + + public function enableAnalysis() + { + $this->enableAnalysis = true; + + return $this; + } + + /** + * @return array + */ + protected function getProperties() + { + $properties = []; + + if ($this->analyzer) { + $properties['analyzer'] = $this->analyzer; + } + + if (! $this->enableAnalysis) { + $properties['index'] = 'not_analyzed'; + } + + if ($this->termVector) { + $properties['term_vector'] = $this->termVector; + } + + return array_replace(parent::getProperties(), $properties); + } +} diff --git a/lib/Alchemy/Phrasea/SearchEngine/Elastic/Mapping/FieldToFieldMappingConverter.php b/lib/Alchemy/Phrasea/SearchEngine/Elastic/Mapping/FieldToFieldMappingConverter.php index d5bf8c36c6..89749b9518 100644 --- a/lib/Alchemy/Phrasea/SearchEngine/Elastic/Mapping/FieldToFieldMappingConverter.php +++ b/lib/Alchemy/Phrasea/SearchEngine/Elastic/Mapping/FieldToFieldMappingConverter.php @@ -19,28 +19,55 @@ class FieldToFieldMappingConverter public function convertField(Field $field, array $locales) { - if ($field->getType() === FieldMapping::TYPE_DATE) { - return new DateFieldMapping($field->getName(), FieldMapping::DATE_FORMAT_CAPTION); + $ret = null; + switch($field->getType()) { + case FieldMapping::TYPE_DATE: + $ret = new DateFieldMapping($field->getName(), FieldMapping::DATE_FORMAT_MYSQL_OR_CAPTION); + if (! $field->isFacet() && ! $field->isSearchable()) { + $ret->disableIndexing(); + } + else { + $ret->addChild( + (new StringFieldMapping('light')) + ->setAnalyzer('general_light') + ->enableTermVectors() + ); + } + break; + + case FieldMapping::TYPE_STRING: + $ret = new StringFieldMapping($field->getName()); + if (! $field->isFacet() && ! $field->isSearchable()) { + $ret->disableIndexing(); + } + else { + $ret->addChild( + (new StringFieldMapping('raw')) + ->enableRawIndexing()); + $ret->addAnalyzedChildren($locales); + $ret->enableTermVectors(true); + } + break; + + case FieldMapping::TYPE_DOUBLE: + $ret = new DoubleFieldMapping($field->getName()); + if (! $field->isFacet() && ! $field->isSearchable()) { + $ret->disableIndexing(); + } + else { + $ret->addChild( + (new StringFieldMapping('light')) + ->setAnalyzer('general_light') + ->enableTermVectors() + ); + } + break; + + default: + $ret = new FieldMapping($field->getName(), $field->getType()); + break; } - if ($field->getType() === FieldMapping::TYPE_STRING) { - $fieldMapping = new StringFieldMapping($field->getName()); - - if (! $field->isFacet() && ! $field->isSearchable()) { - $fieldMapping->disableIndexing(); - } else { - $fieldMapping->addChild((new StringFieldMapping('raw'))->enableRawIndexing()); - - $child = new CompletionFieldMapping('suggest'); - $fieldMapping->addChild($child); - - $fieldMapping->addAnalyzedChildren($locales); - $fieldMapping->enableTermVectors(true); - } - - return $fieldMapping; - } - - return new FieldMapping($field->getName(), $field->getType()); + return $ret; } } diff --git a/lib/Alchemy/Phrasea/SearchEngine/Elastic/Search/FacetsResponse.php b/lib/Alchemy/Phrasea/SearchEngine/Elastic/Search/FacetsResponse.php index a70e5c724a..55503d50d6 100644 --- a/lib/Alchemy/Phrasea/SearchEngine/Elastic/Search/FacetsResponse.php +++ b/lib/Alchemy/Phrasea/SearchEngine/Elastic/Search/FacetsResponse.php @@ -4,6 +4,7 @@ namespace Alchemy\Phrasea\SearchEngine\Elastic\Search; use Alchemy\Phrasea\Exception\RuntimeException; use Alchemy\Phrasea\SearchEngine\Elastic\ElasticsearchOptions; +use Alchemy\Phrasea\SearchEngine\Elastic\Structure\GlobalStructure; use Alchemy\Phrasea\SearchEngine\Elastic\Structure\Structure; use Alchemy\Phrasea\SearchEngine\SearchEngineSuggestion; use Doctrine\Common\Collections\ArrayCollection; @@ -14,28 +15,72 @@ class FacetsResponse private $escaper; private $facets = array(); - public function __construct(Escaper $escaper, array $response) + public function __construct(Escaper $escaper, array $response, GlobalStructure $structure) { $this->escaper = $escaper; if (!isset($response['aggregations'])) { return; } + + $atf = ElasticsearchOptions::getAggregableTechnicalFields(); + foreach ($response['aggregations'] as $name => $aggregation) { + $tf = null; + $valueFormatter = function($v){ return $v; }; // default equality formatter + + if(array_key_exists($name, $atf)) { + $tf = $atf[$name]; + if(array_key_exists('output_formatter', $tf)) { + $valueFormatter = $tf['output_formatter']; + } + } + $aggregation = AggregationHelper::unwrapPrivateFieldAggregation($aggregation); if (!isset($aggregation['buckets'])) { $this->throwAggregationResponseError(); } - $values = $this->buildBucketsValues($name, $aggregation['buckets']); - if ($values) { - $this->facets[] = array( + + $values = []; + foreach ($aggregation['buckets'] as $bucket) { + if (!isset($bucket['key']) || !isset($bucket['doc_count'])) { + $this->throwAggregationResponseError(); + } + if($tf) { + // the field is one of the hardcoded tech fields + $value = [ + 'value' => $valueFormatter($bucket['key']), + 'raw_value' => $bucket['key'], + 'count' => $bucket['doc_count'], + 'query' => sprintf($tf['query'], $this->escaper->escapeWord($bucket['key'])) + ]; + } + else { + // the field is a normal field + $value = [ + 'value' => $bucket['key'], + 'raw_value' => $bucket['key'], + 'count' => $bucket['doc_count'], + 'query' => sprintf('field.%s:%s', $this->escaper->escapeWord($name), $this->escaper->escapeWord($bucket['key'])) + ]; + } + + $values[] = $value; + } + + if (count($values) > 0) { + $this->facets[] = [ + // 'type' => $tf ? $tf['type'] : null, 'name' => $name, + 'field' => $tf ? $tf['field'] : sprintf('field.%s', $name), 'values' => $values, - ); + ]; } } } + + /** * @return ArrayCollection */ @@ -53,44 +98,6 @@ class FacetsResponse return $suggestions; } - private function buildBucketsValues($name, $buckets) - { - $values = array(); - - // does this aggregate has an output_formatter ? if not use a equality formatter - /** @var callable $formatter */ - $formatter = igorw\get_in( - ElasticsearchOptions::getAggregableTechnicalFields(), [$name, 'output_formatter'], - function($v){return $v;} - ); - - foreach ($buckets as $bucket) { - if (!isset($bucket['key']) || !isset($bucket['doc_count'])) { - $this->throwAggregationResponseError(); - } - - $values[] = array( - 'value' => $formatter($bucket['key']), - 'count' => $bucket['doc_count'], - 'query' => $this->buildQuery($name, $bucket['key']), - ); - } - - return $values; - } - - private function buildQuery($name, $value) - { - if(array_key_exists($name, ElasticsearchOptions::getAggregableTechnicalFields())) { - $q = ElasticsearchOptions::getAggregableTechnicalFields()[$name]['query']; - $ret = sprintf($q, $this->escaper->escapeWord($value)); - } - else { - $ret = sprintf('field.%s:%s', $this->escaper->escapeWord($name), $this->escaper->escapeWord($value)); - } - return $ret; - } - private function throwAggregationResponseError() { throw new RuntimeException('Invalid aggregation response'); diff --git a/lib/Alchemy/Phrasea/SearchEngine/Elastic/Search/QueryContext.php b/lib/Alchemy/Phrasea/SearchEngine/Elastic/Search/QueryContext.php index e1772aaac1..cd65ed8d1d 100644 --- a/lib/Alchemy/Phrasea/SearchEngine/Elastic/Search/QueryContext.php +++ b/lib/Alchemy/Phrasea/SearchEngine/Elastic/Search/QueryContext.php @@ -107,13 +107,28 @@ class QueryContext */ public function localizeField(Field $field) { + $ret = null; $index_field = $field->getIndexField(); - if ($field->getType() === FieldMapping::TYPE_STRING) { - return $this->localizeFieldName($index_field); - } else { - return [$index_field]; + switch($field->getType()) { + case FieldMapping::TYPE_STRING: + $ret = $this->localizeFieldName($index_field); + break; + + case FieldMapping::TYPE_DATE: + case FieldMapping::TYPE_DOUBLE: + $ret = [ + $index_field . '.light', + $index_field + ]; + break; + + default: + $ret = [$index_field]; + break; } + + return $ret; } private function localizeFieldName($field) diff --git a/lib/Alchemy/Phrasea/SearchEngine/Elastic/Structure/Field.php b/lib/Alchemy/Phrasea/SearchEngine/Elastic/Structure/Field.php index 7ea7d68d43..3b71f6f451 100644 --- a/lib/Alchemy/Phrasea/SearchEngine/Elastic/Structure/Field.php +++ b/lib/Alchemy/Phrasea/SearchEngine/Elastic/Structure/Field.php @@ -89,7 +89,6 @@ class Field implements Typed case databox_field::TYPE_NUMBER: return FieldMapping::TYPE_DOUBLE; case databox_field::TYPE_STRING: - case databox_field::TYPE_TEXT: return FieldMapping::TYPE_STRING; } diff --git a/lib/Alchemy/Phrasea/SearchEngine/Elastic/Structure/ValueChecker.php b/lib/Alchemy/Phrasea/SearchEngine/Elastic/Structure/ValueChecker.php index 7344a8848d..31f65c580e 100644 --- a/lib/Alchemy/Phrasea/SearchEngine/Elastic/Structure/ValueChecker.php +++ b/lib/Alchemy/Phrasea/SearchEngine/Elastic/Structure/ValueChecker.php @@ -30,14 +30,14 @@ class ValueChecker case FieldMapping::TYPE_LONG: case FieldMapping::TYPE_SHORT: case FieldMapping::TYPE_BYTE: - if ($is_numeric) { +// if ($is_numeric) { $filtered[] = $item; - } +// } break; case FieldMapping::TYPE_DATE: - if ($is_valid_date) { +// if ($is_valid_date) { $filtered[] = $item; - } +// } break; case FieldMapping::TYPE_STRING: default: diff --git a/lib/Alchemy/Phrasea/SearchEngine/Elastic/Thesaurus.php b/lib/Alchemy/Phrasea/SearchEngine/Elastic/Thesaurus.php index 7abe088520..1acc2c740f 100644 --- a/lib/Alchemy/Phrasea/SearchEngine/Elastic/Thesaurus.php +++ b/lib/Alchemy/Phrasea/SearchEngine/Elastic/Thesaurus.php @@ -60,7 +60,7 @@ class Thesaurus // TODO Use bulk queries for performance $concepts = array(); foreach ($terms as $index => $term) { - $strict = ($term instanceof AST\TermNode); // a "term" node is [strict group of words] + $strict |= ($term instanceof AST\TermNode); // a "term" node is [strict group of words] $concepts[] = $this->findConcepts($term, $lang, $filters[$index], $strict); } diff --git a/lib/Alchemy/Phrasea/Twig/PhraseanetExtension.php b/lib/Alchemy/Phrasea/Twig/PhraseanetExtension.php index ffc872ec95..c39271db6a 100644 --- a/lib/Alchemy/Phrasea/Twig/PhraseanetExtension.php +++ b/lib/Alchemy/Phrasea/Twig/PhraseanetExtension.php @@ -88,7 +88,7 @@ class PhraseanetExtension extends \Twig_Extension $highlightValue = $highlights[$field]; // if field is multivalued, merge highlighted values with captions ones - if (is_array($value)) { + if (is_array($value) && count($value) > 1) { $highlightValue = array_merge($highlightValue, array_diff($value, array_map(function($value) { return str_replace(array('[[em]]', '[[/em]]'), array('', ''), $value); }, $highlightValue))); diff --git a/lib/classes/API/OAuth2/Adapter.php b/lib/classes/API/OAuth2/Adapter.php index c674aa277b..4de6639d4d 100644 --- a/lib/classes/API/OAuth2/Adapter.php +++ b/lib/classes/API/OAuth2/Adapter.php @@ -537,7 +537,11 @@ class API_OAuth2_Adapter extends OAuth2 public function verifyAccessToken($scope = null, $exit_not_present = true, $exit_invalid = true, $exit_expired = true, $exit_scope = true, $realm = null) { - $token_param = $this->getAccessTokenParams(); + $apiTokenHeader = $this->app['conf']->get(['main', 'api_token_header']); + + $useTokenHeader = $this->useTokenHeaderChoice($apiTokenHeader); + + $token_param = $this->getAccessTokenParams($useTokenHeader); // Access token was not provided if ($token_param === false) { @@ -808,4 +812,21 @@ class API_OAuth2_Adapter extends OAuth2 return false; } } + + /** + * Get the correct constante to call on Oauth2 + * + * @param $apiTokenHeader + * @return string + */ + private function useTokenHeaderChoice($apiTokenHeader) + { + if ($apiTokenHeader === true) { + return Oauth2::TOKEN_ONLY_IN_HEADER; + } elseif ($apiTokenHeader === false) { + return Oauth2::TOKEN_ONLY_IN_GETPOST; + } else { + return Oauth2::TOKEN_AUTO_FIND; + } + } } diff --git a/lib/classes/databox.php b/lib/classes/databox.php index 76f98524cf..c02ef4ffba 100644 --- a/lib/classes/databox.php +++ b/lib/classes/databox.php @@ -446,7 +446,6 @@ class databox extends base implements ThumbnailedElement databox_field::TYPE_DATE , databox_field::TYPE_NUMBER , databox_field::TYPE_STRING - , databox_field::TYPE_TEXT ] ) ? $type : databox_field::TYPE_STRING; diff --git a/lib/classes/databox/field.php b/lib/classes/databox/field.php index 6a93dbcfa1..35fc525265 100644 --- a/lib/classes/databox/field.php +++ b/lib/classes/databox/field.php @@ -100,7 +100,6 @@ class databox_field implements cache_cacheableInterface protected $original_dces; protected $aggregable; - const TYPE_TEXT = "text"; const TYPE_DATE = "date"; const TYPE_STRING = "string"; const TYPE_NUMBER = "number"; @@ -440,6 +439,16 @@ class databox_field implements cache_cacheableInterface return isset($this->labels[$code]) && '' !== $this->labels[$code] ? $this->labels[$code] : $this->name; } + /** + * get all localized labels + * + * @return string[] + */ + public function get_labels() + { + return $this->labels; + } + /** * @param string $name * @return databox_field diff --git a/lib/classes/databox/subdef.php b/lib/classes/databox/subdef.php index 0dcab4ccc1..f1a269d731 100644 --- a/lib/classes/databox/subdef.php +++ b/lib/classes/databox/subdef.php @@ -44,7 +44,7 @@ class databox_subdef SubdefType::TYPE_DOCUMENT => [SubdefSpecs::TYPE_IMAGE, SubdefSpecs::TYPE_FLEXPAPER, SubdefSpecs::TYPE_PDF], SubdefType::TYPE_FLASH => [SubdefSpecs::TYPE_IMAGE], SubdefType::TYPE_IMAGE => [SubdefSpecs::TYPE_IMAGE, SubdefSpecs::TYPE_PDF], - SubdefType::TYPE_VIDEO => [SubdefSpecs::TYPE_IMAGE, SubdefSpecs::TYPE_VIDEO, SubdefSpecs::TYPE_ANIMATION], + SubdefType::TYPE_VIDEO => [SubdefSpecs::TYPE_IMAGE, SubdefSpecs::TYPE_VIDEO, SubdefSpecs::TYPE_ANIMATION, SubdefSpecs::TYPE_AUDIO], SubdefType::TYPE_UNKNOWN => [SubdefSpecs::TYPE_IMAGE], ]; const CLASS_THUMBNAIL = 'thumbnail'; @@ -156,6 +156,10 @@ class databox_subdef if ($sd->audiosamplerate) { $audio->setOptionValue(Audio::OPTION_AUDIOSAMPLERATE, (int) $sd->audiosamplerate); } + if ($sd->audiochannel) { + $audio->setOptionValue(Audio::OPTION_AUDIOCHANNEL, (string) $sd->audiochannel); + } + return $audio; } /** diff --git a/lib/classes/media/subdef.php b/lib/classes/media/subdef.php index 45eaa4cdbe..53b8b290bc 100644 --- a/lib/classes/media/subdef.php +++ b/lib/classes/media/subdef.php @@ -89,6 +89,7 @@ class media_subdef extends media_abstract implements cache_cacheableInterface const TYPE_AUDIO_MP3 = 'AUDIO_MP3'; const TYPE_IMAGE = 'IMAGE'; const TYPE_NO_PLAYER = 'UNKNOWN'; + const TYPE_PDF = 'PDF'; /* * Technical datas types constants @@ -407,6 +408,7 @@ class media_subdef extends media_abstract implements cache_cacheableInterface { static $types = [ 'application/x-shockwave-flash' => self::TYPE_FLEXPAPER, + 'application/pdf' => self::TYPE_PDF, 'audio/mp3' => self::TYPE_AUDIO_MP3, 'audio/mpeg' => self::TYPE_AUDIO_MP3, 'image/gif' => self::TYPE_IMAGE, diff --git a/lib/classes/patch/380alpha3a.php b/lib/classes/patch/380alpha3a.php index 2c5dbfe17b..d2a02a0c55 100644 --- a/lib/classes/patch/380alpha3a.php +++ b/lib/classes/patch/380alpha3a.php @@ -50,6 +50,21 @@ class patch_380alpha3a extends patchAbstract { $conn = $databox->get_connection(); + $sql = "CREATE TABLE IF NOT EXISTS `log_colls` (\n" + . " `id` int(11) unsigned NOT NULL AUTO_INCREMENT,\n" + . " `log_id` int(11) unsigned NOT NULL,\n" + . " `coll_id` int(11) unsigned NOT NULL,\n" + . " PRIMARY KEY (`id`),\n" + . " UNIQUE KEY `couple` (`log_id`,`coll_id`),\n" + . " KEY `log_id` (`log_id`),\n" + . " KEY `coll_id` (`coll_id`)\n" + . ") ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;"; + + $stmt = $conn->prepare($sql); + $stmt->execute(); + $stmt->closeCursor(); + unset($stmt); + $removeProc = "DROP PROCEDURE IF EXISTS explode_log_table"; $stmt = $conn->prepare($removeProc); diff --git a/lib/classes/patch/410alpha13a.php b/lib/classes/patch/410alpha13a.php index 2a027d829d..b09f645835 100644 --- a/lib/classes/patch/410alpha13a.php +++ b/lib/classes/patch/410alpha13a.php @@ -60,8 +60,14 @@ class patch_410alpha13a implements patchInterface */ public function apply(base $databox, Application $app) { + // @see : https://phraseanet.atlassian.net/browse/PHRAS-2468 + // to be able to migrate from 3.5 to 4.0.8, we must not delete the table anymore + // so the cli "bin/setup patch:log_coll_id" can be executed. + + /* $sql = "DROP TABLE IF EXISTS `log_colls`"; $databox->get_connection()->prepare($sql)->execute(); + */ /* * no need to do those ops, it's done by system:upgrade after fixing the xml scheme diff --git a/lib/classes/patch/410alpha13b.php b/lib/classes/patch/410alpha13b.php new file mode 100644 index 0000000000..3846f8bf19 --- /dev/null +++ b/lib/classes/patch/410alpha13b.php @@ -0,0 +1,64 @@ +release; + } + + /** + * {@inheritdoc} + */ + public function getDoctrineMigrations() + { + return []; + } + + /** + * {@inheritdoc} + */ + public function require_all_upgrades() + { + return false; + } + + /** + * {@inheritdoc} + */ + public function concern() + { + return $this->concern; + } + + /** + * {@inheritdoc} + */ + public function apply(base $databox, Application $app) + { + $sql = "UPDATE `log_docs` SET `coll_id`=`final` WHERE `action`='collection'"; + $databox->get_connection()->prepare($sql)->execute(); + + return true; + } +} diff --git a/lib/classes/patch/410alpha14a.php b/lib/classes/patch/410alpha14a.php new file mode 100644 index 0000000000..719b1a9700 --- /dev/null +++ b/lib/classes/patch/410alpha14a.php @@ -0,0 +1,64 @@ +release; + } + + /** + * {@inheritdoc} + */ + public function getDoctrineMigrations() + { + return []; + } + + /** + * {@inheritdoc} + */ + public function require_all_upgrades() + { + return false; + } + + /** + * {@inheritdoc} + */ + public function concern() + { + return $this->concern; + } + + /** + * {@inheritdoc} + */ + public function apply(base $databox, Application $app) + { + $sql = "UPDATE metadatas_structure SET type = 'string' where type = 'text' OR type = '' "; + $databox->get_connection()->executeQuery($sql); + + return true; + } +} diff --git a/lib/classes/record/adapter.php b/lib/classes/record/adapter.php index 37320f64a3..2a4a3a1c7d 100644 --- a/lib/classes/record/adapter.php +++ b/lib/classes/record/adapter.php @@ -530,11 +530,12 @@ class record_adapter implements RecordInterface, cache_cacheableInterface } $coll_id_from = $this->getCollectionId(); + $coll_id_to = $collection->get_coll_id(); $sql = "UPDATE record SET moddate = NOW(), coll_id = :coll_id WHERE record_id =:record_id"; $params = [ - ':coll_id' => $collection->get_coll_id(), + ':coll_id' => $coll_id_to, ':record_id' => $this->getRecordId(), ]; @@ -543,12 +544,13 @@ class record_adapter implements RecordInterface, cache_cacheableInterface $stmt->closeCursor(); $this->base_id = $collection->get_base_id(); + $this->collection_id = $coll_id_to; + + $this->delete_data_from_cache(); $this->app['phraseanet.logger']($this->getDatabox()) ->log($this, Session_Logger::EVENT_MOVE, $collection->get_coll_id(), '', $coll_id_from); - $this->delete_data_from_cache(); - $this->dispatch(RecordEvents::COLLECTION_CHANGED, new CollectionChangedEvent($this)); return $this; diff --git a/lib/conf.d/bases_structure.xml b/lib/conf.d/bases_structure.xml index 13ed58fcb9..a4d0d2f9c5 100644 --- a/lib/conf.d/bases_structure.xml +++ b/lib/conf.d/bases_structure.xml @@ -1901,7 +1901,7 @@ type - enum('string','text','date','number') + enum('string','date','number') diff --git a/lib/conf.d/data_templates/DublinCore.xml b/lib/conf.d/data_templates/DublinCore.xml index 5de4f32945..e50bf58612 100644 --- a/lib/conf.d/data_templates/DublinCore.xml +++ b/lib/conf.d/data_templates/DublinCore.xml @@ -148,7 +148,7 @@ {{datapathnoweb}}{{basename}}/subdefs - flexpaper + pdf no screen @@ -198,7 +198,7 @@ - + diff --git a/lib/conf.d/data_templates/en-simple.xml b/lib/conf.d/data_templates/en-simple.xml index a9b2e33460..d4a00c347b 100644 --- a/lib/conf.d/data_templates/en-simple.xml +++ b/lib/conf.d/data_templates/en-simple.xml @@ -148,7 +148,7 @@ {{datapathnoweb}}{{basename}}/subdefs - flexpaper + pdf no screen @@ -202,7 +202,7 @@ - + diff --git a/lib/conf.d/data_templates/fr-simple.xml b/lib/conf.d/data_templates/fr-simple.xml index 550b8adac8..3ada8adaa6 100644 --- a/lib/conf.d/data_templates/fr-simple.xml +++ b/lib/conf.d/data_templates/fr-simple.xml @@ -148,7 +148,7 @@ {{datapathnoweb}}{{basename}}/subdefs - flexpaper + pdf no screen @@ -202,7 +202,7 @@ - + diff --git a/package.json b/package.json index 36be25d7d1..a0ceff4f79 100644 --- a/package.json +++ b/package.json @@ -66,7 +66,7 @@ "normalize-css": "^2.1.0", "npm": "^6.0.0", "npm-modernizr": "^2.8.3", - "phraseanet-production-client": "^0.33.0", + "phraseanet-production-client": "0.33.84", "requirejs": "^2.3.5", "tinymce": "^4.0.28", "underscore": "^1.8.3", diff --git a/resources/ansible/roles/app/tasks/main.yml b/resources/ansible/roles/app/tasks/main.yml index 66de8ad0ea..623d28d124 100644 --- a/resources/ansible/roles/app/tasks/main.yml +++ b/resources/ansible/roles/app/tasks/main.yml @@ -60,7 +60,7 @@ chdir: /vagrant/ - name: Create ElasticSearch indexes - shell: php bin/console s:i:c + shell: php bin/console searchengine:index -c args: chdir: /vagrant/ diff --git a/resources/ansible/roles/php/tasks/mod-php.yml b/resources/ansible/roles/php/tasks/mod-php.yml index 355ae6551c..c85d24e2b6 100644 --- a/resources/ansible/roles/php/tasks/mod-php.yml +++ b/resources/ansible/roles/php/tasks/mod-php.yml @@ -28,3 +28,13 @@ lineinfile: dest=/etc/php/{{ phpversion }}/apache2/php.ini regexp=';?max_input_vars\s*=\s*' line='max_input_vars = 12000' + +- name: set session.hash_bits_per_character apache2 + lineinfile: dest=/etc/php/{{ phpversion }}/apache2/php.ini + regexp=';?session.hash_bits_per_character\s*=\s*' + line='session.hash_bits_per_character = 6' + +- name: set session.hash_function apache2 + lineinfile: dest=/etc/php/{{ phpversion }}/apache2/php.ini + regexp=';?session.hash_function\s*=\s*' + line='session.hash_function = 1' \ No newline at end of file diff --git a/resources/ansible/roles/php/tasks/php-cli.yml b/resources/ansible/roles/php/tasks/php-cli.yml index 41016aceab..90e06fd2e5 100644 --- a/resources/ansible/roles/php/tasks/php-cli.yml +++ b/resources/ansible/roles/php/tasks/php-cli.yml @@ -28,3 +28,13 @@ lineinfile: dest=/etc/php/{{ phpversion }}/cli/php.ini regexp=';?max_input_vars\s*=\s*' line='max_input_vars = 12000' + +- name: set session.hash_function cli + lineinfile: dest=/etc/php/{{ phpversion }}/cli/php.ini + regexp=';?session.hash_function\s*=\s*' + line='session.hash_function = 1' + +- name: set session.hash_bits_per_character cli + lineinfile: dest=/etc/php/{{ phpversion }}/cli/php.ini + regexp=';?session.hash_bits_per_character\s*=\s*' + line='session.hash_bits_per_character = 6' \ No newline at end of file diff --git a/resources/ansible/roles/php/tasks/php-fpm.yml b/resources/ansible/roles/php/tasks/php-fpm.yml index 1319e2ee19..ef07f5a599 100644 --- a/resources/ansible/roles/php/tasks/php-fpm.yml +++ b/resources/ansible/roles/php/tasks/php-fpm.yml @@ -46,3 +46,16 @@ regexp=';?max_input_vars\s*=\s*' line='max_input_vars = 12000' notify: restart php{{ phpversion }}-fpm + +- name: set session.hash_function fpm + lineinfile: dest=/etc/php/{{ phpversion }}/fpm/php.ini + regexp=';?session.hash_function\s*=\s*' + line='session.hash_function = 1' + notify: restart php{{ phpversion }}-fpm + + +- name: set session.hash_bits_per_character fpm + lineinfile: dest=/etc/php/{{ phpversion }}/fpm/php.ini + regexp=';?session.hash_bits_per_character\s*=\s*' + line='session.hash_bits_per_character = 6' + notify: restart php{{ phpversion }}-fpm diff --git a/resources/ansible/roles/server/tasks/main.yml b/resources/ansible/roles/server/tasks/main.yml index d1aac1d10f..531e6fa74d 100644 --- a/resources/ansible/roles/server/tasks/main.yml +++ b/resources/ansible/roles/server/tasks/main.yml @@ -18,6 +18,10 @@ with_items: '{{ server.packages }}' when: server.packages is defined +- name: Pip install ndg-httpsclient + shell: pip install ndg-httpsclient + sudo: yes + - name: Configure the timezone sudo: yes template: src=timezone.j2 dest=/etc/timezone diff --git a/resources/ansible/vars/all.yml b/resources/ansible/vars/all.yml index d90cfd8640..e1282c99b5 100644 --- a/resources/ansible/vars/all.yml +++ b/resources/ansible/vars/all.yml @@ -21,6 +21,13 @@ server: - xpdf - libav-tools - gpac + - python + - python-urllib3 + - python3-openssl + - python-pyasn1 + - python-pyasn1-modules + - python3-pyasn1 + - python-pip timezone: UTC locales: - en_GB.UTF-8 diff --git a/resources/gulp/components/report.js b/resources/gulp/components/report.js index 12fbea870a..f67944a667 100644 --- a/resources/gulp/components/report.js +++ b/resources/gulp/components/report.js @@ -8,13 +8,7 @@ gulp.task('copy-report-images', function(){ .pipe(gulp.dest( config.paths.build + 'report/images')); }); -gulp.task('build-report-print-css', function(){ - return utils.buildCssGroup([ - config.paths.src + 'report/styles/main-print.scss' - ], 'print', 'report/css/', debugMode); -}); - -gulp.task('build-report-css', ['build-report-print-css'], function(){ +gulp.task('build-report-css', function(){ return utils.buildCssGroup([ config.paths.src + 'report/styles/main.scss' ], 'report', 'report/css/', debugMode); @@ -22,10 +16,6 @@ gulp.task('build-report-css', ['build-report-print-css'], function(){ gulp.task('build-report-js', function(){ var reportGroup = [ - config.paths.src + 'report/js/jquery.print.js', - config.paths.src + 'report/js/jquery.cluetip.js', - config.paths.src + 'report/js/jquery.nicoslider.js', - config.paths.src + 'report/js/jquery.gvChart-0.1.js', config.paths.src + 'report/js/report.js' ]; return utils.buildJsGroup(reportGroup, 'report', 'report/js', debugMode); diff --git a/resources/locales/messages.de.xlf b/resources/locales/messages.de.xlf index 159892f805..055b51ae1b 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. @@ -289,11 +289,6 @@ %total% Ergebnisse Controller/Prod/QueryController.php - - %total_count% results - %total_count% Ergebnisse - web/report/generate_tab.html.twig - %user% a envoye son rapport de validation de %title% %user% hat seinen Bestätigungsbericht von %title% gesendet @@ -409,7 +404,6 @@ 1 Ergebnis WorkZone/Browser/Results.html.twig WorkZone/Browser/Results.html.twig - web/report/generate_tab.html.twig 10 tags maximum @@ -530,7 +524,7 @@ API Webhook API Webhook - TaskManager/Job/WebhookJob.php + TaskManager/Job/WebhookJob.php AR @@ -757,7 +751,7 @@ Advanced Search Erweiterte Suche - web/prod/index.html.twig + web/prod/index.html.twig Advanced mode @@ -772,37 +766,37 @@ 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 @@ -812,7 +806,7 @@ Aide Hilfe - web/prod/index.html.twig + web/prod/index.html.twig Aide sur les expressions regulieres @@ -863,7 +857,7 @@ All these conditions All these conditions - web/prod/index.html.twig + web/prod/index.html.twig All values @@ -933,14 +927,14 @@ Alphabetic asc Alphabetic asc - 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 Alphabetic desc Alphabetic desc - web/prod/index.html.twig + web/prod/index.html.twig Also delete records that rely on groupings. @@ -1057,7 +1051,7 @@ Aperture Blende - SearchEngine/Elastic/ElasticsearchOptions.php + SearchEngine/Elastic/ElasticsearchOptions.php web/common/technical_datas.html.twig @@ -1253,7 +1247,7 @@ Audio Audio - web/prod/index.html.twig + web/prod/index.html.twig Audio Birate @@ -1269,12 +1263,12 @@ Audio Samplerate Audio Samplerate - SearchEngine/Elastic/ElasticsearchOptions.php + SearchEngine/Elastic/ElasticsearchOptions.php Audio codec Audio codec - SearchEngine/Elastic/ElasticsearchOptions.php + SearchEngine/Elastic/ElasticsearchOptions.php AudioSamplerate @@ -1502,9 +1496,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 + web/prod/index.html.twig Browser @@ -1532,22 +1526,17 @@ By field By field - web/prod/index.html.twig + web/prod/index.html.twig CHAMPS Felder web/admin/tree.html.twig - - CSV export - CSV Export - web/report/generate_tab.html.twig - Camera Model Kameramodell - SearchEngine/Elastic/ElasticsearchOptions.php + SearchEngine/Elastic/ElasticsearchOptions.php web/common/technical_datas.html.twig @@ -1791,11 +1780,6 @@ die ganze Spalte markieren web/admin/index.html.twig - - Cochez les cases correspondantes aux colonnes que vous desirez voire apparaitre dans le report - Markieren Sie die Felder, die Sie im Report sehen möchten - web/report/listColumn.html.twig - Code d'acces Zugangscode @@ -1833,7 +1817,7 @@ Collection order Collection order - web/prod/index.html.twig + web/prod/index.html.twig Color Depth @@ -1848,7 +1832,7 @@ Colorspace Colorspace - SearchEngine/Elastic/ElasticsearchOptions.php + SearchEngine/Elastic/ElasticsearchOptions.php Commande @@ -1904,7 +1888,7 @@ Configuration Konfiguration - web/prod/index.html.twig + web/prod/index.html.twig Confirm new email address @@ -1960,7 +1944,7 @@ Contains Contains - web/prod/index.html.twig + web/prod/index.html.twig Continuer ? @@ -2015,7 +1999,7 @@ Couleur de selection Farbauswahl - web/prod/index.html.twig + web/prod/index.html.twig Country @@ -2229,7 +2213,7 @@ Date Added Hinzufügungsdatum - web/prod/index.html.twig + web/prod/index.html.twig Date Creation @@ -2239,7 +2223,7 @@ Date Updated Date Updated - web/prod/index.html.twig + web/prod/index.html.twig Date de connexion @@ -2268,7 +2252,7 @@ Date(s) from field(s) Date(s) from field(s) - web/prod/index.html.twig + web/prod/index.html.twig De @@ -2346,7 +2330,7 @@ Defined by admin Defined by admin - web/prod/index.html.twig + web/prod/index.html.twig Defined in Apache configuration @@ -2460,7 +2444,8 @@ Alle abwählen actions/Feedback/list.html.twig prod/actions/Push.html.twig - web/report/form_date_and_base.html.twig + web/report/report_layout_child.html.twig + web/report/form_date_and_base.html.twig Design of personalization logo section @@ -2518,7 +2503,7 @@ Display technical data Technische Informationen anzeigen - web/prod/index.html.twig + web/prod/index.html.twig Display thumbnails @@ -2528,7 +2513,7 @@ Do not display Nicht anzeigen - web/prod/index.html.twig + web/prod/index.html.twig Do not forget to restart the tasks scheduler @@ -2560,7 +2545,7 @@ Document Dokument - web/prod/index.html.twig + web/prod/index.html.twig Document Type Sharing @@ -2981,7 +2966,7 @@ Equals Equals - web/prod/index.html.twig + web/prod/index.html.twig Erreur @@ -3047,9 +3032,9 @@ Erreur lors de la tentative ; errreur : %message% Fehler beim Versuch ; Fehler : %message% - Core/Database/DatabaseMaintenanceService.php - Core/Database/DatabaseMaintenanceService.php - Core/Database/DatabaseMaintenanceService.php + Core/Database/DatabaseMaintenanceService.php + Core/Database/DatabaseMaintenanceService.php + Core/Database/DatabaseMaintenanceService.php Erreur lors de votre authentification @@ -3124,7 +3109,7 @@ Ex : Paris, bleu, montagne Ex : Paris, bleu, montagne - web/prod/index.html.twig + web/prod/index.html.twig Executables externes @@ -3287,11 +3272,6 @@ Filtern web/admin/users.html.twig - - Filtrer - Filtern - web/report/generate_tab.html.twig - First Name Vorname @@ -3312,13 +3292,13 @@ Flash Flash - web/prod/index.html.twig + web/prod/index.html.twig web/common/technical_datas.html.twig FlashFired FlashFired - SearchEngine/Elastic/ElasticsearchOptions.php + SearchEngine/Elastic/ElasticsearchOptions.php Flatten layers @@ -3377,7 +3357,7 @@ FrameRate FrameRate - SearchEngine/Elastic/ElasticsearchOptions.php + SearchEngine/Elastic/ElasticsearchOptions.php Frequence d'echantillonage @@ -3409,16 +3389,6 @@ Allgemeine Einstellungen web/admin/dashboard.html.twig - - Generate - Erstellen - web/report/report_layout_child.html.twig - - - Generate dashboard - Dashboard erstellen - web/report/report_layout_child.html.twig - Generates a flexpaper flash file Erstellt eine Flexpaper Flash Datei @@ -3453,7 +3423,7 @@ Geo Search Geo Search - web/prod/index.html.twig + web/prod/index.html.twig Geonames server address @@ -3528,24 +3498,13 @@ Graphiste (preview au rollover) Grafiker (Voransicht mit Rollover) - web/prod/index.html.twig + web/prod/index.html.twig Great Großartig Controller/Root/LoginController.php - - Groupement des resultats sur le champ %name% - Ergebnisse Gruppierung auf Feld %name% - Controller/Report/RootController.php - Controller/Report/ActivityController.php - - - Grouper - Gruppieren - web/report/generate_tab.html.twig - Groupez 2 ou plusieurs mots avec des guillemets: "Michael Jackson" Gruppieren Sie 2 oder mehrere Wörter mit Anführungszeichen : "Michael Jackson" @@ -3627,7 +3586,7 @@ ISO ISO - SearchEngine/Elastic/ElasticsearchOptions.php + SearchEngine/Elastic/ElasticsearchOptions.php ISO sensibility @@ -3637,7 +3596,7 @@ Iconographe (description au rollover) Bildredakteur (Beschreibung mit Rollover) - web/prod/index.html.twig + web/prod/index.html.twig Id @@ -3682,7 +3641,7 @@ Image Bild - web/prod/index.html.twig + web/prod/index.html.twig ImageMagick @@ -3708,7 +3667,7 @@ In the answer grid In einem Tooltip - web/prod/index.html.twig + web/prod/index.html.twig Include Business-fields in caption @@ -3932,7 +3891,7 @@ Language Language - web/prod/index.html.twig + web/prod/index.html.twig Last Name @@ -4069,7 +4028,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 @@ -4193,7 +4152,7 @@ Ma derniere question meine letzte Suchabfrage - web/prod/index.html.twig + web/prod/index.html.twig Mail line %line% is empty @@ -4299,7 +4258,7 @@ MimeType MimeType - SearchEngine/Elastic/ElasticsearchOptions.php + SearchEngine/Elastic/ElasticsearchOptions.php Minimum number of letters before truncation @@ -4350,7 +4309,7 @@ Mode de presentation Anzeigemodus - web/prod/index.html.twig + web/prod/index.html.twig Modele de donnees @@ -4581,6 +4540,11 @@ WorkZone/Browser/Results.html.twig WorkZone/Browser/Results.html.twig + + No thesaurus concept query + No thesaurus concept query + prod/results/infos.html.twig + No users selected Kein Benutzer ausgewählt @@ -4674,7 +4638,7 @@ Notify third party application when an event occurs in Phraseanet Drittanwendung benachrichtigen, beim Eintreten eines Ereignisses - TaskManager/Job/WebhookJob.php + TaskManager/Job/WebhookJob.php Notify users about this publication @@ -4763,7 +4727,7 @@ One of these conditions One of these conditions - web/prod/index.html.twig + web/prod/index.html.twig Only %nbEditableDocuments% records can be modified. @@ -4821,7 +4785,7 @@ Orientation Orientation - SearchEngine/Elastic/ElasticsearchOptions.php + SearchEngine/Elastic/ElasticsearchOptions.php Original name @@ -5105,10 +5069,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 + web/prod/index.html.twig Prefix for notification emails @@ -5123,12 +5087,12 @@ 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 @@ -5181,7 +5145,7 @@ Publications Veröffentlichungen - web/prod/index.html.twig + web/prod/index.html.twig admin/publications/wrapper.html.twig web/admin/tree.html.twig web/common/menubar.html.twig @@ -5293,80 +5257,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% @@ -5387,7 +5351,7 @@ Re-initialiser Zurücksetzen prod/Baskets/Reorder.html.twig - web/prod/index.html.twig + web/prod/index.html.twig prod/Story/Reorder.html.twig @@ -5436,11 +5400,6 @@ WorkZone/Browser/Basket.html.twig WorkZone/Browser/Results.html.twig - - Receiver - Empfänger - Controller/Report/ActivityController.php - Reception d'un rapport de validation Empfang eines Bestätigungsberichtes @@ -5494,7 +5453,7 @@ Rechercher dans un champ date im Feld "Datum" suchen - web/prod/index.html.twig + web/prod/index.html.twig Recommendations @@ -5585,7 +5544,7 @@ Relevance Relevanz - web/prod/index.html.twig + web/prod/index.html.twig Remember me @@ -5651,11 +5610,6 @@ Report admin/fields/templates.html.twig - - Report generation may take a long time to generate, depending on the number of collections and the period selected. - Report Erzeugung kann lange dauern, anhängig von der Anzahl von Kollektionen und der ausgewählten Zeit - web/report/report_layout_child.html.twig - Request access Zugriff anfordern @@ -5962,7 +5916,7 @@ Select a field Select a field - web/prod/index.html.twig + web/prod/index.html.twig Select a list on the left and edit it ! @@ -5974,7 +5928,8 @@ Alle auswählen actions/Feedback/list.html.twig prod/actions/Push.html.twig - web/report/form_date_and_base.html.twig + web/report/report_layout_child.html.twig + web/report/form_date_and_base.html.twig Select all collections @@ -5996,7 +5951,7 @@ Selected base(s) Selected base(s) - web/prod/index.html.twig + web/prod/index.html.twig Selected files @@ -6031,11 +5986,6 @@ Auf Twitter teilen prod/Share/record.html.twig - - Sent - gesendet - web/report/report_layout_child.html.twig - Sent documents (mail) versendete Dokumente (E-Mail) @@ -6128,7 +6078,7 @@ Shutter speed Verschlusszeit - SearchEngine/Elastic/ElasticsearchOptions.php + SearchEngine/Elastic/ElasticsearchOptions.php web/common/technical_datas.html.twig @@ -6271,7 +6221,7 @@ Status des documents a rechercher Zustand der Dokumente zu suchen - web/prod/index.html.twig + web/prod/index.html.twig Status edition @@ -6689,7 +6639,7 @@ Theme Thema - web/prod/index.html.twig + web/prod/index.html.twig There is no one to validate orders, please contact an administrator @@ -6861,7 +6811,7 @@ Tout type Bildschirmtyp - web/prod/index.html.twig + web/prod/index.html.twig Toutes les publications @@ -6884,16 +6834,10 @@ prod/upload/upload-flash.html.twig prod/upload/upload.html.twig - - Trier - Ordnen - web/report/generate_tab.html.twig - web/report/generate_tab.html.twig - Trier par Sortieren nach - web/prod/index.html.twig + web/prod/index.html.twig Try to extract embedded thumbnails @@ -6918,7 +6862,7 @@ Type de documents Dokumenttyp - web/prod/index.html.twig + web/prod/index.html.twig Type nombre @@ -7041,7 +6985,7 @@ Une question personnelle eine persönliche Frage - web/prod/index.html.twig + web/prod/index.html.twig Une selection @@ -7153,7 +7097,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 @@ -7331,7 +7275,7 @@ Video Video - web/prod/index.html.twig + web/prod/index.html.twig Video Codec @@ -7341,7 +7285,7 @@ Video codec Video codec - SearchEngine/Elastic/ElasticsearchOptions.php + SearchEngine/Elastic/ElasticsearchOptions.php Videos @@ -7533,7 +7477,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 ! @@ -7625,11 +7569,17 @@ Meta schreiben web/admin/subdefs.html.twig + + YYYY-MM-DD + YYYY-MM-DD + web/report/form_date_and_base.html.twig + web/report/form_date_and_base.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 @@ -7942,7 +7892,7 @@ action : bridge Bridge - web/prod/index.html.twig + web/prod/index.html.twig action : collection @@ -7964,7 +7914,7 @@ Exportieren prod/WorkZone/Story.html.twig prod/WorkZone/Basket.html.twig - web/prod/index.html.twig + web/prod/index.html.twig prod/results/record.html.twig web/prod/toolbar.html.twig prod/preview/tools.html.twig @@ -7994,7 +7944,7 @@ Veröffentlichen prod/WorkZone/Story.html.twig prod/WorkZone/Basket.html.twig - web/prod/index.html.twig + web/prod/index.html.twig web/prod/toolbar.html.twig web/prod/toolbar.html.twig @@ -8029,9 +7979,9 @@ 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 @@ -9070,12 +9020,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 @@ -9116,7 +9066,7 @@ web/common/dialog_export.html.twig web/common/dialog_export.html.twig web/common/dialog_export.html.twig - web/report/all_content.html.twig + web/report/all_content.html.twig web/account/reset-email.html.twig @@ -9196,7 +9146,7 @@ web/thesaurus/export-topics.html.twig web/lightbox/sc_note.html.twig web/common/dialog_export.html.twig - web/report/all_content.html.twig + web/report/all_content.html.twig boutton::generer @@ -9245,7 +9195,7 @@ boutton::rechercher suchen Controller/Prod/LanguageController.php - web/prod/index.html.twig + web/prod/index.html.twig boutton::refresh @@ -9361,7 +9311,7 @@ Controller/Prod/LanguageController.php prod/Baskets/Reorder.html.twig prod/Baskets/Update.html.twig - web/prod/index.html.twig + web/prod/index.html.twig Bridge/Flickr/photoset_deleteelement.html.twig Bridge/Flickr/photo_moveinto_photoset.html.twig Bridge/Flickr/photo_modify.html.twig @@ -9404,7 +9354,7 @@ admin/statusbit/edit.html.twig web/admin/dashboard.html.twig web/admin/setup.html.twig - web/report/all_content.html.twig + web/report/all_content.html.twig web/account/reset-email.html.twig web/account/account.html.twig web/account/access.html.twig @@ -9506,7 +9456,7 @@ choisir wählen - web/prod/index.html.twig + web/prod/index.html.twig admin/collection/create.html.twig admin/databox/databox.html.twig @@ -9516,11 +9466,6 @@ web/admin/subdefs.html.twig web/admin/subdefs.html.twig - - cocher tout - Alles aktivieren - web/report/listColumn.html.twig - collection.label.unknown Unbekannte Kollektion @@ -9537,16 +9482,10 @@ prod/orders/order_item.html.twig web/common/dialog_export.html.twig - - configuration - Konfiguration - Controller/Report/RootController.php - Controller/Report/ActivityController.php - copyClipboardLabel in der Zwischenablage kopieren - prod/results/infos.html.twig + prod/results/infos.html.twig prod/Share/record.html.twig prod/Share/record.html.twig prod/Share/record.html.twig @@ -9796,14 +9735,6 @@ Controller/Prod/ToolsController.php Controller/Prod/ToolsController.php - - filtrer les resultats sur la colonne %colonne% - die Ergebnisse auf die Spalte %colonne% filtern - Controller/Report/RootController.php - Controller/Report/InformationController.php - Controller/Report/InformationController.php - Controller/Report/ActivityController.php - flash Flash @@ -9873,12 +9804,6 @@ Änderungen wurden hergestellt admin/databox/databox.html.twig - - from - von - web/report/report_layout_child.html.twig - web/report/report_layout_child.html.twig - help::help-section-bullet: check-spelling help::help-section-bullet: check-spelling @@ -9954,42 +9879,42 @@ 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::advance_search: facet-order index::advance_search: facet-order - web/prod/index.html.twig + web/prod/index.html.twig index::advance_search: facet-tech-order index::advance_search: facet-tech-order - web/prod/index.html.twig + web/prod/index.html.twig index::advance_search: facet-values-order index::advance_search: facet-values-order - web/prod/index.html.twig + web/prod/index.html.twig index::advance_search: hidden-facet-values-order index::advance_search: hidden-facet-values-order - web/prod/index.html.twig + web/prod/index.html.twig index::advance_search: order-by-hits index::advance_search: order-by-hits - 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 + web/prod/index.html.twig invite:: Redirection vers la zone d'authentification, cliquez sur OK pour continuer ou annulez @@ -10592,6 +10517,11 @@ Datenbank von entferntem Host erstellen web/admin/databases.html.twig + + phraseanet:: Preferences + phraseanet:: Preferences + web/prod/index.html.twig + phraseanet:: Un email vient de vous etre envoye Wir haben Ihnen ein E-Mail gesendet @@ -10709,7 +10639,6 @@ Unterauflösung module/report/filter.php classes/module/report.php - Controller/Report/RootController.php phraseanet:: thesaurus @@ -10730,17 +10659,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/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 + web/prod/index.html.twig phraseanet:: user @@ -10873,12 +10802,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 @@ -10888,7 +10817,7 @@ phraseanet::type:: documents Dokumente - web/prod/index.html.twig + web/prod/index.html.twig web/prod/toolbar.html.twig @@ -10899,7 +10828,7 @@ phraseanet::type:: reportages Berichte - web/prod/index.html.twig + web/prod/index.html.twig phraseanet::type:: videos @@ -10915,16 +10844,6 @@ phraseanet::utilisateurs Benutzer module/report/filter.php - Controller/Report/RootController.php - - - phrseanet:: sous definition - Dokumenttyp - Controller/Report/RootController.php - Controller/Report/InformationController.php - Controller/Report/InformationController.php - Controller/Report/InformationController.php - Controller/Report/InformationController.php preview @@ -10934,17 +10853,17 @@ 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 @@ -11068,12 +10987,12 @@ prod::advancesearch:tooltips:datefield_restriction_explanation prod::advancesearch:tooltips:datefield_restriction_explanation - web/prod/index.html.twig + web/prod/index.html.twig prod::advancesearch:tooltips:field_restriction_explanation prod::advancesearch:tooltips:field_restriction_explanation - web/prod/index.html.twig + web/prod/index.html.twig prod::collection deplacer egalement les documents rattaches a ce(s) regroupement(s) @@ -11193,17 +11112,17 @@ prod::facet:base_label Datenbanken - SearchEngine/Elastic/ElasticsearchOptions.php + SearchEngine/Elastic/ElasticsearchOptions.php prod::facet:collection_label Kollektionen - SearchEngine/Elastic/ElasticsearchOptions.php + SearchEngine/Elastic/ElasticsearchOptions.php prod::facet:doctype_label Dokumenttyp - SearchEngine/Elastic/ElasticsearchOptions.php + SearchEngine/Elastic/ElasticsearchOptions.php prod::recherche: Attention : la liste des bases selectionnees pour la recherche a ete changee. @@ -11505,12 +11424,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 @@ -11524,7 +11443,7 @@ rechercher dans tous les champs Alle Felder - web/prod/index.html.twig + web/prod/index.html.twig recordtype @@ -11584,17 +11503,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 @@ -11614,115 +11533,55 @@ reponses:: taille des images : Miniaturansichtengrösse - web/prod/index.html.twig + web/prod/index.html.twig reponses::document sans titre ohne Titel - classes/record/adapter.php - - - report :: aucun resultat trouve - keine Filter - web/report/generate_tab.html.twig - - - report :: configurer le tableau - Tabelle konfigurieren - web/report/generate_tab.html.twig - - - report :: filtrer - filter - web/report/generate_tab.html.twig - - - report :: grouper - Gruppe - web/report/generate_tab.html.twig - - - report :: imprimer le tableau - Tabelle drucken - web/report/generate_tab.html.twig - - - report:: (connexions) Globales - Allgemeine - web/report/report_layout_child.html.twig - - - report:: (connexions) OS et navigateurs - pro Plattform und Webbrowser - web/report/report_layout_child.html.twig - - - report:: (connexions) Par utilisateurs - pro Benutzer - web/report/report_layout_child.html.twig - - - report:: (telechargement) Global - Allgemeine - web/report/report_layout_child.html.twig - - - report:: (telechargement) Par documents sur la base - pro Dokument, auf der Datenbank - web/report/report_layout_child.html.twig - - - report:: (telechargement) Par jours base par base - täglich - web/report/report_layout_child.html.twig + classes/record/adapter.php report:: 1 - Periode 1 - Zeit - web/report/form_date_and_base.html.twig + web/report/form_date_and_base.html.twig - - report:: 2 - Bases - 2 - Datenbanken - web/report/form_date_and_base.html.twig + + report:: 2 - Base + report:: 2 - Base + web/report/form_date_and_base.html.twig + + + report:: 3 - Collections + report:: 3 - Collections + web/report/form_date_and_base.html.twig report:: 3 - Type de report 3 - Bericht Typ - web/report/report_layout_child.html.twig - web/report/report_layout_child.html.twig - web/report/report_layout_child.html.twig + web/report/report_layout_child.html.twig + web/report/report_layout_child.html.twig + + + report:: 4 - Fields + report:: 4 - Fields + web/report/report_layout_child.html.twig report:: Au (date) bis - web/report/form_date_and_base.html.twig - web/report/ajax_report_dashboard.html.twig + web/report/form_date_and_base.html.twig report:: Connexion Verbindungen classes/module/report.php - web/report/report_layout.html.twig - web/report/ajax_data_content.html.twig - web/report/ajax_data_content.html.twig - web/report/all_content.html.twig - web/report/ajax_dashboard_content_child.html.twig - web/report/ajax_dashboard_content_child.html.twig - web/report/chart.html.twig - web/report/chart.html.twig + web/report/report_layout.html.twig + web/report/all_content.html.twig - - - - web/report/ajax_dashboard_content_child.html.twig - - - report:: Dashboard - Dashboard - web/report/report_layout.html.twig - web/report/ajax_dashboard_content.html.twig - web/report/ajax_report_dashboard.html.twig + + report:: Databox content + report:: Databox content + web/report/report_layout.html.twig report:: Detail des connexions @@ -11737,30 +11596,17 @@ report:: Du (date) von - web/report/form_date_and_base.html.twig - web/report/ajax_report_dashboard.html.twig - - - report:: Enlever le filtre - Titel - web/report/colFilter.html.twig - - - report:: Grouper par - von - web/report/report_layout_child.html.twig - web/report/report_layout_child.html.twig + web/report/form_date_and_base.html.twig report:: Heures Stunden - web/report/all_content.html.twig + web/report/all_content.html.twig report:: IP IP module/report/filter.php - Controller/Report/RootController.php report:: Information sur l'enregistrement numero %number% @@ -11782,97 +11628,37 @@ Information über die Benutzer entsprechend %critere% module/report/nav.php - - report:: Les questions les plus posees - Meist gestellten Fragen - web/report/report_layout_child.html.twig - web/report/ajax_dashboard_content_child.html.twig + + report:: Phraseanet report + report:: Phraseanet report + web/report/report_layout.html.twig report:: Plateforme Plattform module/report/nav.php - - report:: Utilisateurs les plus actifs - Aktivsten Benutzer - web/report/ajax_dashboard_content_child.html.twig - web/report/ajax_dashboard_content_child.html.twig - web/report/ajax_dashboard_content_child.html.twig - web/report/ajax_dashboard_content_child.html.twig - - - report:: Volumetrie des questions posees sur %home_title% - Meist Suchabfragen in %home_title% - web/report/dashboard_macro.html.twig - report:: activite Aktivität classes/module/report.php - Controller/Report/RootController.php - Controller/Report/RootController.php - Controller/Report/InformationController.php - web/report/report_layout_child.html.twig - web/report/report_layout_child.html.twig - - - report:: activite document ajoute - Hinzugefügte Dokumente - web/report/ajax_dashboard_content_child.html.twig - - - report:: activite document edite - Bearbeitete Dokumente - web/report/ajax_dashboard_content_child.html.twig - - - report:: activite du site - Tätigkeit der Webseite - web/report/report_layout_child.html.twig - web/report/report_layout.html.twig report:: activite par heure Aktivität pro Stunde module/report/activity.php - web/report/ajax_dashboard_content_child.html.twig - - - report:: activite par jour - Aktivität pro Tag - web/report/ajax_dashboard_content_child.html.twig - web/report/chart.html.twig - web/report/chart.html.twig - - - report:: adresse - Addresse - Controller/Report/InformationController.php - Controller/Report/InformationController.php - - - report:: ajoute - hinzugefügt - web/report/report_layout_child.html.twig report:: collections Kollektionen module/report/filter.php classes/module/report.php - Controller/Report/RootController.php - Controller/Report/InformationController.php - Controller/Report/InformationController.php report:: commentaire Kommentar module/report/filter.php classes/module/report.php - Controller/Report/RootController.php - Controller/Report/InformationController.php - Controller/Report/InformationController.php report:: copyright @@ -11885,160 +11671,52 @@ module/report/filter.php classes/module/report.php classes/module/report.php - Controller/Report/RootController.php - Controller/Report/RootController.php - Controller/Report/RootController.php - Controller/Report/InformationController.php - Controller/Report/InformationController.php - Controller/Report/InformationController.php - Controller/Report/InformationController.php - Controller/Report/InformationController.php - Controller/Report/InformationController.php - - - report:: document - Dokument - Controller/Report/InformationController.php - Controller/Report/InformationController.php - Controller/Report/ActivityController.php - web/report/report_layout_child.html.twig - web/report/ajax_dashboard_content_child.html.twig report:: document ajoute hinzugefügte Dokumente module/report/add.php - - report:: documents les plus telecharges - Meist heruntergeladene Dokumente - web/report/ajax_dashboard_content_child.html.twig - - - report:: edite - bearbeitet - web/report/report_layout_child.html.twig - report:: edited documents Bearbeitete Dokumente module/report/edit.php - - report:: email - E Mail - Controller/Report/InformationController.php - Controller/Report/InformationController.php - report:: fichier Datei classes/module/report.php - Controller/Report/RootController.php report:: fonction Beruf classes/module/report.php - Controller/Report/RootController.php - Controller/Report/RootController.php - Controller/Report/InformationController.php - web/report/report_layout_child.html.twig - web/report/report_layout_child.html.twig - - - report:: historique des connexions - Historie von Verbindungen - Controller/Report/InformationController.php - - - report:: historique des questions - Suchabfragen Historie - Controller/Report/InformationController.php - - - report:: historique des telechargements - Historie der downloads - Controller/Report/InformationController.php - Controller/Report/InformationController.php - - - report:: identifiant - Benutzer Id - Controller/Report/InformationController.php - Controller/Report/InformationController.php report:: jour Tag - Controller/Report/ActivityController.php - web/report/all_content.html.twig - - - report:: module - Module - Controller/Report/RootController.php + web/report/all_content.html.twig report:: modules Module module/report/nav.php module/report/filter.php - Controller/Report/RootController.php - Controller/Report/InformationController.php report:: navigateur Webbrowser module/report/nav.php - Controller/Report/RootController.php report:: navigateurs et plateforme Webbrowser und Plattformen module/report/nav.php - Controller/Report/RootController.php - - - report:: nom - Name - Controller/Report/InformationController.php - Controller/Report/InformationController.php report:: nombre Anzahl classes/module/report.php - Controller/Report/RootController.php - Controller/Report/RootController.php - Controller/Report/RootController.php - Controller/Report/RootController.php - Controller/Report/RootController.php - Controller/Report/InformationController.php - Controller/Report/InformationController.php - Controller/Report/ActivityController.php - Controller/Report/ActivityController.php - - - report:: nombre de documents - Anzahl von Dokumenten - Controller/Report/ActivityController.php - - - report:: nombre de preview - Anzahl von Miniaturansichten - Controller/Report/ActivityController.php - - - report:: nombre de reponses - Durchschnittszahl der Ergebnisse - Controller/Report/ActivityController.php - Controller/Report/ActivityController.php - - - report:: nombre de vue - Anzahl von Ansichten - web/report/ajax_dashboard_content_child.html.twig report:: non-renseigne @@ -12058,8 +11736,6 @@ module/report/validate.php module/report/edit.php module/report/sent.php - web/report/colFilter.html.twig - web/report/colFilter.html.twig report:: page d'accueil @@ -12073,68 +11749,15 @@ von %user_infos% prod/preview/short_history.html.twig - - report:: par utilisateurs - Allgemein - web/report/report_layout_child.html.twig - report:: pays Staat classes/module/report.php - Controller/Report/RootController.php - Controller/Report/RootController.php - Controller/Report/InformationController.php - web/report/report_layout_child.html.twig - web/report/report_layout_child.html.twig - - - report:: plateforme - Plattform - Controller/Report/RootController.php - - - report:: poids - Größe - Controller/Report/InformationController.php - Controller/Report/InformationController.php - - - report:: poids document - Gewicht von heruntergeladenen Dokumenten - web/report/ajax_dashboard_content_child.html.twig - - - report:: poids preview - Gewicht von heruntergeladenen Unterauflösungen - web/report/ajax_dashboard_content_child.html.twig - web/report/ajax_dashboard_content_child.html.twig report:: pourcentage % classes/module/report.php - Controller/Report/RootController.php - Controller/Report/RootController.php - Controller/Report/RootController.php - Controller/Report/RootController.php - Controller/Report/RootController.php - - - report:: preview - Unterauflösungen - Controller/Report/ActivityController.php - web/report/ajax_dashboard_content_child.html.twig - - - report:: preview les plus telecharges - Meist heruntergeladene Ansichten - web/report/ajax_dashboard_content_child.html.twig - - - report:: pushe - Pushed - web/report/report_layout_child.html.twig report:: pushed documents @@ -12147,12 +11770,6 @@ module/report/question.php module/report/filter.php classes/module/report.php - Controller/Report/RootController.php - Controller/Report/InformationController.php - Controller/Report/ActivityController.php - Controller/Report/ActivityController.php - web/report/ajax_dashboard_content_child.html.twig - web/report/ajax_dashboard_content_child.html.twig report:: questions @@ -12168,55 +11785,27 @@ report:: questions sans reponses Anfragen ohne Ergebnis module/report/activity.php - web/report/report_layout_child.html.twig report:: record id record id module/report/filter.php classes/module/report.php - Controller/Report/RootController.php - Controller/Report/RootController.php - Controller/Report/InformationController.php - Controller/Report/InformationController.php - Controller/Report/InformationController.php - - - report:: recordid - recordid - web/report/report_layout_child.html.twig report:: resolution Bildschirmauflösung module/report/nav.php - Controller/Report/RootController.php - - - report:: site - Website - web/report/ajax_dashboard_content_child.html.twig - - - report:: site d'ou les photo sont les plus consultees - Website, wo die Dokumente am häufigsten angesehen sind (Referer) - web/report/ajax_dashboard_content_child.html.twig report:: societe Unternehmen classes/module/report.php - Controller/Report/RootController.php - Controller/Report/RootController.php - Controller/Report/InformationController.php - web/report/report_layout_child.html.twig - web/report/report_layout_child.html.twig report:: taille Gesamtzahl classes/module/report.php - Controller/Report/RootController.php report:: telechargement @@ -12227,54 +11816,17 @@ report:: telechargements Download module/report/download.php - Controller/Report/RootController.php - web/report/report_layout.html.twig - web/report/ajax_dashboard_content_child.html.twig - web/report/ajax_dashboard_content_child.html.twig - web/report/ajax_dashboard_content_child.html.twig - - - report:: telechargements document - Heruntergeladene Dokumente - web/report/ajax_dashboard_content_child.html.twig + web/report/report_layout.html.twig report:: telechargements par jour Download pro Tag module/report/activity.php - - report:: telechargements preview - Heruntergeladene Unterauflösungen - web/report/ajax_dashboard_content_child.html.twig - - - report:: telephone - Telefon - Controller/Report/InformationController.php - Controller/Report/InformationController.php - - - report:: titre - Titel - Controller/Report/InformationController.php - Controller/Report/InformationController.php - - - report:: total des telechargements - Allgemeine downloads - Controller/Report/ActivityController.php - - - report:: toutes les questions - häufigsten Suchabfragen - web/report/report_layout_child.html.twig - report:: type Bildschirmtyp classes/module/report.php - Controller/Report/RootController.php report:: type d'action @@ -12285,31 +11837,12 @@ report:: utilisateur Benutzer classes/module/report.php - Controller/Report/RootController.php - Controller/Report/InformationController.php - Controller/Report/ActivityController.php - - - report:: utilisateurs - Benutzer - Controller/Report/RootController.php - Controller/Report/InformationController.php - web/report/ajax_dashboard_content_child.html.twig - web/report/ajax_dashboard_content_child.html.twig - web/report/ajax_dashboard_content_child.html.twig - web/report/ajax_dashboard_content_child.html.twig - web/report/ajax_dashboard_content_child.html.twig report:: validated documents Bestätigte Dokumente module/report/validate.php - - report:: valide - Bestätigt - web/report/report_layout_child.html.twig - report:: visualiseur cooliris Cooliris Viewer @@ -12322,11 +11855,6 @@ Kollektion Verschiebung zu : %coll_name% prod/preview/short_history.html.twig - - report::Connexion - Verbindungen - web/report/ajax_dashboard_content_child.html.twig - report::Connexions Verbindungen @@ -12350,8 +11878,7 @@ report::Heures Module - web/report/ajax_data_content.html.twig - web/report/all_content.html.twig + web/report/all_content.html.twig report::Impression des formats : %format% @@ -12366,17 +11893,17 @@ report::Nombre de connexions Verbindungen - web/report/all_content.html.twig + web/report/all_content.html.twig report::Nombre de document ajoute Anzahl von hinzugefügten Dokumenten - web/report/all_content.html.twig + web/report/all_content.html.twig report::Nombre de document edite Anzahl von bearbeiteten Dokumenten - web/report/all_content.html.twig + web/report/all_content.html.twig report::Publication de %dest% @@ -12413,51 +11940,32 @@ report::activite Aktivität module/report/filter.php - Controller/Report/RootController.php report::ajout du documentt Dokument hinzugefügt prod/preview/short_history.html.twig - - report::aucune precision - keine Filter - web/report/report_layout_child.html.twig - report::fonction Funktion module/report/filter.php - Controller/Report/RootController.php - - - report::la description contient - Die Beschreibung beinhaltet - web/report/report_layout_child.html.twig report::pays Land module/report/filter.php - Controller/Report/RootController.php report::societe Unternehmen module/report/filter.php - Controller/Report/RootController.php report::supression du document Dokument löschen prod/preview/short_history.html.twig - - report::version - Version - Controller/Report/InformationController.php - reportage Bericht @@ -13376,17 +12884,6 @@ actions/Tools/index.html.twig actions/Tools/videoEditor.html.twig - - to - to - web/report/report_layout_child.html.twig - web/report/report_layout_child.html.twig - - - tout decocher - Alles deaktivieren - web/report/listColumn.html.twig - tout le monde Alle @@ -13486,7 +12983,7 @@ veuillez choisir au minimum une collection Mindestens eine Kollektion muss ausgewählt werden - web/report/all_content.html.twig + web/report/all_content.html.twig video diff --git a/resources/locales/messages.en.xlf b/resources/locales/messages.en.xlf index 79433cf168..eb034f964e 100644 --- a/resources/locales/messages.en.xlf +++ b/resources/locales/messages.en.xlf @@ -1,14 +1,14 @@ - + - +
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.
- - + + Form/Configuration/EmailFormType.php Form/Login/PhraseaAuthenticationForm.php @@ -289,11 +289,6 @@ %total% responses Controller/Prod/QueryController.php - - %total_count% results - %total_count% results - web/report/generate_tab.html.twig - %user% a envoye son rapport de validation de %title% %user% has sent his feedback report for %title% @@ -409,7 +404,6 @@ 1 result WorkZone/Browser/Results.html.twig WorkZone/Browser/Results.html.twig - web/report/generate_tab.html.twig 10 tags maximum @@ -530,7 +524,7 @@ API Webhook API Webhook - TaskManager/Job/WebhookJob.php + TaskManager/Job/WebhookJob.php AR @@ -757,7 +751,7 @@ Advanced Search Advanced search - web/prod/index.html.twig + web/prod/index.html.twig Advanced mode @@ -772,37 +766,37 @@ 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 @@ -812,7 +806,7 @@ Aide Help - web/prod/index.html.twig + web/prod/index.html.twig Aide sur les expressions regulieres @@ -863,7 +857,7 @@ All these conditions All these conditions - web/prod/index.html.twig + web/prod/index.html.twig All values @@ -933,14 +927,14 @@ Alphabetic asc Alphabetic asc - 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 Alphabetic desc Alphabetic desc - web/prod/index.html.twig + web/prod/index.html.twig Also delete records that rely on groupings. @@ -1057,7 +1051,7 @@ Aperture Aperture - SearchEngine/Elastic/ElasticsearchOptions.php + SearchEngine/Elastic/ElasticsearchOptions.php web/common/technical_datas.html.twig @@ -1253,7 +1247,7 @@ Audio Audio - web/prod/index.html.twig + web/prod/index.html.twig Audio Birate @@ -1269,12 +1263,12 @@ Audio Samplerate Audio Samplerate - SearchEngine/Elastic/ElasticsearchOptions.php + SearchEngine/Elastic/ElasticsearchOptions.php Audio codec Audio codec - SearchEngine/Elastic/ElasticsearchOptions.php + SearchEngine/Elastic/ElasticsearchOptions.php AudioSamplerate @@ -1502,9 +1496,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 + web/prod/index.html.twig Browser @@ -1532,22 +1526,17 @@ By field By field - web/prod/index.html.twig + web/prod/index.html.twig CHAMPS Fields setup web/admin/tree.html.twig - - CSV export - CSV export - web/report/generate_tab.html.twig - Camera Model Camera model - SearchEngine/Elastic/ElasticsearchOptions.php + SearchEngine/Elastic/ElasticsearchOptions.php web/common/technical_datas.html.twig @@ -1791,11 +1780,6 @@ Check all boxes from column web/admin/index.html.twig - - Cochez les cases correspondantes aux colonnes que vous desirez voire apparaitre dans le report - Select the columns to be displayed in report - web/report/listColumn.html.twig - Code d'acces Access code @@ -1833,7 +1817,7 @@ Collection order Collection order - web/prod/index.html.twig + web/prod/index.html.twig Color Depth @@ -1848,7 +1832,7 @@ Colorspace Colorspace - SearchEngine/Elastic/ElasticsearchOptions.php + SearchEngine/Elastic/ElasticsearchOptions.php Commande @@ -1904,7 +1888,7 @@ Configuration Configuration - web/prod/index.html.twig + web/prod/index.html.twig Confirm new email address @@ -1960,7 +1944,7 @@ Contains Contains - web/prod/index.html.twig + web/prod/index.html.twig Continuer ? @@ -2015,7 +1999,7 @@ Couleur de selection Selection color - web/prod/index.html.twig + web/prod/index.html.twig Country @@ -2229,7 +2213,7 @@ Date Added Date added - web/prod/index.html.twig + web/prod/index.html.twig Date Creation @@ -2239,7 +2223,7 @@ Date Updated Date Updated - web/prod/index.html.twig + web/prod/index.html.twig Date de connexion @@ -2268,7 +2252,7 @@ Date(s) from field(s) Date(s) from field(s) - web/prod/index.html.twig + web/prod/index.html.twig De @@ -2346,7 +2330,7 @@ Defined by admin Defined by admin - web/prod/index.html.twig + web/prod/index.html.twig Defined in Apache configuration @@ -2460,7 +2444,8 @@ Deselect all actions/Feedback/list.html.twig prod/actions/Push.html.twig - web/report/form_date_and_base.html.twig + web/report/report_layout_child.html.twig + web/report/form_date_and_base.html.twig Design of personalization logo section @@ -2518,7 +2503,7 @@ Display technical data Display technical data - web/prod/index.html.twig + web/prod/index.html.twig Display thumbnails @@ -2528,7 +2513,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 @@ -2560,7 +2545,7 @@ Document Document - web/prod/index.html.twig + web/prod/index.html.twig Document Type Sharing @@ -2981,7 +2966,7 @@ Equals Equals - web/prod/index.html.twig + web/prod/index.html.twig Erreur @@ -3047,9 +3032,9 @@ Erreur lors de la tentative ; errreur : %message% Error when trying. Error: %message% - Core/Database/DatabaseMaintenanceService.php - Core/Database/DatabaseMaintenanceService.php - Core/Database/DatabaseMaintenanceService.php + Core/Database/DatabaseMaintenanceService.php + Core/Database/DatabaseMaintenanceService.php + Core/Database/DatabaseMaintenanceService.php Erreur lors de votre authentification @@ -3124,7 +3109,7 @@ Ex : Paris, bleu, montagne Ex : Paris, bleu, montagne - web/prod/index.html.twig + web/prod/index.html.twig Executables externes @@ -3287,11 +3272,6 @@ Filter web/admin/users.html.twig - - Filtrer - Filter - web/report/generate_tab.html.twig - First Name First name @@ -3312,13 +3292,13 @@ Flash Flash - web/prod/index.html.twig + web/prod/index.html.twig web/common/technical_datas.html.twig FlashFired FlashFired - SearchEngine/Elastic/ElasticsearchOptions.php + SearchEngine/Elastic/ElasticsearchOptions.php Flatten layers @@ -3377,7 +3357,7 @@ FrameRate FrameRate - SearchEngine/Elastic/ElasticsearchOptions.php + SearchEngine/Elastic/ElasticsearchOptions.php Frequence d'echantillonage @@ -3409,16 +3389,6 @@ General settings web/admin/dashboard.html.twig - - Generate - Generate - web/report/report_layout_child.html.twig - - - Generate dashboard - Generate dashboard - web/report/report_layout_child.html.twig - Generates a flexpaper flash file Creates a flexpaper flash file @@ -3453,7 +3423,7 @@ Geo Search Geo Search - web/prod/index.html.twig + web/prod/index.html.twig Geonames server address @@ -3527,25 +3497,14 @@ Graphiste (preview au rollover) - Graphist (preview on rollover) - web/prod/index.html.twig + Graphist (preview on thumbnail rollover) + web/prod/index.html.twig Great Great Controller/Root/LoginController.php - - Groupement des resultats sur le champ %name% - Group results on the field %name% - Controller/Report/RootController.php - Controller/Report/ActivityController.php - - - Grouper - Regroup - web/report/generate_tab.html.twig - Groupez 2 ou plusieurs mots avec des guillemets: "Michael Jackson" Group 2 or more words with quotes: "Michael Jackson" @@ -3627,7 +3586,7 @@ ISO ISO - SearchEngine/Elastic/ElasticsearchOptions.php + SearchEngine/Elastic/ElasticsearchOptions.php ISO sensibility @@ -3636,8 +3595,8 @@ Iconographe (description au rollover) - Iconograph (caption on rollover) - web/prod/index.html.twig + Iconograph (caption on thumbnail rollover) + web/prod/index.html.twig Id @@ -3682,7 +3641,7 @@ Image Image - web/prod/index.html.twig + web/prod/index.html.twig ImageMagick @@ -3708,7 +3667,7 @@ In the answer grid In the answer grid - web/prod/index.html.twig + web/prod/index.html.twig Include Business-fields in caption @@ -3932,7 +3891,7 @@ Language Language - web/prod/index.html.twig + web/prod/index.html.twig Last Name @@ -4069,7 +4028,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 @@ -4193,7 +4152,7 @@ Ma derniere question My last query - web/prod/index.html.twig + web/prod/index.html.twig Mail line %line% is empty @@ -4299,7 +4258,7 @@ MimeType MimeType - SearchEngine/Elastic/ElasticsearchOptions.php + SearchEngine/Elastic/ElasticsearchOptions.php Minimum number of letters before truncation @@ -4350,7 +4309,7 @@ Mode de presentation Display mode - web/prod/index.html.twig + web/prod/index.html.twig Modele de donnees @@ -4581,6 +4540,11 @@ WorkZone/Browser/Results.html.twig WorkZone/Browser/Results.html.twig + + No thesaurus concept query + No thesaurus concept query + prod/results/infos.html.twig + No users selected No users selected @@ -4674,7 +4638,7 @@ Notify third party application when an event occurs in Phraseanet Notify third party application when an event occurs in Phraseanet - TaskManager/Job/WebhookJob.php + TaskManager/Job/WebhookJob.php Notify users about this publication @@ -4763,7 +4727,7 @@ One of these conditions One of these conditions - web/prod/index.html.twig + web/prod/index.html.twig Only %nbEditableDocuments% records can be modified. @@ -4821,7 +4785,7 @@ Orientation Orientation - SearchEngine/Elastic/ElasticsearchOptions.php + SearchEngine/Elastic/ElasticsearchOptions.php Original name @@ -5105,10 +5069,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 + web/prod/index.html.twig Prefix for notification emails @@ -5123,12 +5087,12 @@ 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 @@ -5181,7 +5145,7 @@ Publications Publications - web/prod/index.html.twig + web/prod/index.html.twig admin/publications/wrapper.html.twig web/admin/tree.html.twig web/common/menubar.html.twig @@ -5293,80 +5257,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% @@ -5387,7 +5351,7 @@ Re-initialiser Reset prod/Baskets/Reorder.html.twig - web/prod/index.html.twig + web/prod/index.html.twig prod/Story/Reorder.html.twig @@ -5436,11 +5400,6 @@ WorkZone/Browser/Basket.html.twig WorkZone/Browser/Results.html.twig - - Receiver - Recipient - Controller/Report/ActivityController.php - Reception d'un rapport de validation Incoming feedback report @@ -5494,7 +5453,7 @@ Rechercher dans un champ date In a date field - web/prod/index.html.twig + web/prod/index.html.twig Recommendations @@ -5585,7 +5544,7 @@ Relevance Relevance - web/prod/index.html.twig + web/prod/index.html.twig Remember me @@ -5651,11 +5610,6 @@ Report admin/fields/templates.html.twig - - Report generation may take a long time to generate, depending on the number of collections and the period selected. - Depending on the number of collections and the period selected, Report may take time to be generate. - web/report/report_layout_child.html.twig - Request access Access request @@ -5962,7 +5916,7 @@ Select a field Select a field - web/prod/index.html.twig + web/prod/index.html.twig Select a list on the left and edit it ! @@ -5974,7 +5928,8 @@ Select all actions/Feedback/list.html.twig prod/actions/Push.html.twig - web/report/form_date_and_base.html.twig + web/report/report_layout_child.html.twig + web/report/form_date_and_base.html.twig Select all collections @@ -5996,7 +5951,7 @@ Selected base(s) Selected base(s) - web/prod/index.html.twig + web/prod/index.html.twig Selected files @@ -6031,11 +5986,6 @@ Send to Twitter prod/Share/record.html.twig - - Sent - Sent - web/report/report_layout_child.html.twig - Sent documents (mail) Sent documents @@ -6128,7 +6078,7 @@ Shutter speed Shutter speed - SearchEngine/Elastic/ElasticsearchOptions.php + SearchEngine/Elastic/ElasticsearchOptions.php web/common/technical_datas.html.twig @@ -6271,7 +6221,7 @@ Status des documents a rechercher Document status - web/prod/index.html.twig + web/prod/index.html.twig Status edition @@ -6689,7 +6639,7 @@ Theme Skin - web/prod/index.html.twig + web/prod/index.html.twig There is no one to validate orders, please contact an administrator @@ -6861,7 +6811,7 @@ Tout type All types - web/prod/index.html.twig + web/prod/index.html.twig Toutes les publications @@ -6884,16 +6834,10 @@ prod/upload/upload-flash.html.twig prod/upload/upload.html.twig - - Trier - Sort - web/report/generate_tab.html.twig - web/report/generate_tab.html.twig - Trier par Sort by - web/prod/index.html.twig + web/prod/index.html.twig Try to extract embedded thumbnails @@ -6918,7 +6862,7 @@ Type de documents Document(s) Type - web/prod/index.html.twig + web/prod/index.html.twig Type nombre @@ -7041,7 +6985,7 @@ Une question personnelle The query - web/prod/index.html.twig + web/prod/index.html.twig Une selection @@ -7153,7 +7097,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 @@ -7331,7 +7275,7 @@ Video Video - web/prod/index.html.twig + web/prod/index.html.twig Video Codec @@ -7341,7 +7285,7 @@ Video codec Video codec - SearchEngine/Elastic/ElasticsearchOptions.php + SearchEngine/Elastic/ElasticsearchOptions.php Videos @@ -7533,7 +7477,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 ! @@ -7625,11 +7569,17 @@ Write Metadatas web/admin/subdefs.html.twig + + YYYY-MM-DD + YYYY-MM-DD + web/report/form_date_and_base.html.twig + web/report/form_date_and_base.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 @@ -7942,7 +7892,7 @@ action : bridge Bridge - web/prod/index.html.twig + web/prod/index.html.twig action : collection @@ -7964,7 +7914,7 @@ Export prod/WorkZone/Story.html.twig prod/WorkZone/Basket.html.twig - web/prod/index.html.twig + web/prod/index.html.twig prod/results/record.html.twig web/prod/toolbar.html.twig prod/preview/tools.html.twig @@ -7994,7 +7944,7 @@ Publish prod/WorkZone/Story.html.twig prod/WorkZone/Basket.html.twig - web/prod/index.html.twig + web/prod/index.html.twig web/prod/toolbar.html.twig web/prod/toolbar.html.twig @@ -8029,9 +7979,9 @@ 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 @@ -9070,12 +9020,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 @@ -9116,7 +9066,7 @@ web/common/dialog_export.html.twig web/common/dialog_export.html.twig web/common/dialog_export.html.twig - web/report/all_content.html.twig + web/report/all_content.html.twig web/account/reset-email.html.twig @@ -9196,7 +9146,7 @@ web/thesaurus/export-topics.html.twig web/lightbox/sc_note.html.twig web/common/dialog_export.html.twig - web/report/all_content.html.twig + web/report/all_content.html.twig boutton::generer @@ -9245,7 +9195,7 @@ boutton::rechercher Search Controller/Prod/LanguageController.php - web/prod/index.html.twig + web/prod/index.html.twig boutton::refresh @@ -9361,7 +9311,7 @@ Controller/Prod/LanguageController.php prod/Baskets/Reorder.html.twig prod/Baskets/Update.html.twig - web/prod/index.html.twig + web/prod/index.html.twig Bridge/Flickr/photoset_deleteelement.html.twig Bridge/Flickr/photo_moveinto_photoset.html.twig Bridge/Flickr/photo_modify.html.twig @@ -9404,7 +9354,7 @@ admin/statusbit/edit.html.twig web/admin/dashboard.html.twig web/admin/setup.html.twig - web/report/all_content.html.twig + web/report/all_content.html.twig web/account/reset-email.html.twig web/account/account.html.twig web/account/access.html.twig @@ -9506,7 +9456,7 @@ choisir Select - web/prod/index.html.twig + web/prod/index.html.twig admin/collection/create.html.twig admin/databox/databox.html.twig @@ -9516,11 +9466,6 @@ web/admin/subdefs.html.twig web/admin/subdefs.html.twig - - cocher tout - Select all - web/report/listColumn.html.twig - collection.label.unknown Unknown collection @@ -9537,16 +9482,10 @@ prod/orders/order_item.html.twig web/common/dialog_export.html.twig - - configuration - Configuration - Controller/Report/RootController.php - Controller/Report/ActivityController.php - copyClipboardLabel Copy to clipboard - prod/results/infos.html.twig + prod/results/infos.html.twig prod/Share/record.html.twig prod/Share/record.html.twig prod/Share/record.html.twig @@ -9796,14 +9735,6 @@ Controller/Prod/ToolsController.php Controller/Prod/ToolsController.php - - filtrer les resultats sur la colonne %colonne% - filter results on %colonne% column - Controller/Report/RootController.php - Controller/Report/InformationController.php - Controller/Report/InformationController.php - Controller/Report/ActivityController.php - flash flash @@ -9873,12 +9804,6 @@ Modifications done admin/databox/databox.html.twig - - from - from - web/report/report_layout_child.html.twig - web/report/report_layout_child.html.twig - help::help-section-bullet: check-spelling Check that there are no misspellings or typing errors. @@ -9955,42 +9880,42 @@ See documentation for more examples https://docs.phraseanet.com 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::advance_search: facet-order Facets order - web/prod/index.html.twig + web/prod/index.html.twig index::advance_search: facet-tech-order default order - web/prod/index.html.twig + web/prod/index.html.twig index::advance_search: facet-values-order facets value order - web/prod/index.html.twig + web/prod/index.html.twig index::advance_search: hidden-facet-values-order Hidden Facets - web/prod/index.html.twig + web/prod/index.html.twig index::advance_search: order-by-hits index::advance_search: order-by-hits - web/prod/index.html.twig + web/prod/index.html.twig index:advanced-preferences:: use truncation use truncation - web/prod/index.html.twig + web/prod/index.html.twig invite:: Redirection vers la zone d'authentification, cliquez sur OK pour continuer ou annulez @@ -10593,6 +10518,11 @@ See documentation for more examples https://docs.phraseanet.com Mount Database from a distant host. web/admin/databases.html.twig + + phraseanet:: Preferences + phraseanet:: Preferences + web/prod/index.html.twig + phraseanet:: Un email vient de vous etre envoye An e-mail has been sent. @@ -10710,7 +10640,6 @@ See documentation for more examples https://docs.phraseanet.com Subview module/report/filter.php classes/module/report.php - Controller/Report/RootController.php phraseanet:: thesaurus @@ -10731,17 +10660,17 @@ See documentation for more examples https://docs.phraseanet.com 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/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 + web/prod/index.html.twig phraseanet:: user @@ -10874,12 +10803,12 @@ See documentation for more examples https://docs.phraseanet.com 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 @@ -10889,7 +10818,7 @@ See documentation for more examples https://docs.phraseanet.com phraseanet::type:: documents Documents - web/prod/index.html.twig + web/prod/index.html.twig web/prod/toolbar.html.twig @@ -10900,7 +10829,7 @@ See documentation for more examples https://docs.phraseanet.com phraseanet::type:: reportages Stories - web/prod/index.html.twig + web/prod/index.html.twig phraseanet::type:: videos @@ -10916,16 +10845,6 @@ See documentation for more examples https://docs.phraseanet.com phraseanet::utilisateurs Users module/report/filter.php - Controller/Report/RootController.php - - - phrseanet:: sous definition - Document type - Controller/Report/RootController.php - Controller/Report/InformationController.php - Controller/Report/InformationController.php - Controller/Report/InformationController.php - Controller/Report/InformationController.php preview @@ -10935,17 +10854,17 @@ See documentation for more examples https://docs.phraseanet.com preview:: Description Caption - web/prod/index.html.twig + web/prod/index.html.twig preview:: Historique Timeline - web/prod/index.html.twig + web/prod/index.html.twig preview:: Popularite Statistics - web/prod/index.html.twig + web/prod/index.html.twig preview:: arreter le diaporama @@ -11069,12 +10988,12 @@ See documentation for more examples https://docs.phraseanet.com prod::advancesearch:tooltips:datefield_restriction_explanation prod::advancesearch:tooltips:datefield_restriction_explanation - web/prod/index.html.twig + web/prod/index.html.twig prod::advancesearch:tooltips:field_restriction_explanation prod::advancesearch:tooltips:field_restriction_explanation - web/prod/index.html.twig + web/prod/index.html.twig prod::collection deplacer egalement les documents rattaches a ce(s) regroupement(s) @@ -11194,17 +11113,17 @@ See documentation for more examples https://docs.phraseanet.com prod::facet:base_label Base - SearchEngine/Elastic/ElasticsearchOptions.php + SearchEngine/Elastic/ElasticsearchOptions.php prod::facet:collection_label Collection - SearchEngine/Elastic/ElasticsearchOptions.php + SearchEngine/Elastic/ElasticsearchOptions.php prod::facet:doctype_label Document type - SearchEngine/Elastic/ElasticsearchOptions.php + SearchEngine/Elastic/ElasticsearchOptions.php prod::recherche: Attention : la liste des bases selectionnees pour la recherche a ete changee. @@ -11509,12 +11428,12 @@ It is possible to place several search areas raccourci :: a propos des raccourcis claviers About shortcuts - web/prod/index.html.twig + web/prod/index.html.twig raccourcis :: ne plus montrer cette aide Do not display this help anymore - web/prod/index.html.twig + web/prod/index.html.twig rafraichir @@ -11528,7 +11447,7 @@ It is possible to place several search areas rechercher dans tous les champs All fields - web/prod/index.html.twig + web/prod/index.html.twig recordtype @@ -11588,17 +11507,17 @@ It is possible to place several search areas reponses:: images par pages : Results per page - web/prod/index.html.twig + web/prod/index.html.twig reponses:: mode liste List - web/prod/index.html.twig + web/prod/index.html.twig reponses:: mode vignettes Thumbnails - web/prod/index.html.twig + web/prod/index.html.twig reponses:: partager @@ -11618,115 +11537,55 @@ It is possible to place several search areas reponses:: taille des images : Thumbnails size - web/prod/index.html.twig + web/prod/index.html.twig reponses::document sans titre Untitled - classes/record/adapter.php - - - report :: aucun resultat trouve - No Result - web/report/generate_tab.html.twig - - - report :: configurer le tableau - Setup table - web/report/generate_tab.html.twig - - - report :: filtrer - Filter - web/report/generate_tab.html.twig - - - report :: grouper - Group - web/report/generate_tab.html.twig - - - report :: imprimer le tableau - Print table - web/report/generate_tab.html.twig - - - report:: (connexions) Globales - All connections - web/report/report_layout_child.html.twig - - - report:: (connexions) OS et navigateurs - - web/report/report_layout_child.html.twig - - - report:: (connexions) Par utilisateurs - Per users - web/report/report_layout_child.html.twig - - - report:: (telechargement) Global - All downloads - web/report/report_layout_child.html.twig - - - report:: (telechargement) Par documents sur la base - Per documents, from database - web/report/report_layout_child.html.twig - - - report:: (telechargement) Par jours base par base - Daily - web/report/report_layout_child.html.twig + classes/record/adapter.php report:: 1 - Periode 1 - Time space - web/report/form_date_and_base.html.twig + web/report/form_date_and_base.html.twig - - report:: 2 - Bases - 2 - Databases - web/report/form_date_and_base.html.twig + + report:: 2 - Base + report:: 2 - Base + web/report/form_date_and_base.html.twig + + + report:: 3 - Collections + report:: 3 - Collections + web/report/form_date_and_base.html.twig report:: 3 - Type de report 3 - Type of report - web/report/report_layout_child.html.twig - web/report/report_layout_child.html.twig - web/report/report_layout_child.html.twig + web/report/report_layout_child.html.twig + web/report/report_layout_child.html.twig + + + report:: 4 - Fields + report:: 4 - Fields + web/report/report_layout_child.html.twig report:: Au (date) To - web/report/form_date_and_base.html.twig - web/report/ajax_report_dashboard.html.twig + web/report/form_date_and_base.html.twig report:: Connexion Connections classes/module/report.php - web/report/report_layout.html.twig - web/report/ajax_data_content.html.twig - web/report/ajax_data_content.html.twig - web/report/all_content.html.twig - web/report/ajax_dashboard_content_child.html.twig - web/report/ajax_dashboard_content_child.html.twig - web/report/chart.html.twig - web/report/chart.html.twig + web/report/report_layout.html.twig + web/report/all_content.html.twig - - - Cumulated connexions and downloads - web/report/ajax_dashboard_content_child.html.twig - - - report:: Dashboard - Dashboard - web/report/report_layout.html.twig - web/report/ajax_dashboard_content.html.twig - web/report/ajax_report_dashboard.html.twig + + report:: Databox content + report:: Databox content + web/report/report_layout.html.twig report:: Detail des connexions @@ -11741,30 +11600,17 @@ It is possible to place several search areas report:: Du (date) From - web/report/form_date_and_base.html.twig - web/report/ajax_report_dashboard.html.twig - - - report:: Enlever le filtre - Remove filter - web/report/colFilter.html.twig - - - report:: Grouper par - Group by %s - web/report/report_layout_child.html.twig - web/report/report_layout_child.html.twig + web/report/form_date_and_base.html.twig report:: Heures Hours - web/report/all_content.html.twig + web/report/all_content.html.twig report:: IP IP module/report/filter.php - Controller/Report/RootController.php report:: Information sur l'enregistrement numero %number% @@ -11786,97 +11632,37 @@ It is possible to place several search areas Users information corresponding to %critere% module/report/nav.php - - report:: Les questions les plus posees - Top questions - web/report/report_layout_child.html.twig - web/report/ajax_dashboard_content_child.html.twig + + report:: Phraseanet report + report:: Phraseanet report + web/report/report_layout.html.twig report:: Plateforme Platform module/report/nav.php - - report:: Utilisateurs les plus actifs - Most active users - web/report/ajax_dashboard_content_child.html.twig - web/report/ajax_dashboard_content_child.html.twig - web/report/ajax_dashboard_content_child.html.twig - web/report/ajax_dashboard_content_child.html.twig - - - report:: Volumetrie des questions posees sur %home_title% - Questions asked - web/report/dashboard_macro.html.twig - report:: activite Activity classes/module/report.php - Controller/Report/RootController.php - Controller/Report/RootController.php - Controller/Report/InformationController.php - web/report/report_layout_child.html.twig - web/report/report_layout_child.html.twig - - - report:: activite document ajoute - Added documents - web/report/ajax_dashboard_content_child.html.twig - - - report:: activite document edite - Edited documents - web/report/ajax_dashboard_content_child.html.twig - - - report:: activite du site - Site activity - web/report/report_layout_child.html.twig - web/report/report_layout.html.twig report:: activite par heure Hourly Activity (average) module/report/activity.php - web/report/ajax_dashboard_content_child.html.twig - - - report:: activite par jour - Daily Activity - web/report/ajax_dashboard_content_child.html.twig - web/report/chart.html.twig - web/report/chart.html.twig - - - report:: adresse - Address - Controller/Report/InformationController.php - Controller/Report/InformationController.php - - - report:: ajoute - Added - web/report/report_layout_child.html.twig report:: collections Collections module/report/filter.php classes/module/report.php - Controller/Report/RootController.php - Controller/Report/InformationController.php - Controller/Report/InformationController.php report:: commentaire Comments module/report/filter.php classes/module/report.php - Controller/Report/RootController.php - Controller/Report/InformationController.php - Controller/Report/InformationController.php report:: copyright @@ -11889,160 +11675,52 @@ It is possible to place several search areas module/report/filter.php classes/module/report.php classes/module/report.php - Controller/Report/RootController.php - Controller/Report/RootController.php - Controller/Report/RootController.php - Controller/Report/InformationController.php - Controller/Report/InformationController.php - Controller/Report/InformationController.php - Controller/Report/InformationController.php - Controller/Report/InformationController.php - Controller/Report/InformationController.php - - - report:: document - document - Controller/Report/InformationController.php - Controller/Report/InformationController.php - Controller/Report/ActivityController.php - web/report/report_layout_child.html.twig - web/report/ajax_dashboard_content_child.html.twig report:: document ajoute Documents added module/report/add.php - - report:: documents les plus telecharges - Most downloaded assets - web/report/ajax_dashboard_content_child.html.twig - - - report:: edite - Caption Edited - web/report/report_layout_child.html.twig - report:: edited documents Edited documents module/report/edit.php - - report:: email - E-mail - Controller/Report/InformationController.php - Controller/Report/InformationController.php - report:: fichier File classes/module/report.php - Controller/Report/RootController.php report:: fonction Job classes/module/report.php - Controller/Report/RootController.php - Controller/Report/RootController.php - Controller/Report/InformationController.php - web/report/report_layout_child.html.twig - web/report/report_layout_child.html.twig - - - report:: historique des connexions - Connections - Controller/Report/InformationController.php - - - report:: historique des questions - Query log - Controller/Report/InformationController.php - - - report:: historique des telechargements - Downloads - Controller/Report/InformationController.php - Controller/Report/InformationController.php - - - report:: identifiant - User id - Controller/Report/InformationController.php - Controller/Report/InformationController.php report:: jour Day - Controller/Report/ActivityController.php - web/report/all_content.html.twig - - - report:: module - Modules - Controller/Report/RootController.php + web/report/all_content.html.twig report:: modules Modules module/report/nav.php module/report/filter.php - Controller/Report/RootController.php - Controller/Report/InformationController.php report:: navigateur Browser module/report/nav.php - Controller/Report/RootController.php report:: navigateurs et plateforme Browsers and Platform module/report/nav.php - Controller/Report/RootController.php - - - report:: nom - Name - Controller/Report/InformationController.php - Controller/Report/InformationController.php report:: nombre Number classes/module/report.php - Controller/Report/RootController.php - Controller/Report/RootController.php - Controller/Report/RootController.php - Controller/Report/RootController.php - Controller/Report/RootController.php - Controller/Report/InformationController.php - Controller/Report/InformationController.php - Controller/Report/ActivityController.php - Controller/Report/ActivityController.php - - - report:: nombre de documents - Occurrences - Controller/Report/ActivityController.php - - - report:: nombre de preview - number of preview(s) - Controller/Report/ActivityController.php - - - report:: nombre de reponses - Average hits - Controller/Report/ActivityController.php - Controller/Report/ActivityController.php - - - report:: nombre de vue - Number of displays - web/report/ajax_dashboard_content_child.html.twig report:: non-renseigne @@ -12062,8 +11740,6 @@ It is possible to place several search areas module/report/validate.php module/report/edit.php module/report/sent.php - web/report/colFilter.html.twig - web/report/colFilter.html.twig report:: page d'accueil @@ -12077,68 +11753,15 @@ It is possible to place several search areas By %user_infos% prod/preview/short_history.html.twig - - report:: par utilisateurs - Per Users - web/report/report_layout_child.html.twig - report:: pays Country classes/module/report.php - Controller/Report/RootController.php - Controller/Report/RootController.php - Controller/Report/InformationController.php - web/report/report_layout_child.html.twig - web/report/report_layout_child.html.twig - - - report:: plateforme - Platform - Controller/Report/RootController.php - - - report:: poids - Size - Controller/Report/InformationController.php - Controller/Report/InformationController.php - - - report:: poids document - Original document filesize - web/report/ajax_dashboard_content_child.html.twig - - - report:: poids preview - Preview filesize - web/report/ajax_dashboard_content_child.html.twig - web/report/ajax_dashboard_content_child.html.twig report:: pourcentage Percentage classes/module/report.php - Controller/Report/RootController.php - Controller/Report/RootController.php - Controller/Report/RootController.php - Controller/Report/RootController.php - Controller/Report/RootController.php - - - report:: preview - Subviews - Controller/Report/ActivityController.php - web/report/ajax_dashboard_content_child.html.twig - - - report:: preview les plus telecharges - Most downloaded preview files - web/report/ajax_dashboard_content_child.html.twig - - - report:: pushe - Pushed - web/report/report_layout_child.html.twig report:: pushed documents @@ -12151,12 +11774,6 @@ It is possible to place several search areas module/report/question.php module/report/filter.php classes/module/report.php - Controller/Report/RootController.php - Controller/Report/InformationController.php - Controller/Report/ActivityController.php - Controller/Report/ActivityController.php - web/report/ajax_dashboard_content_child.html.twig - web/report/ajax_dashboard_content_child.html.twig report:: questions @@ -12172,55 +11789,27 @@ It is possible to place several search areas report:: questions sans reponses Unanswered questions module/report/activity.php - web/report/report_layout_child.html.twig report:: record id recordId module/report/filter.php classes/module/report.php - Controller/Report/RootController.php - Controller/Report/RootController.php - Controller/Report/InformationController.php - Controller/Report/InformationController.php - Controller/Report/InformationController.php - - - report:: recordid - recordId - web/report/report_layout_child.html.twig report:: resolution Screen resolution module/report/nav.php - Controller/Report/RootController.php - - - report:: site - Site - web/report/ajax_dashboard_content_child.html.twig - - - report:: site d'ou les photo sont les plus consultees - Consultation site - web/report/ajax_dashboard_content_child.html.twig report:: societe Company classes/module/report.php - Controller/Report/RootController.php - Controller/Report/RootController.php - Controller/Report/InformationController.php - web/report/report_layout_child.html.twig - web/report/report_layout_child.html.twig report:: taille Size classes/module/report.php - Controller/Report/RootController.php report:: telechargement @@ -12231,54 +11820,17 @@ It is possible to place several search areas report:: telechargements Downloads module/report/download.php - Controller/Report/RootController.php - web/report/report_layout.html.twig - web/report/ajax_dashboard_content_child.html.twig - web/report/ajax_dashboard_content_child.html.twig - web/report/ajax_dashboard_content_child.html.twig - - - report:: telechargements document - Downloads for documents - web/report/ajax_dashboard_content_child.html.twig + web/report/report_layout.html.twig report:: telechargements par jour Downloads module/report/activity.php - - report:: telechargements preview - Downloads for previews - web/report/ajax_dashboard_content_child.html.twig - - - report:: telephone - Phone - Controller/Report/InformationController.php - Controller/Report/InformationController.php - - - report:: titre - Title - Controller/Report/InformationController.php - Controller/Report/InformationController.php - - - report:: total des telechargements - Total downloads - Controller/Report/ActivityController.php - - - report:: toutes les questions - Top questions - web/report/report_layout_child.html.twig - report:: type Screen type classes/module/report.php - Controller/Report/RootController.php report:: type d'action @@ -12289,31 +11841,12 @@ It is possible to place several search areas report:: utilisateur User classes/module/report.php - Controller/Report/RootController.php - Controller/Report/InformationController.php - Controller/Report/ActivityController.php - - - report:: utilisateurs - Users - Controller/Report/RootController.php - Controller/Report/InformationController.php - web/report/ajax_dashboard_content_child.html.twig - web/report/ajax_dashboard_content_child.html.twig - web/report/ajax_dashboard_content_child.html.twig - web/report/ajax_dashboard_content_child.html.twig - web/report/ajax_dashboard_content_child.html.twig report:: validated documents Validated documents module/report/validate.php - - report:: valide - Leave feedback - web/report/report_layout_child.html.twig - report:: visualiseur cooliris Cooliris viewer @@ -12326,11 +11859,6 @@ It is possible to place several search areas documents moved to : %coll_name% prod/preview/short_history.html.twig - - report::Connexion - Connection - web/report/ajax_dashboard_content_child.html.twig - report::Connexions Connections @@ -12354,8 +11882,7 @@ It is possible to place several search areas report::Heures Hours - web/report/ajax_data_content.html.twig - web/report/all_content.html.twig + web/report/all_content.html.twig report::Impression des formats : %format% @@ -12370,17 +11897,17 @@ It is possible to place several search areas report::Nombre de connexions Connections - web/report/all_content.html.twig + web/report/all_content.html.twig report::Nombre de document ajoute Number of documents added - web/report/all_content.html.twig + web/report/all_content.html.twig report::Nombre de document edite Number of documents edited - web/report/all_content.html.twig + web/report/all_content.html.twig report::Publication de %dest% @@ -12417,51 +11944,32 @@ It is possible to place several search areas report::activite Activity module/report/filter.php - Controller/Report/RootController.php report::ajout du documentt Add document prod/preview/short_history.html.twig - - report::aucune precision - No filters - web/report/report_layout_child.html.twig - report::fonction Fonction module/report/filter.php - Controller/Report/RootController.php - - - report::la description contient - Caption includes - web/report/report_layout_child.html.twig report::pays Country module/report/filter.php - Controller/Report/RootController.php report::societe Company module/report/filter.php - Controller/Report/RootController.php report::supression du document Delete document prod/preview/short_history.html.twig - - report::version - Version - Controller/Report/InformationController.php - reportage Feature @@ -13380,17 +12888,6 @@ It is possible to place several search areas actions/Tools/index.html.twig actions/Tools/videoEditor.html.twig - - to - to - web/report/report_layout_child.html.twig - web/report/report_layout_child.html.twig - - - tout decocher - Unselect all - web/report/listColumn.html.twig - tout le monde Everyone @@ -13490,7 +12987,7 @@ It is possible to place several search areas veuillez choisir au minimum une collection At least one collection must be selected - web/report/all_content.html.twig + web/report/all_content.html.twig video diff --git a/resources/locales/messages.fr.xlf b/resources/locales/messages.fr.xlf index ff536a08d3..b0123c405e 100644 --- a/resources/locales/messages.fr.xlf +++ b/resources/locales/messages.fr.xlf @@ -1,14 +1,14 @@ - + - +
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.
- - + + Form/Configuration/EmailFormType.php Form/Login/PhraseaAuthenticationForm.php @@ -289,11 +289,6 @@ %total% réponses Controller/Prod/QueryController.php - - %total_count% results - %total_count% résultats - web/report/generate_tab.html.twig - %user% a envoye son rapport de validation de %title% %user% a envoyé son rapport de validation pour %title% @@ -409,7 +404,6 @@ 1 résultat WorkZone/Browser/Results.html.twig WorkZone/Browser/Results.html.twig - web/report/generate_tab.html.twig 10 tags maximum @@ -530,7 +524,7 @@ API Webhook Webhook API - TaskManager/Job/WebhookJob.php + TaskManager/Job/WebhookJob.php AR @@ -583,9 +577,9 @@ Accès aux sous résolutions web/admin/editusers.html.twig - + Access to the above bases constitutes acceptance of the following Terms of Use (TOU). - Pour accéder aux bases ci-dessus, vous devez d'abord accepter les conditions générales d'utilisation. + L'accès aux ressources de cette base implique l'acceptation des Conditions générales d'utilisation suivantes : web/account/access.html.twig @@ -642,7 +636,7 @@ Activate highlight - Activer le surlignage + Activer le surlignage (beta). Impacte les performances de recherche SearchEngine/Elastic/ElasticsearchSettingsFormType.php web/setup/step2.html.twig @@ -756,7 +750,7 @@ Advanced Search Recherche avancée - web/prod/index.html.twig + web/prod/index.html.twig Advanced mode @@ -771,37 +765,37 @@ Affichage Affichage - web/prod/index.html.twig + web/prod/index.html.twig Affichage au demarrage Afficher au démarrage - web/prod/index.html.twig + web/prod/index.html.twig Afficher la fiche descriptive Afficher la notice - web/prod/index.html.twig + web/prod/index.html.twig Afficher le titre Afficher le titre - web/prod/index.html.twig + web/prod/index.html.twig Afficher les status Afficher les Status - web/prod/index.html.twig + web/prod/index.html.twig Afficher une icone Afficher une icône - web/prod/index.html.twig + web/prod/index.html.twig After metadata Dans l'infobulle de description, après les métadonnées - web/prod/index.html.twig + web/prod/index.html.twig Aggregation @@ -811,7 +805,7 @@ Aide Aide - web/prod/index.html.twig + web/prod/index.html.twig Aide sur les expressions regulieres @@ -859,10 +853,10 @@ actions/Feedback/list.html.twig actions/Feedback/list.html.twig - + All these conditions - All these conditions - web/prod/index.html.twig + Toutes les conditions + web/prod/index.html.twig All values @@ -932,14 +926,14 @@ Alphabetic asc Alphabétique asc - 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 Alphabetic desc Alphabétique desc - web/prod/index.html.twig + web/prod/index.html.twig Also delete records that rely on groupings. @@ -1056,7 +1050,7 @@ Aperture Ouverture - SearchEngine/Elastic/ElasticsearchOptions.php + SearchEngine/Elastic/ElasticsearchOptions.php web/common/technical_datas.html.twig @@ -1252,7 +1246,7 @@ Audio Audio - web/prod/index.html.twig + web/prod/index.html.twig Audio Birate @@ -1268,12 +1262,12 @@ Audio Samplerate Fréquence d'échantillonnage - SearchEngine/Elastic/ElasticsearchOptions.php + SearchEngine/Elastic/ElasticsearchOptions.php Audio codec Audio codec - SearchEngine/Elastic/ElasticsearchOptions.php + SearchEngine/Elastic/ElasticsearchOptions.php AudioSamplerate @@ -1321,9 +1315,9 @@ OBSOLETE Autoriser *Phraseanet Navigator* Form/Configuration/APIClientsFormType.php - + Authorize Adobe cc Plugin to connect. - Authorize Adobe cc Plugin to connect. + Autoriser la connexion du plugin Adobe CC Form/Configuration/APIClientsFormType.php @@ -1501,9 +1495,9 @@ Browse Baskets Parcourir les paniers - 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 Browser @@ -1531,22 +1525,17 @@ By field Par champ - web/prod/index.html.twig + web/prod/index.html.twig CHAMPS Champs web/admin/tree.html.twig - - CSV export - Export CSV - web/report/generate_tab.html.twig - Camera Model Type d'appareil numérique - SearchEngine/Elastic/ElasticsearchOptions.php + SearchEngine/Elastic/ElasticsearchOptions.php web/common/technical_datas.html.twig @@ -1789,11 +1778,6 @@ Cocher toute la colonne web/admin/index.html.twig - - Cochez les cases correspondantes aux colonnes que vous desirez voire apparaitre dans le report - Cochez les cases correspondantes aux colonnes que vous désirez voir apparaître dans le Report - web/report/listColumn.html.twig - Code d'acces Code d'accès @@ -1831,7 +1815,7 @@ Collection order Ordre des collections - web/prod/index.html.twig + web/prod/index.html.twig Color Depth @@ -1846,7 +1830,7 @@ Colorspace Espace colorimétrique - SearchEngine/Elastic/ElasticsearchOptions.php + SearchEngine/Elastic/ElasticsearchOptions.php Commande @@ -1902,7 +1886,7 @@ Configuration Configuration - web/prod/index.html.twig + web/prod/index.html.twig Confirm new email address @@ -1955,10 +1939,10 @@ Consulter en ligne les prérequis et la configuration du serveur Web web/setup/step2.html.twig - + Contains - Contains - web/prod/index.html.twig + Contient + web/prod/index.html.twig Continuer ? @@ -2013,7 +1997,7 @@ Couleur de selection Couleur de sélection - web/prod/index.html.twig + web/prod/index.html.twig Country @@ -2226,7 +2210,7 @@ Date Added Date d'ajout - web/prod/index.html.twig + web/prod/index.html.twig Date Creation @@ -2236,7 +2220,7 @@ Date Updated Date Updated - web/prod/index.html.twig + web/prod/index.html.twig Date de connexion @@ -2265,7 +2249,7 @@ Date(s) from field(s) Date(s) from field(s) - web/prod/index.html.twig + web/prod/index.html.twig De @@ -2343,7 +2327,7 @@ Defined by admin Définit par l'admin - web/prod/index.html.twig + web/prod/index.html.twig Defined in Apache configuration @@ -2457,7 +2441,8 @@ Tout désélectionner actions/Feedback/list.html.twig prod/actions/Push.html.twig - web/report/form_date_and_base.html.twig + web/report/report_layout_child.html.twig + web/report/form_date_and_base.html.twig Design of personalization logo section @@ -2515,7 +2500,7 @@ Display technical data Affichage des informations techniques - web/prod/index.html.twig + web/prod/index.html.twig Display thumbnails @@ -2525,7 +2510,7 @@ Do not display Masquer les informations techniques - web/prod/index.html.twig + web/prod/index.html.twig Do not forget to restart the tasks scheduler @@ -2557,7 +2542,7 @@ Document Document - web/prod/index.html.twig + web/prod/index.html.twig Document Type Sharing @@ -2978,7 +2963,7 @@ Equals Equals - web/prod/index.html.twig + web/prod/index.html.twig Erreur @@ -3044,9 +3029,9 @@ Erreur lors de la tentative ; errreur : %message% Erreur lors de la tentative. Le message d'erreur est : %message% - Core/Database/DatabaseMaintenanceService.php - Core/Database/DatabaseMaintenanceService.php - Core/Database/DatabaseMaintenanceService.php + Core/Database/DatabaseMaintenanceService.php + Core/Database/DatabaseMaintenanceService.php + Core/Database/DatabaseMaintenanceService.php Erreur lors de votre authentification @@ -3121,7 +3106,7 @@ Ex : Paris, bleu, montagne Ex : Paris, bleu, montagne - web/prod/index.html.twig + web/prod/index.html.twig Executables externes @@ -3284,11 +3269,6 @@ Filtrer web/admin/users.html.twig - - Filtrer - Filtrer - web/report/generate_tab.html.twig - First Name Prénom @@ -3309,13 +3289,13 @@ Flash Flash - web/prod/index.html.twig + web/prod/index.html.twig web/common/technical_datas.html.twig FlashFired Avec Flash - SearchEngine/Elastic/ElasticsearchOptions.php + SearchEngine/Elastic/ElasticsearchOptions.php Flatten layers @@ -3374,7 +3354,7 @@ FrameRate Cadence - SearchEngine/Elastic/ElasticsearchOptions.php + SearchEngine/Elastic/ElasticsearchOptions.php Frequence d'echantillonage @@ -3406,16 +3386,6 @@ Paramètres généraux web/admin/dashboard.html.twig - - Generate - Générer - web/report/report_layout_child.html.twig - - - Generate dashboard - Générer le tableau de bord - web/report/report_layout_child.html.twig - Generates a flexpaper flash file Générer un fichier flexpaper flash @@ -3450,7 +3420,7 @@ Geo Search Recherche géolocalisé - web/prod/index.html.twig + web/prod/index.html.twig Geonames server address @@ -3524,25 +3494,14 @@ Graphiste (preview au rollover) - Graphiste (prévisualisation au rollover) - web/prod/index.html.twig + Graphiste (prévisualisation au survol de la vignette) + web/prod/index.html.twig Great Excellente Controller/Root/LoginController.php - - Groupement des resultats sur le champ %name% - Groupement des résultats sur le champ %name% - Controller/Report/RootController.php - Controller/Report/ActivityController.php - - - Grouper - Grouper - web/report/generate_tab.html.twig - Groupez 2 ou plusieurs mots avec des guillemets: "Michael Jackson" Groupez deux ou plusieurs mots avec des guillemets : "Michael Jackson" @@ -3624,7 +3583,7 @@ ISO ISO - SearchEngine/Elastic/ElasticsearchOptions.php + SearchEngine/Elastic/ElasticsearchOptions.php ISO sensibility @@ -3633,8 +3592,8 @@ Iconographe (description au rollover) - Iconographe (description au rollover) - web/prod/index.html.twig + Iconographe (fiche d'indexation au survol de la vignette) + web/prod/index.html.twig Id @@ -3679,7 +3638,7 @@ Image Image - web/prod/index.html.twig + web/prod/index.html.twig ImageMagick @@ -3705,7 +3664,7 @@ In the answer grid Dans une infobulle séparée - web/prod/index.html.twig + web/prod/index.html.twig Include Business-fields in caption @@ -3929,7 +3888,7 @@ Language Langue - web/prod/index.html.twig + web/prod/index.html.twig Last Name @@ -4066,7 +4025,7 @@ Les termes apparaissent dans le(s) champs Le(s) mot(s) contenu(s) dans le(s) champ(s) - web/prod/index.html.twig + web/prod/index.html.twig Light Value @@ -4190,7 +4149,7 @@ Ma derniere question Ma dernière question - web/prod/index.html.twig + web/prod/index.html.twig Mail line %line% is empty @@ -4296,7 +4255,7 @@ MimeType MimeType - SearchEngine/Elastic/ElasticsearchOptions.php + SearchEngine/Elastic/ElasticsearchOptions.php Minimum number of letters before truncation @@ -4347,7 +4306,7 @@ Mode de presentation Mode de présentation - web/prod/index.html.twig + web/prod/index.html.twig Modele de donnees @@ -4578,6 +4537,11 @@ WorkZone/Browser/Results.html.twig WorkZone/Browser/Results.html.twig + + No thesaurus concept query + No thesaurus concept query + prod/results/infos.html.twig + No users selected Aucun utilisateur sélectionné @@ -4671,7 +4635,7 @@ Notify third party application when an event occurs in Phraseanet Notifier l'application tierce lorsqu'un événement se produit dans Phraseanet - TaskManager/Job/WebhookJob.php + TaskManager/Job/WebhookJob.php Notify users about this publication @@ -4760,7 +4724,7 @@ One of these conditions One of these conditions - web/prod/index.html.twig + web/prod/index.html.twig Only %nbEditableDocuments% records can be modified. @@ -4818,7 +4782,7 @@ Orientation Orientation - SearchEngine/Elastic/ElasticsearchOptions.php + SearchEngine/Elastic/ElasticsearchOptions.php Original name @@ -5102,10 +5066,10 @@ Preferences Préférences - 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 + web/prod/index.html.twig Prefix for notification emails @@ -5120,12 +5084,12 @@ Presentation de vignettes Présentation de vignettes - web/prod/index.html.twig + web/prod/index.html.twig Presentation de vignettes de panier Présentation des vignettes de panier - web/prod/index.html.twig + web/prod/index.html.twig Presets @@ -5178,7 +5142,7 @@ Publications Publications - web/prod/index.html.twig + web/prod/index.html.twig admin/publications/wrapper.html.twig web/admin/tree.html.twig web/common/menubar.html.twig @@ -5292,80 +5256,80 @@ Pour les utilisateurs authentifiés, la demande de validation est également dis Raccourcis claviers de la zone des paniers : - web/prod/index.html.twig + web/prod/index.html.twig Raccourcis claviers en cours de editing : Raccourci de la fenêtre d'édition - web/prod/index.html.twig + web/prod/index.html.twig Raccourcis claviers en cours de preview : Raccourcis de la fenêtre vue détaillée - web/prod/index.html.twig + web/prod/index.html.twig Raccourcis claviers en cours de recherche : Raccourcis de la fenêtre principale - web/prod/index.html.twig + web/prod/index.html.twig Raccourcis:: ctrl-a : tout selectionner ctrl-a : sélectionner tout - 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 : éditer la sélection - 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 : imprimer la sélection - 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 espace : démarrer/arrêter le diaporama - web/prod/index.html.twig + web/prod/index.html.twig Raccourcis::fleche bas : scroll vertical flèche basse : défilement vers le bas - web/prod/index.html.twig + web/prod/index.html.twig Raccourcis::fleche droite : page suivante flèche droite : page suivante - web/prod/index.html.twig + web/prod/index.html.twig Raccourcis::fleche gauche : en arriere flèche gauche : document précédent - web/prod/index.html.twig + web/prod/index.html.twig Raccourcis::fleche gauche : en avant flèche droite : document suivant - web/prod/index.html.twig + web/prod/index.html.twig Raccourcis::fleche gauche : page precedente flèche gauche : page précédente - web/prod/index.html.twig + web/prod/index.html.twig Raccourcis::fleche haut : scroll vertical flèche haute : défilement vers le haut - web/prod/index.html.twig + web/prod/index.html.twig Raccourcis::tab/shift-tab se ballade dans les champs Tab/shift-tab : Changer de champs - web/prod/index.html.twig + web/prod/index.html.twig Rappel : Il vous reste %number% jours pour valider %title% de %user% @@ -5386,7 +5350,7 @@ Pour les utilisateurs authentifiés, la demande de validation est également dis Re-initialiser Ré-initialiser prod/Baskets/Reorder.html.twig - web/prod/index.html.twig + web/prod/index.html.twig prod/Story/Reorder.html.twig @@ -5435,11 +5399,6 @@ Pour les utilisateurs authentifiés, la demande de validation est également dis WorkZone/Browser/Basket.html.twig WorkZone/Browser/Results.html.twig - - Receiver - Destinataire - Controller/Report/ActivityController.php - Reception d'un rapport de validation Réception d'un rapport de validation @@ -5493,7 +5452,7 @@ Pour les utilisateurs authentifiés, la demande de validation est également dis Rechercher dans un champ date Dans un champ date - web/prod/index.html.twig + web/prod/index.html.twig Recommendations @@ -5584,7 +5543,7 @@ Pour les utilisateurs authentifiés, la demande de validation est également dis Relevance Pertinence - web/prod/index.html.twig + web/prod/index.html.twig Remember me @@ -5650,11 +5609,6 @@ Pour les utilisateurs authentifiés, la demande de validation est également dis Afficher dans Phraseanet Report admin/fields/templates.html.twig - - Report generation may take a long time to generate, depending on the number of collections and the period selected. - En fonction du nombre de collections et de l'intervalle de dates, la génération du Report peut prendre du temps. - web/report/report_layout_child.html.twig - Request access Demande d'accès @@ -5958,10 +5912,10 @@ Pour les utilisateurs authentifiés, la demande de validation est également dis Voir les résultats de la demande de validation Notification/Mail/MailInfoValidationDone.php - + Select a field - Select a field - web/prod/index.html.twig + Choisir un champ + web/prod/index.html.twig Select a list on the left and edit it ! @@ -5973,7 +5927,8 @@ Pour les utilisateurs authentifiés, la demande de validation est également dis Tout sélectionner actions/Feedback/list.html.twig prod/actions/Push.html.twig - web/report/form_date_and_base.html.twig + web/report/report_layout_child.html.twig + web/report/form_date_and_base.html.twig Select all collections @@ -5995,7 +5950,7 @@ Pour les utilisateurs authentifiés, la demande de validation est également dis Selected base(s) Selected base(s) - web/prod/index.html.twig + web/prod/index.html.twig Selected files @@ -6030,11 +5985,6 @@ Pour les utilisateurs authentifiés, la demande de validation est également dis Envoyer vers Twitter prod/Share/record.html.twig - - Sent - Envoyé - web/report/report_layout_child.html.twig - Sent documents (mail) Documents envoyés (par e-mail) @@ -6127,7 +6077,7 @@ Pour les utilisateurs authentifiés, la demande de validation est également dis Shutter speed Vitesse d'obturateur - SearchEngine/Elastic/ElasticsearchOptions.php + SearchEngine/Elastic/ElasticsearchOptions.php web/common/technical_datas.html.twig @@ -6270,7 +6220,7 @@ Pour les utilisateurs authentifiés, la demande de validation est également dis Status des documents a rechercher Status des documents pour la recherche - web/prod/index.html.twig + web/prod/index.html.twig Status edition @@ -6688,7 +6638,7 @@ Pour les utilisateurs authentifiés, la demande de validation est également dis Theme Thème - web/prod/index.html.twig + web/prod/index.html.twig There is no one to validate orders, please contact an administrator @@ -6860,7 +6810,7 @@ Pour les utilisateurs authentifiés, la demande de validation est également dis Tout type Tous types - web/prod/index.html.twig + web/prod/index.html.twig Toutes les publications @@ -6883,16 +6833,10 @@ Pour les utilisateurs authentifiés, la demande de validation est également dis prod/upload/upload-flash.html.twig prod/upload/upload.html.twig - - Trier - Trier - web/report/generate_tab.html.twig - web/report/generate_tab.html.twig - Trier par Trier par - web/prod/index.html.twig + web/prod/index.html.twig Try to extract embedded thumbnails @@ -6917,7 +6861,7 @@ Pour les utilisateurs authentifiés, la demande de validation est également dis Type de documents Type de document - web/prod/index.html.twig + web/prod/index.html.twig Type nombre @@ -7040,7 +6984,7 @@ Pour les utilisateurs authentifiés, la demande de validation est également dis Une question personnelle La question - web/prod/index.html.twig + web/prod/index.html.twig Une selection @@ -7152,7 +7096,7 @@ Pour les utilisateurs authentifiés, la demande de validation est également dis Use latest search settings on Production loading Utiliser la dernière question posée au lancement de Production - web/prod/index.html.twig + web/prod/index.html.twig Use my Phraseanet account @@ -7252,9 +7196,9 @@ Pour les utilisateurs authentifiés, la demande de validation est également dis Suggestion d'utilisateurs prod/actions/Push.html.twig - + Utilisation prevue: - Utilisation prévue: + Utilisation prévue : prod/orders/order_item.html.twig @@ -7330,7 +7274,7 @@ Pour les utilisateurs authentifiés, la demande de validation est également dis Video Vidéo - web/prod/index.html.twig + web/prod/index.html.twig Video Codec @@ -7340,7 +7284,7 @@ Pour les utilisateurs authentifiés, la demande de validation est également dis Video codec Video codec - SearchEngine/Elastic/ElasticsearchOptions.php + SearchEngine/Elastic/ElasticsearchOptions.php Videos @@ -7532,7 +7476,7 @@ Pour les utilisateurs authentifiés, la demande de validation est également dis Vous pouvez quitter la plupart des fenetres survolantes via la touche echap Vous pouvez fermer la plupart des fênetres en sur impression avec la touche echap - web/prod/index.html.twig + web/prod/index.html.twig Warning ! @@ -7624,11 +7568,17 @@ Pour les utilisateurs authentifiés, la demande de validation est également dis Ecriture des métadonnées web/admin/subdefs.html.twig + + YYYY-MM-DD + YYYY-MM-DD + web/report/form_date_and_base.html.twig + web/report/form_date_and_base.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 @@ -7941,7 +7891,7 @@ Pour les utilisateurs authentifiés, la demande de validation est également dis action : bridge Bridge - web/prod/index.html.twig + web/prod/index.html.twig action : collection @@ -7963,7 +7913,7 @@ Pour les utilisateurs authentifiés, la demande de validation est également dis Exporter prod/WorkZone/Story.html.twig prod/WorkZone/Basket.html.twig - web/prod/index.html.twig + web/prod/index.html.twig prod/results/record.html.twig web/prod/toolbar.html.twig prod/preview/tools.html.twig @@ -7993,7 +7943,7 @@ Pour les utilisateurs authentifiés, la demande de validation est également dis Publier prod/WorkZone/Story.html.twig prod/WorkZone/Basket.html.twig - web/prod/index.html.twig + web/prod/index.html.twig web/prod/toolbar.html.twig web/prod/toolbar.html.twig @@ -8028,9 +7978,9 @@ Pour les utilisateurs authentifiés, la demande de validation est également dis action:: nouveau reportage Nouveau reportage - 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 @@ -9070,12 +9020,12 @@ Si vous recevez cet e-mail sans l'avoir sollicité, merci de l'ignorer ou de le boutton:: selectionner aucune base Aucune - web/prod/index.html.twig + web/prod/index.html.twig boutton:: selectionner toutes les bases Toutes - web/prod/index.html.twig + web/prod/index.html.twig boutton::ajouter @@ -9116,7 +9066,7 @@ Si vous recevez cet e-mail sans l'avoir sollicité, merci de l'ignorer ou de le web/common/dialog_export.html.twig web/common/dialog_export.html.twig web/common/dialog_export.html.twig - web/report/all_content.html.twig + web/report/all_content.html.twig web/account/reset-email.html.twig @@ -9196,7 +9146,7 @@ Si vous recevez cet e-mail sans l'avoir sollicité, merci de l'ignorer ou de le web/thesaurus/export-topics.html.twig web/lightbox/sc_note.html.twig web/common/dialog_export.html.twig - web/report/all_content.html.twig + web/report/all_content.html.twig boutton::generer @@ -9245,7 +9195,7 @@ Si vous recevez cet e-mail sans l'avoir sollicité, merci de l'ignorer ou de le boutton::rechercher Rechercher Controller/Prod/LanguageController.php - web/prod/index.html.twig + web/prod/index.html.twig boutton::refresh @@ -9361,7 +9311,7 @@ Si vous recevez cet e-mail sans l'avoir sollicité, merci de l'ignorer ou de le Controller/Prod/LanguageController.php prod/Baskets/Reorder.html.twig prod/Baskets/Update.html.twig - web/prod/index.html.twig + web/prod/index.html.twig Bridge/Flickr/photoset_deleteelement.html.twig Bridge/Flickr/photo_moveinto_photoset.html.twig Bridge/Flickr/photo_modify.html.twig @@ -9404,7 +9354,7 @@ Si vous recevez cet e-mail sans l'avoir sollicité, merci de l'ignorer ou de le admin/statusbit/edit.html.twig web/admin/dashboard.html.twig web/admin/setup.html.twig - web/report/all_content.html.twig + web/report/all_content.html.twig web/account/reset-email.html.twig web/account/account.html.twig web/account/access.html.twig @@ -9506,7 +9456,7 @@ Si vous recevez cet e-mail sans l'avoir sollicité, merci de l'ignorer ou de le choisir Choisir - web/prod/index.html.twig + web/prod/index.html.twig admin/collection/create.html.twig admin/databox/databox.html.twig @@ -9516,11 +9466,6 @@ Si vous recevez cet e-mail sans l'avoir sollicité, merci de l'ignorer ou de le web/admin/subdefs.html.twig web/admin/subdefs.html.twig - - cocher tout - Tout cocher - web/report/listColumn.html.twig - collection.label.unknown Collection inconnue @@ -9537,16 +9482,10 @@ Si vous recevez cet e-mail sans l'avoir sollicité, merci de l'ignorer ou de le prod/orders/order_item.html.twig web/common/dialog_export.html.twig - - configuration - Configuration - Controller/Report/RootController.php - Controller/Report/ActivityController.php - copyClipboardLabel Copier dans le presse-papier - prod/results/infos.html.twig + prod/results/infos.html.twig prod/Share/record.html.twig prod/Share/record.html.twig prod/Share/record.html.twig @@ -9796,14 +9735,6 @@ Si vous recevez cet e-mail sans l'avoir sollicité, merci de l'ignorer ou de le Controller/Prod/ToolsController.php Controller/Prod/ToolsController.php - - filtrer les resultats sur la colonne %colonne% - filtrer les résultats sur la colonne %colonne% - Controller/Report/RootController.php - Controller/Report/InformationController.php - Controller/Report/InformationController.php - Controller/Report/ActivityController.php - flash Flash @@ -9873,12 +9804,6 @@ Si vous recevez cet e-mail sans l'avoir sollicité, merci de l'ignorer ou de le Modifications effectuées admin/databox/databox.html.twig - - from - De - web/report/report_layout_child.html.twig - web/report/report_layout_child.html.twig - help::help-section-bullet: check-spelling help::help-section-bullet: check-spelling @@ -9954,42 +9879,42 @@ Si vous recevez cet e-mail sans l'avoir sollicité, merci de l'ignorer ou de le index::advance_search: disable-facet Ne pas afficher les facettes contenant un seul résultat (expérimental) - web/prod/index.html.twig + web/prod/index.html.twig index::advance_search: facet Préférences sur les facettes - web/prod/index.html.twig + web/prod/index.html.twig index::advance_search: facet-order index::advance_search: facet-order - web/prod/index.html.twig + web/prod/index.html.twig index::advance_search: facet-tech-order index::advance_search: facet-tech-order - web/prod/index.html.twig + web/prod/index.html.twig index::advance_search: facet-values-order index::advance_search: facet-values-order - web/prod/index.html.twig + web/prod/index.html.twig index::advance_search: hidden-facet-values-order Facettes Masquées - web/prod/index.html.twig + web/prod/index.html.twig index::advance_search: order-by-hits Trier les facettes par hits - web/prod/index.html.twig + web/prod/index.html.twig index:advanced-preferences:: use truncation Activer la troncature - web/prod/index.html.twig + web/prod/index.html.twig invite:: Redirection vers la zone d'authentification, cliquez sur OK pour continuer ou annulez @@ -10592,6 +10517,11 @@ Si vous recevez cet e-mail sans l'avoir sollicité, merci de l'ignorer ou de le Monter une base provenant d'un serveur different de l'application box web/admin/databases.html.twig + + phraseanet:: Preferences + phraseanet:: Preferences + web/prod/index.html.twig + phraseanet:: Un email vient de vous etre envoye Un e-mail vient de vous être envoyé @@ -10709,7 +10639,6 @@ Si vous recevez cet e-mail sans l'avoir sollicité, merci de l'ignorer ou de le Sous-définition module/report/filter.php classes/module/report.php - Controller/Report/RootController.php phraseanet:: thesaurus @@ -10730,17 +10659,17 @@ Si vous recevez cet e-mail sans l'avoir sollicité, merci de l'ignorer ou de le phraseanet:: tri par date Tri par 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/prod/index.html.twig web/thesaurus/export-topics-dialog.html.twig phraseanet:: tri par nom Tri alphabétique - 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 phraseanet:: user @@ -10873,12 +10802,12 @@ Si vous recevez cet e-mail sans l'avoir sollicité, merci de l'ignorer ou de le phraseanet::time:: a A - web/prod/index.html.twig + web/prod/index.html.twig phraseanet::time:: de De - web/prod/index.html.twig + web/prod/index.html.twig phraseanet::type:: audios @@ -10888,7 +10817,7 @@ Si vous recevez cet e-mail sans l'avoir sollicité, merci de l'ignorer ou de le phraseanet::type:: documents Documents - web/prod/index.html.twig + web/prod/index.html.twig web/prod/toolbar.html.twig @@ -10899,7 +10828,7 @@ Si vous recevez cet e-mail sans l'avoir sollicité, merci de l'ignorer ou de le phraseanet::type:: reportages Reportages - web/prod/index.html.twig + web/prod/index.html.twig phraseanet::type:: videos @@ -10915,16 +10844,6 @@ Si vous recevez cet e-mail sans l'avoir sollicité, merci de l'ignorer ou de le phraseanet::utilisateurs Utilisateurs module/report/filter.php - Controller/Report/RootController.php - - - phrseanet:: sous definition - Sous-définition - Controller/Report/RootController.php - Controller/Report/InformationController.php - Controller/Report/InformationController.php - Controller/Report/InformationController.php - Controller/Report/InformationController.php preview @@ -10934,17 +10853,17 @@ Si vous recevez cet e-mail sans l'avoir sollicité, merci de l'ignorer ou de le preview:: Description Notice - web/prod/index.html.twig + web/prod/index.html.twig preview:: Historique Historique - web/prod/index.html.twig + web/prod/index.html.twig preview:: Popularite Popularité - web/prod/index.html.twig + web/prod/index.html.twig preview:: arreter le diaporama @@ -11065,15 +10984,15 @@ Si vous recevez cet e-mail sans l'avoir sollicité, merci de l'ignorer ou de le Vous ne possédez pas les autorisations d'accès requises sur les documents pour effectuer cette action. Controller/Prod/MoveCollectionController.php - + prod::advancesearch:tooltips:datefield_restriction_explanation - prod::advancesearch:tooltips:datefield_restriction_explanation - web/prod/index.html.twig + Limiter l'affichage des résultats à des dates + web/prod/index.html.twig prod::advancesearch:tooltips:field_restriction_explanation prod::advancesearch:tooltips:field_restriction_explanation - web/prod/index.html.twig + web/prod/index.html.twig prod::collection deplacer egalement les documents rattaches a ce(s) regroupement(s) @@ -11193,17 +11112,17 @@ Si vous recevez cet e-mail sans l'avoir sollicité, merci de l'ignorer ou de le prod::facet:base_label Bases - SearchEngine/Elastic/ElasticsearchOptions.php + SearchEngine/Elastic/ElasticsearchOptions.php prod::facet:collection_label Collections - SearchEngine/Elastic/ElasticsearchOptions.php + SearchEngine/Elastic/ElasticsearchOptions.php prod::facet:doctype_label Types de documents - SearchEngine/Elastic/ElasticsearchOptions.php + SearchEngine/Elastic/ElasticsearchOptions.php prod::recherche: Attention : la liste des bases selectionnees pour la recherche a ete changee. @@ -11505,12 +11424,12 @@ Si vous recevez cet e-mail sans l'avoir sollicité, merci de l'ignorer ou de le raccourci :: a propos des raccourcis claviers A propos des raccourcis clavier - web/prod/index.html.twig + web/prod/index.html.twig raccourcis :: ne plus montrer cette aide Ne plus montrer cette aide - web/prod/index.html.twig + web/prod/index.html.twig rafraichir @@ -11524,7 +11443,7 @@ Si vous recevez cet e-mail sans l'avoir sollicité, merci de l'ignorer ou de le rechercher dans tous les champs Tous les champs - web/prod/index.html.twig + web/prod/index.html.twig recordtype @@ -11584,17 +11503,17 @@ Si vous recevez cet e-mail sans l'avoir sollicité, merci de l'ignorer ou de le reponses:: images par pages : Résultats par page - 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 Vignettes - web/prod/index.html.twig + web/prod/index.html.twig reponses:: partager @@ -11614,115 +11533,55 @@ Si vous recevez cet e-mail sans l'avoir sollicité, merci de l'ignorer ou de le reponses:: taille des images : Taille des vignettes - web/prod/index.html.twig + web/prod/index.html.twig reponses::document sans titre Sans titre - classes/record/adapter.php - - - report :: aucun resultat trouve - Aucun résultat trouvé - web/report/generate_tab.html.twig - - - report :: configurer le tableau - Configurer le tableau - web/report/generate_tab.html.twig - - - report :: filtrer - Filtrer - web/report/generate_tab.html.twig - - - report :: grouper - Grouper - web/report/generate_tab.html.twig - - - report :: imprimer le tableau - Imprimer le tableau - web/report/generate_tab.html.twig - - - report:: (connexions) Globales - Toutes les connexions - web/report/report_layout_child.html.twig - - - report:: (connexions) OS et navigateurs - Plateformes et navigateurs - web/report/report_layout_child.html.twig - - - report:: (connexions) Par utilisateurs - Groupé par utilisateurs - web/report/report_layout_child.html.twig - - - report:: (telechargement) Global - Tous les téléchargements - web/report/report_layout_child.html.twig - - - report:: (telechargement) Par documents sur la base - Par document, sur la base - web/report/report_layout_child.html.twig - - - report:: (telechargement) Par jours base par base - Par Jour - web/report/report_layout_child.html.twig + classes/record/adapter.php report:: 1 - Periode 1 - Période - web/report/form_date_and_base.html.twig + web/report/form_date_and_base.html.twig - - report:: 2 - Bases - 2 - Bases - web/report/form_date_and_base.html.twig + + report:: 2 - Base + report:: 2 - Base + web/report/form_date_and_base.html.twig + + + report:: 3 - Collections + report:: 3 - Collections + web/report/form_date_and_base.html.twig report:: 3 - Type de report 3 - Type de report - web/report/report_layout_child.html.twig - web/report/report_layout_child.html.twig - web/report/report_layout_child.html.twig + web/report/report_layout_child.html.twig + web/report/report_layout_child.html.twig + + + report:: 4 - Fields + report:: 4 - Fields + web/report/report_layout_child.html.twig report:: Au (date) Au - web/report/form_date_and_base.html.twig - web/report/ajax_report_dashboard.html.twig + web/report/form_date_and_base.html.twig report:: Connexion Connexions classes/module/report.php - web/report/report_layout.html.twig - web/report/ajax_data_content.html.twig - web/report/ajax_data_content.html.twig - web/report/all_content.html.twig - web/report/ajax_dashboard_content_child.html.twig - web/report/ajax_dashboard_content_child.html.twig - web/report/chart.html.twig - web/report/chart.html.twig + web/report/report_layout.html.twig + web/report/all_content.html.twig - - - Téléchargements et connexions - web/report/ajax_dashboard_content_child.html.twig - - - report:: Dashboard - Tableau de bord - web/report/report_layout.html.twig - web/report/ajax_dashboard_content.html.twig - web/report/ajax_report_dashboard.html.twig + + report:: Databox content + report:: Databox content + web/report/report_layout.html.twig report:: Detail des connexions @@ -11737,30 +11596,17 @@ Si vous recevez cet e-mail sans l'avoir sollicité, merci de l'ignorer ou de le report:: Du (date) Du - web/report/form_date_and_base.html.twig - web/report/ajax_report_dashboard.html.twig - - - report:: Enlever le filtre - Enlever le filtre - web/report/colFilter.html.twig - - - report:: Grouper par - Grouper par - web/report/report_layout_child.html.twig - web/report/report_layout_child.html.twig + web/report/form_date_and_base.html.twig report:: Heures Heures - web/report/all_content.html.twig + web/report/all_content.html.twig report:: IP IP module/report/filter.php - Controller/Report/RootController.php report:: Information sur l'enregistrement numero %number% @@ -11782,97 +11628,37 @@ Si vous recevez cet e-mail sans l'avoir sollicité, merci de l'ignorer ou de le Information sur les utilisateurs correspondant à %critere% module/report/nav.php - - report:: Les questions les plus posees - Questions les plus posées - web/report/report_layout_child.html.twig - web/report/ajax_dashboard_content_child.html.twig + + report:: Phraseanet report + report:: Phraseanet report + web/report/report_layout.html.twig report:: Plateforme Plateforme module/report/nav.php - - report:: Utilisateurs les plus actifs - Utilisateurs les plus actifs - web/report/ajax_dashboard_content_child.html.twig - web/report/ajax_dashboard_content_child.html.twig - web/report/ajax_dashboard_content_child.html.twig - web/report/ajax_dashboard_content_child.html.twig - - - report:: Volumetrie des questions posees sur %home_title% - Volumétrie des questions posées sur %home_title% - web/report/dashboard_macro.html.twig - report:: activite Activité classes/module/report.php - Controller/Report/RootController.php - Controller/Report/RootController.php - Controller/Report/InformationController.php - web/report/report_layout_child.html.twig - web/report/report_layout_child.html.twig - - - report:: activite document ajoute - Documents ajoutés - web/report/ajax_dashboard_content_child.html.twig - - - report:: activite document edite - Documents édités - web/report/ajax_dashboard_content_child.html.twig - - - report:: activite du site - Activité du site - web/report/report_layout_child.html.twig - web/report/report_layout.html.twig report:: activite par heure Activité par heure (moyenne) module/report/activity.php - web/report/ajax_dashboard_content_child.html.twig - - - report:: activite par jour - Activité par jour - web/report/ajax_dashboard_content_child.html.twig - web/report/chart.html.twig - web/report/chart.html.twig - - - report:: adresse - Adresse - Controller/Report/InformationController.php - Controller/Report/InformationController.php - - - report:: ajoute - Ajouté - web/report/report_layout_child.html.twig report:: collections Collections module/report/filter.php classes/module/report.php - Controller/Report/RootController.php - Controller/Report/InformationController.php - Controller/Report/InformationController.php report:: commentaire Commentaire module/report/filter.php classes/module/report.php - Controller/Report/RootController.php - Controller/Report/InformationController.php - Controller/Report/InformationController.php report:: copyright @@ -11885,160 +11671,52 @@ Si vous recevez cet e-mail sans l'avoir sollicité, merci de l'ignorer ou de le module/report/filter.php classes/module/report.php classes/module/report.php - Controller/Report/RootController.php - Controller/Report/RootController.php - Controller/Report/RootController.php - Controller/Report/InformationController.php - Controller/Report/InformationController.php - Controller/Report/InformationController.php - Controller/Report/InformationController.php - Controller/Report/InformationController.php - Controller/Report/InformationController.php - - - report:: document - Documents - Controller/Report/InformationController.php - Controller/Report/InformationController.php - Controller/Report/ActivityController.php - web/report/report_layout_child.html.twig - web/report/ajax_dashboard_content_child.html.twig report:: document ajoute Documents ajoutés module/report/add.php - - report:: documents les plus telecharges - Documents les plus téléchargés - web/report/ajax_dashboard_content_child.html.twig - - - report:: edite - Edité - web/report/report_layout_child.html.twig - report:: edited documents Documents édités module/report/edit.php - - report:: email - E-mail - Controller/Report/InformationController.php - Controller/Report/InformationController.php - report:: fichier Fichier classes/module/report.php - Controller/Report/RootController.php report:: fonction Fonction classes/module/report.php - Controller/Report/RootController.php - Controller/Report/RootController.php - Controller/Report/InformationController.php - web/report/report_layout_child.html.twig - web/report/report_layout_child.html.twig - - - report:: historique des connexions - Historique des connexions - Controller/Report/InformationController.php - - - report:: historique des questions - Historique des questions - Controller/Report/InformationController.php - - - report:: historique des telechargements - Historique des téléchargements - Controller/Report/InformationController.php - Controller/Report/InformationController.php - - - report:: identifiant - Identifiant - Controller/Report/InformationController.php - Controller/Report/InformationController.php report:: jour Jour - Controller/Report/ActivityController.php - web/report/all_content.html.twig - - - report:: module - Module - Controller/Report/RootController.php + web/report/all_content.html.twig report:: modules Modules module/report/nav.php module/report/filter.php - Controller/Report/RootController.php - Controller/Report/InformationController.php report:: navigateur Navigateur module/report/nav.php - Controller/Report/RootController.php report:: navigateurs et plateforme Navigateurs et Plateformes module/report/nav.php - Controller/Report/RootController.php - - - report:: nom - Nom - Controller/Report/InformationController.php - Controller/Report/InformationController.php report:: nombre Nombre classes/module/report.php - Controller/Report/RootController.php - Controller/Report/RootController.php - Controller/Report/RootController.php - Controller/Report/RootController.php - Controller/Report/RootController.php - Controller/Report/InformationController.php - Controller/Report/InformationController.php - Controller/Report/ActivityController.php - Controller/Report/ActivityController.php - - - report:: nombre de documents - Nombre de documents - Controller/Report/ActivityController.php - - - report:: nombre de preview - Nombre de sous-définitions - Controller/Report/ActivityController.php - - - report:: nombre de reponses - Nombre de réponses - Controller/Report/ActivityController.php - Controller/Report/ActivityController.php - - - report:: nombre de vue - Nombre de vues - web/report/ajax_dashboard_content_child.html.twig report:: non-renseigne @@ -12058,8 +11736,6 @@ Si vous recevez cet e-mail sans l'avoir sollicité, merci de l'ignorer ou de le module/report/validate.php module/report/edit.php module/report/sent.php - web/report/colFilter.html.twig - web/report/colFilter.html.twig report:: page d'accueil @@ -12073,68 +11749,15 @@ Si vous recevez cet e-mail sans l'avoir sollicité, merci de l'ignorer ou de le par %user_infos% prod/preview/short_history.html.twig - - report:: par utilisateurs - Par utilisateur - web/report/report_layout_child.html.twig - report:: pays Pays classes/module/report.php - Controller/Report/RootController.php - Controller/Report/RootController.php - Controller/Report/InformationController.php - web/report/report_layout_child.html.twig - web/report/report_layout_child.html.twig - - - report:: plateforme - Plateforme - Controller/Report/RootController.php - - - report:: poids - Poids - Controller/Report/InformationController.php - Controller/Report/InformationController.php - - - report:: poids document - Poids des documents téléchargés - web/report/ajax_dashboard_content_child.html.twig - - - report:: poids preview - Poids des sous-définitions téléchargées - web/report/ajax_dashboard_content_child.html.twig - web/report/ajax_dashboard_content_child.html.twig report:: pourcentage Pourcentage classes/module/report.php - Controller/Report/RootController.php - Controller/Report/RootController.php - Controller/Report/RootController.php - Controller/Report/RootController.php - Controller/Report/RootController.php - - - report:: preview - Sous-définitions - Controller/Report/ActivityController.php - web/report/ajax_dashboard_content_child.html.twig - - - report:: preview les plus telecharges - Sous-définitions les plus téléchargées - web/report/ajax_dashboard_content_child.html.twig - - - report:: pushe - Poussé - web/report/report_layout_child.html.twig report:: pushed documents @@ -12147,12 +11770,6 @@ Si vous recevez cet e-mail sans l'avoir sollicité, merci de l'ignorer ou de le module/report/question.php module/report/filter.php classes/module/report.php - Controller/Report/RootController.php - Controller/Report/InformationController.php - Controller/Report/ActivityController.php - Controller/Report/ActivityController.php - web/report/ajax_dashboard_content_child.html.twig - web/report/ajax_dashboard_content_child.html.twig report:: questions @@ -12168,55 +11785,27 @@ Si vous recevez cet e-mail sans l'avoir sollicité, merci de l'ignorer ou de le report:: questions sans reponses Questions sans réponses module/report/activity.php - web/report/report_layout_child.html.twig report:: record id recordId module/report/filter.php classes/module/report.php - Controller/Report/RootController.php - Controller/Report/RootController.php - Controller/Report/InformationController.php - Controller/Report/InformationController.php - Controller/Report/InformationController.php - - - report:: recordid - recordId - web/report/report_layout_child.html.twig report:: resolution Définition module/report/nav.php - Controller/Report/RootController.php - - - report:: site - Site - web/report/ajax_dashboard_content_child.html.twig - - - report:: site d'ou les photo sont les plus consultees - Site d'où les documents sont les plus consultés (Référent) - web/report/ajax_dashboard_content_child.html.twig report:: societe Société classes/module/report.php - Controller/Report/RootController.php - Controller/Report/RootController.php - Controller/Report/InformationController.php - web/report/report_layout_child.html.twig - web/report/report_layout_child.html.twig report:: taille Taille classes/module/report.php - Controller/Report/RootController.php report:: telechargement @@ -12227,54 +11816,17 @@ Si vous recevez cet e-mail sans l'avoir sollicité, merci de l'ignorer ou de le report:: telechargements Téléchargements module/report/download.php - Controller/Report/RootController.php - web/report/report_layout.html.twig - web/report/ajax_dashboard_content_child.html.twig - web/report/ajax_dashboard_content_child.html.twig - web/report/ajax_dashboard_content_child.html.twig - - - report:: telechargements document - Documents téléchargés - web/report/ajax_dashboard_content_child.html.twig + web/report/report_layout.html.twig report:: telechargements par jour Téléchargements par jour module/report/activity.php - - report:: telechargements preview - Sous-définitions téléchargées - web/report/ajax_dashboard_content_child.html.twig - - - report:: telephone - Téléphone - Controller/Report/InformationController.php - Controller/Report/InformationController.php - - - report:: titre - Titre - Controller/Report/InformationController.php - Controller/Report/InformationController.php - - - report:: total des telechargements - Total des téléchargements - Controller/Report/ActivityController.php - - - report:: toutes les questions - Historique des questions - web/report/report_layout_child.html.twig - report:: type Définition classes/module/report.php - Controller/Report/RootController.php report:: type d'action @@ -12285,31 +11837,12 @@ Si vous recevez cet e-mail sans l'avoir sollicité, merci de l'ignorer ou de le report:: utilisateur Utilisateur classes/module/report.php - Controller/Report/RootController.php - Controller/Report/InformationController.php - Controller/Report/ActivityController.php - - - report:: utilisateurs - Utilisateurs - Controller/Report/RootController.php - Controller/Report/InformationController.php - web/report/ajax_dashboard_content_child.html.twig - web/report/ajax_dashboard_content_child.html.twig - web/report/ajax_dashboard_content_child.html.twig - web/report/ajax_dashboard_content_child.html.twig - web/report/ajax_dashboard_content_child.html.twig report:: validated documents Documents validés module/report/validate.php - - report:: valide - Validé - web/report/report_layout_child.html.twig - report:: visualiseur cooliris Visualiseur Cooliris @@ -12322,11 +11855,6 @@ Si vous recevez cet e-mail sans l'avoir sollicité, merci de l'ignorer ou de le Changement de collection vers : %coll_name% prod/preview/short_history.html.twig - - report::Connexion - Connexions - web/report/ajax_dashboard_content_child.html.twig - report::Connexions Connexions @@ -12350,8 +11878,7 @@ Si vous recevez cet e-mail sans l'avoir sollicité, merci de l'ignorer ou de le report::Heures Heures - web/report/ajax_data_content.html.twig - web/report/all_content.html.twig + web/report/all_content.html.twig report::Impression des formats : %format% @@ -12366,17 +11893,17 @@ Si vous recevez cet e-mail sans l'avoir sollicité, merci de l'ignorer ou de le report::Nombre de connexions Nombre de connexions - web/report/all_content.html.twig + web/report/all_content.html.twig report::Nombre de document ajoute Nombre de documents ajoutés - web/report/all_content.html.twig + web/report/all_content.html.twig report::Nombre de document edite Nombre de documents édités - web/report/all_content.html.twig + web/report/all_content.html.twig report::Publication de %dest% @@ -12413,51 +11940,32 @@ Si vous recevez cet e-mail sans l'avoir sollicité, merci de l'ignorer ou de le report::activite Activité module/report/filter.php - Controller/Report/RootController.php report::ajout du documentt Ajout du document prod/preview/short_history.html.twig - - report::aucune precision - Aucun filtre - web/report/report_layout_child.html.twig - report::fonction Fonction module/report/filter.php - Controller/Report/RootController.php - - - report::la description contient - la description contient - web/report/report_layout_child.html.twig report::pays Pays module/report/filter.php - Controller/Report/RootController.php report::societe Société module/report/filter.php - Controller/Report/RootController.php report::supression du document Suppression du document prod/preview/short_history.html.twig - - report::version - Version - Controller/Report/InformationController.php - reportage Reportage @@ -13376,17 +12884,6 @@ Si vous recevez cet e-mail sans l'avoir sollicité, merci de l'ignorer ou de le actions/Tools/index.html.twig actions/Tools/videoEditor.html.twig - - to - to - web/report/report_layout_child.html.twig - web/report/report_layout_child.html.twig - - - tout decocher - Tout décocher - web/report/listColumn.html.twig - tout le monde Tout le monde @@ -13486,7 +12983,7 @@ Si vous recevez cet e-mail sans l'avoir sollicité, merci de l'ignorer ou de le veuillez choisir au minimum une collection Veuillez choisir au moins une collection - web/report/all_content.html.twig + web/report/all_content.html.twig video diff --git a/resources/locales/messages.nl.xlf b/resources/locales/messages.nl.xlf index f41a46e884..91dd2b0b8d 100644 --- a/resources/locales/messages.nl.xlf +++ b/resources/locales/messages.nl.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. @@ -293,11 +293,6 @@ %total% reponses Controller/Prod/QueryController.php - - %total_count% results - %total_count% resultaten - web/report/generate_tab.html.twig - %user% a envoye son rapport de validation de %title% %user% a envoye son rapport de validation de %title% @@ -413,7 +408,6 @@ 1 resultaat WorkZone/Browser/Results.html.twig WorkZone/Browser/Results.html.twig - web/report/generate_tab.html.twig 10 tags maximum @@ -534,7 +528,7 @@ API Webhook API Webhook - TaskManager/Job/WebhookJob.php + TaskManager/Job/WebhookJob.php AR @@ -761,7 +755,7 @@ Advanced Search Geavanceerd zoeken - web/prod/index.html.twig + web/prod/index.html.twig Advanced mode @@ -776,37 +770,37 @@ Affichage Tonen - web/prod/index.html.twig + web/prod/index.html.twig Affichage au demarrage Tonen bij opstart - web/prod/index.html.twig + web/prod/index.html.twig Afficher la fiche descriptive De beschrijvingsfiche tonen - web/prod/index.html.twig + web/prod/index.html.twig Afficher le titre De titel tonen - web/prod/index.html.twig + web/prod/index.html.twig Afficher les status De statussen tonen - web/prod/index.html.twig + web/prod/index.html.twig Afficher une icone Pictogram tonen - web/prod/index.html.twig + web/prod/index.html.twig After metadata After metadata - web/prod/index.html.twig + web/prod/index.html.twig Aggregation @@ -816,7 +810,7 @@ Aide Help - web/prod/index.html.twig + web/prod/index.html.twig Aide sur les expressions regulieres @@ -867,7 +861,7 @@ All these conditions All these conditions - web/prod/index.html.twig + web/prod/index.html.twig All values @@ -937,14 +931,14 @@ Alphabetic asc Alphabetic asc - 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 Alphabetic desc Alphabetic desc - web/prod/index.html.twig + web/prod/index.html.twig Also delete records that rely on groupings. @@ -1061,7 +1055,7 @@ Aperture Diafragma - SearchEngine/Elastic/ElasticsearchOptions.php + SearchEngine/Elastic/ElasticsearchOptions.php web/common/technical_datas.html.twig @@ -1257,7 +1251,7 @@ Audio Audio - web/prod/index.html.twig + web/prod/index.html.twig Audio Birate @@ -1273,12 +1267,12 @@ Audio Samplerate Audio Samplerate - SearchEngine/Elastic/ElasticsearchOptions.php + SearchEngine/Elastic/ElasticsearchOptions.php Audio codec Audio codec - SearchEngine/Elastic/ElasticsearchOptions.php + SearchEngine/Elastic/ElasticsearchOptions.php AudioSamplerate @@ -1506,9 +1500,9 @@ Browse Baskets Mandjes doorbladeren - 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 Browser @@ -1536,22 +1530,17 @@ By field By field - web/prod/index.html.twig + web/prod/index.html.twig CHAMPS VELDEN web/admin/tree.html.twig - - CSV export - CSV export - web/report/generate_tab.html.twig - Camera Model Cameramodel - SearchEngine/Elastic/ElasticsearchOptions.php + SearchEngine/Elastic/ElasticsearchOptions.php web/common/technical_datas.html.twig @@ -1795,11 +1784,6 @@ Verberg de hele kolom web/admin/index.html.twig - - Cochez les cases correspondantes aux colonnes que vous desirez voire apparaitre dans le report - Schakel de selectievakjes die overeenkomen met de kolommen die u wilt of zelfs opgenomen zijn het rapport uit - web/report/listColumn.html.twig - Code d'acces Toegangs code @@ -1837,7 +1821,7 @@ Collection order Collection order - web/prod/index.html.twig + web/prod/index.html.twig Color Depth @@ -1852,7 +1836,7 @@ Colorspace Colorspace - SearchEngine/Elastic/ElasticsearchOptions.php + SearchEngine/Elastic/ElasticsearchOptions.php Commande @@ -1908,7 +1892,7 @@ Configuration Configuratie - web/prod/index.html.twig + web/prod/index.html.twig Confirm new email address @@ -1964,7 +1948,7 @@ Contains Contains - web/prod/index.html.twig + web/prod/index.html.twig Continuer ? @@ -2019,7 +2003,7 @@ Couleur de selection Kleur van de selectie - web/prod/index.html.twig + web/prod/index.html.twig Country @@ -2233,7 +2217,7 @@ Date Added Date Added - web/prod/index.html.twig + web/prod/index.html.twig Date Creation @@ -2243,7 +2227,7 @@ Date Updated Date Updated - web/prod/index.html.twig + web/prod/index.html.twig Date de connexion @@ -2272,7 +2256,7 @@ Date(s) from field(s) Date(s) from field(s) - web/prod/index.html.twig + web/prod/index.html.twig De @@ -2350,7 +2334,7 @@ Defined by admin Defined by admin - web/prod/index.html.twig + web/prod/index.html.twig Defined in Apache configuration @@ -2464,7 +2448,8 @@ Alles deselecteren actions/Feedback/list.html.twig prod/actions/Push.html.twig - web/report/form_date_and_base.html.twig + web/report/report_layout_child.html.twig + web/report/form_date_and_base.html.twig Design of personalization logo section @@ -2522,7 +2507,7 @@ Display technical data Display technical data - web/prod/index.html.twig + web/prod/index.html.twig Display thumbnails @@ -2532,7 +2517,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 @@ -2564,7 +2549,7 @@ Document Document - web/prod/index.html.twig + web/prod/index.html.twig Document Type Sharing @@ -2985,7 +2970,7 @@ Equals Equals - web/prod/index.html.twig + web/prod/index.html.twig Erreur @@ -3051,9 +3036,9 @@ Erreur lors de la tentative ; errreur : %message% Erreur lors de la tentative ; errreur : %message% - Core/Database/DatabaseMaintenanceService.php - Core/Database/DatabaseMaintenanceService.php - Core/Database/DatabaseMaintenanceService.php + Core/Database/DatabaseMaintenanceService.php + Core/Database/DatabaseMaintenanceService.php + Core/Database/DatabaseMaintenanceService.php Erreur lors de votre authentification @@ -3128,7 +3113,7 @@ Ex : Paris, bleu, montagne Ex : Paris, bleu, montagne - web/prod/index.html.twig + web/prod/index.html.twig Executables externes @@ -3291,11 +3276,6 @@ Filter web/admin/users.html.twig - - Filtrer - Filteren - web/report/generate_tab.html.twig - First Name Voornaam @@ -3316,13 +3296,13 @@ Flash Flash - web/prod/index.html.twig + web/prod/index.html.twig web/common/technical_datas.html.twig FlashFired FlashFired - SearchEngine/Elastic/ElasticsearchOptions.php + SearchEngine/Elastic/ElasticsearchOptions.php Flatten layers @@ -3381,7 +3361,7 @@ FrameRate FrameRate - SearchEngine/Elastic/ElasticsearchOptions.php + SearchEngine/Elastic/ElasticsearchOptions.php Frequence d'echantillonage @@ -3413,16 +3393,6 @@ Algemene instellingen web/admin/dashboard.html.twig - - Generate - Generate - web/report/report_layout_child.html.twig - - - Generate dashboard - Generate dashboard - web/report/report_layout_child.html.twig - Generates a flexpaper flash file Genereerd een flexpaper flash file @@ -3457,7 +3427,7 @@ Geo Search Geo Search - web/prod/index.html.twig + web/prod/index.html.twig Geonames server address @@ -3532,24 +3502,13 @@ Graphiste (preview au rollover) Graficus (preview au rollover) - web/prod/index.html.twig + web/prod/index.html.twig Great Uitstekend Controller/Root/LoginController.php - - Groupement des resultats sur le champ %name% - Groupement des resultats sur le champ %name% - Controller/Report/RootController.php - Controller/Report/ActivityController.php - - - Grouper - Groeperen - web/report/generate_tab.html.twig - Groupez 2 ou plusieurs mots avec des guillemets: "Michael Jackson" Groupez 2 ou plusieurs mots avec des guillemets: "Michael Jackson" @@ -3631,7 +3590,7 @@ ISO ISO - SearchEngine/Elastic/ElasticsearchOptions.php + SearchEngine/Elastic/ElasticsearchOptions.php ISO sensibility @@ -3641,7 +3600,7 @@ Iconographe (description au rollover) Iconographe (beschrijving bij de rollover) - web/prod/index.html.twig + web/prod/index.html.twig Id @@ -3686,7 +3645,7 @@ Image Beeld - web/prod/index.html.twig + web/prod/index.html.twig ImageMagick @@ -3712,7 +3671,7 @@ In the answer grid In the answer grid - web/prod/index.html.twig + web/prod/index.html.twig Include Business-fields in caption @@ -3936,7 +3895,7 @@ Language Language - web/prod/index.html.twig + web/prod/index.html.twig Last Name @@ -4073,7 +4032,7 @@ Les termes apparaissent dans le(s) champs De termen verschijnen in de veld(en) - web/prod/index.html.twig + web/prod/index.html.twig Light Value @@ -4197,7 +4156,7 @@ Ma derniere question Mijn laatste vraag - web/prod/index.html.twig + web/prod/index.html.twig Mail line %line% is empty @@ -4303,7 +4262,7 @@ MimeType MimeType - SearchEngine/Elastic/ElasticsearchOptions.php + SearchEngine/Elastic/ElasticsearchOptions.php Minimum number of letters before truncation @@ -4354,7 +4313,7 @@ Mode de presentation Presentatie mode - web/prod/index.html.twig + web/prod/index.html.twig Modele de donnees @@ -4585,6 +4544,11 @@ WorkZone/Browser/Results.html.twig WorkZone/Browser/Results.html.twig + + No thesaurus concept query + No thesaurus concept query + prod/results/infos.html.twig + No users selected Geen gebruikers geselecteerd @@ -4678,7 +4642,7 @@ Notify third party application when an event occurs in Phraseanet Notify third party application when an event occurs in Phraseanet - TaskManager/Job/WebhookJob.php + TaskManager/Job/WebhookJob.php Notify users about this publication @@ -4767,7 +4731,7 @@ One of these conditions One of these conditions - web/prod/index.html.twig + web/prod/index.html.twig Only %nbEditableDocuments% records can be modified. @@ -4825,7 +4789,7 @@ Orientation Orientation - SearchEngine/Elastic/ElasticsearchOptions.php + SearchEngine/Elastic/ElasticsearchOptions.php Original name @@ -5109,10 +5073,10 @@ Preferences Voorkeuren - 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 + web/prod/index.html.twig Prefix for notification emails @@ -5127,12 +5091,12 @@ Presentation de vignettes Presentatie van de thumbnails - web/prod/index.html.twig + web/prod/index.html.twig Presentation de vignettes de panier Presentatie van de thumbnails in het mandje - web/prod/index.html.twig + web/prod/index.html.twig Presets @@ -5185,7 +5149,7 @@ Publications Publicaties - web/prod/index.html.twig + web/prod/index.html.twig admin/publications/wrapper.html.twig web/admin/tree.html.twig web/common/menubar.html.twig @@ -5297,80 +5261,80 @@ Raccourcis claviers de la zone des paniers : Sneltoetsen in de mandjes zone : - web/prod/index.html.twig + web/prod/index.html.twig Raccourcis claviers en cours de editing : Sneltoetsen tijdens het bewerken : - web/prod/index.html.twig + web/prod/index.html.twig Raccourcis claviers en cours de preview : Sneltoetsen tijdens de voorvertoning : - web/prod/index.html.twig + web/prod/index.html.twig Raccourcis claviers en cours de recherche : Sneltoetsen tijdens het zoeken : - web/prod/index.html.twig + web/prod/index.html.twig Raccourcis:: ctrl-a : tout selectionner ctrl-a : alles selecteren - 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 : bewerk de selectie - 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 de selectie - 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 espace : start/stop de slideshow - web/prod/index.html.twig + web/prod/index.html.twig Raccourcis::fleche bas : scroll vertical pijl onder : verticale scroll - web/prod/index.html.twig + web/prod/index.html.twig Raccourcis::fleche droite : page suivante pijl rechts : volgende pagina - web/prod/index.html.twig + web/prod/index.html.twig Raccourcis::fleche gauche : en arriere pijl links : achterwaarts - web/prod/index.html.twig + web/prod/index.html.twig Raccourcis::fleche gauche : en avant pijl rechts : voorwaarts - web/prod/index.html.twig + web/prod/index.html.twig Raccourcis::fleche gauche : page precedente pijl links : vorige pagina - web/prod/index.html.twig + web/prod/index.html.twig Raccourcis::fleche haut : scroll vertical pijl boven : verticale scroll - web/prod/index.html.twig + web/prod/index.html.twig Raccourcis::tab/shift-tab se ballade dans les champs tab/shift-tab verspringt tussen de velden - web/prod/index.html.twig + web/prod/index.html.twig Rappel : Il vous reste %number% jours pour valider %title% de %user% @@ -5391,7 +5355,7 @@ Re-initialiser Herinitialiseren prod/Baskets/Reorder.html.twig - web/prod/index.html.twig + web/prod/index.html.twig prod/Story/Reorder.html.twig @@ -5440,11 +5404,6 @@ WorkZone/Browser/Basket.html.twig WorkZone/Browser/Results.html.twig - - Receiver - Ontvanger - Controller/Report/ActivityController.php - Reception d'un rapport de validation Ontvangst van een goedkeuringsrapport @@ -5498,7 +5457,7 @@ Rechercher dans un champ date Zoeken in een datum veld - web/prod/index.html.twig + web/prod/index.html.twig Recommendations @@ -5589,7 +5548,7 @@ Relevance Relevance - web/prod/index.html.twig + web/prod/index.html.twig Remember me @@ -5655,11 +5614,6 @@ Overzicht admin/fields/templates.html.twig - - Report generation may take a long time to generate, depending on the number of collections and the period selected. - Report generation may take a long time to generate, depending on the number of collections and the period selected. - web/report/report_layout_child.html.twig - Request access Aanvraag toegang @@ -5966,7 +5920,7 @@ Select a field Select a field - web/prod/index.html.twig + web/prod/index.html.twig Select a list on the left and edit it ! @@ -5978,7 +5932,8 @@ Alles selecteren actions/Feedback/list.html.twig prod/actions/Push.html.twig - web/report/form_date_and_base.html.twig + web/report/report_layout_child.html.twig + web/report/form_date_and_base.html.twig Select all collections @@ -6000,7 +5955,7 @@ Selected base(s) Selected base(s) - web/prod/index.html.twig + web/prod/index.html.twig Selected files @@ -6035,11 +5990,6 @@ Verstuur naar Twitter prod/Share/record.html.twig - - Sent - Verstuurd - web/report/report_layout_child.html.twig - Sent documents (mail) Verstuurde documenten (mail) @@ -6132,7 +6082,7 @@ Shutter speed Sluitersnelheid - SearchEngine/Elastic/ElasticsearchOptions.php + SearchEngine/Elastic/ElasticsearchOptions.php web/common/technical_datas.html.twig @@ -6275,7 +6225,7 @@ Status des documents a rechercher Status van de te zoeken documenten - web/prod/index.html.twig + web/prod/index.html.twig Status edition @@ -6693,7 +6643,7 @@ Theme Thema - web/prod/index.html.twig + web/prod/index.html.twig There is no one to validate orders, please contact an administrator @@ -6865,7 +6815,7 @@ Tout type Alle type - web/prod/index.html.twig + web/prod/index.html.twig Toutes les publications @@ -6888,16 +6838,10 @@ prod/upload/upload-flash.html.twig prod/upload/upload.html.twig - - Trier - Sorteren - web/report/generate_tab.html.twig - web/report/generate_tab.html.twig - Trier par Sorteren op - web/prod/index.html.twig + web/prod/index.html.twig Try to extract embedded thumbnails @@ -6922,7 +6866,7 @@ Type de documents Type van de documenten - web/prod/index.html.twig + web/prod/index.html.twig Type nombre @@ -7045,7 +6989,7 @@ Une question personnelle Een persoonlijke vraag - web/prod/index.html.twig + web/prod/index.html.twig Une selection @@ -7157,7 +7101,7 @@ Use latest search settings on Production loading Use latest search settings on Production loading - web/prod/index.html.twig + web/prod/index.html.twig Use my Phraseanet account @@ -7335,7 +7279,7 @@ Video Video - web/prod/index.html.twig + web/prod/index.html.twig Video Codec @@ -7345,7 +7289,7 @@ Video codec Video codec - SearchEngine/Elastic/ElasticsearchOptions.php + SearchEngine/Elastic/ElasticsearchOptions.php Videos @@ -7537,7 +7481,7 @@ Vous pouvez quitter la plupart des fenetres survolantes via la touche echap U kunt het grootste deel van de bovenliggende vensters sluiten met de escape toets - web/prod/index.html.twig + web/prod/index.html.twig Warning ! @@ -7629,11 +7573,17 @@ Schrijf Metas web/admin/subdefs.html.twig + + YYYY-MM-DD + YYYY-MM-DD + web/report/form_date_and_base.html.twig + web/report/form_date_and_base.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 @@ -7946,7 +7896,7 @@ action : bridge Bridge - web/prod/index.html.twig + web/prod/index.html.twig action : collection @@ -7968,7 +7918,7 @@ Exporteer prod/WorkZone/Story.html.twig prod/WorkZone/Basket.html.twig - web/prod/index.html.twig + web/prod/index.html.twig prod/results/record.html.twig web/prod/toolbar.html.twig prod/preview/tools.html.twig @@ -7998,7 +7948,7 @@ Publiceren prod/WorkZone/Story.html.twig prod/WorkZone/Basket.html.twig - web/prod/index.html.twig + web/prod/index.html.twig web/prod/toolbar.html.twig web/prod/toolbar.html.twig @@ -8033,9 +7983,9 @@ action:: nouveau reportage Nieuwe reportage - 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 @@ -9074,12 +9024,12 @@ boutton:: selectionner aucune base Selecteer geen enkele database - web/prod/index.html.twig + web/prod/index.html.twig boutton:: selectionner toutes les bases Selecteer alle databases - web/prod/index.html.twig + web/prod/index.html.twig boutton::ajouter @@ -9120,7 +9070,7 @@ web/common/dialog_export.html.twig web/common/dialog_export.html.twig web/common/dialog_export.html.twig - web/report/all_content.html.twig + web/report/all_content.html.twig web/account/reset-email.html.twig @@ -9200,7 +9150,7 @@ web/thesaurus/export-topics.html.twig web/lightbox/sc_note.html.twig web/common/dialog_export.html.twig - web/report/all_content.html.twig + web/report/all_content.html.twig boutton::generer @@ -9249,7 +9199,7 @@ boutton::rechercher zoeken Controller/Prod/LanguageController.php - web/prod/index.html.twig + web/prod/index.html.twig boutton::refresh @@ -9365,7 +9315,7 @@ Controller/Prod/LanguageController.php prod/Baskets/Reorder.html.twig prod/Baskets/Update.html.twig - web/prod/index.html.twig + web/prod/index.html.twig Bridge/Flickr/photoset_deleteelement.html.twig Bridge/Flickr/photo_moveinto_photoset.html.twig Bridge/Flickr/photo_modify.html.twig @@ -9408,7 +9358,7 @@ admin/statusbit/edit.html.twig web/admin/dashboard.html.twig web/admin/setup.html.twig - web/report/all_content.html.twig + web/report/all_content.html.twig web/account/reset-email.html.twig web/account/account.html.twig web/account/access.html.twig @@ -9510,7 +9460,7 @@ choisir kiezen - web/prod/index.html.twig + web/prod/index.html.twig admin/collection/create.html.twig admin/databox/databox.html.twig @@ -9520,11 +9470,6 @@ web/admin/subdefs.html.twig web/admin/subdefs.html.twig - - cocher tout - alles uitschakelen - web/report/listColumn.html.twig - collection.label.unknown collection.label.unknown @@ -9541,16 +9486,10 @@ prod/orders/order_item.html.twig web/common/dialog_export.html.twig - - configuration - Configuratie - Controller/Report/RootController.php - Controller/Report/ActivityController.php - copyClipboardLabel copyClipboardLabel - prod/results/infos.html.twig + prod/results/infos.html.twig prod/Share/record.html.twig prod/Share/record.html.twig prod/Share/record.html.twig @@ -9800,14 +9739,6 @@ Controller/Prod/ToolsController.php Controller/Prod/ToolsController.php - - filtrer les resultats sur la colonne %colonne% - filtrer les resultats sur la colonne %colonne% - Controller/Report/RootController.php - Controller/Report/InformationController.php - Controller/Report/InformationController.php - Controller/Report/ActivityController.php - flash flash @@ -9877,12 +9808,6 @@ Bewerking correct uitgevoerd admin/databox/databox.html.twig - - from - from - web/report/report_layout_child.html.twig - web/report/report_layout_child.html.twig - help::help-section-bullet: check-spelling help::help-section-bullet: check-spelling @@ -9958,42 +9883,42 @@ 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::advance_search: facet-order index::advance_search: facet-order - web/prod/index.html.twig + web/prod/index.html.twig index::advance_search: facet-tech-order index::advance_search: facet-tech-order - web/prod/index.html.twig + web/prod/index.html.twig index::advance_search: facet-values-order index::advance_search: facet-values-order - web/prod/index.html.twig + web/prod/index.html.twig index::advance_search: hidden-facet-values-order index::advance_search: hidden-facet-values-order - web/prod/index.html.twig + web/prod/index.html.twig index::advance_search: order-by-hits index::advance_search: order-by-hits - 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 + web/prod/index.html.twig invite:: Redirection vers la zone d'authentification, cliquez sur OK pour continuer ou annulez @@ -10596,6 +10521,11 @@ Toon een database die van een verschillende server komt dan die van de programma box web/admin/databases.html.twig + + phraseanet:: Preferences + phraseanet:: Preferences + web/prod/index.html.twig + phraseanet:: Un email vient de vous etre envoye Een email werd u toegestuurd @@ -10713,7 +10643,6 @@ Per definitie module/report/filter.php classes/module/report.php - Controller/Report/RootController.php phraseanet:: thesaurus @@ -10734,17 +10663,17 @@ phraseanet:: tri par date Op datum sorteren - 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/thesaurus/export-topics-dialog.html.twig phraseanet:: tri par nom Op naam sorteren - 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 phraseanet:: user @@ -10877,12 +10806,12 @@ phraseanet::time:: a a - web/prod/index.html.twig + web/prod/index.html.twig phraseanet::time:: de de - web/prod/index.html.twig + web/prod/index.html.twig phraseanet::type:: audios @@ -10892,7 +10821,7 @@ phraseanet::type:: documents Documenten - web/prod/index.html.twig + web/prod/index.html.twig web/prod/toolbar.html.twig @@ -10903,7 +10832,7 @@ phraseanet::type:: reportages Reportages - web/prod/index.html.twig + web/prod/index.html.twig phraseanet::type:: videos @@ -10919,16 +10848,6 @@ phraseanet::utilisateurs Gebruikers module/report/filter.php - Controller/Report/RootController.php - - - phrseanet:: sous definition - Per definitie - Controller/Report/RootController.php - Controller/Report/InformationController.php - Controller/Report/InformationController.php - Controller/Report/InformationController.php - Controller/Report/InformationController.php preview @@ -10938,17 +10857,17 @@ preview:: Description Beschrijving - 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 Populariteit - web/prod/index.html.twig + web/prod/index.html.twig preview:: arreter le diaporama @@ -11072,12 +10991,12 @@ prod::advancesearch:tooltips:datefield_restriction_explanation prod::advancesearch:tooltips:datefield_restriction_explanation - web/prod/index.html.twig + web/prod/index.html.twig prod::advancesearch:tooltips:field_restriction_explanation prod::advancesearch:tooltips:field_restriction_explanation - web/prod/index.html.twig + web/prod/index.html.twig prod::collection deplacer egalement les documents rattaches a ce(s) regroupement(s) @@ -11197,17 +11116,17 @@ prod::facet:base_label prod::facet:base_label - SearchEngine/Elastic/ElasticsearchOptions.php + SearchEngine/Elastic/ElasticsearchOptions.php prod::facet:collection_label prod::facet:collection_label - SearchEngine/Elastic/ElasticsearchOptions.php + SearchEngine/Elastic/ElasticsearchOptions.php prod::facet:doctype_label prod::facet:doctype_label - SearchEngine/Elastic/ElasticsearchOptions.php + SearchEngine/Elastic/ElasticsearchOptions.php prod::recherche: Attention : la liste des bases selectionnees pour la recherche a ete changee. @@ -11509,12 +11428,12 @@ raccourci :: a propos des raccourcis claviers Over toetsenbord sneltoetsen - web/prod/index.html.twig + web/prod/index.html.twig raccourcis :: ne plus montrer cette aide Deze help niet meer tonen - web/prod/index.html.twig + web/prod/index.html.twig rafraichir @@ -11528,7 +11447,7 @@ rechercher dans tous les champs in alle velden zoeken - web/prod/index.html.twig + web/prod/index.html.twig recordtype @@ -11588,17 +11507,17 @@ reponses:: images par pages : Beelden per pagina : - web/prod/index.html.twig + web/prod/index.html.twig reponses:: mode liste Lijst mode - web/prod/index.html.twig + web/prod/index.html.twig reponses:: mode vignettes Thumbnail mode - web/prod/index.html.twig + web/prod/index.html.twig reponses:: partager @@ -11618,115 +11537,55 @@ reponses:: taille des images : Grootte van de beelden : - web/prod/index.html.twig + web/prod/index.html.twig reponses::document sans titre Documenten zonder titel - classes/record/adapter.php - - - report :: aucun resultat trouve - geen enkel resultaat gevonden - web/report/generate_tab.html.twig - - - report :: configurer le tableau - Configureer het paneel - web/report/generate_tab.html.twig - - - report :: filtrer - Filteren - web/report/generate_tab.html.twig - - - report :: grouper - Groeperen - web/report/generate_tab.html.twig - - - report :: imprimer le tableau - Print het panel - web/report/generate_tab.html.twig - - - report:: (connexions) Globales - Globalen - web/report/report_layout_child.html.twig - - - report:: (connexions) OS et navigateurs - OS en browsers - web/report/report_layout_child.html.twig - - - report:: (connexions) Par utilisateurs - Per gebruikers - web/report/report_layout_child.html.twig - - - report:: (telechargement) Global - Algemeen - web/report/report_layout_child.html.twig - - - report:: (telechargement) Par documents sur la base - Per document in database - web/report/report_layout_child.html.twig - - - report:: (telechargement) Par jours base par base - Per dag database per database - web/report/report_layout_child.html.twig + classes/record/adapter.php report:: 1 - Periode 1 - Periode - web/report/form_date_and_base.html.twig + web/report/form_date_and_base.html.twig - - report:: 2 - Bases - 2 - Databases - web/report/form_date_and_base.html.twig + + report:: 2 - Base + report:: 2 - Base + web/report/form_date_and_base.html.twig + + + report:: 3 - Collections + report:: 3 - Collections + web/report/form_date_and_base.html.twig report:: 3 - Type de report 3 - Rapport type - web/report/report_layout_child.html.twig - web/report/report_layout_child.html.twig - web/report/report_layout_child.html.twig + web/report/report_layout_child.html.twig + web/report/report_layout_child.html.twig + + + report:: 4 - Fields + report:: 4 - Fields + web/report/report_layout_child.html.twig report:: Au (date) Au (datum) - web/report/form_date_and_base.html.twig - web/report/ajax_report_dashboard.html.twig + web/report/form_date_and_base.html.twig report:: Connexion Verbinding classes/module/report.php - web/report/report_layout.html.twig - web/report/ajax_data_content.html.twig - web/report/ajax_data_content.html.twig - web/report/all_content.html.twig - web/report/ajax_dashboard_content_child.html.twig - web/report/ajax_dashboard_content_child.html.twig - web/report/chart.html.twig - web/report/chart.html.twig + web/report/report_layout.html.twig + web/report/all_content.html.twig - - - - web/report/ajax_dashboard_content_child.html.twig - - - report:: Dashboard - Dashboard - web/report/report_layout.html.twig - web/report/ajax_dashboard_content.html.twig - web/report/ajax_report_dashboard.html.twig + + report:: Databox content + report:: Databox content + web/report/report_layout.html.twig report:: Detail des connexions @@ -11741,30 +11600,17 @@ report:: Du (date) Du (datum) - web/report/form_date_and_base.html.twig - web/report/ajax_report_dashboard.html.twig - - - report:: Enlever le filtre - De filter verwijderen - web/report/colFilter.html.twig - - - report:: Grouper par - Grouperen per - web/report/report_layout_child.html.twig - web/report/report_layout_child.html.twig + web/report/form_date_and_base.html.twig report:: Heures Uren - web/report/all_content.html.twig + web/report/all_content.html.twig report:: IP IP module/report/filter.php - Controller/Report/RootController.php report:: Information sur l'enregistrement numero %number% @@ -11786,97 +11632,37 @@ report:: Information sur les utilisateurs correspondant a %critere% module/report/nav.php - - report:: Les questions les plus posees - De meest gestelde vragen - web/report/report_layout_child.html.twig - web/report/ajax_dashboard_content_child.html.twig + + report:: Phraseanet report + report:: Phraseanet report + web/report/report_layout.html.twig report:: Plateforme Platform module/report/nav.php - - report:: Utilisateurs les plus actifs - report:: Utilisateurs les plus actifs - web/report/ajax_dashboard_content_child.html.twig - web/report/ajax_dashboard_content_child.html.twig - web/report/ajax_dashboard_content_child.html.twig - web/report/ajax_dashboard_content_child.html.twig - - - report:: Volumetrie des questions posees sur %home_title% - Volumetrie van de vragen over %home_title% - web/report/dashboard_macro.html.twig - report:: activite Activiteit classes/module/report.php - Controller/Report/RootController.php - Controller/Report/RootController.php - Controller/Report/InformationController.php - web/report/report_layout_child.html.twig - web/report/report_layout_child.html.twig - - - report:: activite document ajoute - report:: activite document ajoute - web/report/ajax_dashboard_content_child.html.twig - - - report:: activite document edite - report:: activite document edite - web/report/ajax_dashboard_content_child.html.twig - - - report:: activite du site - Activiteit van de site - web/report/report_layout_child.html.twig - web/report/report_layout.html.twig report:: activite par heure Activitiet per uur module/report/activity.php - web/report/ajax_dashboard_content_child.html.twig - - - report:: activite par jour - Activiteit per dag - web/report/ajax_dashboard_content_child.html.twig - web/report/chart.html.twig - web/report/chart.html.twig - - - report:: adresse - Adres - Controller/Report/InformationController.php - Controller/Report/InformationController.php - - - report:: ajoute - Voeg toe - web/report/report_layout_child.html.twig report:: collections Collecties module/report/filter.php classes/module/report.php - Controller/Report/RootController.php - Controller/Report/InformationController.php - Controller/Report/InformationController.php report:: commentaire Commentaar module/report/filter.php classes/module/report.php - Controller/Report/RootController.php - Controller/Report/InformationController.php - Controller/Report/InformationController.php report:: copyright @@ -11889,160 +11675,52 @@ module/report/filter.php classes/module/report.php classes/module/report.php - Controller/Report/RootController.php - Controller/Report/RootController.php - Controller/Report/RootController.php - Controller/Report/InformationController.php - Controller/Report/InformationController.php - Controller/Report/InformationController.php - Controller/Report/InformationController.php - Controller/Report/InformationController.php - Controller/Report/InformationController.php - - - report:: document - Document - Controller/Report/InformationController.php - Controller/Report/InformationController.php - Controller/Report/ActivityController.php - web/report/report_layout_child.html.twig - web/report/ajax_dashboard_content_child.html.twig report:: document ajoute Document toegevoegd module/report/add.php - - report:: documents les plus telecharges - report:: documents les plus telecharges - web/report/ajax_dashboard_content_child.html.twig - - - report:: edite - Bewerk - web/report/report_layout_child.html.twig - report:: edited documents Bewerkte documenten module/report/edit.php - - report:: email - Email - Controller/Report/InformationController.php - Controller/Report/InformationController.php - report:: fichier Document classes/module/report.php - Controller/Report/RootController.php report:: fonction Functie classes/module/report.php - Controller/Report/RootController.php - Controller/Report/RootController.php - Controller/Report/InformationController.php - web/report/report_layout_child.html.twig - web/report/report_layout_child.html.twig - - - report:: historique des connexions - Historie van de verbindingen - Controller/Report/InformationController.php - - - report:: historique des questions - Historie van de vragen - Controller/Report/InformationController.php - - - report:: historique des telechargements - Historie van de downloads - Controller/Report/InformationController.php - Controller/Report/InformationController.php - - - report:: identifiant - ID - Controller/Report/InformationController.php - Controller/Report/InformationController.php report:: jour Dag - Controller/Report/ActivityController.php - web/report/all_content.html.twig - - - report:: module - Module - Controller/Report/RootController.php + web/report/all_content.html.twig report:: modules Modules module/report/nav.php module/report/filter.php - Controller/Report/RootController.php - Controller/Report/InformationController.php report:: navigateur Browser module/report/nav.php - Controller/Report/RootController.php report:: navigateurs et plateforme Browsers en platform module/report/nav.php - Controller/Report/RootController.php - - - report:: nom - Naam - Controller/Report/InformationController.php - Controller/Report/InformationController.php report:: nombre Aantal classes/module/report.php - Controller/Report/RootController.php - Controller/Report/RootController.php - Controller/Report/RootController.php - Controller/Report/RootController.php - Controller/Report/RootController.php - Controller/Report/InformationController.php - Controller/Report/InformationController.php - Controller/Report/ActivityController.php - Controller/Report/ActivityController.php - - - report:: nombre de documents - Aantal documenten - Controller/Report/ActivityController.php - - - report:: nombre de preview - Aantal voorvertoningen - Controller/Report/ActivityController.php - - - report:: nombre de reponses - Aantal antwoorden - Controller/Report/ActivityController.php - Controller/Report/ActivityController.php - - - report:: nombre de vue - report:: nombre de vue - web/report/ajax_dashboard_content_child.html.twig report:: non-renseigne @@ -12062,8 +11740,6 @@ module/report/validate.php module/report/edit.php module/report/sent.php - web/report/colFilter.html.twig - web/report/colFilter.html.twig report:: page d'accueil @@ -12077,68 +11753,15 @@ per %user_infos% prod/preview/short_history.html.twig - - report:: par utilisateurs - per gebruikers - web/report/report_layout_child.html.twig - report:: pays Land classes/module/report.php - Controller/Report/RootController.php - Controller/Report/RootController.php - Controller/Report/InformationController.php - web/report/report_layout_child.html.twig - web/report/report_layout_child.html.twig - - - report:: plateforme - Platform - Controller/Report/RootController.php - - - report:: poids - Gewicht - Controller/Report/InformationController.php - Controller/Report/InformationController.php - - - report:: poids document - report:: poids document - web/report/ajax_dashboard_content_child.html.twig - - - report:: poids preview - report:: poids preview - web/report/ajax_dashboard_content_child.html.twig - web/report/ajax_dashboard_content_child.html.twig report:: pourcentage Percentage classes/module/report.php - Controller/Report/RootController.php - Controller/Report/RootController.php - Controller/Report/RootController.php - Controller/Report/RootController.php - Controller/Report/RootController.php - - - report:: preview - Voorvertoning - Controller/Report/ActivityController.php - web/report/ajax_dashboard_content_child.html.twig - - - report:: preview les plus telecharges - report:: preview les plus telecharges - web/report/ajax_dashboard_content_child.html.twig - - - report:: pushe - Stuur door - web/report/report_layout_child.html.twig report:: pushed documents @@ -12151,12 +11774,6 @@ module/report/question.php module/report/filter.php classes/module/report.php - Controller/Report/RootController.php - Controller/Report/InformationController.php - Controller/Report/ActivityController.php - Controller/Report/ActivityController.php - web/report/ajax_dashboard_content_child.html.twig - web/report/ajax_dashboard_content_child.html.twig report:: questions @@ -12172,55 +11789,27 @@ report:: questions sans reponses Vragen zonder antwoord module/report/activity.php - web/report/report_layout_child.html.twig report:: record id Record id module/report/filter.php classes/module/report.php - Controller/Report/RootController.php - Controller/Report/RootController.php - Controller/Report/InformationController.php - Controller/Report/InformationController.php - Controller/Report/InformationController.php - - - report:: recordid - recordid - web/report/report_layout_child.html.twig report:: resolution Resolutie module/report/nav.php - Controller/Report/RootController.php - - - report:: site - report:: site - web/report/ajax_dashboard_content_child.html.twig - - - report:: site d'ou les photo sont les plus consultees - report:: site d'ou les photo sont les plus consultees - web/report/ajax_dashboard_content_child.html.twig report:: societe Bedrijf classes/module/report.php - Controller/Report/RootController.php - Controller/Report/RootController.php - Controller/Report/InformationController.php - web/report/report_layout_child.html.twig - web/report/report_layout_child.html.twig report:: taille Grootte classes/module/report.php - Controller/Report/RootController.php report:: telechargement @@ -12231,54 +11820,17 @@ report:: telechargements Downloads module/report/download.php - Controller/Report/RootController.php - web/report/report_layout.html.twig - web/report/ajax_dashboard_content_child.html.twig - web/report/ajax_dashboard_content_child.html.twig - web/report/ajax_dashboard_content_child.html.twig - - - report:: telechargements document - report:: telechargements document - web/report/ajax_dashboard_content_child.html.twig + web/report/report_layout.html.twig report:: telechargements par jour Downloads per dag module/report/activity.php - - report:: telechargements preview - report:: telechargements preview - web/report/ajax_dashboard_content_child.html.twig - - - report:: telephone - Telefoon - Controller/Report/InformationController.php - Controller/Report/InformationController.php - - - report:: titre - Titel - Controller/Report/InformationController.php - Controller/Report/InformationController.php - - - report:: total des telechargements - Totaal van de downloads - Controller/Report/ActivityController.php - - - report:: toutes les questions - Alle vragen - web/report/report_layout_child.html.twig - report:: type Type classes/module/report.php - Controller/Report/RootController.php report:: type d'action @@ -12289,31 +11841,12 @@ report:: utilisateur Gebruiker classes/module/report.php - Controller/Report/RootController.php - Controller/Report/InformationController.php - Controller/Report/ActivityController.php - - - report:: utilisateurs - Gebruikers - Controller/Report/RootController.php - Controller/Report/InformationController.php - web/report/ajax_dashboard_content_child.html.twig - web/report/ajax_dashboard_content_child.html.twig - web/report/ajax_dashboard_content_child.html.twig - web/report/ajax_dashboard_content_child.html.twig - web/report/ajax_dashboard_content_child.html.twig report:: validated documents Gevalideerde documenten module/report/validate.php - - report:: valide - OK - web/report/report_layout_child.html.twig - report:: visualiseur cooliris Cooliris voorvertoning @@ -12326,11 +11859,6 @@ Verandering van de collectie naar : %coll_name% prod/preview/short_history.html.twig - - report::Connexion - report::Connexion - web/report/ajax_dashboard_content_child.html.twig - report::Connexions Connecties @@ -12354,8 +11882,7 @@ report::Heures Uren - web/report/ajax_data_content.html.twig - web/report/all_content.html.twig + web/report/all_content.html.twig report::Impression des formats : %format% @@ -12370,17 +11897,17 @@ report::Nombre de connexions Aantal connecties - web/report/all_content.html.twig + web/report/all_content.html.twig report::Nombre de document ajoute Aantel toegevoegde documenten - web/report/all_content.html.twig + web/report/all_content.html.twig report::Nombre de document edite Aantal bewerkte documenten - web/report/all_content.html.twig + web/report/all_content.html.twig report::Publication de %dest% @@ -12417,51 +11944,32 @@ report::activite Activiteit module/report/filter.php - Controller/Report/RootController.php report::ajout du documentt Toevoegen van het document prod/preview/short_history.html.twig - - report::aucune precision - geen enkele precisie - web/report/report_layout_child.html.twig - report::fonction Functie module/report/filter.php - Controller/Report/RootController.php - - - report::la description contient - de beschrijving bevat - web/report/report_layout_child.html.twig report::pays Land module/report/filter.php - Controller/Report/RootController.php report::societe Bedrijf module/report/filter.php - Controller/Report/RootController.php report::supression du document Verwijderen van het document prod/preview/short_history.html.twig - - report::version - Versie - Controller/Report/InformationController.php - reportage Reportage @@ -13380,17 +12888,6 @@ actions/Tools/index.html.twig actions/Tools/videoEditor.html.twig - - to - to - web/report/report_layout_child.html.twig - web/report/report_layout_child.html.twig - - - tout decocher - alles inschakelen - web/report/listColumn.html.twig - tout le monde iedereen @@ -13490,7 +12987,7 @@ veuillez choisir au minimum une collection wilt u minimum één collectie kiezen - web/report/all_content.html.twig + web/report/all_content.html.twig video diff --git a/resources/locales/validators.de.xlf b/resources/locales/validators.de.xlf index 712ecc5993..dda5c3a166 100644 --- a/resources/locales/validators.de.xlf +++ b/resources/locales/validators.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. diff --git a/resources/locales/validators.en.xlf b/resources/locales/validators.en.xlf index 0a758424a1..88e9e76063 100644 --- a/resources/locales/validators.en.xlf +++ b/resources/locales/validators.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. diff --git a/resources/locales/validators.fr.xlf b/resources/locales/validators.fr.xlf index 0cb547e346..89f3c26df6 100644 --- a/resources/locales/validators.fr.xlf +++ b/resources/locales/validators.fr.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. diff --git a/resources/locales/validators.nl.xlf b/resources/locales/validators.nl.xlf index ddf130eea8..e3ac896d04 100644 --- a/resources/locales/validators.nl.xlf +++ b/resources/locales/validators.nl.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. diff --git a/resources/www/common/images/icons/Alphabetique.png b/resources/www/common/images/icons/Alphabetique.png new file mode 100644 index 0000000000..1f36e83ad6 Binary files /dev/null and b/resources/www/common/images/icons/Alphabetique.png differ diff --git a/resources/www/common/images/icons/Basket-Browse.png b/resources/www/common/images/icons/Basket-Browse.png new file mode 100644 index 0000000000..fd297349eb Binary files /dev/null and b/resources/www/common/images/icons/Basket-Browse.png differ diff --git a/resources/www/common/images/icons/Basket-New-Story.png b/resources/www/common/images/icons/Basket-New-Story.png new file mode 100644 index 0000000000..72a7a1a4c2 Binary files /dev/null and b/resources/www/common/images/icons/Basket-New-Story.png differ diff --git a/resources/www/common/images/icons/Basket-New.png b/resources/www/common/images/icons/Basket-New.png new file mode 100644 index 0000000000..d59995805b Binary files /dev/null and b/resources/www/common/images/icons/Basket-New.png differ diff --git a/resources/www/common/images/icons/Basket-Setting.png b/resources/www/common/images/icons/Basket-Setting.png new file mode 100644 index 0000000000..77372631c4 Binary files /dev/null and b/resources/www/common/images/icons/Basket-Setting.png differ diff --git a/resources/www/common/images/icons/Basket-Settings.png b/resources/www/common/images/icons/Basket-Settings.png new file mode 100644 index 0000000000..bcc21f08b9 Binary files /dev/null and b/resources/www/common/images/icons/Basket-Settings.png differ diff --git a/resources/www/common/images/icons/Share.png b/resources/www/common/images/icons/Share.png new file mode 100644 index 0000000000..447ced8ba7 Binary files /dev/null and b/resources/www/common/images/icons/Share.png differ diff --git a/resources/www/common/images/icons/Sort-Date.png b/resources/www/common/images/icons/Sort-Date.png new file mode 100644 index 0000000000..5adc01d08c Binary files /dev/null and b/resources/www/common/images/icons/Sort-Date.png differ diff --git a/resources/www/common/images/icons/archive.png b/resources/www/common/images/icons/archive.png new file mode 100644 index 0000000000..0d63a2e6f6 Binary files /dev/null and b/resources/www/common/images/icons/archive.png differ diff --git a/resources/www/common/images/icons/basket-1.png b/resources/www/common/images/icons/basket-1.png new file mode 100644 index 0000000000..fa62394842 Binary files /dev/null and b/resources/www/common/images/icons/basket-1.png differ diff --git a/resources/www/common/images/icons/calendar-grey.png b/resources/www/common/images/icons/calendar-grey.png new file mode 100644 index 0000000000..880f700607 Binary files /dev/null and b/resources/www/common/images/icons/calendar-grey.png differ diff --git a/resources/www/common/images/icons/calendar-white.png b/resources/www/common/images/icons/calendar-white.png new file mode 100644 index 0000000000..665b9e6298 Binary files /dev/null and b/resources/www/common/images/icons/calendar-white.png differ diff --git a/resources/www/common/images/icons/checked.png b/resources/www/common/images/icons/checked.png new file mode 100644 index 0000000000..a225313d00 Binary files /dev/null and b/resources/www/common/images/icons/checked.png differ diff --git a/resources/www/common/images/icons/detach.png b/resources/www/common/images/icons/detach.png new file mode 100644 index 0000000000..0f9080d04f Binary files /dev/null and b/resources/www/common/images/icons/detach.png differ diff --git a/resources/www/common/images/icons/disktt_history.png b/resources/www/common/images/icons/disktt_history.png index 849c5acdc2..e81e9e383a 100644 Binary files a/resources/www/common/images/icons/disktt_history.png and b/resources/www/common/images/icons/disktt_history.png differ diff --git a/resources/www/common/images/icons/double-arrow-white.png b/resources/www/common/images/icons/double-arrow-white.png new file mode 100644 index 0000000000..4374b7fcba Binary files /dev/null and b/resources/www/common/images/icons/double-arrow-white.png differ diff --git a/resources/www/common/images/icons/edit-pen.png b/resources/www/common/images/icons/edit-pen.png new file mode 100644 index 0000000000..efba208714 Binary files /dev/null and b/resources/www/common/images/icons/edit-pen.png differ diff --git a/resources/www/common/images/icons/export-shadow.png b/resources/www/common/images/icons/export-shadow.png new file mode 100644 index 0000000000..90ba5c1b53 Binary files /dev/null and b/resources/www/common/images/icons/export-shadow.png differ diff --git a/resources/www/common/images/icons/print-shadow.png b/resources/www/common/images/icons/print-shadow.png new file mode 100644 index 0000000000..8f13ffd61a Binary files /dev/null and b/resources/www/common/images/icons/print-shadow.png differ diff --git a/resources/www/common/images/icons/print_history.png b/resources/www/common/images/icons/print_history.png index c4e4090c41..139cb45458 100644 Binary files a/resources/www/common/images/icons/print_history.png and b/resources/www/common/images/icons/print_history.png differ diff --git a/resources/www/common/images/icons/push-icon.png b/resources/www/common/images/icons/push-icon.png new file mode 100644 index 0000000000..ff1ddd46de Binary files /dev/null and b/resources/www/common/images/icons/push-icon.png differ diff --git a/resources/www/common/images/icons/rename.png b/resources/www/common/images/icons/rename.png new file mode 100644 index 0000000000..f86b6c80b7 Binary files /dev/null and b/resources/www/common/images/icons/rename.png differ diff --git a/resources/www/common/images/icons/set-order.png b/resources/www/common/images/icons/set-order.png new file mode 100644 index 0000000000..e49be67dc8 Binary files /dev/null and b/resources/www/common/images/icons/set-order.png differ diff --git a/resources/www/common/images/icons/unchecked.png b/resources/www/common/images/icons/unchecked.png new file mode 100644 index 0000000000..adc12939e2 Binary files /dev/null and b/resources/www/common/images/icons/unchecked.png differ diff --git a/resources/www/lightbox/images/lightbox-icon.png b/resources/www/lightbox/images/lightbox-icon.png new file mode 100644 index 0000000000..ef9f72ec70 Binary files /dev/null and b/resources/www/lightbox/images/lightbox-icon.png differ diff --git a/resources/www/report/images/arrow_down.png b/resources/www/report/images/arrow_down.png deleted file mode 100644 index e3e43ec2bd..0000000000 Binary files a/resources/www/report/images/arrow_down.png and /dev/null differ diff --git a/resources/www/report/images/arrow_up.png b/resources/www/report/images/arrow_up.png deleted file mode 100644 index 9921c35e58..0000000000 Binary files a/resources/www/report/images/arrow_up.png and /dev/null differ diff --git a/resources/www/report/images/checkbox_checked.png b/resources/www/report/images/checkbox_checked.png deleted file mode 100644 index 6a3a8d470f..0000000000 Binary files a/resources/www/report/images/checkbox_checked.png and /dev/null differ diff --git a/resources/www/report/images/checkbox_unchecked.png b/resources/www/report/images/checkbox_unchecked.png deleted file mode 100644 index e4ab2932a0..0000000000 Binary files a/resources/www/report/images/checkbox_unchecked.png and /dev/null differ diff --git a/resources/www/report/images/config.png b/resources/www/report/images/config.png deleted file mode 100644 index f028e35624..0000000000 Binary files a/resources/www/report/images/config.png and /dev/null differ diff --git a/resources/www/report/images/csv.gif b/resources/www/report/images/csv.gif deleted file mode 100644 index 09550dfa3c..0000000000 Binary files a/resources/www/report/images/csv.gif and /dev/null differ diff --git a/resources/www/report/images/dash-ajax-loader.gif b/resources/www/report/images/dash-ajax-loader.gif deleted file mode 100644 index 85e107f90b..0000000000 Binary files a/resources/www/report/images/dash-ajax-loader.gif and /dev/null differ diff --git a/resources/www/report/images/filter.png b/resources/www/report/images/filter.png deleted file mode 100644 index 3b65d5c1a7..0000000000 Binary files a/resources/www/report/images/filter.png and /dev/null differ diff --git a/resources/www/report/images/filter_on.png b/resources/www/report/images/filter_on.png deleted file mode 100644 index 46f8b5794a..0000000000 Binary files a/resources/www/report/images/filter_on.png and /dev/null differ diff --git a/resources/www/report/images/group.png b/resources/www/report/images/group.png deleted file mode 100644 index 002d00c83a..0000000000 Binary files a/resources/www/report/images/group.png and /dev/null differ diff --git a/resources/www/report/images/loupe2.png b/resources/www/report/images/loupe2.png deleted file mode 100644 index 82763e47e1..0000000000 Binary files a/resources/www/report/images/loupe2.png and /dev/null differ diff --git a/resources/www/report/images/noresults.png b/resources/www/report/images/noresults.png deleted file mode 100644 index 127eda87a9..0000000000 Binary files a/resources/www/report/images/noresults.png and /dev/null differ diff --git a/resources/www/report/images/print.png b/resources/www/report/images/print.png deleted file mode 100644 index eb355fc5c7..0000000000 Binary files a/resources/www/report/images/print.png and /dev/null differ diff --git a/resources/www/report/images/white-arrow.gif b/resources/www/report/images/white-arrow.gif deleted file mode 100644 index 19ecebb38e..0000000000 Binary files a/resources/www/report/images/white-arrow.gif and /dev/null differ diff --git a/resources/www/report/js/jquery.cluetip.js b/resources/www/report/js/jquery.cluetip.js deleted file mode 100644 index 544c62e911..0000000000 --- a/resources/www/report/js/jquery.cluetip.js +++ /dev/null @@ -1,632 +0,0 @@ -/* - * jQuery clueTip plugin - * Version 1.1pre (May 16, 2010) - * @requires jQuery v1.3+ - * - * Dual licensed under the MIT and GPL licenses: - * http://www.opensource.org/licenses/mit-license.php - * http://www.gnu.org/licenses/gpl.html - * - */ - -/* - * - * Full list of options/settings can be found at the bottom of this file and at http://plugins.learningjquery.com/cluetip/ - * - * Examples can be found at http://plugins.learningjquery.com/cluetip/demo/ - * -*/ - -(function($) { - $.cluetip = {version: '1.1pre'}; - var $cluetip, $cluetipInner, $cluetipOuter, $cluetipTitle, $cluetipArrows, $cluetipWait, $dropShadow, imgCount; - var insertionType = 'appendTo', insertionElement = 'body'; - - - $.fn.cluetip = function(js, options) { - if (typeof js == 'object') { - options = js; - js = null; - } - if (js == 'destroy') { - return this.removeData('cluetip').unbind('.cluetip'); - } - - // merge per-call options with defaults - options = $.extend(true, {}, $.fn.cluetip.defaults, options || {}); - - /** =create cluetip divs **/ - - if (!$('#cluetip').length) { - $(['
', - '
', - '

', - '
', - '
', - '
', - '
', - '
'].join('')) - [insertionType](insertionElement).hide(); - - var cluezIndex = +options.cluezIndex; - - $cluetip = $('#cluetip').css({position: 'absolute'}); - $cluetipOuter = $('#cluetip-outer').css({position: 'relative', zIndex: cluezIndex}); - $cluetipInner = $('#cluetip-inner'); - $cluetipTitle = $('#cluetip-title'); - $cluetipArrows = $('#cluetip-arrows'); - $cluetipWait = $('
') - .css({position: 'absolute'}).insertBefore($cluetip).hide(); - } - var cluetipPadding = (parseInt($cluetip.css('paddingLeft'),10)||0) + (parseInt($cluetip.css('paddingRight'),10)||0); - - - this.each(function(index) { - var link = this, $this = $(this); - - // support metadata plugin (v1.0 and 2.0) - var opts = $.extend(true, {}, options, $.metadata ? $this.metadata() : $.meta ? $this.data() : {}); - - - // start out with no contents (for ajax activation) - var cluetipContents = false; - - cluezIndex = +opts.cluezIndex; - $this.data('cluetip', {title: link.title, zIndex: cluezIndex}); - var isActive = false, closeOnDelay = 0; - - var tipAttribute = $this.attr(opts.attribute), ctClass = opts.cluetipClass; - if (!tipAttribute && !opts.splitTitle && !js) { - return true; - } - // if hideLocal is set to true, on DOM ready hide the local content that will be displayed in the clueTip - if (opts.local && opts.localPrefix) {tipAttribute = opts.localPrefix + tipAttribute;} - if (opts.local && opts.hideLocal) { $(tipAttribute + ':first').hide(); } - var tOffset = parseInt(opts.topOffset, 10), lOffset = parseInt(opts.leftOffset, 10); - // vertical measurement variables - var tipHeight, wHeight, - defHeight = isNaN(parseInt(opts.height, 10)) ? 'auto' : (/\D/g).test(opts.height) ? opts.height : opts.height + 'px'; - var sTop, linkTop, posY, tipY, mouseY, baseline; - // horizontal measurement variables - var tipInnerWidth = parseInt(opts.width, 10) || 275, - tipWidth = tipInnerWidth + cluetipPadding + opts.dropShadowSteps, - linkWidth = this.offsetWidth, - linkLeft, posX, tipX, mouseX, winWidth; - - // parse the title - var tipParts; - var tipTitle = (opts.attribute != 'title') ? $this.attr(opts.titleAttribute) : ''; - if (opts.splitTitle) { - if (tipTitle == undefined) {tipTitle = '';} - tipParts = tipTitle.split(opts.splitTitle); - tipTitle = tipParts.shift(); - } - if (opts.escapeTitle) { - tipTitle = tipTitle.replace(/&/g,'&').replace(/>/g,'>').replace(/ linkLeft && linkLeft > tipWidth) - || linkLeft + linkWidth + tipWidth + lOffset > winWidth - ? linkLeft - tipWidth - lOffset - : linkWidth + linkLeft + lOffset; - if (link.tagName.toLowerCase() == 'area' || opts.positionBy == 'mouse' || linkWidth + tipWidth > winWidth) { // position by mouse - if (mouseX + 20 + tipWidth > winWidth) { - $cluetip.addClass(' cluetip-' + ctClass); - posX = (mouseX - tipWidth - lOffset) >= 0 ? mouseX - tipWidth - lOffset - parseInt($cluetip.css('marginLeft'),10) + parseInt($cluetipInner.css('marginRight'),10) : mouseX - (tipWidth/2); - } else { - posX = mouseX + lOffset; - } - } - var pY = posX < 0 ? event.pageY + tOffset : event.pageY; - $cluetip.css({ - left: (posX > 0 && opts.positionBy != 'bottomTop') ? posX : (mouseX + (tipWidth/2) > winWidth) ? winWidth/2 - tipWidth/2 : Math.max(mouseX - (tipWidth/2),0), - zIndex: $this.data('cluetip').zIndex - }); - $cluetipArrows.css({zIndex: $this.data('cluetip').zIndex+1}); - } - wHeight = $(window).height(); - -/*************************************** -* load a string from cluetip method's first argument -***************************************/ - if (js) { - if (typeof js == 'function') { - js = js.call(link); - } - $cluetipInner.html(js); - cluetipShow(pY); - } -/*************************************** -* load the title attribute only (or user-selected attribute). -* clueTip title is the string before the first delimiter -* subsequent delimiters place clueTip body text on separate lines -***************************************/ - - else if (tipParts) { - var tpl = tipParts.length; - $cluetipInner.html(tpl ? tipParts[0] : ''); - if (tpl > 1) { - for (var i=1; i < tpl; i++){ - $cluetipInner.append('
' + tipParts[i] + '
'); - } - } - cluetipShow(pY); - } -/*************************************** -* load external file via ajax -***************************************/ - - else if (!opts.local && tipAttribute.indexOf('#') !== 0) { - if (/\.(jpe?g|tiff?|gif|png)$/i.test(tipAttribute)) { - $cluetipInner.html('' + tipTitle + ''); - cluetipShow(pY); - } else if (cluetipContents && opts.ajaxCache) { - $cluetipInner.html(cluetipContents); - cluetipShow(pY); - } else { - var optionBeforeSend = opts.ajaxSettings.beforeSend, - optionError = opts.ajaxSettings.error, - optionSuccess = opts.ajaxSettings.success, - optionComplete = opts.ajaxSettings.complete; - var ajaxSettings = { - cache: false, // force requested page not to be cached by browser - url: tipAttribute, - beforeSend: function(xhr) { - if (optionBeforeSend) {optionBeforeSend.call(link, xhr, $cluetip, $cluetipInner);} - $cluetipOuter.children().empty(); - if (opts.waitImage) { - $cluetipWait - .css({top: mouseY+20, left: mouseX+20, zIndex: $this.data('cluetip').zIndex-1}) - .show(); - } - }, - error: function(xhr, textStatus) { - if (isActive) { - if (optionError) { - optionError.call(link, xhr, textStatus, $cluetip, $cluetipInner); - } else { - $cluetipInner.html('sorry, the contents could not be loaded'); - } - } - }, - success: function(data, textStatus) { - cluetipContents = opts.ajaxProcess.call(link, data); - if (isActive) { - if (optionSuccess) {optionSuccess.call(link, data, textStatus, $cluetip, $cluetipInner);} - $cluetipInner.html(cluetipContents); - } - }, - complete: function(xhr, textStatus) { - if (optionComplete) {optionComplete.call(link, xhr, textStatus, $cluetip, $cluetipInner);} - var imgs = $cluetipInner[0].getElementsByTagName('img'); - imgCount = imgs.length; - for (var i=0, l = imgs.length; i < l; i++) { - if (imgs[i].complete) { - imgCount--; - } - } - if (imgCount && !$.browser.opera) { - $(imgs).bind('load error', function() { - imgCount--; - if (imgCount<1) { - $cluetipWait.hide(); - if (isActive) { cluetipShow(pY); } - } - }); - } else { - $cluetipWait.hide(); - if (isActive) { cluetipShow(pY); } - } - } - }; - var ajaxMergedSettings = $.extend(true, {}, opts.ajaxSettings, ajaxSettings); - - $.ajax(ajaxMergedSettings); - } - -/*************************************** -* load an element from the same page -***************************************/ - } else if (opts.local) { - - var $localContent = $(tipAttribute + (/#\S+$/.test(tipAttribute) ? '' : ':eq(' + index + ')')).clone(true).show(); - if (opts.localIdSuffix) { - $localContent.attr('id', $localContent[0].id + opts.localIdSuffix); - } - $cluetipInner.html($localContent); - cluetipShow(pY); - } - }; - -// get dimensions and options for cluetip and prepare it to be shown - var cluetipShow = function(bpY) { - $cluetip.addClass('cluetip-' + ctClass); - if (opts.truncate) { - var $truncloaded = $cluetipInner.text().slice(0,opts.truncate) + '...'; - $cluetipInner.html($truncloaded); - } - - function doNothing() {}; //empty function - tipTitle ? $cluetipTitle.show().html(tipTitle) : (opts.showTitle) ? $cluetipTitle.show().html(' ') : $cluetipTitle.hide(); - if (opts.sticky) { - var $closeLink = $(''); - (opts.closePosition == 'bottom') ? $closeLink.appendTo($cluetipInner) : (opts.closePosition == 'title') ? $closeLink.prependTo($cluetipTitle) : $closeLink.prependTo($cluetipInner); - $closeLink.bind('click.cluetip', function() { - cluetipClose(); - return false; - }); - if (opts.mouseOutClose) { - $cluetip.bind('mouseleave.cluetip', function() { - cluetipClose(); - }); - } else { - $cluetip.unbind('mouseleave.cluetip'); - } - } -// now that content is loaded, finish the positioning - var direction = ''; - $cluetipOuter.css({zIndex: $this.data('cluetip').zIndex, overflow: defHeight == 'auto' ? 'visible' : 'auto', height: defHeight}); - tipHeight = defHeight == 'auto' ? Math.max($cluetip.outerHeight(),$cluetip.height()) : parseInt(defHeight,10); - tipY = posY; - baseline = sTop + wHeight; - if (opts.positionBy == 'fixed') { - tipY = posY - opts.dropShadowSteps + tOffset; - } else if ( (posX < mouseX && Math.max(posX, 0) + tipWidth > mouseX) || opts.positionBy == 'bottomTop') { - if (posY + tipHeight + tOffset > baseline && mouseY - sTop > tipHeight + tOffset) { - tipY = mouseY - tipHeight - tOffset; - direction = 'top'; - } else { - tipY = mouseY + tOffset; - direction = 'bottom'; - } - } else if ( posY + tipHeight + tOffset > baseline ) { - tipY = (tipHeight >= wHeight) ? sTop : baseline - tipHeight - tOffset; - } else if ($this.css('display') == 'block' || link.tagName.toLowerCase() == 'area' || opts.positionBy == "mouse") { - tipY = bpY - tOffset; - } else { - tipY = posY - opts.dropShadowSteps; - } - if (direction == '') { - posX < linkLeft ? direction = 'left' : direction = 'right'; - } - $cluetip.css({top: tipY + 'px'}).removeClass().addClass('clue-' + direction + '-' + ctClass).addClass(' cluetip-' + ctClass); - if (opts.arrows) { // set up arrow positioning to align with element - var bgY = (posY - tipY - opts.dropShadowSteps); - $cluetipArrows.css({top: (/(left|right)/.test(direction) && posX >=0 && bgY > 0) ? bgY + 'px' : /(left|right)/.test(direction) ? 0 : ''}).show(); - } else { - $cluetipArrows.hide(); - } - -// (first hide, then) ***SHOW THE CLUETIP*** - // handle dropshadow divs first - $dropShadow = createDropShadows(opts); - if ($dropShadow && $dropShadow.length) { - $dropShadow.hide().css({height: tipHeight, width: tipInnerWidth, zIndex: $this.data('cluetip').zIndex-1}).show(); - } - - $cluetip.hide()[opts.fx.open](opts.fx.openSpeed || 0); - if ($.fn.bgiframe) { $cluetip.bgiframe(); } - // delayed close (not fully tested) - if (opts.delayedClose > 0) { - closeOnDelay = setTimeout(cluetipClose, opts.delayedClose); - } - // trigger the optional onShow function - opts.onShow.call(link, $cluetip, $cluetipInner); - }; - -/*************************************** - =INACTIVATION --------------------------------------- */ - var inactivate = function(event) { - isActive = false; - $cluetipWait.hide(); - if (!opts.sticky || (/click|toggle/).test(opts.activation) ) { - cluetipClose(); - clearTimeout(closeOnDelay); - } - if (opts.hoverClass) { - $this.removeClass(opts.hoverClass); - } - }; -// close cluetip and reset some things - var cluetipClose = function() { - $cluetipOuter - .parent().hide().removeClass(); - opts.onHide.call(link, $cluetip, $cluetipInner); - $this.removeClass('cluetip-clicked'); - if (tipTitle) { - $this.attr(opts.titleAttribute, tipTitle); - } - $this.css('cursor',''); - if (opts.arrows) { - $cluetipArrows.css({top: ''}); - } - }; - - $(document).bind('hideCluetip', function(e) { - cluetipClose(); - }); -/*************************************** - =BIND EVENTS --------------------------------------- */ - // activate by click - if ( (/click|toggle/).test(opts.activation) ) { - $this.bind('click.cluetip', function(event) { - if ($cluetip.is(':hidden') || !$this.is('.cluetip-clicked')) { - activate(event); - $('.cluetip-clicked').removeClass('cluetip-clicked'); - $this.addClass('cluetip-clicked'); - } else { - inactivate(event); - } - this.blur(); - return false; - }); - // activate by focus; inactivate by blur - } else if (opts.activation == 'focus') { - $this.bind('focus.cluetip', function(event) { - activate(event); - }); - $this.bind('blur.cluetip', function(event) { - inactivate(event); - }); - // activate by hover - } else { - // clicking is returned false if clickThrough option is set to false - $this[opts.clickThrough ? 'unbind' : 'bind']('click', returnFalse); - //set up mouse tracking - var mouseTracks = function(evt) { - if (opts.tracking == true) { - var trackX = posX - evt.pageX; - var trackY = tipY ? tipY - evt.pageY : posY - evt.pageY; - $this.bind('mousemove.cluetip', function(evt) { - $cluetip.css({left: evt.pageX + trackX, top: evt.pageY + trackY }); - }); - } - }; - if ($.fn.hoverIntent && opts.hoverIntent) { - $this.hoverIntent({ - sensitivity: opts.hoverIntent.sensitivity, - interval: opts.hoverIntent.interval, - over: function(event) { - activate(event); - mouseTracks(event); - }, - timeout: opts.hoverIntent.timeout, - out: function(event) {inactivate(event); $this.unbind('mousemove.cluetip');} - }); - } else { - $this.bind('mouseenter.cluetip', function(event) { - activate(event); - mouseTracks(event); - }) - .bind('mouseleave.cluetip', function(event) { - inactivate(event); - $this.unbind('mousemove.cluetip'); - }); - } - - $this.bind('mouseover.cluetip', function(event) { - $this.attr('title',''); - }).bind('mouseleave.cluetip', function(event) { - $this.attr('title', $this.data('cluetip').title); - }); - } - }); - - /** =private functions - ************************************************************/ - /** =create dropshadow divs **/ - - function createDropShadows(options, newDropShadow) { - var dropShadowSteps = (options.dropShadow && options.dropShadowSteps) ? +options.dropShadowSteps : 0; - if ($.support.boxShadow) { - var dsOffsets = dropShadowSteps === 0 ? '0 0 ' : '1px 1px '; - $('#cluetip').css($.support.boxShadow, dsOffsets + dropShadowSteps + 'px rgba(0,0,0,0.5)'); - return false; - } - var oldDropShadow = $('#cluetip .cluetip-drop-shadow'); - if (dropShadowSteps == oldDropShadow.length) { - return oldDropShadow; - } - oldDropShadow.remove(); - var dropShadows = []; - for (var i=0; i < dropShadowSteps;) { - dropShadows[i++] = '
'; - } - - newDropShadow = $(dropShadows.join('')) - .css({ - position: 'absolute', - backgroundColor: '#FFF', - zIndex: cluezIndex -1 - }) - .addClass('cluetip-drop-shadow') - .prependTo('#cluetip'); - return newDropShadow; - - } - - - return this; - }; - - (function() { - $.support = $.support || {}; - // check support for CSS3 properties (currently only boxShadow) - var div = document.createElement('div'), - divStyle = div.style, - styleProps = ['boxShadow'], - prefixes = ['moz', 'Moz', 'webkit', 'o']; - - for (var i=0, sl = styleProps.length; i < sl; i++) { - var prop = styleProps[i], - uProp = prop.charAt(0).toUpperCase() + prop.slice(1); - - if ( typeof divStyle[ prop ] !== 'undefined' ) { - $.support[ prop ] = prop; - } else { - for (var j=0, pl = prefixes.length; j < pl; j++) { - - if (typeof divStyle[ prefixes[j] + uProp ] !== 'undefined') { - $.support[ prop ] = prefixes[j] + uProp; - break; - } - } - } - } - div = null; delete div; - })(); - -/* - * options for clueTip - * - * each one can be explicitly overridden by changing its value. - * for example: $.fn.cluetip.defaults.width = 200; - * would change the default width for all clueTips to 200. - * - * each one can also be overridden by passing an options map to the cluetip method. - * for example: $('a.example').cluetip({width: 200}); - * would change the default width to 200 for clueTips invoked by a link with class of "example" - * - */ - - $.fn.cluetip.defaults = { // set up default options - width: 'auto', // The width of the clueTip - height: 'auto', // The height of the clueTip - cluezIndex: 9999, // Sets the z-index style property of the clueTip - positionBy: 'auto', // Sets the type of positioning: 'auto', 'mouse','bottomTop', 'fixed' - topOffset: 5, // Number of px to offset clueTip from top of invoking element - leftOffset: 5, // Number of px to offset clueTip from left of invoking element - local: false, // Whether to use content from the same page for the clueTip's body - localPrefix: null, // string to be prepended to the tip attribute if local is true - localIdSuffix: null, // string to be appended to the cluetip content element's id if local is true - hideLocal: true, // If local option is set to true, this determines whether local content - // to be shown in clueTip should be hidden at its original location - attribute: 'rel', // the attribute to be used for fetching the clueTip's body content - titleAttribute: 'title', // the attribute to be used for fetching the clueTip's title - splitTitle: '', // A character used to split the title attribute into the clueTip title and divs - // within the clueTip body. more info below [6] - escapeTitle: false, // whether to html escape the title attribute - showTitle: false, // show title bar of the clueTip, even if title attribute not set - cluetipClass: '',// class added to outermost clueTip div in the form of 'cluetip-' + clueTipClass. - hoverClass: '', // class applied to the invoking element onmouseover and removed onmouseout - waitImage: true, // whether to show a "loading" img, which is set in jquery.cluetip.css - cursor: 'help', - arrows: false, // if true, displays arrow on appropriate side of clueTip - dropShadow: false, // set to false if you don't want the drop-shadow effect on the clueTip - dropShadowSteps: 6, // adjusts the size of the drop shadow - sticky: false, // keep visible until manually closed - mouseOutClose: false, // close when clueTip is moused out - activation: 'hover', // set to 'click' to force user to click to show clueTip - // set to 'focus' to show on focus of a form element and hide on blur - clickThrough: false, // if true, and activation is not 'click', then clicking on link will take user to the link's href, - // even if href and tipAttribute are equal - tracking: false, // if true, clueTip will track mouse movement (experimental) - delayedClose: 0, // close clueTip on a timed delay (experimental) - closePosition: 'top', // location of close text for sticky cluetips; can be 'top' or 'bottom' or 'title' - closeText: 'Close', // text (or HTML) to to be clicked to close sticky clueTips - truncate: 0, // number of characters to truncate clueTip's contents. if 0, no truncation occurs - - // effect and speed for opening clueTips - fx: { - open: 'show', // can be 'show' or 'slideDown' or 'fadeIn' - openSpeed: '' - }, - - // settings for when hoverIntent plugin is used - hoverIntent: { - sensitivity: 3, - interval: 50, - timeout: 0 - }, - - // short-circuit function to run just before clueTip is shown. - onActivate: function(e) {return true;}, - // function to run just after clueTip is shown. - onShow: function(ct, ci){}, - // function to run just after clueTip is hidden. - onHide: function(ct, ci){}, - // whether to cache results of ajax request to avoid unnecessary hits to server - ajaxCache: true, - - // process data retrieved via xhr before it's displayed - ajaxProcess: function(data) { - data = data.replace(/<(script|style|title)[^<]+<\/(script|style|title)>/gm, '').replace(/<(link|meta)[^>]+>/g,''); - return data; - }, - - // can pass in standard $.ajax() parameters. Callback functions, such as beforeSend, - // will be queued first within the default callbacks. - // The only exception is error, which overrides the default - ajaxSettings: { - // error: function(ct, ci) { /* override default error callback */ } - // beforeSend: function(ct, ci) { /* called first within default beforeSend callback } - dataType: 'html' - }, - debug: false - }; - - -/* - * Global defaults for clueTips. Apply to all calls to the clueTip plugin. - * - * @example $.cluetip.setup({ - * insertionType: 'prependTo', - * insertionElement: '#container' - * }); - * - * @property - * @name $.cluetip.setup - * @type Map - * @cat Plugins/tooltip - * @option String insertionType: Default is 'appendTo'. Determines the method to be used for inserting the clueTip into the DOM. Permitted values are 'appendTo', 'prependTo', 'insertBefore', and 'insertAfter' - * @option String insertionElement: Default is 'body'. Determines which element in the DOM the plugin will reference when inserting the clueTip. - * - */ - - var insertionType = 'appendTo', insertionElement = 'body'; - - $.cluetip.setup = function(options) { - if (options && options.insertionType && (options.insertionType).match(/appendTo|prependTo|insertBefore|insertAfter/)) { - insertionType = options.insertionType; - } - if (options && options.insertionElement) { - insertionElement = options.insertionElement; - } - }; - -})(jQuery); diff --git a/resources/www/report/js/jquery.gvChart-0.1.js b/resources/www/report/js/jquery.gvChart-0.1.js deleted file mode 100644 index 8d69a9436b..0000000000 --- a/resources/www/report/js/jquery.gvChart-0.1.js +++ /dev/null @@ -1,86 +0,0 @@ -/* - * jQuery gvChart plugin - * This plugin was created to simplify things when using Google Visualisation Charts. - * It still needs to be used with google script import tag, however now you can - * crate chart from your table. - * All examples you will find on http://www.ivellios.toron.pl/technikalia/demos/gvChart/ - * @name jquery.gvChart-1.0.1.js - * @author Janusz Kamieński - http://www.ivellios.toron.pl/technikalia - * @version 1.0.1 - * @date December 04, 2010 - * @category jQuery plugin google charts - * @copyright (c) 2010 Janusz Kamieński (www.ivellios.toron.pl) - * @license CC Attribution Works 3.0 Poland - http://creativecommons.org/licenses/by/3.0/pl/deed.en_US - * @example Visit http://www.ivellios.toron.pl/technikalia/demos/gvChart/ for more informations about this jQuery plugin - */ -(function (jQuery){ - jQuery.fn.gvChart = function(settings){ - - defaults={ - hideTable: true, - chartType: 'AreaChart', - chartDivID: 'gvChartDiv', - gvSettings: null - }; - - var el = document.createElement('div'); - jQuery(el).insertBefore(this); - gvChartCount++; - gvChartID = defaults.chartDivID+gvChartCount; - jQuery(el).attr('id',gvChartID); - jQuery(el).addClass('gvChart'); - - if(settings){ - jQuery.extend(defaults,settings); - } - - if(defaults.hideTable) - $(this).hide(); - - var data = new google.visualization.DataTable(); - - // add X label - data.addColumn('string','X labels'); - - var a = new Array(); - - var headers = $(this).find('thead').find('th'); - var rows = $(this).find('tbody').find('tr'); - - rows.each(function(index){ - data.addColumn('number',$(this).find('th').text()); - }); - - data.addRows(headers.length-1); - - headers.each(function(index){ - if(index){ - data.setCell(index-1, 0, $(this).text()); - } - }); - - rows.each(function(index){ - $(this).find('td').each(function(index2){ - data.setCell(index2, index+1, parseFloat($(this).text())); - }); - }); - - chartSettings = { - title : $(this).find('caption').text() - }; - - if(defaults.gvSettings){ - jQuery.extend(chartSettings,defaults.gvSettings); - } - - eval("var chart = new google.visualization."+defaults.chartType+"(document.getElementById('"+gvChartID+"'))"); - chart.draw(data, chartSettings); - } -})(jQuery); - - -function gvChartInit(){ - gvChartCount = 0; - google.load('visualization', '1', {packages: ['corechart']}); -} - diff --git a/resources/www/report/js/jquery.nicoslider.js b/resources/www/report/js/jquery.nicoslider.js deleted file mode 100644 index 10acff56fa..0000000000 --- a/resources/www/report/js/jquery.nicoslider.js +++ /dev/null @@ -1,138 +0,0 @@ -(function ($) { - $.fn.nicoslider = function (options) { - var defaults = { - start: 0, - color: '#F6F2F1', - sliderHeight: false - }; - - var opts = $.extend({}, $.fn.nicoslider.defaults, defaults, options); - - return this.each(function () { - new nicoslide(this, opts); - }); - }; - - - var nicoslide = function (slider, o) { - var $slider = $(slider); - - $sliderWidth = $slider.parent().innerWidth(); - - $sliderCss = { - 'width': $sliderWidth, - 'background-color': o.color - }; - - $slider.css($sliderCss); - - var ul = $slider.find("ul"); - var ulWidth = 0; - var liHeight = 0; - - $slider.find("li").each(function () { - ulWidth += $(this).width() + 5; - ulWidth += parseInt($(this).css("padding-left")); - ulWidth += parseInt($(this).css("padding-right")); - ulWidth += parseInt($(this).css("margin-left")); - ulWidth += parseInt($(this).css("margin-right")); - liHeight = Math.max(liHeight, $(this).outerHeight()); - }); - //5 % of slider width - $scrollWidth = Math.round(parseInt($sliderWidth) * parseFloat("0.05")); - //min 30 px; - if ($scrollWidth < 30) { - $scrollWidth = 30; - } - - var $wrapperWidth = Math.round(parseInt($sliderWidth) - ( 2 * $scrollWidth )); - - if (ulWidth > $wrapperWidth) { - ul.wrapAll("
"); - $wrapper = $slider.find(".wrapper"); - $ulHeight = ul.height(); - $wrapper.width($wrapperWidth); - $wrapper.height($ulHeight); - - $wrapperCss = { - 'overflow': 'hidden', - 'float': 'left', - 'position': 'relative' - }; - - $wrapper.css($wrapperCss); - ul.css('position', 'absolute'); - ul.width(ulWidth); - $slider.prepend("
"); - $slider.append("
"); - - var rightScroll = $slider.find(".scrollright"); - var leftScroll = $slider.find(".scrollleft"); - - rightScroll.append("
>
"); - leftScroll.append("
<
"); - - $("div.rb").css('float', 'right'); - - rightCss = { - 'width': $scrollWidth - ($wrapper.outerWidth(true) - $wrapper.innerWidth()), - 'height': liHeight + 5, - 'float': 'right', - 'background-color': o.color, - 'cursor': 'pointer', - ' user-select': 'none' - }; - - leftCss = { - 'width': $scrollWidth - ($wrapper.outerWidth(true) - $wrapper.innerWidth()), - 'height': liHeight + 5, - 'float': 'left', - 'background-color': o.color, - 'cursor': 'pointer', - ' user-select': 'none' - }; - - leftScroll.css(leftCss); - rightScroll.css(rightCss); - - var rightScrollWidth = rightScroll.width(); - var leftScrollWidth = leftScroll.width(); - var scrollXpos = 0; - var scrollStepSpeed = 40; - var speed = 8; - var shift = o.start; - - - //scroll a droite - rightScroll.bind("click", function (e) { - var x = e.pageX - ($(this).offset().left); - scrollXpos = Math.round((x / rightScrollWidth) * scrollStepSpeed); - shift += (scrollXpos * speed); - - if (shift > (ulWidth - $wrapperWidth) + 50) { - shift = (ulWidth - $wrapperWidth) + 50; - } - ul.animate({ - left: -shift - }, 1); - }); - - //scroll a gauche - leftScroll.bind("click", function (e) { - var x = $(this).innerWidth() - (e.pageX - $(this).offset().left); - - scrollXpos = Math.round((x / leftScrollWidth) * scrollStepSpeed); - shift -= (scrollXpos * speed); - - if (shift < 0) { - shift = 0; - } - - ul.animate({ - left: -shift - }, 1); - - }); - } - }; -})(jQuery); diff --git a/resources/www/report/js/jquery.print.js b/resources/www/report/js/jquery.print.js deleted file mode 100644 index 8a2cd7bb66..0000000000 --- a/resources/www/report/js/jquery.print.js +++ /dev/null @@ -1,75 +0,0 @@ -// ----------------------------------------------------------------------- -// Eros Fratini - eros@recoding.it -// jqprint 0.3 -// -// - 19/06/2009 - some new implementations, added Opera support -// - 11/05/2009 - first sketch -// -// Printing plug-in for jQuery, evolution of jPrintArea: http://plugins.jquery.com/project/jPrintArea -// requires jQuery 1.3.x -// -// Licensed under the MIT license: http://www.opensource.org/licenses/mit-license.php -//------------------------------------------------------------------------ - -(function($) { - var opt; - - $.fn.jqprint = function (options) { - opt = $.extend({}, $.fn.jqprint.defaults, options); - - var $element = (this instanceof jQuery) ? this : $(this), doc; - - if (opt.operaSupport && $.browser.opera) - { - var tab = window.open("","jqPrint-preview"); - tab.document.open(); - - doc = tab.document; - } - else - { - var $iframe = $(" - {% elseif record_type == 'FLEXPAPER' %} + {% elseif record_type == 'FLEXPAPER' or record_type == 'PDF' %}
-
+
{{ 'action::exporter' | trans }} + data-kind="basket" data-id="{{basket.getId()}}"> + + {{ 'action::exporter' | trans }} + {{ 'action::exporter' | trans }} +
- Lightbox + + {{ 'Lightbox' | trans }} + {{ 'Lightbox' | trans }} +
- {{ 'action::renommer' | trans }} + {{ 'action::renommer' | trans }} + {{ 'action::renommer' | trans }}
{% if basket.getValidation() %}
- -
- {{ 'action::Valider' | trans }} -
- +
+ + {{ 'action::Valider' | trans }} + {{ 'action::Valider' | trans }} + +
{% endif %}
- {{ 'Archive' | trans }} -
-
-
-
- {{ 'action : supprimer' | trans }} + + {{ 'Archive' | trans }} + {{ 'Archive' | trans }} +
- {{ 'Re-ordonner' | trans }} + {{ 'Re-ordonner' | trans }} + {{ 'Re-ordonner' | trans }}
+
+
+ +
@@ -222,24 +239,33 @@ -
+
{{ 'action::exporter' | trans }} + data-kind="record" data-id="{{story.getRecord(app).get_serialize_key()}}"> + + {{ 'action::exporter' | trans }} + {{ 'action::exporter' | trans }} +
- {% if app.getAclForUser(app.getAuthenticatedUser()).has_right(constant('\\ACL::CANMODIFRECORD')) %} + {% if app.getAclForUser(app.getAuthenticatedUser()).has_right(constant('\\ACL::CANMODIFRECORD')) %}
{{ 'action::editer' | trans }} + > + + {{ 'action::editer' | trans }} + {{ 'action::editer' | trans }} +
- {% endif %} + {% endif %}
- {{ 'action::detacher' | trans }} + {{ 'action::detacher' | trans }} + {{ 'action::detacher' | trans }}
@@ -249,7 +275,8 @@ data-db-id="{{ story.getRecord(app).get_sbas_id }}" data-record-id="{{ story.getRecord(app).get_record_id() }}" href="#"> - {{ 'Re-ordonner' | trans }} + {{ 'Re-ordonner' | trans }} + {{ 'Re-ordonner' | trans }}
diff --git a/templates/web/prod/actions/Push.html.twig b/templates/web/prod/actions/Push.html.twig index f1c9beaec7..13270f08f3 100644 --- a/templates/web/prod/actions/Push.html.twig +++ b/templates/web/prod/actions/Push.html.twig @@ -17,7 +17,7 @@
{% if context == 'Push' %} - + {% else %} {% endif %} diff --git a/templates/web/prod/index.html.twig b/templates/web/prod/index.html.twig index e2a0d4fa7f..0da645943d 100644 --- a/templates/web/prod/index.html.twig +++ b/templates/web/prod/index.html.twig @@ -197,39 +197,43 @@ {% endif %}
-