diff --git a/lib/Alchemy/Phrasea/Controller/Prod/PrinterController.php b/lib/Alchemy/Phrasea/Controller/Prod/PrinterController.php index d6f85bcd05..41b26f504f 100644 --- a/lib/Alchemy/Phrasea/Controller/Prod/PrinterController.php +++ b/lib/Alchemy/Phrasea/Controller/Prod/PrinterController.php @@ -44,8 +44,6 @@ class PrinterController extends Controller $printer->setThumbnailName($request->request->get('thumbnail-chosen')); $printer->setPreviewName($request->request->get('preview-chosen')); - $b = $printer->get_original_basket(); - $layout = $request->request->get('lay'); $title = $request->request->get('print-pdf-title') ? : ''; $description = $request->request->get('print-pdf-description') ? : ''; @@ -53,8 +51,11 @@ class PrinterController extends Controller $canDownload = $request->request->get('can-download-subdef') == 1 ? true : false ; $downloadSubdef = ''; + $urlTtl = null; if ($canDownload) { $downloadSubdef = $request->request->get('print-select-download-subdef'); + $urlTtl = $request->request->get('print-download-ttl') ? (int)$request->request->get('print-download-ttl') * (int)$request->request->get('print-download-ttl-unit') : null; + $printer->setUrlTtl($urlTtl); } foreach ($printer->get_elements() as $record) { diff --git a/lib/Alchemy/Phrasea/Helper/Record/Printer.php b/lib/Alchemy/Phrasea/Helper/Record/Printer.php index 4a58448893..de1ff255af 100644 --- a/lib/Alchemy/Phrasea/Helper/Record/Printer.php +++ b/lib/Alchemy/Phrasea/Helper/Record/Printer.php @@ -20,7 +20,9 @@ class Printer extends RecordHelper { protected $flatten_groupings = true; private $thumbnailName = 'thumbnail'; - private $previewName = 'preview;'; + private $previewName = 'preview'; + private $urlTtl = null; + /** * @var \ACL */ @@ -135,7 +137,6 @@ class Printer extends RecordHelper $element->get_subdef($subdefName)->is_physically_present()) ) { - $countSubdefs[$subdefName] ++; } } @@ -179,6 +180,16 @@ class Printer extends RecordHelper $this->thumbnailName = $thumbnailName; } + public function setUrlTtl($urlTtl) + { + $this->urlTtl = $urlTtl; + } + + public function getUrlTtl() + { + return $this->urlTtl; + } + public function getPreviewName() { return $this->previewName; @@ -188,4 +199,6 @@ class Printer extends RecordHelper { return $this->thumbnailName; } + + } diff --git a/lib/Alchemy/Phrasea/Out/Module/PDFRecords.php b/lib/Alchemy/Phrasea/Out/Module/PDFRecords.php index b379cedc04..aa31d076d9 100644 --- a/lib/Alchemy/Phrasea/Out/Module/PDFRecords.php +++ b/lib/Alchemy/Phrasea/Out/Module/PDFRecords.php @@ -12,6 +12,7 @@ namespace Alchemy\Phrasea\Out\Module; use Alchemy\Phrasea\Application; +use Alchemy\Phrasea\Media\MediaSubDefinitionUrlGenerator; use Alchemy\Phrasea\Out\Tool\PhraseaPDF; use Alchemy\Phrasea\Helper\Record\Printer; use Alchemy\Phrasea\Model\Entities\ValidationParticipant; @@ -22,6 +23,9 @@ class PDFRecords extends PDF /** @var Printer */ private $printer; + /** @var MediaSubDefinitionUrlGenerator */ + private $urlGenerator; + private $pdfTitle; private $pdfDescription; private $isUserInputPrinted = false; @@ -34,6 +38,7 @@ class PDFRecords extends PDF public function __construct(Application $app, Printer $printer, $layout, $pdfTitle = '', $pdfDescription = '', $userPassword = '', $canDownload = false, $downloadSubdef = '') { parent::__construct($app); + $this->urlGenerator = $app['media_accessor.subdef_url_generator']; $this->printer = $printer; $this->pdfTitle = $pdfTitle; $this->pdfDescription = $pdfDescription; @@ -256,8 +261,6 @@ class PDFRecords extends PDF $this->pdf->SetXY($x, $y + 1); $this->pdf->SetFont(PhraseaPDF::FONT, '', 10); - $t = $irow . '-' . $x; - $t = $rec->get_title(); if ($links) { $lk = $this->pdf->AddLink(); @@ -277,8 +280,16 @@ class PDFRecords extends PDF ); } - $this->pdf->MultiCell($DiapoW, $TitleH, $t, '0', 'C', false); + $downloadLink = $rec->get_title(); + if ($this->canDownload && !empty($this->downloadSubdef) && $rec->has_subdef($this->downloadSubdef)) { + $sd = $rec->get_subdef($this->downloadSubdef); + if ($sd->is_physically_present()) { + $downloadLink = sprintf('%s', (string)$this->urlGenerator->generate($this->app->getAuthenticatedUser(), $sd, $this->printer->getUrlTtl())."?download=1", $rec->get_title()); + } + } + + $this->pdf->MultiCell($DiapoW, $TitleH, $downloadLink, '0', 'C', false, 1, '', '', true, 0, true); $this->pdf->Circle($x + 6, $y + $DiapoH - 6, 5, 0, 360, "F", [], [200, 200, 200]); @@ -316,11 +327,11 @@ class PDFRecords extends PDF $this->pdf->SetLeftMargin($lmargin + 55); $ndoc = 0; + /* @var \record_adapter $rec */ foreach ($this->records as $rec) { $subdef = null; if ($rec->has_subdef($this->thumbnailName)) { - /* @var \record_adapter $rec */ $subdef = $rec->get_subdef($this->thumbnailName); } @@ -410,6 +421,17 @@ class PDFRecords extends PDF $this->pdf->SetX($lmargin + 55); $p0 = $this->pdf->PageNo(); $y0 = $this->pdf->GetY(); + + if ($this->canDownload && !empty($this->downloadSubdef) && $rec->has_subdef($this->downloadSubdef)) { + $sd = $rec->get_subdef($this->downloadSubdef); + if ($sd->is_physically_present()) { + $downloadLink = sprintf('%s', (string)$this->urlGenerator->generate($this->app->getAuthenticatedUser(), $sd, $this->printer->getUrlTtl())."?download=1", $this->app->trans("print:: download")); + + $this->pdf->writeHTML($downloadLink, true, false, false, true); + } + } + $this->pdf->SetY($this->pdf->GetY() + 2); + foreach ($rec->get_caption()->get_fields() as $field) { /* @var $field caption_field */ @@ -439,6 +461,7 @@ class PDFRecords extends PDF $lmargin = $oldMargins['left']; $rmargin = $oldMargins['right']; + /* @var \record_adapter $rec */ foreach ($this->records as $rec) { $title = "record : " . $rec->get_title(); @@ -474,6 +497,15 @@ class PDFRecords extends PDF $this->pdf->SetY($y = $y2); $this->pdf->SetY($y + 2); + if ($this->canDownload && !empty($this->downloadSubdef) && $rec->has_subdef($this->downloadSubdef)) { + $sd = $rec->get_subdef($this->downloadSubdef); + if ($sd->is_physically_present()) { + $downloadLink = sprintf('%s', (string)$this->urlGenerator->generate($this->app->getAuthenticatedUser(), $sd, $this->printer->getUrlTtl())."?download=1", $this->app->trans("print:: download")); + + $this->pdf->writeHTML($downloadLink, true, false, false, true); + } + } + $this->pdf->SetY($this->pdf->GetY() + 2); foreach ($rec->get_caption()->get_fields() as $field) { if ($field->get_databox_field()->get_gui_visible()) { $this->pdf->SetFont(PhraseaPDF::FONT, 'B', 12); @@ -742,8 +774,7 @@ class PDFRecords extends PDF if ($this->canDownload && !empty($this->downloadSubdef) && $rec->has_subdef($this->downloadSubdef)) { $sd = $rec->get_subdef($this->downloadSubdef); if ($sd->is_physically_present()) { - - $downloadLink = sprintf('%s', (string)$sd->get_permalink()->get_url()."&download=1", $this->app->trans("print:: download")); + $downloadLink = sprintf('%s', (string)$this->urlGenerator->generate($this->app->getAuthenticatedUser(), $sd, $this->printer->getUrlTtl())."?download=1", $this->app->trans("print:: download")); $this->pdf->writeHTML($downloadLink, true, false, false, true); } diff --git a/resources/locales/messages.de.xlf b/resources/locales/messages.de.xlf index f37dae9ed0..c8ed1a5a9c 100644 --- a/resources/locales/messages.de.xlf +++ b/resources/locales/messages.de.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 @@ -196,7 +196,7 @@ Bridge/Dailymotion/element_informations.html.twig - %number% documents<br/>selectionnes + selectionnes]]> ausgewählt]]> Controller/Prod/QueryController.php @@ -2534,7 +2534,7 @@ Form/Configuration/ActionsFormType.php - Display & action settings + Anzeige und Handlung-Einstellungen admin/fields/templates.html.twig @@ -4724,7 +4724,7 @@ None of the selected records can be printed Keine der ausgewählte Datensätze können gedruckt werden - prod/actions/printer_default.html.twig + prod/actions/printer_default.html.twig None of the selected records can be pushed. @@ -9930,7 +9930,7 @@ boutton::imprimer Drucken - prod/actions/printer_default.html.twig + prod/actions/printer_default.html.twig boutton::modifier @@ -10559,7 +10559,7 @@ export:: erreur : aucun document selectionne Fehler: kein ausgewähltes Dokument - prod/actions/printer_default.html.twig + prod/actions/printer_default.html.twig export:: telechargement @@ -11826,7 +11826,7 @@ Controller/Root/AccountController.php - phraseanet::account: << your account can be deleted via admin interface >> + >]]> Ihr Benutzerkonto kann nur durch die Administration Anwendung gelöscht werden. web/account/account.html.twig @@ -12133,17 +12133,17 @@ print:: Can download subdef Einen Download-Link hinzufügen - prod/actions/printer_default.html.twig + prod/actions/printer_default.html.twig print:: Choose subdef for preview Eine Unterauflösung für den Druck der Vorschau auswählen - prod/actions/printer_default.html.twig + prod/actions/printer_default.html.twig print:: Choose subdef for thumbnail Die Unterauflösung für den Druck der Miniaturansicht auswählen - prod/actions/printer_default.html.twig + prod/actions/printer_default.html.twig print:: add and remember password to protect the pdf @@ -12165,6 +12165,11 @@ Eine Druckschablone auswählen prod/actions/printer_default.html.twig + + print:: day + print:: day + prod/actions/printer_default.html.twig + print:: description Bildunterschrift @@ -12173,22 +12178,29 @@ print:: download Download-Link - Out/Module/PDFRecords.php + Out/Module/PDFRecords.php + Out/Module/PDFRecords.php + Out/Module/PDFRecords.php print:: element downloadable Wählen Sie die heruntergeladene Unterauflösung aus - prod/actions/printer_default.html.twig + prod/actions/printer_default.html.twig print:: element printable on preview model Verfügbare Unterauflösung - prod/actions/printer_default.html.twig + prod/actions/printer_default.html.twig print:: element printable on thumbnail model Verfügbare Unterauflösung - prod/actions/printer_default.html.twig + prod/actions/printer_default.html.twig + + + print:: hour + print:: hour + prod/actions/printer_default.html.twig print:: image de choix et description @@ -12215,6 +12227,11 @@ Miniaturansichten Liste prod/actions/printer_default.html.twig + + print:: month + print:: month + prod/actions/printer_default.html.twig + print:: pdf description Nachricht @@ -12235,100 +12252,115 @@ Weitere Optionen prod/actions/printer_default.html.twig + + print:: subdef mapping + print:: subdef mapping + prod/actions/printer_default.html.twig + + + print:: subdef url ttl + print:: subdef url ttl + prod/actions/printer_default.html.twig + print:: warning! Only available image for chosen subdef is printed Wenn die ausgewählte Unterauflösung fehlt, wird sie durch ein Ersatzbild ersetzt - prod/actions/printer_default.html.twig + prod/actions/printer_default.html.twig print:: warning! Only available media for chosen subdef is downloadable Wenn die ausgewählte Unterauflösung fehlt, wird sie durch ein Ersatzbild ersetzt - prod/actions/printer_default.html.twig + prod/actions/printer_default.html.twig + + + print:: week + print:: week + prod/actions/printer_default.html.twig print_feedback:: Document generated on : Drucken erzeugt am - Out/Module/PDFRecords.php + Out/Module/PDFRecords.php print_feedback:: Feedback active Feedback ist aktiviert - Out/Module/PDFRecords.php + Out/Module/PDFRecords.php print_feedback:: Feedback expired Feedback ist abgelaufen - Out/Module/PDFRecords.php + Out/Module/PDFRecords.php print_feedback:: Feedback expiring on : Erlischt am - Out/Module/PDFRecords.php + Out/Module/PDFRecords.php print_feedback:: Feedback initiated by : Feedback gesendet von - Out/Module/PDFRecords.php + Out/Module/PDFRecords.php print_feedback:: Feedback initiated on : Feedback Beginn am - Out/Module/PDFRecords.php + Out/Module/PDFRecords.php print_feedback:: Feedback on basket %name% Feedback auf Sammelkorb %name% - Out/Module/PDFRecords.php + Out/Module/PDFRecords.php print_feedback:: Non Nein - Out/Module/PDFRecords.php + Out/Module/PDFRecords.php print_feedback:: Oui Ja - Out/Module/PDFRecords.php + Out/Module/PDFRecords.php print_feedback:: Participants : Teilnehmer : - Out/Module/PDFRecords.php + Out/Module/PDFRecords.php print_feedback:: Votes : Zustimmung : - Out/Module/PDFRecords.php + Out/Module/PDFRecords.php print_feedback:: base name: Datenbank - Out/Module/PDFRecords.php + Out/Module/PDFRecords.php print_feedback:: document Uuid: Uuid Dokument - Out/Module/PDFRecords.php + Out/Module/PDFRecords.php print_feedback:: non voté unausgedrückt - Out/Module/PDFRecords.php + Out/Module/PDFRecords.php print_feedback:: originale filename: Originale Dateiname - Out/Module/PDFRecords.php + Out/Module/PDFRecords.php print_feedback:: record id: Record id - Out/Module/PDFRecords.php + Out/Module/PDFRecords.php print_feedback:: record title: Titel - Out/Module/PDFRecords.php + Out/Module/PDFRecords.php prive @@ -14525,7 +14557,7 @@ Vorsicht: die aktuelle Werte werden durch die neue Werte überschrieben web/thesaurus/thesaurus.html.twig - thesaurus:: Supprimer cette branche ?&#10;(les termes concernes remonteront en candidats a la prochaine indexation) + web/thesaurus/thesaurus.html.twig diff --git a/resources/locales/messages.en.xlf b/resources/locales/messages.en.xlf index 2b7843a8cd..9db963cf35 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 @@ -196,7 +196,7 @@ Bridge/Dailymotion/element_informations.html.twig - %number% documents<br/>selectionnes + selectionnes]]> selected]]> Controller/Prod/QueryController.php @@ -2537,7 +2537,7 @@ Form/Configuration/ActionsFormType.php - Display & action settings + Display and action settings admin/fields/templates.html.twig @@ -4727,7 +4727,7 @@ None of the selected records can be printed None of the selected records can be printed - prod/actions/printer_default.html.twig + prod/actions/printer_default.html.twig None of the selected records can be pushed. @@ -9933,7 +9933,7 @@ boutton::imprimer Print - prod/actions/printer_default.html.twig + prod/actions/printer_default.html.twig boutton::modifier @@ -10562,7 +10562,7 @@ export:: erreur : aucun document selectionne Error : no document selected - prod/actions/printer_default.html.twig + prod/actions/printer_default.html.twig export:: telechargement @@ -11829,7 +11829,7 @@ Controller/Root/AccountController.php - phraseanet::account: << your account can be deleted via admin interface >> + >]]> Your rights do not allow to perform this action. Your account can only be deleted via the Administration interface. web/account/account.html.twig @@ -12136,17 +12136,17 @@ print:: Can download subdef Add a download link - prod/actions/printer_default.html.twig + prod/actions/printer_default.html.twig print:: Choose subdef for preview Choose a sub-definition for printed "preview" - prod/actions/printer_default.html.twig + prod/actions/printer_default.html.twig print:: Choose subdef for thumbnail Choose a subdefinition for printed "thumbnail" - prod/actions/printer_default.html.twig + prod/actions/printer_default.html.twig print:: add and remember password to protect the pdf @@ -12168,6 +12168,11 @@ Select a printing template prod/actions/printer_default.html.twig + + print:: day + print:: day + prod/actions/printer_default.html.twig + print:: description Caption only @@ -12176,22 +12181,29 @@ print:: download Download link - Out/Module/PDFRecords.php + Out/Module/PDFRecords.php + Out/Module/PDFRecords.php + Out/Module/PDFRecords.php print:: element downloadable Define the downloaded subdefinition - prod/actions/printer_default.html.twig + prod/actions/printer_default.html.twig print:: element printable on preview model Available for print "Preview" - prod/actions/printer_default.html.twig + prod/actions/printer_default.html.twig print:: element printable on thumbnail model Available for print "Thumbnail" - prod/actions/printer_default.html.twig + prod/actions/printer_default.html.twig + + + print:: hour + print:: hour + prod/actions/printer_default.html.twig print:: image de choix et description @@ -12218,6 +12230,11 @@ Thumbnail list prod/actions/printer_default.html.twig + + print:: month + print:: month + prod/actions/printer_default.html.twig + print:: pdf description Message @@ -12238,101 +12255,116 @@ More Options prod/actions/printer_default.html.twig + + print:: subdef mapping + print:: subdef mapping + prod/actions/printer_default.html.twig + + + print:: subdef url ttl + print:: subdef url ttl + prod/actions/printer_default.html.twig + print:: warning! Only available image for chosen subdef is printed If the selected sub-definition is missing, it will be replaced by a substitute image - prod/actions/printer_default.html.twig + prod/actions/printer_default.html.twig print:: warning! Only available media for chosen subdef is downloadable The download link will NEVER EXPIRE. If the selected subdefinition is missing, it will be replaced by a substitute image. - prod/actions/printer_default.html.twig + prod/actions/printer_default.html.twig + + + print:: week + print:: week + prod/actions/printer_default.html.twig print_feedback:: Document generated on : Generated on : - Out/Module/PDFRecords.php + Out/Module/PDFRecords.php print_feedback:: Feedback active Feedback session still opened - Out/Module/PDFRecords.php + Out/Module/PDFRecords.php print_feedback:: Feedback expired Feedback session closed - Out/Module/PDFRecords.php + Out/Module/PDFRecords.php print_feedback:: Feedback expiring on : Feedback expiring on : - Out/Module/PDFRecords.php + Out/Module/PDFRecords.php print_feedback:: Feedback initiated by : Feedback initiated by : - Out/Module/PDFRecords.php + Out/Module/PDFRecords.php print_feedback:: Feedback initiated on : Feedback initiated on : - Out/Module/PDFRecords.php + Out/Module/PDFRecords.php print_feedback:: Feedback on basket %name% Feedback report on basket : %name% - Out/Module/PDFRecords.php + Out/Module/PDFRecords.php print_feedback:: Non No - Out/Module/PDFRecords.php + Out/Module/PDFRecords.php print_feedback:: Oui Yes - Out/Module/PDFRecords.php + Out/Module/PDFRecords.php print_feedback:: Participants : Participants list : - Out/Module/PDFRecords.php + Out/Module/PDFRecords.php print_feedback:: Votes : Approvals : - Out/Module/PDFRecords.php + Out/Module/PDFRecords.php print_feedback:: base name: Base Name : - Out/Module/PDFRecords.php + Out/Module/PDFRecords.php print_feedback:: document Uuid: Document Unique Id : - Out/Module/PDFRecords.php + Out/Module/PDFRecords.php print_feedback:: non voté Unexpressed - Out/Module/PDFRecords.php + Out/Module/PDFRecords.php print_feedback:: originale filename: Original file name : - Out/Module/PDFRecords.php + Out/Module/PDFRecords.php print_feedback:: record id: Record Id : - Out/Module/PDFRecords.php + Out/Module/PDFRecords.php print_feedback:: record title: Record Title : - Out/Module/PDFRecords.php + Out/Module/PDFRecords.php prive @@ -14534,7 +14566,7 @@ It is possible to place several search areas web/thesaurus/thesaurus.html.twig - thesaurus:: Supprimer cette branche ?&#10;(les termes concernes remonteront en candidats a la prochaine indexation) + web/thesaurus/thesaurus.html.twig diff --git a/resources/locales/messages.fr.xlf b/resources/locales/messages.fr.xlf index 91a42878cc..c5d010b826 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 @@ -196,7 +196,7 @@ Bridge/Dailymotion/element_informations.html.twig - %number% documents<br/>selectionnes + selectionnes]]> sélectionnés]]> Controller/Prod/QueryController.php @@ -2534,7 +2534,7 @@ Form/Configuration/ActionsFormType.php - Display & action settings + Paramétrage d'affichage et d'action admin/fields/templates.html.twig @@ -4724,7 +4724,7 @@ None of the selected records can be printed Aucun des documents sélectionnés ne peut être imprimé - prod/actions/printer_default.html.twig + prod/actions/printer_default.html.twig None of the selected records can be pushed. @@ -9933,7 +9933,7 @@ Si vous recevez cet e-mail sans l'avoir sollicité, merci de l'ignorer ou de le boutton::imprimer Imprimer - prod/actions/printer_default.html.twig + prod/actions/printer_default.html.twig boutton::modifier @@ -10562,7 +10562,7 @@ Si vous recevez cet e-mail sans l'avoir sollicité, merci de l'ignorer ou de le export:: erreur : aucun document selectionne Erreur : aucun document sélectionné - prod/actions/printer_default.html.twig + prod/actions/printer_default.html.twig export:: telechargement @@ -11829,7 +11829,7 @@ Si vous recevez cet e-mail sans l'avoir sollicité, merci de l'ignorer ou de le Controller/Root/AccountController.php - phraseanet::account: << your account can be deleted via admin interface >> + >]]> Vos droits ne vous permettent pas de réaliser cette action, votre compte ne peut être supprimé que via l'interface d'Administration. web/account/account.html.twig @@ -12136,17 +12136,17 @@ Si vous recevez cet e-mail sans l'avoir sollicité, merci de l'ignorer ou de le print:: Can download subdef Ajouter un lien de téléchargement - prod/actions/printer_default.html.twig + prod/actions/printer_default.html.twig print:: Choose subdef for preview Sélectionner une sous-définition pour l'impression de la prévisualisation - prod/actions/printer_default.html.twig + prod/actions/printer_default.html.twig print:: Choose subdef for thumbnail Sélectionner la sous-définition pour l'impression de la vignette - prod/actions/printer_default.html.twig + prod/actions/printer_default.html.twig print:: add and remember password to protect the pdf @@ -12168,6 +12168,11 @@ Si vous recevez cet e-mail sans l'avoir sollicité, merci de l'ignorer ou de le Choisir un gabarit d'impression prod/actions/printer_default.html.twig + + print:: day + print:: day + prod/actions/printer_default.html.twig + print:: description Notice seule @@ -12176,22 +12181,29 @@ Si vous recevez cet e-mail sans l'avoir sollicité, merci de l'ignorer ou de le print:: download Lien de téléchargement - Out/Module/PDFRecords.php + Out/Module/PDFRecords.php + Out/Module/PDFRecords.php + Out/Module/PDFRecords.php print:: element downloadable Choisir la sous définition téléchargée - prod/actions/printer_default.html.twig + prod/actions/printer_default.html.twig print:: element printable on preview model sous définition disponible - prod/actions/printer_default.html.twig + prod/actions/printer_default.html.twig print:: element printable on thumbnail model Sous définition disponible - prod/actions/printer_default.html.twig + prod/actions/printer_default.html.twig + + + print:: hour + print:: hour + prod/actions/printer_default.html.twig print:: image de choix et description @@ -12218,6 +12230,11 @@ Si vous recevez cet e-mail sans l'avoir sollicité, merci de l'ignorer ou de le Liste de vignette(s) avec notice(s) prod/actions/printer_default.html.twig + + print:: month + print:: month + prod/actions/printer_default.html.twig + print:: pdf description Message @@ -12238,101 +12255,116 @@ Si vous recevez cet e-mail sans l'avoir sollicité, merci de l'ignorer ou de le Options supplémentaires prod/actions/printer_default.html.twig + + print:: subdef mapping + print:: subdef mapping + prod/actions/printer_default.html.twig + + + print:: subdef url ttl + print:: subdef url ttl + prod/actions/printer_default.html.twig + print:: warning! Only available image for chosen subdef is printed Si la sous définition choisie n'existe pas, elle sera remplacée par une image de substitution - prod/actions/printer_default.html.twig + prod/actions/printer_default.html.twig print:: warning! Only available media for chosen subdef is downloadable Le lien de téléchargement n'expire Jamais. Si la sous définition choisie n'existe pas, elle sera remplacée par une image de substitution - prod/actions/printer_default.html.twig + prod/actions/printer_default.html.twig + + + print:: week + print:: week + prod/actions/printer_default.html.twig print_feedback:: Document generated on : Impression générée le : - Out/Module/PDFRecords.php + Out/Module/PDFRecords.php print_feedback:: Feedback active Validation en cours - Out/Module/PDFRecords.php + Out/Module/PDFRecords.php print_feedback:: Feedback expired Validation Fermée - Out/Module/PDFRecords.php + Out/Module/PDFRecords.php print_feedback:: Feedback expiring on : Expire le : - Out/Module/PDFRecords.php + Out/Module/PDFRecords.php print_feedback:: Feedback initiated by : Validation envoyée par : - Out/Module/PDFRecords.php + Out/Module/PDFRecords.php print_feedback:: Feedback initiated on : Début de validation le : - Out/Module/PDFRecords.php + Out/Module/PDFRecords.php print_feedback:: Feedback on basket %name% Rapport de validation de : %name% - Out/Module/PDFRecords.php + Out/Module/PDFRecords.php print_feedback:: Non Non - Out/Module/PDFRecords.php + Out/Module/PDFRecords.php print_feedback:: Oui Oui - Out/Module/PDFRecords.php + Out/Module/PDFRecords.php print_feedback:: Participants : Participants : - Out/Module/PDFRecords.php + Out/Module/PDFRecords.php print_feedback:: Votes : Approbations : - Out/Module/PDFRecords.php + Out/Module/PDFRecords.php print_feedback:: base name: Base : - Out/Module/PDFRecords.php + Out/Module/PDFRecords.php print_feedback:: document Uuid: Id unique de document : - Out/Module/PDFRecords.php + Out/Module/PDFRecords.php print_feedback:: non voté Non exprimé - Out/Module/PDFRecords.php + Out/Module/PDFRecords.php print_feedback:: originale filename: Nom de fichier : - Out/Module/PDFRecords.php + Out/Module/PDFRecords.php print_feedback:: record id: Record id: - Out/Module/PDFRecords.php + Out/Module/PDFRecords.php print_feedback:: record title: Titre : - Out/Module/PDFRecords.php + Out/Module/PDFRecords.php prive @@ -14537,7 +14569,7 @@ Attention: les valeurs actuellement en place seront écrasées par ces nouvelles web/thesaurus/thesaurus.html.twig - thesaurus:: Supprimer cette branche ?&#10;(les termes concernes remonteront en candidats a la prochaine indexation) + web/thesaurus/thesaurus.html.twig diff --git a/resources/locales/messages.nl.xlf b/resources/locales/messages.nl.xlf index a83cf61e43..c85a02df82 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. @@ -4736,7 +4736,7 @@ None of the selected records can be printed Geen enkele van de geselecteerde records kunnen geprint worden - prod/actions/printer_default.html.twig + prod/actions/printer_default.html.twig None of the selected records can be pushed. @@ -9942,7 +9942,7 @@ boutton::imprimer Print - prod/actions/printer_default.html.twig + prod/actions/printer_default.html.twig boutton::modifier @@ -10571,7 +10571,7 @@ export:: erreur : aucun document selectionne Erreur : geen enkel document geslecteerd - prod/actions/printer_default.html.twig + prod/actions/printer_default.html.twig export:: telechargement @@ -12145,17 +12145,17 @@ print:: Can download subdef print:: Can download subdef - prod/actions/printer_default.html.twig + prod/actions/printer_default.html.twig print:: Choose subdef for preview print:: Choose subdef for preview - prod/actions/printer_default.html.twig + prod/actions/printer_default.html.twig print:: Choose subdef for thumbnail print:: Choose subdef for thumbnail - prod/actions/printer_default.html.twig + prod/actions/printer_default.html.twig print:: add and remember password to protect the pdf @@ -12177,6 +12177,11 @@ print:: choose model prod/actions/printer_default.html.twig + + print:: day + print:: day + prod/actions/printer_default.html.twig + print:: description print:: description @@ -12185,22 +12190,29 @@ print:: download print:: download - Out/Module/PDFRecords.php + Out/Module/PDFRecords.php + Out/Module/PDFRecords.php + Out/Module/PDFRecords.php print:: element downloadable print:: element downloadable - prod/actions/printer_default.html.twig + prod/actions/printer_default.html.twig print:: element printable on preview model print:: element printable on preview model - prod/actions/printer_default.html.twig + prod/actions/printer_default.html.twig print:: element printable on thumbnail model print:: element printable on thumbnail model - prod/actions/printer_default.html.twig + prod/actions/printer_default.html.twig + + + print:: hour + print:: hour + prod/actions/printer_default.html.twig print:: image de choix et description @@ -12227,6 +12239,11 @@ Thumbnail lijst prod/actions/printer_default.html.twig + + print:: month + print:: month + prod/actions/printer_default.html.twig + print:: pdf description print:: pdf description @@ -12247,100 +12264,115 @@ print:: some options prod/actions/printer_default.html.twig + + print:: subdef mapping + print:: subdef mapping + prod/actions/printer_default.html.twig + + + print:: subdef url ttl + print:: subdef url ttl + prod/actions/printer_default.html.twig + print:: warning! Only available image for chosen subdef is printed print:: warning! Only available image for chosen subdef is printed - prod/actions/printer_default.html.twig + prod/actions/printer_default.html.twig print:: warning! Only available media for chosen subdef is downloadable print:: warning! Only available media for chosen subdef is downloadable - prod/actions/printer_default.html.twig + prod/actions/printer_default.html.twig + + + print:: week + print:: week + prod/actions/printer_default.html.twig print_feedback:: Document generated on : print_feedback:: Document generated on : - Out/Module/PDFRecords.php + Out/Module/PDFRecords.php print_feedback:: Feedback active print_feedback:: Feedback active - Out/Module/PDFRecords.php + Out/Module/PDFRecords.php print_feedback:: Feedback expired print_feedback:: Feedback expired - Out/Module/PDFRecords.php + Out/Module/PDFRecords.php print_feedback:: Feedback expiring on : print_feedback:: Feedback expiring on : - Out/Module/PDFRecords.php + Out/Module/PDFRecords.php print_feedback:: Feedback initiated by : print_feedback:: Feedback initiated by : - Out/Module/PDFRecords.php + Out/Module/PDFRecords.php print_feedback:: Feedback initiated on : print_feedback:: Feedback initiated on : - Out/Module/PDFRecords.php + Out/Module/PDFRecords.php print_feedback:: Feedback on basket %name% print_feedback:: Feedback on basket %name% - Out/Module/PDFRecords.php + Out/Module/PDFRecords.php print_feedback:: Non print_feedback:: Non - Out/Module/PDFRecords.php + Out/Module/PDFRecords.php print_feedback:: Oui print_feedback:: Oui - Out/Module/PDFRecords.php + Out/Module/PDFRecords.php print_feedback:: Participants : print_feedback:: Participants : - Out/Module/PDFRecords.php + Out/Module/PDFRecords.php print_feedback:: Votes : print_feedback:: Votes : - Out/Module/PDFRecords.php + Out/Module/PDFRecords.php print_feedback:: base name: print_feedback:: base name: - Out/Module/PDFRecords.php + Out/Module/PDFRecords.php print_feedback:: document Uuid: print_feedback:: document Uuid: - Out/Module/PDFRecords.php + Out/Module/PDFRecords.php print_feedback:: non voté print_feedback:: non voté - Out/Module/PDFRecords.php + Out/Module/PDFRecords.php print_feedback:: originale filename: print_feedback:: originale filename: - Out/Module/PDFRecords.php + Out/Module/PDFRecords.php print_feedback:: record id: print_feedback:: record id: - Out/Module/PDFRecords.php + Out/Module/PDFRecords.php print_feedback:: record title: print_feedback:: record title: - Out/Module/PDFRecords.php + Out/Module/PDFRecords.php prive diff --git a/resources/locales/validators.de.xlf b/resources/locales/validators.de.xlf index b7f0ba133d..2c6c542464 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 74d248700b..069489567d 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 e78be9e277..17cca4eaf9 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 f33602996d..970e601356 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/templates/web/prod/actions/printer_default.html.twig b/templates/web/prod/actions/printer_default.html.twig index 29df2f27ab..f834666397 100644 --- a/templates/web/prod/actions/printer_default.html.twig +++ b/templates/web/prod/actions/printer_default.html.twig @@ -71,6 +71,7 @@ +

{{ 'print:: subdef mapping' | trans }}

{{ 'print:: warning! Only available image for chosen subdef is printed' | trans }}
@@ -78,15 +79,15 @@
- {{ printer.getSubdefImageCount['preview'] }} / {{ total_count }} {{ 'print:: element printable on preview model' | trans }} + {{ 'print:: element printable on preview model' | trans }}
@@ -94,15 +95,15 @@
- {{ printer.getSubdefImageCount['thumbnail'] }} / {{ total_count }} {{ 'print:: element printable on thumbnail model' | trans }} + {{ 'print:: element printable on thumbnail model' | trans }}
@@ -117,15 +118,25 @@
- {{ printer.getSubdefCount['preview'] }} / {{ total_count }} {{ 'print:: element downloadable' | trans }} + {{ 'print:: element downloadable' | trans }} +
+
+ + +
@@ -163,6 +174,25 @@ toolbar1: 'formatselect | bold italic strikethrough forecolor backcolor | link | alignleft aligncenter alignright alignjustify | numlist bullist outdent indent | removeformat', }); + // add dynamically the subdef count in the select option + var totalCount = {{ total_count }}; + var subdefImageCount = JSON.parse('{{ printer.getSubdefImageCount|json_encode|raw }}'); + var subdefCount = JSON.parse('{{ printer.getSubdefCount|json_encode|raw }}'); + + for (const [key, value] of Object.entries(subdefCount)) { + $(".download-"+ key).attr('data-count', value + " / " + totalCount); + if (key == 'preview') { + $('.download-count-info').empty().text(value + " / " + totalCount); + } + } + + for (const [key, value] of Object.entries(subdefImageCount)) { + $(".subdef-"+ key).attr('data-count', value + " / " + totalCount); + if (key === 'thumbnail' || key === 'preview') { + $("." + key +"-count-info").empty().text(value + " / " + totalCount); + } + } + $("#print-choose-preview").on('change', function() { var selectedSubdef = $(this).children('option:selected'); $(".preview-count-info").empty().html(selectedSubdef.attr("data-count"));