diff --git a/package.json b/package.json index 62fa0e1cea..fbe48edbd0 100644 --- a/package.json +++ b/package.json @@ -65,7 +65,7 @@ "normalize-css": "^2.1.0", "npm": "^6.0.0", "npm-modernizr": "^2.8.3", - "phraseanet-production-client": "0.34.102-d", + "phraseanet-production-client": "0.34.106-d", "requirejs": "^2.3.5", "tinymce": "^4.0.28", "underscore": "^1.8.3", diff --git a/resources/locales/messages.de.xlf b/resources/locales/messages.de.xlf index e3d0083eb4..a1b7ab8fab 100644 --- a/resources/locales/messages.de.xlf +++ b/resources/locales/messages.de.xlf @@ -1,4 +1,4 @@ - +
@@ -7,14 +7,14 @@
- - + + Form/Configuration/EmailFormType.php Form/Login/PhraseaAuthenticationForm.php - + Add - Add + Hinzufügen admin/fields/templates.html.twig @@ -667,9 +667,9 @@ eine Kollektion aktivieren admin/databox/databox.html.twig - + Activity - Activity + Tätigkeit actions/Feedback/list.html.twig @@ -680,16 +680,15 @@ prod/upload/lazaret.html.twig prod/upload/lazaret.html.twig - + Add a new field - Add a - new field + Ein neues Feld hinzufügen admin/fields/templates.html.twig - + Add a list - Add a list + Eine Liste hinzufügen actions/Feedback/lists-all.html.twig @@ -764,14 +763,14 @@ web/prod/index.html.twig web/prod/index.html.twig - + Advanced mode - Advanced mode + Erweiterter Modus actions/Feedback/list.html.twig - + Advanced settings - Advanced settings + Erweiterte Einstellungen web/admin/subdefs.html.twig @@ -936,16 +935,16 @@ Push wird erlaubt web/admin/editusers.html.twig - + Alphabetic asc - Alphabetic asc + aufsteigender alphabetischer Reihenfolge web/prod/index.html.twig web/prod/index.html.twig web/prod/index.html.twig - + Alphabetic desc - Alphabetic desc + absteigender alphabetischer Reihenfolge web/prod/index.html.twig @@ -992,9 +991,9 @@ admin/databox/databox.html.twig web/admin/databases.html.twig - + An error occured when wanting to change status! - An error occured when wanting to change status! + Beim Ändern des Status ist ein Fehler aufgetreten! Controller/Prod/LazaretController.php @@ -1547,9 +1546,9 @@ Standardmässig ist es für die Administratoren verfügbar Form/Configuration/FtpExportFormType.php - + By field - By field + Nach Feld web/prod/index.html.twig @@ -1838,9 +1837,9 @@ Die Leerung der Kollektion wurde erfolgreich abgeschlossen Controller/Admin/CollectionController.php - + Collection order - Collection order + Kollektionen Ordnung web/prod/index.html.twig @@ -2031,9 +2030,9 @@ actions/Feedback/list.html.twig actions/Feedback/ListsMacros.html.twig - + Create a user - Create a user + Einen Benutzer erstellen actions/Feedback/list.html.twig @@ -2119,9 +2118,9 @@ Erstellen Sie zuerst eine Anwendung, um das Phraseanet API danach zu benutzen. web/developers/applications.html.twig - + Ctrl - Ctrl + Strg Controller/Prod/LanguageController.php @@ -2172,9 +2171,9 @@ DU Form/Configuration/CustomLinkFormType.php - + Danger zone ! - Danger zone ! + Gefahrenzone ! admin/fields/index.html.twig @@ -2244,9 +2243,9 @@ Erstellungsdatum admin/publications/list.html.twig - + Date Updated - Date Updated + Aktualisierungsdatum web/prod/index.html.twig @@ -2351,9 +2350,9 @@ Eine Webhook URL festlegen web/developers/application.html.twig - + Defined by admin - Defined by admin + Von Administrator festgelegt web/prod/index.html.twig @@ -2404,14 +2403,14 @@ Datensätze löschen Controller/Prod/LanguageController.php - + Delete the selection - Delete the selection + Auswahl löschen actions/Feedback/list.html.twig - + Delete the subview ? - Delete the subview ? + Unteransicht löschen ? web/admin/subdefs.html.twig @@ -2660,9 +2659,9 @@ Form/Login/PhraseaForgotPasswordForm.php Form/Login/PhraseaRegisterForm.php - + E-mail domain - E-mail domain + E-Mail Domäne actions/Feedback/list.html.twig @@ -2909,9 +2908,9 @@ HD Ersetzung aktivieren Form/Configuration/ModulesFormType.php - + Enable Phraseanet Web API - Enable Phraseanet Web API + Phraseanet Web API aktivieren Form/Configuration/APIClientsFormType.php @@ -3873,9 +3872,9 @@ Synchronisierung zwischen Bridge und Client APIs erhalten. TaskManager/Job/BridgeJob.php - + Keyboard shortcuts - Keyboard shortcuts + Tastenkombinationen Controller/Prod/LanguageController.php @@ -4892,9 +4891,9 @@ prod/upload/lazaret.html.twig prod/upload/lazaret.html.twig - + Pages - Pages + Seiten actions/Feedback/ListsMacros.html.twig @@ -4941,9 +4940,9 @@ Letztes Jahr WorkZone/Browser/Browser.html.twig - + Path - Path + Pfad web/admin/subdefs.html.twig @@ -4951,9 +4950,9 @@ Pause Controller/Prod/LanguageController.php - + Pays - Pays + Land prod/User/Add.html.twig @@ -5916,14 +5915,14 @@ Alle Änderungen speichern admin/fields/templates.html.twig - + Save as VTT - Save as VTT + Abschnitte speichern Controller/Prod/LanguageController.php - + Save the list - Save the list + Liste speichern actions/Feedback/list.html.twig @@ -5946,9 +5945,9 @@ Suchmaschine Form/Configuration/MainConfigurationFormType.php - + Search for existing user - Search for existing user + Suchen Sie nach bestehende Benutzer actions/Feedback/List-Share.html.twig @@ -5967,9 +5966,9 @@ Sehen WorkZone/Browser/Browser.html.twig - + See documentation about structure manipulation. - See documentation about structure manipulation. + Für Struktur Veränderungen, Dokumentation sehen admin/fields/index.html.twig @@ -5989,9 +5988,9 @@ Andere sehen prod/actions/Push.html.twig - + See the list - See the list + Liste sehen actions/Feedback/list.html.twig @@ -6147,9 +6146,9 @@ Verteilen Controller/Prod/LanguageController.php - + Share my list - Share my list + Meine Liste teilen actions/Feedback/list.html.twig @@ -6157,9 +6156,9 @@ Die Liste teilen actions/Feedback/list.html.twig - + Shift - Shift + Umschalt Controller/Prod/LanguageController.php @@ -6274,9 +6273,9 @@ admin/publications/list.html.twig admin/publications/fiche.html.twig - + Space bar - Space bar + Space-Taste Controller/Prod/LanguageController.php @@ -6400,9 +6399,9 @@ Unterauflösung admin/databox/details.html.twig - + Submit - Submit + Einreichen Controller/Prod/LanguageController.php @@ -6468,9 +6467,9 @@ Vorschlagswerte admin/collection/suggested_value.html.twig - + Suppr - Suppr + Entf Controller/Prod/LanguageController.php @@ -6596,9 +6595,9 @@ web/login/cgus.html.twig login/layout/base-layout.html.twig - + The Phraseanet Web API allows other web application to rely on this instance - The Phraseanet Web API allows other web application to rely on this instance + Die Phraseanet Web API ermöglicht, andere Web Anwendungen, auf diese Instanz zu vertrauen Form/Configuration/APIClientsFormType.php @@ -7188,9 +7187,9 @@ Benutzen Sie einen SMTP Server Form/Configuration/EmailFormType.php - + Use an existing index - Use an existing index + Benutzen Sie einen bestehenden Index web/setup/step2.html.twig @@ -7296,9 +7295,9 @@ Benutzer Vorschlag prod/actions/Push.html.twig - + Utilisation prevue: - Utilisation prevue: + Verwendungszweck: prod/orders/order_item.html.twig @@ -9692,9 +9691,9 @@ hinzugefügtes Datum SearchEngine/Elastic/ElasticSearchEngine.php - + date de modification - date de modification + Änderungsdatum SearchEngine/Elastic/ElasticSearchEngine.php @@ -11170,14 +11169,14 @@ Mosaikansicht prod/actions/printer_default.html.twig - + print_feedback:: Document generated on : - print_feedback:: Document generated on : + Erstellt am : Out/Module/PDFRecords.php - + print_feedback:: Feedback expiring on : - print_feedback:: Feedback expiring on : + Feedback läuft am : ab Out/Module/PDFRecords.php @@ -11195,29 +11194,29 @@ print_feedback:: Feedback on basket %name% Out/Module/PDFRecords.php - + print_feedback:: Non - print_feedback:: Non + Nein Out/Module/PDFRecords.php - + print_feedback:: Oui - print_feedback:: Oui + Ja Out/Module/PDFRecords.php - + print_feedback:: Participants : - print_feedback:: Participants : + Teilnehmer : Out/Module/PDFRecords.php - + print_feedback:: Votes : - print_feedback:: Votes : + Zustimmung : Out/Module/PDFRecords.php - + print_feedback:: non voté - print_feedback:: non voté + unausgedrückt Out/Module/PDFRecords.php diff --git a/resources/locales/messages.en.xlf b/resources/locales/messages.en.xlf index 80b98f0732..c37ed44070 100644 --- a/resources/locales/messages.en.xlf +++ b/resources/locales/messages.en.xlf @@ -1,4 +1,4 @@ - +
@@ -7,8 +7,8 @@
- - + + Form/Configuration/EmailFormType.php Form/Login/PhraseaAuthenticationForm.php @@ -992,9 +992,9 @@ admin/databox/databox.html.twig web/admin/databases.html.twig - + An error occured when wanting to change status! - An error occured when wanting to change status! + An error occured when wanting to change status! Controller/Prod/LazaretController.php @@ -1982,7 +1982,7 @@ Contributor - Contributor + Contribute prod/actions/Push.html.twig @@ -3175,9 +3175,9 @@ Controller/Prod/DoDownloadController.php Controller/Prod/LanguageController.php - + Export ranges - Export ranges + Export ranges Controller/Prod/LanguageController.php @@ -3578,14 +3578,14 @@ You must be authenticated to have the right to download. web/common/dialog_export.html.twig - + Gui-editable - Editable in Graphical interface (prod) + Editable in Graphical interface (prod) admin/fields/templates.html.twig - + Gui-visible - Visible in Graphical Interface + Displayed in Graphical Interface admin/fields/templates.html.twig @@ -4416,9 +4416,9 @@ Move %countable% selected records to the chosen collection in the list. prod/actions/collection_default.html.twig - + Move down range - Move down range + Move down range Controller/Prod/LanguageController.php @@ -4426,9 +4426,9 @@ Move one record to the chosen collection in the list. prod/actions/collection_default.html.twig - + Move up range - Move up range + Move up range Controller/Prod/LanguageController.php @@ -4787,9 +4787,9 @@ One document can not be modified. prod/actions/collection_default.html.twig - + One frame backward - One frame backward + One frame backward Controller/Prod/LanguageController.php @@ -4892,9 +4892,9 @@ prod/upload/lazaret.html.twig prod/upload/lazaret.html.twig - + Pages - Pages + Pages actions/Feedback/ListsMacros.html.twig @@ -4941,9 +4941,9 @@ Past year WorkZone/Browser/Browser.html.twig - + Path - Path + Path web/admin/subdefs.html.twig @@ -5643,9 +5643,9 @@ Media/Subdef/Image.php Media/Subdef/Unknown.php - + Remove current Range - Remove current Range + Remove current Range Controller/Prod/LanguageController.php @@ -5859,9 +5859,9 @@ Row Password is missing. Script has stopped. user/import/file.html.twig - + Résultats des derniers envois effectués pour cette application - Results of last documents sent for this application + Last webhooks sent for this application web/developers/application.html.twig @@ -5916,9 +5916,9 @@ Save all changes admin/fields/templates.html.twig - + Save as VTT - Save as VTT + Save chaptering Controller/Prod/LanguageController.php @@ -6290,9 +6290,9 @@ admin/task-manager/templates.html.twig admin/task-manager/templates.html.twig - + Start Range - Start Range + Start Range Controller/Prod/LanguageController.php @@ -9136,15 +9136,15 @@ Re-index database now (regarding quantity of documents, this operation can last several hours) admin/databox/databox.html.twig - + basket:action:delete record form basket - Delete record from basket + Delete record from basket prod/WorkZone/Basket.html.twig prod/WorkZone/Story.html.twig - + basket:action:delete record form database - Delete record from database + Delete record from database prod/WorkZone/Basket.html.twig prod/WorkZone/Story.html.twig @@ -9631,9 +9631,9 @@ Create new subview web/admin/subdefs.html.twig - + create_subdef_modal_access_class - Access right: + Access right : web/admin/subdefs.html.twig @@ -9641,9 +9641,9 @@ "Documents" Right web/admin/subdefs.html.twig - + create_subdef_modal_access_class_no_restriction - "Thumbnail" Right (No Restriction) + No Restriction (Protect with hash) web/admin/subdefs.html.twig @@ -9656,14 +9656,14 @@ Presets web/admin/subdefs.html.twig - + create_subdef_modal_preview_mediatype - Preview Media Type (mime type) + Preview Media Type (mime type) : web/admin/subdefs.html.twig - + create_subdef_modal_record_phraseanet_type - Build subview for document Type: + Build subview for document Type : web/admin/subdefs.html.twig @@ -10087,9 +10087,9 @@ Service will be available again in a few minutes actions/Bridge/deactivated.html.twig - + lightbox::list - summary + Summary mobile/lightbox/validate.html.twig @@ -10296,9 +10296,9 @@ Your Order Of : prod/orders/order_item.html.twig - + order-manager::order-item: accepted-item - accepted item + Accepted item(s) prod/orders/order_item.html.twig @@ -10388,9 +10388,9 @@ prod/orders/order_item.html.twig prod/orders/order_item.html.twig - + order-manager::order-item: rejected-item - rejected item + Rejected item(s) prod/orders/order_item.html.twig @@ -10405,9 +10405,9 @@ Select All prod/orders/order_item.html.twig - + order-manager::order-item: selected-item - selected item + Selected item(s) prod/orders/order_item.html.twig @@ -10696,9 +10696,9 @@ web/common/menubar.html.twig web/common/menubar.html.twig - + phraseanet:: basket feedback - phraseanet:: basket feedback + Feedback report with description prod/actions/printer_default.html.twig @@ -11130,9 +11130,9 @@ prod/Share/record.html.twig prod/Share/record.html.twig - + print:: basket feedback - print:: basket feedback + Feedback report with description prod/actions/printer_default.html.twig @@ -11170,54 +11170,54 @@ Thumbnails prod/actions/printer_default.html.twig - + print_feedback:: Document generated on : - print_feedback:: Document generated on : + Generated on : Out/Module/PDFRecords.php - + print_feedback:: Feedback expiring on : - print_feedback:: Feedback expiring on : + Feedback expiring on : Out/Module/PDFRecords.php - + print_feedback:: Feedback initiated by : - print_feedback:: Feedback initiated by : + Feedback initiated by : Out/Module/PDFRecords.php - + print_feedback:: Feedback initiated on : - print_feedback:: Feedback initiated on : + Feedback initiated on : Out/Module/PDFRecords.php - + print_feedback:: Feedback on basket %name% - print_feedback:: Feedback on basket %name% + Feedback report on basket %name% Out/Module/PDFRecords.php - + print_feedback:: Non - print_feedback:: Non + No Out/Module/PDFRecords.php - + print_feedback:: Oui - print_feedback:: Oui + Yes Out/Module/PDFRecords.php - + print_feedback:: Participants : - print_feedback:: Participants : + Participants list : Out/Module/PDFRecords.php - + print_feedback:: Votes : - print_feedback:: Votes : + Approvals : Out/Module/PDFRecords.php - + print_feedback:: non voté - print_feedback:: non voté + Unexpressed Out/Module/PDFRecords.php @@ -11550,9 +11550,9 @@ No overlap for chapters Controller/Prod/LanguageController.php - + prod:edit: only a media of type video can be edited - Only a media of video type can be edited + Only video type record can be edited Controller/Prod/LanguageController.php @@ -11560,9 +11560,9 @@ Suggested values Controller/Prod/LanguageController.php - + prod:edit: video-editor - Video tools + Video tools Controller/Prod/LanguageController.php @@ -11573,14 +11573,14 @@ Use grip for resize or move the area. It is possible to place several search areas Controller/Prod/LanguageController.php - + prod:mapboxgl: title map dialog - Geographic Search + Geoloc Search Controller/Prod/LanguageController.php - + prod:mapboxgl: title notice - Geographic Search + Geoloc Search Controller/Prod/LanguageController.php diff --git a/resources/locales/messages.fr.xlf b/resources/locales/messages.fr.xlf index 0323dd26e1..1049880237 100644 --- a/resources/locales/messages.fr.xlf +++ b/resources/locales/messages.fr.xlf @@ -1,4 +1,4 @@ - +
@@ -7,8 +7,8 @@
- - + + Form/Configuration/EmailFormType.php Form/Login/PhraseaAuthenticationForm.php @@ -5915,9 +5915,9 @@ Pour les utilisateurs authentifiés, la demande de validation est également dis Sauvegarder toutes les modifications admin/fields/templates.html.twig - + Save as VTT - Save as VTT + Sauvegarder le chapitrage Controller/Prod/LanguageController.php @@ -6289,9 +6289,9 @@ Pour les utilisateurs authentifiés, la demande de validation est également dis admin/task-manager/templates.html.twig admin/task-manager/templates.html.twig - + Start Range - Start Range + Début de l'extrait Controller/Prod/LanguageController.php @@ -6467,9 +6467,9 @@ Pour les utilisateurs authentifiés, la demande de validation est également dis Valeurs suggérées admin/collection/suggested_value.html.twig - + Suppr - Suppr + Suppression Controller/Prod/LanguageController.php @@ -9661,9 +9661,9 @@ Si vous recevez cet e-mail sans l'avoir sollicité, merci de l'ignorer ou de le Format de fichier pour la sous définition web/admin/subdefs.html.twig - + create_subdef_modal_record_phraseanet_type - Sous définition définie pour le type + Sous définition définie pour le type web/admin/subdefs.html.twig @@ -9955,9 +9955,9 @@ Si vous recevez cet e-mail sans l'avoir sollicité, merci de l'ignorer ou de le L'opérateur par défaut entre les termes est un ET, exemple: l'expression «voiture rouge» cherchera le terme «voiture» ET le terme «rouge» prod/results/help.html.twig - + help::help-section-bullet: expand search - help::help-section-bullet: expand search + Elargir la recherche en utilisant moins de mots clefs prod/results/help.html.twig @@ -10696,9 +10696,9 @@ Si vous recevez cet e-mail sans l'avoir sollicité, merci de l'ignorer ou de le web/common/menubar.html.twig web/common/menubar.html.twig - + phraseanet:: basket feedback - phraseanet:: basket feedback + Rapport de validation avec description prod/actions/printer_default.html.twig @@ -10924,9 +10924,9 @@ Si vous recevez cet e-mail sans l'avoir sollicité, merci de l'ignorer ou de le Controller/Root/AccountController.php Controller/Root/AccountController.php - + phraseanet::error: failed to revoke some user access - Erreur, impossible de révoquer l'accès de certains utilisateurs + Erreur pendant la révocation de droits utilisateur Controller/Root/AccountController.php @@ -11130,9 +11130,9 @@ Si vous recevez cet e-mail sans l'avoir sollicité, merci de l'ignorer ou de le prod/Share/record.html.twig prod/Share/record.html.twig - + print:: basket feedback - print:: basket feedback + Rapport de validation avec description prod/actions/printer_default.html.twig @@ -11170,54 +11170,54 @@ Si vous recevez cet e-mail sans l'avoir sollicité, merci de l'ignorer ou de le Planche contact prod/actions/printer_default.html.twig - + print_feedback:: Document generated on : - print_feedback:: Document generated on : + Impression générée le : Out/Module/PDFRecords.php - + print_feedback:: Feedback expiring on : - print_feedback:: Feedback expiring on : + Clôturée le : Out/Module/PDFRecords.php - + print_feedback:: Feedback initiated by : - print_feedback:: Feedback initiated by : + Validation envoyée par : Out/Module/PDFRecords.php - + print_feedback:: Feedback initiated on : - print_feedback:: Feedback initiated on : + Début de validation le : Out/Module/PDFRecords.php - + print_feedback:: Feedback on basket %name% - print_feedback:: Feedback on basket %name% + Récapitulatif de validation de %name% Out/Module/PDFRecords.php - + print_feedback:: Non - print_feedback:: Non + Non Out/Module/PDFRecords.php - + print_feedback:: Oui - print_feedback:: Oui + Oui Out/Module/PDFRecords.php - + print_feedback:: Participants : - print_feedback:: Participants : + Participants : Out/Module/PDFRecords.php - + print_feedback:: Votes : - print_feedback:: Votes : + Approbations : Out/Module/PDFRecords.php - + print_feedback:: non voté - print_feedback:: non voté + Non exprimé Out/Module/PDFRecords.php @@ -11254,9 +11254,9 @@ Si vous recevez cet e-mail sans l'avoir sollicité, merci de l'ignorer ou de le Limiter la recherche des résultats à des dates web/prod/index.html.twig - + prod::advancesearch:tooltips:field_restriction_explanation - Effectuer une recherche sur le contenu d'un champ documentaire de type texte + Effectuer une recherche sur le contenu d'un champ documentaire de type texte web/prod/index.html.twig @@ -11535,9 +11535,9 @@ Si vous recevez cet e-mail sans l'avoir sollicité, merci de l'ignorer ou de le Enregistrement(s) déplacé(s) dans la corbeille. prod/actions/delete_records_confirm.html.twig - + prod:app trash: title-trash - prod:app trash: title-trash + prod:app trash: title-trash Controller/Prod/LanguageController.php @@ -11565,9 +11565,9 @@ Si vous recevez cet e-mail sans l'avoir sollicité, merci de l'ignorer ou de le Outils vidéo Controller/Prod/LanguageController.php - + prod:mapboxgl: description notice - — Faire un clic droit pour ajouter une zone de recherche, il est possible de cumuler plusieurs zones. + — Faire un clic droit pour ajouter une zone de recherche, il est possible de cumuler plusieurs zones. — Un simple clic sur une zone de recherche permet de la supprimer. @@ -11696,39 +11696,39 @@ Si vous recevez cet e-mail sans l'avoir sollicité, merci de l'ignorer ou de le Régénération des sous-définitions actions/Tools/index.html.twig - + registration:collection.accepted - registration:collection.accepted + Accepté web/account/access.html.twig - + registration:collection.active - registration:collection.active + Active web/account/access.html.twig - + registration:collection.in-time - registration:collection.in-time + Accès limité dans le temps (actif) web/account/access.html.twig - + registration:collection.out-dated - registration:collection.out-dated + Date dépassée web/account/access.html.twig - + registration:collection.pending - registration:collection.pending + En attente web/account/access.html.twig - + registration:collection.registrable - registration:collection.registrable + Faire une demande web/account/access.html.twig - + registration:collection.rejected - registration:collection.rejected + Demande refusée web/account/access.html.twig diff --git a/templates/web/prod/Tooltip/Caption.html.twig b/templates/web/prod/Tooltip/Caption.html.twig index cd85656671..8bd04c2fe8 100644 --- a/templates/web/prod/Tooltip/Caption.html.twig +++ b/templates/web/prod/Tooltip/Caption.html.twig @@ -1,6 +1,11 @@ {% extends 'prod/Tooltip/Tooltip.html.twig' %} -{% set title %}{{ 'Caption' | trans }}{% endset %} +{% set title %}{{ 'Caption' | trans }}   {% set collectionLogo = collection_logo(record.baseId) %} + {% if collectionLogo is empty %} + {{ record.collectionName }} + {% else %} + {{ collectionLogo|raw }} + {% endif %} {% endset %} {% set width = 400 %} {% set maxwidth = 700 %} diff --git a/templates/web/prod/User/Add.html.twig b/templates/web/prod/User/Add.html.twig index 3dda889f64..674ff60453 100644 --- a/templates/web/prod/User/Add.html.twig +++ b/templates/web/prod/User/Add.html.twig @@ -1,6 +1,6 @@ {# designed to be printed in a small box #}
-
+ - - - - -
@@ -23,16 +23,6 @@
- - - -
diff --git a/templates/web/prod/WorkZone/Basket.html.twig b/templates/web/prod/WorkZone/Basket.html.twig index 8b8d724b66..c3959230e7 100644 --- a/templates/web/prod/WorkZone/Basket.html.twig +++ b/templates/web/prod/WorkZone/Basket.html.twig @@ -89,7 +89,7 @@ {% endif %} -
+
{% set basket_length = basket.getElements()|length %}
{{ 'Certaines donnees du panier ont change' | trans }} {{ 'rafraichir' | trans }}
{% if basket_length == 0 %} diff --git a/templates/web/prod/WorkZone/Macros.html.twig b/templates/web/prod/WorkZone/Macros.html.twig index 95c401e925..b3298373c3 100644 --- a/templates/web/prod/WorkZone/Macros.html.twig +++ b/templates/web/prod/WorkZone/Macros.html.twig @@ -5,8 +5,37 @@
+
+ {{ 'See' | trans }} : + + + + + + + + + + + + +
+
{% set content = WorkZone.getContent(srt) %} +
{% for basket in content.get(constant('\\Alchemy\\Phrasea\\Helper\\WorkZone::VALIDATIONS')) %}
- + + + + +
@@ -78,13 +110,14 @@
{% endfor %} - + +
{% for basket in content.get(constant('\\Alchemy\\Phrasea\\Helper\\WorkZone::BASKETS')) %}
+ {% if basket.getId() == selected_id and selected_type == 'basket' %}active{% endif %}{% if basket.getValidation() %}feedbacks-block{% elseif basket.getPusher() %}pushes-block{% else %}baskets-block{% endif %} "> {% if basket.getValidation() %} @@ -125,8 +158,10 @@ {% endif %} --> - - + + + + @@ -209,9 +244,8 @@
{% endfor %} - - - +
+
{% for story in content.get(constant('\\Alchemy\\Phrasea\\Helper\\WorkZone::STORIES')) %}
+ {% endmacro %} @@ -304,53 +342,56 @@ {% endif %} {% import 'common/thumbnail.html.twig' as thumbnail %} +
+ {% if app['settings'].getUserSetting(app.getAuthenticatedUser(), 'basket_title_display') == '1' %} +
+ {{ record.get_title()|truncate(20, "...") }} +
+ {% endif %} + {% if app['settings'].getUserSetting(app.getAuthenticatedUser(), 'basket_status_display') == '1' %} +
+ {% for flag in record_flags(record) %} + + {% endfor %} +
+ {% endif %} +
+ -
- - {% if app['settings'].getUserSetting(app.getAuthenticatedUser(), 'basket_title_display') == '1' %} -
- {{record.get_title()}} -
- {% endif %} - {% if app['settings'].getUserSetting(app.getAuthenticatedUser(), 'basket_status_display') == '1' %} -
- {% for flag in record_flags(record) %} - - {% endfor %} -
- {% endif %} -
- {{record.getNumber()}} -
- {{thumbnail.format(record.get_thumbnail,82,82, '', true, false)}} -
- {% if app['settings'].getUserSetting(app.getAuthenticatedUser(), 'basket_caption_display') == '1' %} - - - - {% endif %} - - - +
+ {{record.getNumber()}} +
+ {{thumbnail.format(record.get_thumbnail,140,140, '', true, false)}} +
+ {% if app['settings'].getUserSetting(app.getAuthenticatedUser(), 'basket_caption_display') == '1' %} + + + + {% endif %} + + + + -
-
+
+
+
{% endmacro %} {% macro display_basket(app, basket) %} diff --git a/templates/web/prod/WorkZone/Story.html.twig b/templates/web/prod/WorkZone/Story.html.twig index 7cfeabe0d7..f15eed1ca9 100644 --- a/templates/web/prod/WorkZone/Story.html.twig +++ b/templates/web/prod/WorkZone/Story.html.twig @@ -1,5 +1,5 @@
- +
-
+
{% set story_length = Story.get_children().get_elements()|length %}
{{ 'Certaines donnees du reportage ont change' | trans }} @@ -97,7 +97,7 @@ {% import 'prod/WorkZone/Macros.html.twig' as Macros %} {% for record in Story.get_children().get_elements() %} - + {{ Macros.element('groupings', Story, record, record, record.getNumber()) }} {% endfor %} diff --git a/templates/web/prod/actions/edit_default.html.twig b/templates/web/prod/actions/edit_default.html.twig index 781183b270..e065811f8d 100644 --- a/templates/web/prod/actions/edit_default.html.twig +++ b/templates/web/prod/actions/edit_default.html.twig @@ -97,7 +97,7 @@ {##} - + {% if field.get_dces_element %} diff --git a/templates/web/prod/results/record.html.twig b/templates/web/prod/results/record.html.twig index 61088ea939..191bb21c95 100644 --- a/templates/web/prod/results/record.html.twig +++ b/templates/web/prod/results/record.html.twig @@ -104,7 +104,7 @@ {% if settings.show_context_menu %} - + diff --git a/yarn.lock b/yarn.lock index b0531eaf13..89b0c8e0ea 100644 --- a/yarn.lock +++ b/yarn.lock @@ -7577,10 +7577,10 @@ phraseanet-common@^0.4.5-d: js-cookie "^2.1.0" pym.js "^1.3.1" -phraseanet-production-client@0.34.102-d: - version "0.34.102-d" - resolved "https://registry.yarnpkg.com/phraseanet-production-client/-/phraseanet-production-client-0.34.102-d.tgz#ee2772fd712a5fb2acc87eae5c7d4a2a46f5a28a" - integrity sha512-3KtY3n9uI42o6mDUDDXX6KgP3Os2FlQE3nkzEJc3eVbstG9V6rNlk8J/ujXaMKy1hibBT+9f7TTSYy0Z9ARPBA== +phraseanet-production-client@0.34.106-d: + version "0.34.106-d" + resolved "https://registry.yarnpkg.com/phraseanet-production-client/-/phraseanet-production-client-0.34.106-d.tgz#020379df0fc6023eebd5e188c7047b2e83892070" + integrity sha512-Z8XPVe++0oQ6LYubGMHovOhJg1qbSPoCyAD0HMazmtg+TzklfNcvPmUKWxKev2mP9qMLwYr5h4ts7XueyangAQ== dependencies: "@mapbox/mapbox-gl-language" "^0.9.2" "@turf/turf" "^5.1.6"