diff --git a/Makefile b/Makefile index d644c078c7..52f1317967 100644 --- a/Makefile +++ b/Makefile @@ -5,7 +5,7 @@ install: make install_assets install_composer: - composer + composer install install_asset_dependencies: npm install diff --git a/bower.json b/bower.json index aa528e4c43..8d8660055f 100644 --- a/bower.json +++ b/bower.json @@ -28,7 +28,8 @@ "jquery.lazyload": "~1.9.7", "jquery-treeview": "~1.4.2", "alchemy-embed-medias": "~0.3.4", - "html5shiv": "^3.7.3" + "html5shiv": "^3.7.3", + "jquery-simplecolorpicker": "^0.3.1" }, "devDependencies": { "mocha": "latest", diff --git a/lib/Alchemy/Phrasea/Controller/Admin/SetupController.php b/lib/Alchemy/Phrasea/Controller/Admin/SetupController.php index 0ca5c9f262..ad045207d8 100644 --- a/lib/Alchemy/Phrasea/Controller/Admin/SetupController.php +++ b/lib/Alchemy/Phrasea/Controller/Admin/SetupController.php @@ -38,7 +38,14 @@ class SetupController extends Controller public function submitGlobalsAction(Request $request) { - $form = $this->registryFormManipulator->createForm(); + if (null !== $this->configuration->get('registry')) + { + $form = $this->registryFormManipulator->createForm($this->configuration); + } + else + { + $form = $this->registryFormManipulator->createForm(); + } if ('POST' === $request->getMethod()) { $form->submit($request->request->all()); diff --git a/lib/Alchemy/Phrasea/Controller/Api/V1Controller.php b/lib/Alchemy/Phrasea/Controller/Api/V1Controller.php index 7358539cbe..b521d80a7b 100644 --- a/lib/Alchemy/Phrasea/Controller/Api/V1Controller.php +++ b/lib/Alchemy/Phrasea/Controller/Api/V1Controller.php @@ -376,6 +376,7 @@ class V1Controller extends Controller 'password' => $conf->get(['registry', 'email', 'smtp-password']), ], ], + 'custom-links' => $conf->get(['registry', 'custom-links']), 'ftp' => [ 'active' => $conf->get(['registry', 'ftp', 'ftp-enabled']), 'activeForUser' => $conf->get(['registry', 'ftp', 'ftp-user-access']), diff --git a/lib/Alchemy/Phrasea/Core/Configuration/RegistryFormManipulator.php b/lib/Alchemy/Phrasea/Core/Configuration/RegistryFormManipulator.php index 9543cbbc6d..ead1dcc964 100644 --- a/lib/Alchemy/Phrasea/Core/Configuration/RegistryFormManipulator.php +++ b/lib/Alchemy/Phrasea/Core/Configuration/RegistryFormManipulator.php @@ -173,6 +173,22 @@ class RegistryFormManipulator 'smtp-user' => null, 'smtp-password' => isset($config['email']['smtp-password']) ? $config['email']['smtp-password'] : null, ], + 'custom-links' => [ + [ + 'linkName' => 'Phraseanet store', + 'linkLanguage' => 'fr', + 'linkUrl' => 'https://alchemy.odoo.com/shop', + 'linkLocation' => 'help-menu', + 'linkOrder' => '1', + ], + [ + 'linkName' => 'Phraseanet store', + 'linkLanguage' => 'en', + 'linkUrl' => 'https://alchemy.odoo.com/en_US/shop', + 'linkLocation' => 'help-menu', + 'linkOrder' => '1', + ], + ] ]; } } diff --git a/lib/Alchemy/Phrasea/Form/Configuration/CustomLinkFormType.php b/lib/Alchemy/Phrasea/Form/Configuration/CustomLinkFormType.php new file mode 100644 index 0000000000..30838d9c28 --- /dev/null +++ b/lib/Alchemy/Phrasea/Form/Configuration/CustomLinkFormType.php @@ -0,0 +1,90 @@ +add('linkName', 'text', [ + 'label' => false, + 'attr' => [ + 'placeholder' => 'setup::custom-link:name-link', + 'required' => true, + 'maxlength' => "30" + ] + ]); + $builder->add('linkLanguage', 'choice', [ + 'label' => false, + 'attr' => [ + 'required' => true + ], + 'choices' => [ + '' => 'setup::custom-link:select-language', + 'all' => 'All', + 'fr' => 'FR', + 'en' => 'EN', + 'es' => 'ES', + 'ar' => 'AR', + 'de' => 'DE', + 'du' => 'DU' + ] + ]); + $builder->add('linkUrl', 'url', [ + 'label' => false, + 'attr' => [ + 'placeholder' => 'setup::custom-link:placeholder-link-url', + 'required' => true + ] + ]); + $builder->add('linkLocation', 'choice', [ + 'label' => false, + 'attr' => [ + 'required' => true + ], + 'choices' => [ + '' => 'setup::custom-link:location', + 'help-menu' => 'setup::custom-link:help-menu', + 'navigation-bar' => 'setup::custom-link:navigation-bar', + ] + ]); + $builder->add('linkOrder', 'integer', [ + 'label' => false, + ]); + $builder->add('linkBold', 'checkbox', [ + 'label' => false, + ]); + $builder->add('linkColor', 'choice', [ + 'label' => false, + 'choices' => [ + '' => '#ad0800', + '#ad0800' => '#ad0800', + '#f06006' => '#f06006', + '#f5842b' => '#f5842b', + '#ffc322' => '#ffc322', + '#f4ea5b' => '#f4ea5b', + '#b8d84e' => '#b8d84e', + '#5aa53b' => '#5aa53b', + '#a1d0d0' => '#a1d0d0', + '#4497d5' => '#4497d5', + '#3567c6' => '#3567c6', + '#b151ee' => '#b151ee', + '#c875ea' => '#c875ea', + '#e46990' => '#e46990', + '#ffccd7' => '#ffccd7' + ] + ]); + } + public function getName() + { + return null; + } +} \ No newline at end of file diff --git a/lib/Alchemy/Phrasea/Form/Configuration/MainConfigurationFormType.php b/lib/Alchemy/Phrasea/Form/Configuration/MainConfigurationFormType.php index d16e09c2ad..bf97379934 100644 --- a/lib/Alchemy/Phrasea/Form/Configuration/MainConfigurationFormType.php +++ b/lib/Alchemy/Phrasea/Form/Configuration/MainConfigurationFormType.php @@ -15,6 +15,7 @@ use Symfony\Component\Form\AbstractType; use Symfony\Component\Form\FormBuilderInterface; use Symfony\Component\OptionsResolver\OptionsResolverInterface; use Symfony\Component\Translation\TranslatorInterface; +use Symfony\Component\Form\Extension\Core\Type\CollectionType; class MainConfigurationFormType extends AbstractType { @@ -62,12 +63,19 @@ class MainConfigurationFormType extends AbstractType $builder->add('email', new EmailFormType(), [ 'label' => 'Emails', ]); + $builder->add('custom-links', CollectionType::class, [ + 'entry_type' => CustomLinkFormType::class, + 'entry_options' => ['label' => false], + 'allow_add' => true, + 'allow_delete' => true, + ]); } public function setDefaultOptions(OptionsResolverInterface $resolver) { $resolver->setDefaults([ 'required' => false, + 'allow_extra_fields' => true ]); } diff --git a/resources/gulp/build.js b/resources/gulp/build.js index 63dc8beba8..aba6843cc5 100644 --- a/resources/gulp/build.js +++ b/resources/gulp/build.js @@ -48,5 +48,6 @@ gulp.task('build-vendors', [ 'build-requirejs', 'build-jquery-treeview', 'build-jquery-lazyload', - 'build-jquery-test-paths' - ], function() {}); + 'build-jquery-test-paths', + 'build-simple-colorpicker' +], function() {}); diff --git a/resources/gulp/components/vendors/simple-colorpicker.js b/resources/gulp/components/vendors/simple-colorpicker.js new file mode 100644 index 0000000000..0013cbb212 --- /dev/null +++ b/resources/gulp/components/vendors/simple-colorpicker.js @@ -0,0 +1,12 @@ +var gulp = require('gulp'); +var config = require('../../config.js'); +var utils = require('../../utils.js'); + +gulp.task('build-simple-colorpicker', function () { + gulp.start('copy-simple-colorpicker'); +}); + +gulp.task('copy-simple-colorpicker', function () { + return gulp.src(config.paths.vendors + 'jquery-simplecolorpicker/*') + .pipe(gulp.dest(config.paths.build + 'vendors/jquery-simplecolorpicker')); +}); \ No newline at end of file diff --git a/resources/locales/messages.de.xlf b/resources/locales/messages.de.xlf index c2aacbe27e..5532826611 100644 --- a/resources/locales/messages.de.xlf +++ b/resources/locales/messages.de.xlf @@ -1,6 +1,6 @@ - +
The source node in most cases contains the sample message as written by the developer. If it looks like a dot-delimitted string such as "form.label.firstname", then the developer has not provided a default message. @@ -21,6 +21,77 @@ Parameter "Authentifizierung erzwingen" erzwingt den Push Empfänger, ein Phraseanet Konto zu haben, um den Inhalt anzuschauen. Es vermeidet, unautorisierte Benutzer dem Push Inhalt zuzugreifen, falls sie die URL bekämen (Email wurde weitergeleitet, zum Beispiel). prod/templates/push.html.twig + + #3567c6 + #3567c6 + Form/Configuration/CustomLinkFormType.php + + + #4497d5 + #4497d5 + Form/Configuration/CustomLinkFormType.php + + + #5aa53b + #5aa53b + Form/Configuration/CustomLinkFormType.php + + + #a1d0d0 + #a1d0d0 + Form/Configuration/CustomLinkFormType.php + + + #ad0800 + #ad0800 + Form/Configuration/CustomLinkFormType.php + Form/Configuration/CustomLinkFormType.php + + + #b151ee + #b151ee + Form/Configuration/CustomLinkFormType.php + + + #b8d84e + #b8d84e + Form/Configuration/CustomLinkFormType.php + + + #c875ea + #c875ea + Form/Configuration/CustomLinkFormType.php + + + #e46990 + #e46990 + Form/Configuration/CustomLinkFormType.php + + + #f06006 + #f06006 + Form/Configuration/CustomLinkFormType.php + + + #f4ea5b + #f4ea5b + Form/Configuration/CustomLinkFormType.php + + + #f5842b + #f5842b + Form/Configuration/CustomLinkFormType.php + + + #ffc322 + #ffc322 + Form/Configuration/CustomLinkFormType.php + + + #ffccd7 + #ffccd7 + Form/Configuration/CustomLinkFormType.php + %ElementsCount% records %ElementsCount% Datensätze @@ -461,6 +532,11 @@ API Webhook TaskManager/Job/WebhookJob.php + + AR + AR + Form/Configuration/CustomLinkFormType.php + About Roles : Über die Funktionen : @@ -645,7 +721,7 @@ Additionnal modules Zusatzmodule - Form/Configuration/MainConfigurationFormType.php + Form/Configuration/MainConfigurationFormType.php Adds an option to the push form submission to restrict push recipient(s) to Phraseanet users only. @@ -665,7 +741,7 @@ Adresse email du nouvel utilisateur Email Adresse des neuen Benutzers - web/admin/index.html.twig + web/admin/index.html.twig Advanced Search @@ -739,7 +815,7 @@ Ajouter un nouvel utilisateur einen neuen Benutzer hinzufügen - web/admin/index.html.twig + web/admin/index.html.twig Ajouter un publisher @@ -754,6 +830,7 @@ All Alle + Form/Configuration/CustomLinkFormType.php actions/Feedback/list.html.twig actions/Feedback/list.html.twig actions/Feedback/list.html.twig @@ -911,8 +988,8 @@ Ein Fehler ist aufgetreten Controller/Admin/CollectionController.php Controller/Admin/DataboxController.php - Controller/Api/V1Controller.php - Controller/Api/V1Controller.php + Controller/Api/V1Controller.php + Controller/Api/V1Controller.php Controller/Prod/BasketController.php Order/Controller/ProdOrderController.php web/admin/statusbit.html.twig @@ -1022,7 +1099,7 @@ Apply template Vorlage anwenden - web/admin/index.html.twig + web/admin/index.html.twig Apply to all selected documents @@ -1064,7 +1141,7 @@ Attention Vorsicht Controller/Prod/LanguageController.php - web/admin/index.html.twig + web/admin/index.html.twig prod/results/help.html.twig @@ -1652,7 +1729,7 @@ Cocher toute la colonne die ganze Spalte markieren - web/admin/index.html.twig + web/admin/index.html.twig Cochez les cases correspondantes aux colonnes que vous desirez voire apparaitre dans le report @@ -1717,7 +1794,7 @@ Commandes Bestellungen - web/common/menubar.html.twig + web/common/menubar.html.twig Company @@ -1767,7 +1844,7 @@ Confirm reset users rights before applying template Zurücksetzung von Benutzerrechten bestätigen, bevor Sie die Vorlage anwenden - web/admin/index.html.twig + web/admin/index.html.twig Confirmation de votre mot de passe @@ -1931,17 +2008,17 @@ Creer un model eine Vorlage erstellen - web/admin/index.html.twig + web/admin/index.html.twig Creer un modele eine Vorlage erstellen - web/admin/index.html.twig + web/admin/index.html.twig Creer un utilisateur einen Benutzer erstellen - web/admin/index.html.twig + web/admin/index.html.twig Creer une nouvelle applications @@ -1994,6 +2071,16 @@ DCES admin/fields/templates.html.twig + + DE + DE + Form/Configuration/CustomLinkFormType.php + + + DU + DU + Form/Configuration/CustomLinkFormType.php + Danger zone ! Danger zone ! @@ -2099,7 +2186,7 @@ Decocher toute la colonne die ganze Spalte unmarkieren - web/admin/index.html.twig + web/admin/index.html.twig Deconnexion @@ -2441,6 +2528,11 @@ Form/Login/PhraseaForgotPasswordForm.php Form/Login/PhraseaRegisterForm.php + + EN + EN + Form/Configuration/CustomLinkFormType.php + ERREUR : La classe de subdef est necessaire et egal a "thumbnail","preview" ou "document" FEHLER : Unterauflösung Kategorie ist erforderlich und ist gleich "Miniaturansicht","Voransicht" oder "Dokument" @@ -2456,6 +2548,11 @@ FEHLER : Alle "subdefgroup" tags brauchen ein "name" Attribut lib/classes/databox.php + + ES + ES + Form/Configuration/CustomLinkFormType.php + Edit Bearbeiten @@ -2575,7 +2672,7 @@ Emails E-Mail Adressen - Form/Configuration/MainConfigurationFormType.php + Form/Configuration/MainConfigurationFormType.php Embed code @@ -2908,7 +3005,7 @@ Executables settings Einstellungen von ausführbaren Programme - Form/Configuration/MainConfigurationFormType.php + Form/Configuration/MainConfigurationFormType.php Export @@ -2927,6 +3024,11 @@ Export in der Warteschlange gespeichert Controller/Prod/ExportController.php + + FR + FR + Form/Configuration/CustomLinkFormType.php + FTP FTP @@ -2935,7 +3037,7 @@ FTP Export FTP Export - Form/Configuration/MainConfigurationFormType.php + Form/Configuration/MainConfigurationFormType.php Fail @@ -3166,7 +3268,7 @@ General configuration Allgemeine Einstellungen - Form/Configuration/MainConfigurationFormType.php + Form/Configuration/MainConfigurationFormType.php General settings @@ -3308,7 +3410,7 @@ Guest Gast - web/common/menubar.html.twig + web/common/menubar.html.twig Guest access @@ -3967,7 +4069,7 @@ Maintenance state Wartungszustand - Form/Configuration/MainConfigurationFormType.php + Form/Configuration/MainConfigurationFormType.php Manage DB fields @@ -4346,7 +4448,7 @@ Nom du nouveau modele Name der neue Vorlage - web/admin/index.html.twig + web/admin/index.html.twig Nom du nouveau panier @@ -4405,7 +4507,7 @@ Notifications Benachrichtigungen - web/common/menubar.html.twig + web/common/menubar.html.twig Notifications globales @@ -4543,7 +4645,7 @@ Orders manager Bestellungen Manager eventsmanager/notify/order.php - web/common/menubar.html.twig + web/common/menubar.html.twig Ordinary @@ -4669,7 +4771,7 @@ Phraseanet client API Phraseanet Kunde API - Form/Configuration/MainConfigurationFormType.php + Form/Configuration/MainConfigurationFormType.php Phraseanet embarque un moteur de taches pour la lecture / ecriture des metadonnes, et autre operations @@ -4898,7 +5000,7 @@ Veröffentlichungen admin/publications/wrapper.html.twig web/admin/tree.html.twig - web/common/menubar.html.twig + web/common/menubar.html.twig web/prod/index.html.twig @@ -4926,7 +5028,7 @@ Push configuration Push Konfiguration - Form/Configuration/MainConfigurationFormType.php + Form/Configuration/MainConfigurationFormType.php Push from %user% @@ -5234,7 +5336,7 @@ Record Not Found Datensatz wurde nicht gefunden - Controller/Api/V1Controller.php + Controller/Api/V1Controller.php Record removed from basket @@ -5293,7 +5395,7 @@ Registration Anmeldung - Form/Configuration/MainConfigurationFormType.php + Form/Configuration/MainConfigurationFormType.php Reglages:: reglages d acces guest @@ -5415,7 +5517,7 @@ Require email validation to activate the account Email Validierung erfordern, um Konto zu aktivieren - web/admin/index.html.twig + web/admin/index.html.twig Required @@ -5435,12 +5537,12 @@ Reset and apply Zurücksetzen und Vorlage anwenden - web/admin/index.html.twig + web/admin/index.html.twig Reset and apply template Zurücksetzen und Vorlage anwenden - web/admin/index.html.twig + web/admin/index.html.twig Reset cache @@ -5450,7 +5552,7 @@ Reset rights before applying template? Möchten Sie die Benutzerrechte zurücksetzen, bevor Sie die Vorlage anwenden? - web/admin/index.html.twig + web/admin/index.html.twig Resolution @@ -5537,7 +5639,7 @@ Rights will be erased before applying template, do you confirm? Benutzerrechte werden gelöscht, bevor Sie die Vorlage anwenden. Bestätigen? - web/admin/index.html.twig + web/admin/index.html.twig Role @@ -5637,7 +5739,7 @@ Search engine Suchmaschine - Form/Configuration/MainConfigurationFormType.php + Form/Configuration/MainConfigurationFormType.php SearchEngine settings @@ -5734,7 +5836,7 @@ Send an email to the user to setup his password Eine Email zum Benutzer senden, um sein Passwort festzulegen - web/admin/index.html.twig + web/admin/index.html.twig Send to Facebook @@ -6027,7 +6129,7 @@ Story Not Found Bericht wurde nicht gefunden - Controller/Api/V1Controller.php + Controller/Api/V1Controller.php Story created @@ -6104,7 +6206,7 @@ Successful install Erfolgreiche Installation - web/admin/index.html.twig + web/admin/index.html.twig Successful removal @@ -6497,7 +6599,7 @@ This field is required Dieses Feld ist erforderlich - web/admin/index.html.twig + web/admin/index.html.twig This field represents the title of the document @@ -6508,7 +6610,7 @@ This file is too big Datei ist zu gross Controller/Prod/LanguageController.php - web/admin/index.html.twig + web/admin/index.html.twig This is a template @@ -6853,7 +6955,7 @@ Upload upload - web/common/menubar.html.twig + web/common/menubar.html.twig Bridge/Dailymotion/upload.html.twig Bridge/Dailymotion/upload.html.twig Bridge/Flickr/upload.html.twig @@ -7326,7 +7428,7 @@ Webservices connectivity Webservices Konnektivität - Form/Configuration/MainConfigurationFormType.php + Form/Configuration/MainConfigurationFormType.php Weight @@ -7374,8 +7476,8 @@ Would you like to reset rights before applying the template? Möchten Sie die Benutzerrechte zurücksetzen, bevor Sie die Vorlage anwenden? - web/admin/index.html.twig web/admin/index.html.twig + web/admin/index.html.twig Write Metas @@ -8509,7 +8611,7 @@ Controller/Admin/ConnectedUsersController.php lib/classes/phrasea.php web/admin/connected-users.html.twig - web/common/menubar.html.twig + web/common/menubar.html.twig admin::monitor: module client @@ -8549,7 +8651,7 @@ Controller/Admin/ConnectedUsersController.php lib/classes/phrasea.php web/admin/connected-users.html.twig - web/common/menubar.html.twig + web/common/menubar.html.twig admin::monitor: module thesaurus @@ -8557,14 +8659,14 @@ Controller/Admin/ConnectedUsersController.php lib/classes/phrasea.php web/admin/connected-users.html.twig - web/common/menubar.html.twig + web/common/menubar.html.twig admin::monitor: module upload Upload Controller/Admin/ConnectedUsersController.php lib/classes/phrasea.php - web/common/menubar.html.twig + web/common/menubar.html.twig admin::monitor: module validation @@ -8574,7 +8676,7 @@ Phrasea/Controller/LightboxController.php Phrasea/Controller/LightboxController.php lib/classes/phrasea.php - web/common/menubar.html.twig + web/common/menubar.html.twig admin::monitor: modules @@ -8584,7 +8686,7 @@ admin::monitor: production Prod - web/common/menubar.html.twig + web/common/menubar.html.twig admin::monitor: total des utilisateurs uniques : @@ -8862,7 +8964,7 @@ Controller/Prod/LanguageController.php web/account/reset-email.html.twig admin/collection/create.html.twig - web/admin/index.html.twig + web/admin/index.html.twig admin/publications/fiche.html.twig web/common/dialog_export.html.twig web/common/dialog_export.html.twig @@ -9140,7 +9242,7 @@ web/admin/editusers.html.twig admin/publications/fiche.html.twig admin/publications/list.html.twig - web/admin/setup.html.twig + web/admin/setup.html.twig admin/statusbit/edit.html.twig web/admin/structure.html.twig web/admin/subdefs.html.twig @@ -9692,7 +9794,7 @@ login:: Mon compte Mein Benutzerkonto web/account/account.html.twig - web/common/menubar.html.twig + web/common/menubar.html.twig login:: Visitez le lien suivant et suivez les instructions pour continuer, sinon ignorez cet email et il ne se passera rien @@ -10255,7 +10357,7 @@ phraseanet:: a propos Über - web/common/menubar.html.twig + web/common/menubar.html.twig phraseanet:: adresse @@ -10269,7 +10371,7 @@ phraseanet:: aide Hilfe - web/common/menubar.html.twig + web/common/menubar.html.twig phraseanet:: choisir @@ -10290,7 +10392,7 @@ phraseanet:: deconnection Abmeldung - web/common/menubar.html.twig + web/common/menubar.html.twig actions/Bridge/wrapper.html.twig @@ -10353,7 +10455,7 @@ phraseanet:: raccourcis clavier Abkürzungen - web/common/menubar.html.twig + web/common/menubar.html.twig phraseanet:: sous definition @@ -10419,19 +10521,19 @@ phraseanet::erreur: La connection au serveur Phraseanet semble etre indisponible Die Verbindung mit Phraseanet Server ist derzeit nich verfügbar Controller/Prod/LanguageController.php - web/admin/index.html.twig + web/admin/index.html.twig phraseanet::erreur: Une erreur est survenue, si ce probleme persiste, contactez le support technique Leider ist ein Fehler aufgetreten. Sollte sich dieser Fehler wiederholen kontaktieren Sie bitte den Administrator Controller/Prod/LanguageController.php - web/admin/index.html.twig + web/admin/index.html.twig phraseanet::erreur: Votre session est fermee, veuillez vous re-authentifier Sie sind nun abgemeldet. Bitte loggen Sie sich wieder ein Controller/Prod/LanguageController.php - web/admin/index.html.twig + web/admin/index.html.twig web/thesaurus/thesaurus.html.twig @@ -12107,6 +12209,67 @@ Test E-Mail Überprüfungen web/admin/dashboard.html.twig + + setup::custom-link:add-link + setup::custom-link:add-link + web/admin/setup.html.twig + + + setup::custom-link:help-menu + setup::custom-link:help-menu + Form/Configuration/CustomLinkFormType.php + + + setup::custom-link:language-link + setup::custom-link:language-link + web/admin/setup.html.twig + + + setup::custom-link:link-url + setup::custom-link:link-url + web/admin/setup.html.twig + + + setup::custom-link:location + setup::custom-link:location + Form/Configuration/CustomLinkFormType.php + + + setup::custom-link:location-link + setup::custom-link:location-link + web/admin/setup.html.twig + + + setup::custom-link:name-link + setup::custom-link:name-link + Form/Configuration/CustomLinkFormType.php + web/admin/setup.html.twig + + + setup::custom-link:navigation-bar + setup::custom-link:navigation-bar + Form/Configuration/CustomLinkFormType.php + + + setup::custom-link:order-link + setup::custom-link:order-link + web/admin/setup.html.twig + + + setup::custom-link:placeholder-link-url + setup::custom-link:placeholder-link-url + Form/Configuration/CustomLinkFormType.php + + + setup::custom-link:select-language + setup::custom-link:select-language + Form/Configuration/CustomLinkFormType.php + + + setup::custom-link:title-custom-link + setup::custom-link:title-custom-link + web/admin/setup.html.twig + sport Sport diff --git a/resources/locales/messages.en.xlf b/resources/locales/messages.en.xlf index 4638d71a8b..e8286bc599 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 @@ -21,6 +21,77 @@ Check the force authentication checkbox to constrain users to authenticate to access content of Push and Feedbacks. This feature can avoid divulging connection parameters contained in given links in e-mails notifications. prod/templates/push.html.twig
+ + #3567c6 + #3567c6 + Form/Configuration/CustomLinkFormType.php + + + #4497d5 + #4497d5 + Form/Configuration/CustomLinkFormType.php + + + #5aa53b + #5aa53b + Form/Configuration/CustomLinkFormType.php + + + #a1d0d0 + #a1d0d0 + Form/Configuration/CustomLinkFormType.php + + + #ad0800 + #ad0800 + Form/Configuration/CustomLinkFormType.php + Form/Configuration/CustomLinkFormType.php + + + #b151ee + #b151ee + Form/Configuration/CustomLinkFormType.php + + + #b8d84e + #b8d84e + Form/Configuration/CustomLinkFormType.php + + + #c875ea + #c875ea + Form/Configuration/CustomLinkFormType.php + + + #e46990 + #e46990 + Form/Configuration/CustomLinkFormType.php + + + #f06006 + #f06006 + Form/Configuration/CustomLinkFormType.php + + + #f4ea5b + #f4ea5b + Form/Configuration/CustomLinkFormType.php + + + #f5842b + #f5842b + Form/Configuration/CustomLinkFormType.php + + + #ffc322 + #ffc322 + Form/Configuration/CustomLinkFormType.php + + + #ffccd7 + #ffccd7 + Form/Configuration/CustomLinkFormType.php + %ElementsCount% records %ElementsCount% records @@ -461,6 +532,11 @@ API Webhook TaskManager/Job/WebhookJob.php + + AR + AR + Form/Configuration/CustomLinkFormType.php + About Roles : About roles: @@ -645,7 +721,7 @@ Additionnal modules Additional modules - Form/Configuration/MainConfigurationFormType.php + Form/Configuration/MainConfigurationFormType.php Adds an option to the push form submission to restrict push recipient(s) to Phraseanet users only. @@ -665,7 +741,7 @@ Adresse email du nouvel utilisateur New user e-mail address - web/admin/index.html.twig + web/admin/index.html.twig Advanced Search @@ -739,7 +815,7 @@ Ajouter un nouvel utilisateur Add a new user - web/admin/index.html.twig + web/admin/index.html.twig Ajouter un publisher @@ -754,6 +830,7 @@ All All + Form/Configuration/CustomLinkFormType.php actions/Feedback/list.html.twig actions/Feedback/list.html.twig actions/Feedback/list.html.twig @@ -911,8 +988,8 @@ An error occurred Controller/Admin/CollectionController.php Controller/Admin/DataboxController.php - Controller/Api/V1Controller.php - Controller/Api/V1Controller.php + Controller/Api/V1Controller.php + Controller/Api/V1Controller.php Controller/Prod/BasketController.php Order/Controller/ProdOrderController.php web/admin/statusbit.html.twig @@ -1022,7 +1099,7 @@ Apply template Apply template - web/admin/index.html.twig + web/admin/index.html.twig Apply to all selected documents @@ -1064,7 +1141,7 @@ Attention Warning Controller/Prod/LanguageController.php - web/admin/index.html.twig + web/admin/index.html.twig prod/results/help.html.twig @@ -1652,7 +1729,7 @@ Cocher toute la colonne Check all boxes from column - web/admin/index.html.twig + web/admin/index.html.twig Cochez les cases correspondantes aux colonnes que vous desirez voire apparaitre dans le report @@ -1717,7 +1794,7 @@ Commandes Orders - web/common/menubar.html.twig + web/common/menubar.html.twig Company @@ -1767,7 +1844,7 @@ Confirm reset users rights before applying template Confirm the reset of selected users' rights before applying the template - web/admin/index.html.twig + web/admin/index.html.twig Confirmation de votre mot de passe @@ -1931,17 +2008,17 @@ Creer un model Create a template user - web/admin/index.html.twig + web/admin/index.html.twig Creer un modele Create a template - web/admin/index.html.twig + web/admin/index.html.twig Creer un utilisateur Create a new user - web/admin/index.html.twig + web/admin/index.html.twig Creer une nouvelle applications @@ -1994,6 +2071,16 @@ Dublin Core Input/Output admin/fields/templates.html.twig + + DE + DE + Form/Configuration/CustomLinkFormType.php + + + DU + DU + Form/Configuration/CustomLinkFormType.php + Danger zone ! Danger zone ! @@ -2099,7 +2186,7 @@ Decocher toute la colonne Uncheck all boxes from column - web/admin/index.html.twig + web/admin/index.html.twig Deconnexion @@ -2232,7 +2319,7 @@ prod/results/entry.html.twig prod/results/feeds_entry.html.twig - + Derniers envois Last sent web/developers/application.html.twig @@ -2441,6 +2528,11 @@ Form/Login/PhraseaForgotPasswordForm.php Form/Login/PhraseaRegisterForm.php + + EN + EN + Form/Configuration/CustomLinkFormType.php + ERREUR : La classe de subdef est necessaire et egal a "thumbnail","preview" ou "document" Error: Class attribute is mandatory and must be Thumbnail, Preview or Document @@ -2456,6 +2548,11 @@ Error : All "subdefgroup" tags must have an attribute "name" lib/classes/databox.php + + ES + ES + Form/Configuration/CustomLinkFormType.php + Edit Edit @@ -2575,7 +2672,7 @@ Emails E-mail configuration - Form/Configuration/MainConfigurationFormType.php + Form/Configuration/MainConfigurationFormType.php Embed code @@ -2908,7 +3005,7 @@ Executables settings Executables setting - Form/Configuration/MainConfigurationFormType.php + Form/Configuration/MainConfigurationFormType.php Export @@ -2927,6 +3024,11 @@ Export saved in the waiting queue. Controller/Prod/ExportController.php + + FR + FR + Form/Configuration/CustomLinkFormType.php + FTP FTP @@ -2935,7 +3037,7 @@ FTP Export FTP Export - Form/Configuration/MainConfigurationFormType.php + Form/Configuration/MainConfigurationFormType.php Fail @@ -3166,7 +3268,7 @@ General configuration General configuration - Form/Configuration/MainConfigurationFormType.php + Form/Configuration/MainConfigurationFormType.php General settings @@ -3308,7 +3410,7 @@ Guest Guest - web/common/menubar.html.twig + web/common/menubar.html.twig Guest access @@ -3967,7 +4069,7 @@ Maintenance state Maintenance state - Form/Configuration/MainConfigurationFormType.php + Form/Configuration/MainConfigurationFormType.php Manage DB fields @@ -4346,7 +4448,7 @@ Nom du nouveau modele New template name - web/admin/index.html.twig + web/admin/index.html.twig Nom du nouveau panier @@ -4405,7 +4507,7 @@ Notifications Notifications - web/common/menubar.html.twig + web/common/menubar.html.twig Notifications globales @@ -4543,7 +4645,7 @@ Orders manager Orders manager eventsmanager/notify/order.php - web/common/menubar.html.twig + web/common/menubar.html.twig Ordinary @@ -4625,7 +4727,7 @@ Past year WorkZone/Browser/Browser.html.twig - + Pause Pause Controller/Prod/LanguageController.php @@ -4669,7 +4771,7 @@ Phraseanet client API Phraseanet client API - Form/Configuration/MainConfigurationFormType.php + Form/Configuration/MainConfigurationFormType.php Phraseanet embarque un moteur de taches pour la lecture / ecriture des metadonnes, et autre operations @@ -4898,7 +5000,7 @@ Publications admin/publications/wrapper.html.twig web/admin/tree.html.twig - web/common/menubar.html.twig + web/common/menubar.html.twig web/prod/index.html.twig @@ -4926,7 +5028,7 @@ Push configuration Push configuration - Form/Configuration/MainConfigurationFormType.php + Form/Configuration/MainConfigurationFormType.php Push from %user% @@ -5234,7 +5336,7 @@ Record Not Found Record not found - Controller/Api/V1Controller.php + Controller/Api/V1Controller.php Record removed from basket @@ -5293,7 +5395,7 @@ Registration Registration - Form/Configuration/MainConfigurationFormType.php + Form/Configuration/MainConfigurationFormType.php Reglages:: reglages d acces guest @@ -5415,7 +5517,7 @@ Require email validation to activate the account Require e-mail validation to activate the account. - web/admin/index.html.twig + web/admin/index.html.twig Required @@ -5435,12 +5537,12 @@ Reset and apply Reset and apply - web/admin/index.html.twig + web/admin/index.html.twig Reset and apply template Reset and apply template - web/admin/index.html.twig + web/admin/index.html.twig Reset cache @@ -5450,7 +5552,7 @@ Reset rights before applying template? Reset rights before applying template? - web/admin/index.html.twig + web/admin/index.html.twig Resolution @@ -5537,7 +5639,7 @@ Rights will be erased before applying template, do you confirm? Rights will be erased before applying template, do you confirm? - web/admin/index.html.twig + web/admin/index.html.twig Role @@ -5637,7 +5739,7 @@ Search engine Search engine - Form/Configuration/MainConfigurationFormType.php + Form/Configuration/MainConfigurationFormType.php SearchEngine settings @@ -5734,7 +5836,7 @@ Send an email to the user to setup his password Send user an e-mail for password setup. - web/admin/index.html.twig + web/admin/index.html.twig Send to Facebook @@ -6027,7 +6129,7 @@ Story Not Found Story not found - Controller/Api/V1Controller.php + Controller/Api/V1Controller.php Story created @@ -6104,7 +6206,7 @@ Successful install Successful installation - web/admin/index.html.twig + web/admin/index.html.twig Successful removal @@ -6497,7 +6599,7 @@ This field is required This field is required - web/admin/index.html.twig + web/admin/index.html.twig This field represents the title of the document @@ -6508,7 +6610,7 @@ This file is too big This file is too big Controller/Prod/LanguageController.php - web/admin/index.html.twig + web/admin/index.html.twig This is a template @@ -6853,7 +6955,7 @@ Upload Upload - web/common/menubar.html.twig + web/common/menubar.html.twig Bridge/Dailymotion/upload.html.twig Bridge/Dailymotion/upload.html.twig Bridge/Flickr/upload.html.twig @@ -6995,7 +7097,7 @@ Users suggestion prod/actions/Push.html.twig - + Utilisation prevue: Intended use: prod/orders/order_item.html.twig @@ -7327,7 +7429,7 @@ Webservices connectivity Webservices connectivity - Form/Configuration/MainConfigurationFormType.php + Form/Configuration/MainConfigurationFormType.php Weight @@ -7375,8 +7477,8 @@ Would you like to reset rights before applying the template? Reset rights before applying the template? - web/admin/index.html.twig web/admin/index.html.twig + web/admin/index.html.twig Write Metas @@ -8510,7 +8612,7 @@ Controller/Admin/ConnectedUsersController.php lib/classes/phrasea.php web/admin/connected-users.html.twig - web/common/menubar.html.twig + web/common/menubar.html.twig admin::monitor: module client @@ -8550,7 +8652,7 @@ Controller/Admin/ConnectedUsersController.php lib/classes/phrasea.php web/admin/connected-users.html.twig - web/common/menubar.html.twig + web/common/menubar.html.twig admin::monitor: module thesaurus @@ -8558,14 +8660,14 @@ Controller/Admin/ConnectedUsersController.php lib/classes/phrasea.php web/admin/connected-users.html.twig - web/common/menubar.html.twig + web/common/menubar.html.twig admin::monitor: module upload Upload Controller/Admin/ConnectedUsersController.php lib/classes/phrasea.php - web/common/menubar.html.twig + web/common/menubar.html.twig admin::monitor: module validation @@ -8575,7 +8677,7 @@ Phrasea/Controller/LightboxController.php Phrasea/Controller/LightboxController.php lib/classes/phrasea.php - web/common/menubar.html.twig + web/common/menubar.html.twig admin::monitor: modules @@ -8585,7 +8687,7 @@ admin::monitor: production Prod - web/common/menubar.html.twig + web/common/menubar.html.twig admin::monitor: total des utilisateurs uniques : @@ -8863,7 +8965,7 @@ Controller/Prod/LanguageController.php web/account/reset-email.html.twig admin/collection/create.html.twig - web/admin/index.html.twig + web/admin/index.html.twig admin/publications/fiche.html.twig web/common/dialog_export.html.twig web/common/dialog_export.html.twig @@ -9141,7 +9243,7 @@ web/admin/editusers.html.twig admin/publications/fiche.html.twig admin/publications/list.html.twig - web/admin/setup.html.twig + web/admin/setup.html.twig admin/statusbit/edit.html.twig web/admin/structure.html.twig web/admin/subdefs.html.twig @@ -9693,7 +9795,7 @@ login:: Mon compte My account web/account/account.html.twig - web/common/menubar.html.twig + web/common/menubar.html.twig login:: Visitez le lien suivant et suivez les instructions pour continuer, sinon ignorez cet email et il ne se passera rien @@ -10256,7 +10358,7 @@ phraseanet:: a propos About - web/common/menubar.html.twig + web/common/menubar.html.twig phraseanet:: adresse @@ -10270,7 +10372,7 @@ phraseanet:: aide Help - web/common/menubar.html.twig + web/common/menubar.html.twig phraseanet:: choisir @@ -10291,7 +10393,7 @@ phraseanet:: deconnection Sign out - web/common/menubar.html.twig + web/common/menubar.html.twig actions/Bridge/wrapper.html.twig @@ -10354,7 +10456,7 @@ phraseanet:: raccourcis clavier Shortcuts - web/common/menubar.html.twig + web/common/menubar.html.twig phraseanet:: sous definition @@ -10420,19 +10522,19 @@ phraseanet::erreur: La connection au serveur Phraseanet semble etre indisponible Server connection is not available Controller/Prod/LanguageController.php - web/admin/index.html.twig + web/admin/index.html.twig phraseanet::erreur: Une erreur est survenue, si ce probleme persiste, contactez le support technique An error occurred. If this problem happens again, please contact technical support Controller/Prod/LanguageController.php - web/admin/index.html.twig + web/admin/index.html.twig phraseanet::erreur: Votre session est fermee, veuillez vous re-authentifier Your session is closed, please re-authentificate Controller/Prod/LanguageController.php - web/admin/index.html.twig + web/admin/index.html.twig web/thesaurus/thesaurus.html.twig @@ -12108,6 +12210,67 @@ E-mails send test web/admin/dashboard.html.twig + + setup::custom-link:add-link + setup::custom-link:add-link + web/admin/setup.html.twig + + + setup::custom-link:help-menu + setup::custom-link:help-menu + Form/Configuration/CustomLinkFormType.php + + + setup::custom-link:language-link + setup::custom-link:language-link + web/admin/setup.html.twig + + + setup::custom-link:link-url + setup::custom-link:link-url + web/admin/setup.html.twig + + + setup::custom-link:location + setup::custom-link:location + Form/Configuration/CustomLinkFormType.php + + + setup::custom-link:location-link + setup::custom-link:location-link + web/admin/setup.html.twig + + + setup::custom-link:name-link + setup::custom-link:name-link + Form/Configuration/CustomLinkFormType.php + web/admin/setup.html.twig + + + setup::custom-link:navigation-bar + setup::custom-link:navigation-bar + Form/Configuration/CustomLinkFormType.php + + + setup::custom-link:order-link + setup::custom-link:order-link + web/admin/setup.html.twig + + + setup::custom-link:placeholder-link-url + setup::custom-link:placeholder-link-url + Form/Configuration/CustomLinkFormType.php + + + setup::custom-link:select-language + setup::custom-link:select-language + Form/Configuration/CustomLinkFormType.php + + + setup::custom-link:title-custom-link + setup::custom-link:title-custom-link + web/admin/setup.html.twig + sport sport diff --git a/resources/locales/messages.fr.xlf b/resources/locales/messages.fr.xlf index 3c131fe38e..340af52166 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 @@ -21,6 +21,77 @@ L'option Forcer l'authentification des utilisateurs contraint les destinataires à s'authentifier pour accéder au contenu diffusé. Cela interdit l'accès aux documents à des personnes auprès desquels l'URL aurait été divulguée notamment par un transfert d'e-mail. prod/templates/push.html.twig
+ + #3567c6 + #3567c6 + Form/Configuration/CustomLinkFormType.php + + + #4497d5 + #4497d5 + Form/Configuration/CustomLinkFormType.php + + + #5aa53b + #5aa53b + Form/Configuration/CustomLinkFormType.php + + + #a1d0d0 + #a1d0d0 + Form/Configuration/CustomLinkFormType.php + + + #ad0800 + #ad0800 + Form/Configuration/CustomLinkFormType.php + Form/Configuration/CustomLinkFormType.php + + + #b151ee + #b151ee + Form/Configuration/CustomLinkFormType.php + + + #b8d84e + #b8d84e + Form/Configuration/CustomLinkFormType.php + + + #c875ea + #c875ea + Form/Configuration/CustomLinkFormType.php + + + #e46990 + #e46990 + Form/Configuration/CustomLinkFormType.php + + + #f06006 + #f06006 + Form/Configuration/CustomLinkFormType.php + + + #f4ea5b + #f4ea5b + Form/Configuration/CustomLinkFormType.php + + + #f5842b + #f5842b + Form/Configuration/CustomLinkFormType.php + + + #ffc322 + #ffc322 + Form/Configuration/CustomLinkFormType.php + + + #ffccd7 + #ffccd7 + Form/Configuration/CustomLinkFormType.php + %ElementsCount% records %ElementsCount% enregistrement(s) @@ -461,6 +532,11 @@ Webhook API TaskManager/Job/WebhookJob.php + + AR + AR + Form/Configuration/CustomLinkFormType.php + About Roles : A propos des rôles : @@ -645,7 +721,7 @@ Additionnal modules Modules additionnels - Form/Configuration/MainConfigurationFormType.php + Form/Configuration/MainConfigurationFormType.php Adds an option to the push form submission to restrict push recipient(s) to Phraseanet users only. @@ -665,7 +741,7 @@ Adresse email du nouvel utilisateur Adresse e-mail du nouvel utilisateur - web/admin/index.html.twig + web/admin/index.html.twig Advanced Search @@ -739,7 +815,7 @@ Ajouter un nouvel utilisateur Ajouter un nouvel utilisateur - web/admin/index.html.twig + web/admin/index.html.twig Ajouter un publisher @@ -754,6 +830,7 @@ All Tout + Form/Configuration/CustomLinkFormType.php actions/Feedback/list.html.twig actions/Feedback/list.html.twig actions/Feedback/list.html.twig @@ -911,8 +988,8 @@ Une erreur est survenue Controller/Admin/CollectionController.php Controller/Admin/DataboxController.php - Controller/Api/V1Controller.php - Controller/Api/V1Controller.php + Controller/Api/V1Controller.php + Controller/Api/V1Controller.php Controller/Prod/BasketController.php Order/Controller/ProdOrderController.php web/admin/statusbit.html.twig @@ -1022,7 +1099,7 @@ Apply template Appliquer le modèle - web/admin/index.html.twig + web/admin/index.html.twig Apply to all selected documents @@ -1064,7 +1141,7 @@ Attention Attention Controller/Prod/LanguageController.php - web/admin/index.html.twig + web/admin/index.html.twig prod/results/help.html.twig @@ -1652,7 +1729,7 @@ Cocher toute la colonne Cocher toute la colonne - web/admin/index.html.twig + web/admin/index.html.twig Cochez les cases correspondantes aux colonnes que vous desirez voire apparaitre dans le report @@ -1717,7 +1794,7 @@ Commandes Commandes - web/common/menubar.html.twig + web/common/menubar.html.twig Company @@ -1767,7 +1844,7 @@ Confirm reset users rights before applying template Confirmez la réinitialisation les droits utilisateurs avant d'appliquer le modèle. - web/admin/index.html.twig + web/admin/index.html.twig Confirmation de votre mot de passe @@ -1931,17 +2008,17 @@ Creer un model Créer un modèle - web/admin/index.html.twig + web/admin/index.html.twig Creer un modele Créer un modèle - web/admin/index.html.twig + web/admin/index.html.twig Creer un utilisateur Créer un utilisateur - web/admin/index.html.twig + web/admin/index.html.twig Creer une nouvelle applications @@ -1994,6 +2071,16 @@ Entrée/Sortie Dublin Core admin/fields/templates.html.twig + + DE + DE + Form/Configuration/CustomLinkFormType.php + + + DU + DU + Form/Configuration/CustomLinkFormType.php + Danger zone ! Danger ! @@ -2099,7 +2186,7 @@ Decocher toute la colonne Décocher toute la colonne - web/admin/index.html.twig + web/admin/index.html.twig Deconnexion @@ -2441,6 +2528,11 @@ Form/Login/PhraseaForgotPasswordForm.php Form/Login/PhraseaRegisterForm.php + + EN + EN + Form/Configuration/CustomLinkFormType.php + ERREUR : La classe de subdef est necessaire et egal a "thumbnail","preview" ou "document" Erreur : Une classe est nécessaire et peut être égale à "Tout le monde","Sous-résolution" ou "Document" @@ -2456,6 +2548,11 @@ ERREUR : Toutes les balises "subdefgroup" nécessitent un attribut "name" lib/classes/databox.php + + ES + ES + Form/Configuration/CustomLinkFormType.php + Edit Editer @@ -2575,7 +2672,7 @@ Emails E-mails - Form/Configuration/MainConfigurationFormType.php + Form/Configuration/MainConfigurationFormType.php Embed code @@ -2908,7 +3005,7 @@ Executables settings Paramètres d'exécutables - Form/Configuration/MainConfigurationFormType.php + Form/Configuration/MainConfigurationFormType.php Export @@ -2927,6 +3024,11 @@ Export ajouté dans la file d'attente. Controller/Prod/ExportController.php + + FR + FR + Form/Configuration/CustomLinkFormType.php + FTP Serveur FTP @@ -2935,7 +3037,7 @@ FTP Export Export FTP - Form/Configuration/MainConfigurationFormType.php + Form/Configuration/MainConfigurationFormType.php Fail @@ -3166,7 +3268,7 @@ General configuration Configuration générale - Form/Configuration/MainConfigurationFormType.php + Form/Configuration/MainConfigurationFormType.php General settings @@ -3308,7 +3410,7 @@ Guest Invité - web/common/menubar.html.twig + web/common/menubar.html.twig Guest access @@ -3967,7 +4069,7 @@ Maintenance state Etat de maintenance - Form/Configuration/MainConfigurationFormType.php + Form/Configuration/MainConfigurationFormType.php Manage DB fields @@ -4346,7 +4448,7 @@ Nom du nouveau modele Nom du nouveau modèle - web/admin/index.html.twig + web/admin/index.html.twig Nom du nouveau panier @@ -4405,7 +4507,7 @@ Notifications Notifications - web/common/menubar.html.twig + web/common/menubar.html.twig Notifications globales @@ -4543,7 +4645,7 @@ Orders manager Gestionnaire des commandes eventsmanager/notify/order.php - web/common/menubar.html.twig + web/common/menubar.html.twig Ordinary @@ -4669,7 +4771,7 @@ Phraseanet client API API cliente Phraseanet - Form/Configuration/MainConfigurationFormType.php + Form/Configuration/MainConfigurationFormType.php Phraseanet embarque un moteur de taches pour la lecture / ecriture des metadonnes, et autre operations @@ -4898,7 +5000,7 @@ Publications admin/publications/wrapper.html.twig web/admin/tree.html.twig - web/common/menubar.html.twig + web/common/menubar.html.twig web/prod/index.html.twig @@ -4926,7 +5028,7 @@ Push configuration Configuration de la demande de validation - Form/Configuration/MainConfigurationFormType.php + Form/Configuration/MainConfigurationFormType.php Push from %user% @@ -5236,7 +5338,7 @@ Pour les utilisateurs authentifiés, la demande de validation est également dis Record Not Found Enregistrement non trouvé - Controller/Api/V1Controller.php + Controller/Api/V1Controller.php Record removed from basket @@ -5295,7 +5397,7 @@ Pour les utilisateurs authentifiés, la demande de validation est également dis Registration Inscription - Form/Configuration/MainConfigurationFormType.php + Form/Configuration/MainConfigurationFormType.php Reglages:: reglages d acces guest @@ -5417,7 +5519,7 @@ Pour les utilisateurs authentifiés, la demande de validation est également dis Require email validation to activate the account Demander une confirmation par e-mail pour valider le compte - web/admin/index.html.twig + web/admin/index.html.twig Required @@ -5437,12 +5539,12 @@ Pour les utilisateurs authentifiés, la demande de validation est également dis Reset and apply Réinitialiser et appliquer - web/admin/index.html.twig + web/admin/index.html.twig Reset and apply template Réinitialiser et appliquer le modèle - web/admin/index.html.twig + web/admin/index.html.twig Reset cache @@ -5452,7 +5554,7 @@ Pour les utilisateurs authentifiés, la demande de validation est également dis Reset rights before applying template? Réinitialiser les droits avant d'appliquer modèle ? - web/admin/index.html.twig + web/admin/index.html.twig Resolution @@ -5539,7 +5641,7 @@ Pour les utilisateurs authentifiés, la demande de validation est également dis Rights will be erased before applying template, do you confirm? Les droits seront effacés avant d'appliquer le modèle. Confirmez-vous l'action ? - web/admin/index.html.twig + web/admin/index.html.twig Role @@ -5639,7 +5741,7 @@ Pour les utilisateurs authentifiés, la demande de validation est également dis Search engine Moteur de recherche - Form/Configuration/MainConfigurationFormType.php + Form/Configuration/MainConfigurationFormType.php SearchEngine settings @@ -5736,7 +5838,7 @@ Pour les utilisateurs authentifiés, la demande de validation est également dis Send an email to the user to setup his password Envoyer un e-mail à l'utilisateur pour créer son mot de passe - web/admin/index.html.twig + web/admin/index.html.twig Send to Facebook @@ -6029,7 +6131,7 @@ Pour les utilisateurs authentifiés, la demande de validation est également dis Story Not Found Reportage inconnu - Controller/Api/V1Controller.php + Controller/Api/V1Controller.php Story created @@ -6106,7 +6208,7 @@ Pour les utilisateurs authentifiés, la demande de validation est également dis Successful install Installation réussie - web/admin/index.html.twig + web/admin/index.html.twig Successful removal @@ -6296,7 +6398,7 @@ Pour les utilisateurs authentifiés, la demande de validation est également dis web/login/cgus.html.twig login/layout/base-layout.html.twig - + The Phraseanet Web API allows other web application to rely on this instance L'API Web Phraseanet permet à d'autres applications web de se reposer sur cette instance Form/Configuration/APIClientsFormType.php @@ -6499,7 +6601,7 @@ Pour les utilisateurs authentifiés, la demande de validation est également dis This field is required Ce champ est obligatoire - web/admin/index.html.twig + web/admin/index.html.twig This field represents the title of the document @@ -6510,7 +6612,7 @@ Pour les utilisateurs authentifiés, la demande de validation est également dis This file is too big Ce fichier est trop volumineux Controller/Prod/LanguageController.php - web/admin/index.html.twig + web/admin/index.html.twig This is a template @@ -6855,7 +6957,7 @@ Pour les utilisateurs authentifiés, la demande de validation est également dis Upload Ajouter - web/common/menubar.html.twig + web/common/menubar.html.twig Bridge/Dailymotion/upload.html.twig Bridge/Dailymotion/upload.html.twig Bridge/Flickr/upload.html.twig @@ -6997,7 +7099,7 @@ 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: prod/orders/order_item.html.twig @@ -7329,7 +7431,7 @@ La base de compte sera définitivement perdus. Webservices connectivity Connexion à des Webservices - Form/Configuration/MainConfigurationFormType.php + Form/Configuration/MainConfigurationFormType.php Weight @@ -7377,8 +7479,8 @@ La base de compte sera définitivement perdus. Would you like to reset rights before applying the template? Souhaitez-vous réinitialiser les droits avant d'appliquer le modèle ? - web/admin/index.html.twig web/admin/index.html.twig + web/admin/index.html.twig Write Metas @@ -8513,7 +8615,7 @@ Si vous recevez cet e-mail sans l'avoir sollicité, merci de l'ignorer ou de le Controller/Admin/ConnectedUsersController.php lib/classes/phrasea.php web/admin/connected-users.html.twig - web/common/menubar.html.twig + web/common/menubar.html.twig admin::monitor: module client @@ -8553,7 +8655,7 @@ Si vous recevez cet e-mail sans l'avoir sollicité, merci de l'ignorer ou de le Controller/Admin/ConnectedUsersController.php lib/classes/phrasea.php web/admin/connected-users.html.twig - web/common/menubar.html.twig + web/common/menubar.html.twig admin::monitor: module thesaurus @@ -8561,14 +8663,14 @@ Si vous recevez cet e-mail sans l'avoir sollicité, merci de l'ignorer ou de le Controller/Admin/ConnectedUsersController.php lib/classes/phrasea.php web/admin/connected-users.html.twig - web/common/menubar.html.twig + web/common/menubar.html.twig admin::monitor: module upload Upload Controller/Admin/ConnectedUsersController.php lib/classes/phrasea.php - web/common/menubar.html.twig + web/common/menubar.html.twig admin::monitor: module validation @@ -8578,7 +8680,7 @@ Si vous recevez cet e-mail sans l'avoir sollicité, merci de l'ignorer ou de le Phrasea/Controller/LightboxController.php Phrasea/Controller/LightboxController.php lib/classes/phrasea.php - web/common/menubar.html.twig + web/common/menubar.html.twig admin::monitor: modules @@ -8588,7 +8690,7 @@ Si vous recevez cet e-mail sans l'avoir sollicité, merci de l'ignorer ou de le admin::monitor: production Prod - web/common/menubar.html.twig + web/common/menubar.html.twig admin::monitor: total des utilisateurs uniques : @@ -8866,7 +8968,7 @@ Si vous recevez cet e-mail sans l'avoir sollicité, merci de l'ignorer ou de le Controller/Prod/LanguageController.php web/account/reset-email.html.twig admin/collection/create.html.twig - web/admin/index.html.twig + web/admin/index.html.twig admin/publications/fiche.html.twig web/common/dialog_export.html.twig web/common/dialog_export.html.twig @@ -9144,7 +9246,7 @@ Si vous recevez cet e-mail sans l'avoir sollicité, merci de l'ignorer ou de le web/admin/editusers.html.twig admin/publications/fiche.html.twig admin/publications/list.html.twig - web/admin/setup.html.twig + web/admin/setup.html.twig admin/statusbit/edit.html.twig web/admin/structure.html.twig web/admin/subdefs.html.twig @@ -9696,7 +9798,7 @@ Si vous recevez cet e-mail sans l'avoir sollicité, merci de l'ignorer ou de le login:: Mon compte Mon Compte web/account/account.html.twig - web/common/menubar.html.twig + web/common/menubar.html.twig login:: Visitez le lien suivant et suivez les instructions pour continuer, sinon ignorez cet email et il ne se passera rien @@ -10259,7 +10361,7 @@ Si vous recevez cet e-mail sans l'avoir sollicité, merci de l'ignorer ou de le phraseanet:: a propos A propos - web/common/menubar.html.twig + web/common/menubar.html.twig phraseanet:: adresse @@ -10273,7 +10375,7 @@ Si vous recevez cet e-mail sans l'avoir sollicité, merci de l'ignorer ou de le phraseanet:: aide Aide - web/common/menubar.html.twig + web/common/menubar.html.twig phraseanet:: choisir @@ -10294,7 +10396,7 @@ Si vous recevez cet e-mail sans l'avoir sollicité, merci de l'ignorer ou de le phraseanet:: deconnection Déconnexion - web/common/menubar.html.twig + web/common/menubar.html.twig actions/Bridge/wrapper.html.twig @@ -10357,7 +10459,7 @@ Si vous recevez cet e-mail sans l'avoir sollicité, merci de l'ignorer ou de le phraseanet:: raccourcis clavier Raccourcis - web/common/menubar.html.twig + web/common/menubar.html.twig phraseanet:: sous definition @@ -10423,19 +10525,19 @@ Si vous recevez cet e-mail sans l'avoir sollicité, merci de l'ignorer ou de le phraseanet::erreur: La connection au serveur Phraseanet semble etre indisponible La connexion au serveur Phraseanet semble être indisponible. Controller/Prod/LanguageController.php - web/admin/index.html.twig + web/admin/index.html.twig phraseanet::erreur: Une erreur est survenue, si ce probleme persiste, contactez le support technique Une erreur est survenue, si le problème persiste, contactez le support technique Controller/Prod/LanguageController.php - web/admin/index.html.twig + web/admin/index.html.twig phraseanet::erreur: Votre session est fermee, veuillez vous re-authentifier Votre session a expiré. Veuillez vous ré-authentifier Controller/Prod/LanguageController.php - web/admin/index.html.twig + web/admin/index.html.twig web/thesaurus/thesaurus.html.twig @@ -12111,6 +12213,67 @@ Si vous recevez cet e-mail sans l'avoir sollicité, merci de l'ignorer ou de le Tests d'envois d'e-mails web/admin/dashboard.html.twig + + setup::custom-link:add-link + setup::custom-link:add-link + web/admin/setup.html.twig + + + setup::custom-link:help-menu + setup::custom-link:help-menu + Form/Configuration/CustomLinkFormType.php + + + setup::custom-link:language-link + setup::custom-link:language-link + web/admin/setup.html.twig + + + setup::custom-link:link-url + setup::custom-link:link-url + web/admin/setup.html.twig + + + setup::custom-link:location + setup::custom-link:location + Form/Configuration/CustomLinkFormType.php + + + setup::custom-link:location-link + setup::custom-link:location-link + web/admin/setup.html.twig + + + setup::custom-link:name-link + setup::custom-link:name-link + Form/Configuration/CustomLinkFormType.php + web/admin/setup.html.twig + + + setup::custom-link:navigation-bar + setup::custom-link:navigation-bar + Form/Configuration/CustomLinkFormType.php + + + setup::custom-link:order-link + setup::custom-link:order-link + web/admin/setup.html.twig + + + setup::custom-link:placeholder-link-url + setup::custom-link:placeholder-link-url + Form/Configuration/CustomLinkFormType.php + + + setup::custom-link:select-language + setup::custom-link:select-language + Form/Configuration/CustomLinkFormType.php + + + setup::custom-link:title-custom-link + setup::custom-link:title-custom-link + web/admin/setup.html.twig + sport sport diff --git a/resources/locales/messages.nl.xlf b/resources/locales/messages.nl.xlf index f368872247..eceb16c78f 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. @@ -25,6 +25,77 @@ prod/templates/push.html.twig + + #3567c6 + #3567c6 + Form/Configuration/CustomLinkFormType.php + + + #4497d5 + #4497d5 + Form/Configuration/CustomLinkFormType.php + + + #5aa53b + #5aa53b + Form/Configuration/CustomLinkFormType.php + + + #a1d0d0 + #a1d0d0 + Form/Configuration/CustomLinkFormType.php + + + #ad0800 + #ad0800 + Form/Configuration/CustomLinkFormType.php + Form/Configuration/CustomLinkFormType.php + + + #b151ee + #b151ee + Form/Configuration/CustomLinkFormType.php + + + #b8d84e + #b8d84e + Form/Configuration/CustomLinkFormType.php + + + #c875ea + #c875ea + Form/Configuration/CustomLinkFormType.php + + + #e46990 + #e46990 + Form/Configuration/CustomLinkFormType.php + + + #f06006 + #f06006 + Form/Configuration/CustomLinkFormType.php + + + #f4ea5b + #f4ea5b + Form/Configuration/CustomLinkFormType.php + + + #f5842b + #f5842b + Form/Configuration/CustomLinkFormType.php + + + #ffc322 + #ffc322 + Form/Configuration/CustomLinkFormType.php + + + #ffccd7 + #ffccd7 + Form/Configuration/CustomLinkFormType.php + %ElementsCount% records %ElementsCount% records @@ -465,6 +536,11 @@ API Webhook TaskManager/Job/WebhookJob.php + + AR + AR + Form/Configuration/CustomLinkFormType.php + About Roles : Over Functies : @@ -649,7 +725,7 @@ Additionnal modules Bijkomende modules - Form/Configuration/MainConfigurationFormType.php + Form/Configuration/MainConfigurationFormType.php Adds an option to the push form submission to restrict push recipient(s) to Phraseanet users only. @@ -669,7 +745,7 @@ Adresse email du nouvel utilisateur Email adres van de nieuwe gebruiker - web/admin/index.html.twig + web/admin/index.html.twig Advanced Search @@ -743,7 +819,7 @@ Ajouter un nouvel utilisateur Voeg een nieuwe gebruiker toe - web/admin/index.html.twig + web/admin/index.html.twig Ajouter un publisher @@ -758,6 +834,7 @@ All Alle + Form/Configuration/CustomLinkFormType.php actions/Feedback/list.html.twig actions/Feedback/list.html.twig actions/Feedback/list.html.twig @@ -915,8 +992,8 @@ Er is een fout opgetreden Controller/Admin/CollectionController.php Controller/Admin/DataboxController.php - Controller/Api/V1Controller.php - Controller/Api/V1Controller.php + Controller/Api/V1Controller.php + Controller/Api/V1Controller.php Controller/Prod/BasketController.php Order/Controller/ProdOrderController.php web/admin/statusbit.html.twig @@ -1026,7 +1103,7 @@ Apply template Pas de template toe - web/admin/index.html.twig + web/admin/index.html.twig Apply to all selected documents @@ -1068,7 +1145,7 @@ Attention Let op! Controller/Prod/LanguageController.php - web/admin/index.html.twig + web/admin/index.html.twig prod/results/help.html.twig @@ -1656,7 +1733,7 @@ Cocher toute la colonne Verberg de hele kolom - web/admin/index.html.twig + web/admin/index.html.twig Cochez les cases correspondantes aux colonnes que vous desirez voire apparaitre dans le report @@ -1721,7 +1798,7 @@ Commandes Commandos - web/common/menubar.html.twig + web/common/menubar.html.twig Company @@ -1771,7 +1848,7 @@ Confirm reset users rights before applying template Bevestig reset van de gebruikersrechten alvorens de template toe te passen - web/admin/index.html.twig + web/admin/index.html.twig Confirmation de votre mot de passe @@ -1935,17 +2012,17 @@ Creer un model Maak een model - web/admin/index.html.twig + web/admin/index.html.twig Creer un modele Maak een model - web/admin/index.html.twig + web/admin/index.html.twig Creer un utilisateur Maak een gebruiker - web/admin/index.html.twig + web/admin/index.html.twig Creer une nouvelle applications @@ -1998,6 +2075,16 @@ DCES admin/fields/templates.html.twig + + DE + DE + Form/Configuration/CustomLinkFormType.php + + + DU + DU + Form/Configuration/CustomLinkFormType.php + Danger zone ! Danger zone ! @@ -2103,7 +2190,7 @@ Decocher toute la colonne Toon de hele kolom - web/admin/index.html.twig + web/admin/index.html.twig Deconnexion @@ -2445,6 +2532,11 @@ Form/Login/PhraseaForgotPasswordForm.php Form/Login/PhraseaRegisterForm.php + + EN + EN + Form/Configuration/CustomLinkFormType.php + ERREUR : La classe de subdef est necessaire et egal a "thumbnail","preview" ou "document" ERREUR : La classe de subdef est necessaire et egal a "thumbnail","preview" ou "document" @@ -2460,6 +2552,11 @@ FOUT : ALLE TAGS subdefgroup vereisen een atribuut naam lib/classes/databox.php + + ES + ES + Form/Configuration/CustomLinkFormType.php + Edit Wijzigen @@ -2579,7 +2676,7 @@ Emails Emails - Form/Configuration/MainConfigurationFormType.php + Form/Configuration/MainConfigurationFormType.php Embed code @@ -2912,7 +3009,7 @@ Executables settings Executables instellingen - Form/Configuration/MainConfigurationFormType.php + Form/Configuration/MainConfigurationFormType.php Export @@ -2931,6 +3028,11 @@ Export werd in de wachtrij geplaatst Controller/Prod/ExportController.php + + FR + FR + Form/Configuration/CustomLinkFormType.php + FTP FTP @@ -2939,7 +3041,7 @@ FTP Export FTP Export - Form/Configuration/MainConfigurationFormType.php + Form/Configuration/MainConfigurationFormType.php Fail @@ -3170,7 +3272,7 @@ General configuration General configuration - Form/Configuration/MainConfigurationFormType.php + Form/Configuration/MainConfigurationFormType.php General settings @@ -3312,7 +3414,7 @@ Guest Gast - web/common/menubar.html.twig + web/common/menubar.html.twig Guest access @@ -3971,7 +4073,7 @@ Maintenance state Staat van onderhoud - Form/Configuration/MainConfigurationFormType.php + Form/Configuration/MainConfigurationFormType.php Manage DB fields @@ -4350,7 +4452,7 @@ Nom du nouveau modele Naam van het nieuwe model - web/admin/index.html.twig + web/admin/index.html.twig Nom du nouveau panier @@ -4409,7 +4511,7 @@ Notifications Mededelingen - web/common/menubar.html.twig + web/common/menubar.html.twig Notifications globales @@ -4547,7 +4649,7 @@ Orders manager Beheerder bestellingen eventsmanager/notify/order.php - web/common/menubar.html.twig + web/common/menubar.html.twig Ordinary @@ -4673,7 +4775,7 @@ Phraseanet client API Phraseanet klant API - Form/Configuration/MainConfigurationFormType.php + Form/Configuration/MainConfigurationFormType.php Phraseanet embarque un moteur de taches pour la lecture / ecriture des metadonnes, et autre operations @@ -4902,7 +5004,7 @@ Publicaties admin/publications/wrapper.html.twig web/admin/tree.html.twig - web/common/menubar.html.twig + web/common/menubar.html.twig web/prod/index.html.twig @@ -4930,7 +5032,7 @@ Push configuration Push configurative - Form/Configuration/MainConfigurationFormType.php + Form/Configuration/MainConfigurationFormType.php Push from %user% @@ -5238,7 +5340,7 @@ Record Not Found Document niet gevonden - Controller/Api/V1Controller.php + Controller/Api/V1Controller.php Record removed from basket @@ -5297,7 +5399,7 @@ Registration Registratie - Form/Configuration/MainConfigurationFormType.php + Form/Configuration/MainConfigurationFormType.php Reglages:: reglages d acces guest @@ -5419,7 +5521,7 @@ Require email validation to activate the account Email validatie verwacht om de gebruiker te activeren - web/admin/index.html.twig + web/admin/index.html.twig Required @@ -5439,12 +5541,12 @@ Reset and apply Reset en pas toe - web/admin/index.html.twig + web/admin/index.html.twig Reset and apply template Reset en pas de template toe - web/admin/index.html.twig + web/admin/index.html.twig Reset cache @@ -5454,7 +5556,7 @@ Reset rights before applying template? De rechten resetten alvorens de template toe te passen? - web/admin/index.html.twig + web/admin/index.html.twig Resolution @@ -5541,7 +5643,7 @@ Rights will be erased before applying template, do you confirm? Rechten worden gewist voor het toe passen van de template, bent u zeker? - web/admin/index.html.twig + web/admin/index.html.twig Role @@ -5641,7 +5743,7 @@ Search engine Zoekmachine - Form/Configuration/MainConfigurationFormType.php + Form/Configuration/MainConfigurationFormType.php SearchEngine settings @@ -5738,7 +5840,7 @@ Send an email to the user to setup his password Stuur een email naar de gebruiker om zijn wachtwoord in te stellen - web/admin/index.html.twig + web/admin/index.html.twig Send to Facebook @@ -6031,7 +6133,7 @@ Story Not Found Artikel niet gevonden - Controller/Api/V1Controller.php + Controller/Api/V1Controller.php Story created @@ -6108,7 +6210,7 @@ Successful install Installatie geslaagd - web/admin/index.html.twig + web/admin/index.html.twig Successful removal @@ -6501,7 +6603,7 @@ This field is required Dit veld is verplicht - web/admin/index.html.twig + web/admin/index.html.twig This field represents the title of the document @@ -6512,7 +6614,7 @@ This file is too big Deze file is te groot Controller/Prod/LanguageController.php - web/admin/index.html.twig + web/admin/index.html.twig This is a template @@ -6857,7 +6959,7 @@ Upload Upload - web/common/menubar.html.twig + web/common/menubar.html.twig Bridge/Dailymotion/upload.html.twig Bridge/Dailymotion/upload.html.twig Bridge/Flickr/upload.html.twig @@ -7330,7 +7432,7 @@ Webservices connectivity Webservices connectiviteit - Form/Configuration/MainConfigurationFormType.php + Form/Configuration/MainConfigurationFormType.php Weight @@ -7378,8 +7480,8 @@ Would you like to reset rights before applying the template? Wilt u de rechten resetten alvorens de template toe te passen? - web/admin/index.html.twig web/admin/index.html.twig + web/admin/index.html.twig Write Metas @@ -8513,7 +8615,7 @@ Controller/Admin/ConnectedUsersController.php lib/classes/phrasea.php web/admin/connected-users.html.twig - web/common/menubar.html.twig + web/common/menubar.html.twig admin::monitor: module client @@ -8553,7 +8655,7 @@ Controller/Admin/ConnectedUsersController.php lib/classes/phrasea.php web/admin/connected-users.html.twig - web/common/menubar.html.twig + web/common/menubar.html.twig admin::monitor: module thesaurus @@ -8561,14 +8663,14 @@ Controller/Admin/ConnectedUsersController.php lib/classes/phrasea.php web/admin/connected-users.html.twig - web/common/menubar.html.twig + web/common/menubar.html.twig admin::monitor: module upload Upload Controller/Admin/ConnectedUsersController.php lib/classes/phrasea.php - web/common/menubar.html.twig + web/common/menubar.html.twig admin::monitor: module validation @@ -8578,7 +8680,7 @@ Phrasea/Controller/LightboxController.php Phrasea/Controller/LightboxController.php lib/classes/phrasea.php - web/common/menubar.html.twig + web/common/menubar.html.twig admin::monitor: modules @@ -8588,7 +8690,7 @@ admin::monitor: production Productie - web/common/menubar.html.twig + web/common/menubar.html.twig admin::monitor: total des utilisateurs uniques : @@ -8866,7 +8968,7 @@ Controller/Prod/LanguageController.php web/account/reset-email.html.twig admin/collection/create.html.twig - web/admin/index.html.twig + web/admin/index.html.twig admin/publications/fiche.html.twig web/common/dialog_export.html.twig web/common/dialog_export.html.twig @@ -9144,7 +9246,7 @@ web/admin/editusers.html.twig admin/publications/fiche.html.twig admin/publications/list.html.twig - web/admin/setup.html.twig + web/admin/setup.html.twig admin/statusbit/edit.html.twig web/admin/structure.html.twig web/admin/subdefs.html.twig @@ -9696,7 +9798,7 @@ login:: Mon compte Mijn account web/account/account.html.twig - web/common/menubar.html.twig + web/common/menubar.html.twig login:: Visitez le lien suivant et suivez les instructions pour continuer, sinon ignorez cet email et il ne se passera rien @@ -10259,7 +10361,7 @@ phraseanet:: a propos Over - web/common/menubar.html.twig + web/common/menubar.html.twig phraseanet:: adresse @@ -10273,7 +10375,7 @@ phraseanet:: aide Help - web/common/menubar.html.twig + web/common/menubar.html.twig phraseanet:: choisir @@ -10294,7 +10396,7 @@ phraseanet:: deconnection Afmelden - web/common/menubar.html.twig + web/common/menubar.html.twig actions/Bridge/wrapper.html.twig @@ -10357,7 +10459,7 @@ phraseanet:: raccourcis clavier Sneltoetsen - web/common/menubar.html.twig + web/common/menubar.html.twig phraseanet:: sous definition @@ -10423,19 +10525,19 @@ phraseanet::erreur: La connection au serveur Phraseanet semble etre indisponible De connectie met de Phraseanet server blijkt niet mogelijk te zijn Controller/Prod/LanguageController.php - web/admin/index.html.twig + web/admin/index.html.twig phraseanet::erreur: Une erreur est survenue, si ce probleme persiste, contactez le support technique Een fout heeft zicht voorgedaan, als dit probleem aanhoudt, contacteer dan de technishe support Controller/Prod/LanguageController.php - web/admin/index.html.twig + web/admin/index.html.twig phraseanet::erreur: Votre session est fermee, veuillez vous re-authentifier Uw sessile werd afgesloten, gelieve opnieuw in te loggen Controller/Prod/LanguageController.php - web/admin/index.html.twig + web/admin/index.html.twig web/thesaurus/thesaurus.html.twig @@ -12111,6 +12213,67 @@ Testen voor het versturen van mail web/admin/dashboard.html.twig + + setup::custom-link:add-link + setup::custom-link:add-link + web/admin/setup.html.twig + + + setup::custom-link:help-menu + setup::custom-link:help-menu + Form/Configuration/CustomLinkFormType.php + + + setup::custom-link:language-link + setup::custom-link:language-link + web/admin/setup.html.twig + + + setup::custom-link:link-url + setup::custom-link:link-url + web/admin/setup.html.twig + + + setup::custom-link:location + setup::custom-link:location + Form/Configuration/CustomLinkFormType.php + + + setup::custom-link:location-link + setup::custom-link:location-link + web/admin/setup.html.twig + + + setup::custom-link:name-link + setup::custom-link:name-link + Form/Configuration/CustomLinkFormType.php + web/admin/setup.html.twig + + + setup::custom-link:navigation-bar + setup::custom-link:navigation-bar + Form/Configuration/CustomLinkFormType.php + + + setup::custom-link:order-link + setup::custom-link:order-link + web/admin/setup.html.twig + + + setup::custom-link:placeholder-link-url + setup::custom-link:placeholder-link-url + Form/Configuration/CustomLinkFormType.php + + + setup::custom-link:select-language + setup::custom-link:select-language + Form/Configuration/CustomLinkFormType.php + + + setup::custom-link:title-custom-link + setup::custom-link:title-custom-link + web/admin/setup.html.twig + sport sport diff --git a/resources/locales/validators.de.xlf b/resources/locales/validators.de.xlf index e9542f0cc8..e3a9ccfdbb 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 324bce198f..2f3eb3cbc5 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 6446b7e611..a840a38ca2 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 7077d6f7e7..f5928fce8f 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/admin/styles/main.scss b/resources/www/admin/styles/main.scss index 0ffe631229..c5453d6d9e 100644 --- a/resources/www/admin/styles/main.scss +++ b/resources/www/admin/styles/main.scss @@ -336,6 +336,103 @@ div.switch_right.unchecked { margin-top: 5px; } +/******* SETUP *******************************************************************/ +#custom-link-table { + width: 100%; + thead { + th { + text-align: left; + font-weight: bold; + } + } + td { + height: 30px; + width: 19%; + input { + width: 100%; + box-sizing: border-box; + -moz-box-sizing: border-box; + -webkit-box-sizing: border-box; + height: 30px; + } + select { + width: 100%; + box-sizing: border-box; + -moz-box-sizing: border-box; + -webkit-box-sizing: border-box; + height: 30px; + } + .simplecolorpicker { + width: 21px; + height: 21px; + background-repeat: no-repeat; + background-size: contain !important; + background-position: center center; + border: none; + margin-right: 3px; + } + button { + height: 30px; + box-sizing: border-box; + -moz-box-sizing: border-box; + -webkit-box-sizing: border-box; + } + } + td:nth-of-type(5) { + width: 14%; + } + td:nth-of-type(6) { + width: 3%; + } + td:nth-of-type(7) { + width: 3%; + } + td:last-child { + width: 8%; + } +} + +span.simplecolorpicker.picker { + min-width: 0px; + width: 22px; + margin-top: -360px; + border-radius: 0px; + margin-left: 4px; + padding: 0; + span { + width: 20px; + margin: 0px; + } +} + +#add-row { + margin-top: 10px; + margin-bottom: 20px; + float: right; +} + +.link_check_box:before { + content: ""; + display: inline-block; + width: 30px; + height: 30px; + background: url(/assets/common/images/icons/Bouton-Bold.png) #fff; + background-repeat: no-repeat; + background-size: 75%; + background-position: center center; +} + +.link_check_box:checked:before { + content: ""; + display: inline-block; + width: 30px; + height: 30px; + background: url(/assets/common/images/icons/Bouton-bold-active.png) #fff; + background-repeat: no-repeat; + background-size: 75%; + background-position: center center; +} + @import './databases'; @import './fields'; @import './tables'; diff --git a/templates/web/admin/custom_links.html.twig b/templates/web/admin/custom_links.html.twig new file mode 100644 index 0000000000..f205e0d2fc --- /dev/null +++ b/templates/web/admin/custom_links.html.twig @@ -0,0 +1,14 @@ + + {{ form_widget(form.linkName) }} + {{ form_widget(form.linkLanguage) }} + {{ form_widget(form.linkUrl) }} + {{ form_widget(form.linkLocation) }} + {{ form_widget(form.linkOrder) }} + {{ form_widget(form.linkBold, { 'attr': {'style' : 'margin-top:0', 'class': 'link_check_box'} }) }} + {{ form_widget(form.linkColor, { 'attr': {'class': 'link-color'} }) }} + + + + \ No newline at end of file diff --git a/templates/web/admin/index.html.twig b/templates/web/admin/index.html.twig index 249d3e40ad..14edca3b50 100644 --- a/templates/web/admin/index.html.twig +++ b/templates/web/admin/index.html.twig @@ -8,6 +8,7 @@ {% endblock %} {% block stylesheet %} + {% endblock %} diff --git a/templates/web/admin/setup.html.twig b/templates/web/admin/setup.html.twig index 5b4190d83f..40efe7d47f 100644 --- a/templates/web/admin/setup.html.twig +++ b/templates/web/admin/setup.html.twig @@ -34,23 +34,36 @@ {{ form_start(form, {'method': 'POST', 'action' : path('setup_display_globals'), 'attr': {'class' : 'form-horizontal'}}) }} {{ form_errors(form) }} {% for daform in form %} -
- {{ daform.vars['label'] }} - {% for formdata in daform %} -
- {{ form_errors(formdata) }} - {{ form_label(formdata, null, { 'label_attr': {'class' : 'control-label'} } ) }} -
- {{ form_widget(formdata, {'attr': {'class': 'input-xxlarge'}}) }} -
+ {% if daform.vars['label'] != null %} +
+ {{ daform.vars['label'] }} + {% for formdata in daform %} +
+ {{ form_errors(formdata) }} + {{ form_label(formdata, null, { 'label_attr': {'class' : 'control-label'} } ) }} +
+ {{ form_widget(formdata, {'attr': {'class': 'input-xxlarge'}}) }} +
-
{{ formdata.vars['help_message'] }}
- {{ form_rest(formdata) }} -
- {% endfor %} - {{ form_rest(daform) }} -
+
{{ formdata.vars['help_message'] }}
+ {{ form_rest(formdata) }} +
+ {% endfor %} + {{ form_rest(daform) }} +
+ {% endif %} {% endfor %} +{{ "setup::custom-link:title-custom-link" | trans }} + + + {% for links in form['custom-links'] %} + {% include 'admin/custom_links.html.twig' with {'form': links} %} + {% endfor %} + + + +
@@ -58,12 +71,26 @@
{{ form_end(form) }} + diff --git a/templates/web/common/index_bootstrap.html.twig b/templates/web/common/index_bootstrap.html.twig index 6565aae7ed..9ebaf7f8c7 100644 --- a/templates/web/common/index_bootstrap.html.twig +++ b/templates/web/common/index_bootstrap.html.twig @@ -25,6 +25,7 @@ + {% block rss %}{% endblock %} {% block javascript %}{% endblock %} diff --git a/templates/web/common/menubar.html.twig b/templates/web/common/menubar.html.twig index 24fdc6b267..38fdc2d87f 100644 --- a/templates/web/common/menubar.html.twig +++ b/templates/web/common/menubar.html.twig @@ -1,5 +1,6 @@