From 5d88a36c724564440cd4562f5f90513ef3cc2b7e Mon Sep 17 00:00:00 2001
From: Bernd Oliver Suenderhauf <bos@suenderhauf.de>
Date: Mon, 15 Apr 2019 21:03:30 +0200
Subject: [PATCH] Issue #3048321 by Pancho: Visually improve filename pattern
token link
---
css/fillpdf.form.css | 3 ++-
src/Entity/FillPdfForm.php | 2 +-
src/Form/FillPdfFormForm.php | 7 +------
3 files changed, 4 insertions(+), 8 deletions(-)
diff --git a/css/fillpdf.form.css b/css/fillpdf.form.css
index 6ffcbeb..56cd197 100644
--- a/css/fillpdf.form.css
+++ b/css/fillpdf.form.css
@@ -3,7 +3,8 @@
vertical-align: top;
}
-#edit-storage .form-item {
+#edit-storage .form-item,
+#edit-title-wrapper .form-item {
margin-bottom: 0;
}
diff --git a/src/Entity/FillPdfForm.php b/src/Entity/FillPdfForm.php
index 5fb5c0d..1a8de65 100644
--- a/src/Entity/FillPdfForm.php
+++ b/src/Entity/FillPdfForm.php
@@ -81,7 +81,7 @@ class FillPdfForm extends ContentEntityBase implements FillPdfFormInterface {
$fields['title'] = BaseFieldDefinition::create('string')
->setLabel(t('Filename pattern'))
- ->setDescription(t('Enter a title for this mapping configuration. This will be used for deciding the filename of your PDF. <strong>This field supports tokens.</strong>'))
+ ->setDescription(new TranslatableMarkup('This pattern will be used for deciding the filename of your PDF. This field supports tokens.'))
->setDisplayOptions('form', [
'type' => 'string',
'weight' => 10,
diff --git a/src/Form/FillPdfFormForm.php b/src/Form/FillPdfFormForm.php
index 02d64db..95e6071 100644
--- a/src/Form/FillPdfFormForm.php
+++ b/src/Form/FillPdfFormForm.php
@@ -124,12 +124,7 @@ class FillPdfFormForm extends ContentEntityForm {
/** @var \Drupal\fillpdf\FillPdfFormInterface $entity */
$entity = $this->entity;
- $form['tokens'] = [
- '#type' => 'fieldset',
- '#title' => $this->t('Tokens'),
- '#weight' => 11,
- 'token_tree' => $this->adminFormHelper->getAdminTokenForm(),
- ];
+ $form['title']['token_tree'] = $this->adminFormHelper->getAdminTokenForm();
$entity_types = [];
$entity_type_definitions = $this->entityTypeManager->getDefinitions();
--
GitLab