From 21940aeb5124738d7ac681367006dd29f48fe48c Mon Sep 17 00:00:00 2001 From: Peter Dulacka Date: Fri, 27 May 2022 18:05:06 +0200 Subject: [PATCH] Use HTML content of submit button instead of caption Caption was used historically and before the latest dependency update it was never displayed. The update made it more important than the HTML content of the submit buttons. This caused that some buttons had their caption (or system.save placeholder) as their text instead of the HTML with icon that we intended to use. remp/remp#1138 --- CHANGELOG.md | 1 + Mailer/app/Forms/ArticleUrlParserTemplateFormFactory.php | 4 ++-- Mailer/app/Forms/DennikeTemplateFormFactory.php | 4 ++-- Mailer/app/Forms/MMSTemplateFormFactory.php | 4 ++-- Mailer/app/Forms/MediaBriefingTemplateFormFactory.php | 4 ++-- Mailer/app/Forms/NewsfilterTemplateFormFactory.php | 4 ++-- Mailer/app/Forms/NovydenikNewsfilterTemplateFormFactory.php | 4 ++-- Mailer/app/Forms/TldrTemplateFormFactory.php | 4 ++-- .../extensions/mailer-module/src/Forms/ConfigFormFactory.php | 2 +- .../mailer-module/src/Forms/EditBatchFormFactory.php | 4 ++-- Mailer/extensions/mailer-module/src/Forms/JobFormFactory.php | 2 +- .../extensions/mailer-module/src/Forms/LayoutFormFactory.php | 4 ++-- Mailer/extensions/mailer-module/src/Forms/ListFormFactory.php | 2 +- .../mailer-module/src/Forms/NewBatchFormFactory.php | 4 ++-- .../mailer-module/src/Forms/NewTemplateFormFactory.php | 2 +- .../extensions/mailer-module/src/Forms/SnippetFormFactory.php | 4 ++-- .../mailer-module/src/Forms/SourceTemplateFormFactory.php | 4 ++-- .../mailer-module/src/Forms/TemplateFormFactory.php | 4 ++-- .../mailer-module/src/Forms/TemplateTestFormFactory.php | 2 +- .../extensions/mailer-module/src/Presenters/LogPresenter.php | 2 +- 20 files changed, 33 insertions(+), 32 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 71d15c14d..7f20b1d7b 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -19,6 +19,7 @@ The format is based on [Keep a Changelog](http://keepachangelog.com/) and this p - Fixed deprecated warning because of using `Latte#addFilter()` method. remp/remp#1135 - Fixed the filter loading issue. remp/remp#1135 - Fixed Latte deprecation issues introduced in the latest version of the templating engine. remp/remp#1136 +- Removed captions from the submit buttons in favor of HTML content with icons. remp/remp#1138 ## [0.32.2] - 2022-05-11 diff --git a/Mailer/app/Forms/ArticleUrlParserTemplateFormFactory.php b/Mailer/app/Forms/ArticleUrlParserTemplateFormFactory.php index 3fe8a0bdd..d1533e18c 100644 --- a/Mailer/app/Forms/ArticleUrlParserTemplateFormFactory.php +++ b/Mailer/app/Forms/ArticleUrlParserTemplateFormFactory.php @@ -134,13 +134,13 @@ public function create() $form->setDefaults($defaults); if ($this->permissionManager->isAllowed($this->user, 'batch', 'start')) { - $withJobs = $form->addSubmit('generate_emails_jobs', 'system.save'); + $withJobs = $form->addSubmit('generate_emails_jobs'); $withJobs->getControlPrototype() ->setName('button') ->setHtml('Generate newsletter batch and start sending'); } - $withJobsCreated = $form->addSubmit('generate_emails_jobs_created', 'system.save'); + $withJobsCreated = $form->addSubmit('generate_emails_jobs_created'); $withJobsCreated->getControlPrototype() ->setName('button') ->setHtml('Generate newsletter batch'); diff --git a/Mailer/app/Forms/DennikeTemplateFormFactory.php b/Mailer/app/Forms/DennikeTemplateFormFactory.php index 738d24126..c38a3a1b9 100644 --- a/Mailer/app/Forms/DennikeTemplateFormFactory.php +++ b/Mailer/app/Forms/DennikeTemplateFormFactory.php @@ -115,13 +115,13 @@ public function create() $form->setDefaults($defaults); if ($this->permissionManager->isAllowed($this->user, 'batch', 'start')) { - $withJobs = $form->addSubmit('generate_emails_jobs', 'system.save'); + $withJobs = $form->addSubmit('generate_emails_jobs'); $withJobs->getControlPrototype() ->setName('button') ->setHtml('Generate newsletter batch and start sending'); } - $withJobsCreated = $form->addSubmit('generate_emails_jobs_created', 'system.save'); + $withJobsCreated = $form->addSubmit('generate_emails_jobs_created'); $withJobsCreated->getControlPrototype() ->setName('button') ->setHtml('Generate newsletter batch'); diff --git a/Mailer/app/Forms/MMSTemplateFormFactory.php b/Mailer/app/Forms/MMSTemplateFormFactory.php index 75f4f58e3..a5def256c 100644 --- a/Mailer/app/Forms/MMSTemplateFormFactory.php +++ b/Mailer/app/Forms/MMSTemplateFormFactory.php @@ -106,13 +106,13 @@ public function create(): Form $form->setDefaults($defaults); if ($this->permissionManager->isAllowed($this->user, 'batch', 'start')) { - $withJobs = $form->addSubmit('generate_emails_jobs', 'system.save'); + $withJobs = $form->addSubmit('generate_emails_jobs'); $withJobs->getControlPrototype() ->setName('button') ->setHtml('Generate newsletter batch and start sending'); } - $withJobsCreated = $form->addSubmit('generate_emails_jobs_created', 'system.save'); + $withJobsCreated = $form->addSubmit('generate_emails_jobs_created'); $withJobsCreated->getControlPrototype() ->setName('button') ->setHtml('Generate newsletter batch'); diff --git a/Mailer/app/Forms/MediaBriefingTemplateFormFactory.php b/Mailer/app/Forms/MediaBriefingTemplateFormFactory.php index 5043a2338..bc89963af 100644 --- a/Mailer/app/Forms/MediaBriefingTemplateFormFactory.php +++ b/Mailer/app/Forms/MediaBriefingTemplateFormFactory.php @@ -105,13 +105,13 @@ public function create(): Form $form->setDefaults($defaults); if ($this->permissionManager->isAllowed($this->user, 'batch', 'start')) { - $withJobs = $form->addSubmit('generate_emails_jobs', 'system.save'); + $withJobs = $form->addSubmit('generate_emails_jobs'); $withJobs->getControlPrototype() ->setName('button') ->setHtml('Generate newsletter batch and start sending'); } - $withJobsCreated = $form->addSubmit('generate_emails_jobs_created', 'system.save'); + $withJobsCreated = $form->addSubmit('generate_emails_jobs_created'); $withJobsCreated->getControlPrototype() ->setName('button') ->setHtml('Generate newsletter batch'); diff --git a/Mailer/app/Forms/NewsfilterTemplateFormFactory.php b/Mailer/app/Forms/NewsfilterTemplateFormFactory.php index 98b9d5dc1..20ebaba7b 100644 --- a/Mailer/app/Forms/NewsfilterTemplateFormFactory.php +++ b/Mailer/app/Forms/NewsfilterTemplateFormFactory.php @@ -333,13 +333,13 @@ public function create() $form->setDefaults($defaults); if ($this->permissionManager->isAllowed($this->user, 'batch', 'start')) { - $withJobs = $form->addSubmit('generate_emails_jobs', 'system.save'); + $withJobs = $form->addSubmit('generate_emails_jobs'); $withJobs->getControlPrototype() ->setName('button') ->setHtml('Generate newsletter batch and start sending'); } - $withJobsCreated = $form->addSubmit('generate_emails_jobs_created', 'system.save'); + $withJobsCreated = $form->addSubmit('generate_emails_jobs_created'); $withJobsCreated->getControlPrototype() ->setName('button') ->setHtml('Generate newsletter batch'); diff --git a/Mailer/app/Forms/NovydenikNewsfilterTemplateFormFactory.php b/Mailer/app/Forms/NovydenikNewsfilterTemplateFormFactory.php index 086e40cd9..eb0da41e8 100644 --- a/Mailer/app/Forms/NovydenikNewsfilterTemplateFormFactory.php +++ b/Mailer/app/Forms/NovydenikNewsfilterTemplateFormFactory.php @@ -188,13 +188,13 @@ public function create(): Form $form->setDefaults($defaults); if ($this->permissionManager->isAllowed($this->user, 'batch', 'start')) { - $withJobs = $form->addSubmit('generate_emails_jobs', 'system.save'); + $withJobs = $form->addSubmit('generate_emails_jobs'); $withJobs->getControlPrototype() ->setName('button') ->setHtml('Generate newsletter batch and start sending'); } - $withJobsCreated = $form->addSubmit('generate_emails_jobs_created', 'system.save'); + $withJobsCreated = $form->addSubmit('generate_emails_jobs_created'); $withJobsCreated->getControlPrototype() ->setName('button') ->setHtml('Generate newsletter batch'); diff --git a/Mailer/app/Forms/TldrTemplateFormFactory.php b/Mailer/app/Forms/TldrTemplateFormFactory.php index 44c9d280c..077e16d93 100644 --- a/Mailer/app/Forms/TldrTemplateFormFactory.php +++ b/Mailer/app/Forms/TldrTemplateFormFactory.php @@ -105,13 +105,13 @@ public function create(): Form $form->setDefaults($defaults); if ($this->permissionManager->isAllowed($this->user, 'batch', 'start')) { - $withJobs = $form->addSubmit('generate_emails_jobs', 'system.save'); + $withJobs = $form->addSubmit('generate_emails_jobs'); $withJobs->getControlPrototype() ->setName('button') ->setHtml('Generate newsletter batch and start sending'); } - $withJobsCreated = $form->addSubmit('generate_emails_jobs_created', 'system.save'); + $withJobsCreated = $form->addSubmit('generate_emails_jobs_created'); $withJobsCreated->getControlPrototype() ->setName('button') ->setHtml('Generate newsletter batch'); diff --git a/Mailer/extensions/mailer-module/src/Forms/ConfigFormFactory.php b/Mailer/extensions/mailer-module/src/Forms/ConfigFormFactory.php index 5b41ad3ec..ac475f3aa 100644 --- a/Mailer/extensions/mailer-module/src/Forms/ConfigFormFactory.php +++ b/Mailer/extensions/mailer-module/src/Forms/ConfigFormFactory.php @@ -136,7 +136,7 @@ public function create(): Form } } - $form->addSubmit('save', 'Save') + $form->addSubmit('save') ->getControlPrototype() ->setName('button') ->setHtml(' Save'); diff --git a/Mailer/extensions/mailer-module/src/Forms/EditBatchFormFactory.php b/Mailer/extensions/mailer-module/src/Forms/EditBatchFormFactory.php index 652bb0778..4b07723f8 100644 --- a/Mailer/extensions/mailer-module/src/Forms/EditBatchFormFactory.php +++ b/Mailer/extensions/mailer-module/src/Forms/EditBatchFormFactory.php @@ -63,12 +63,12 @@ public function create(ActiveRow $batch): Form $form->addHidden('id', $batch->id); - $form->addSubmit(self::FORM_ACTION_SAVE, self::FORM_ACTION_SAVE) + $form->addSubmit(self::FORM_ACTION_SAVE) ->getControlPrototype() ->setName('button') ->setHtml(' Save'); - $form->addSubmit(self::FORM_ACTION_SAVE_CLOSE, self::FORM_ACTION_SAVE_CLOSE) + $form->addSubmit(self::FORM_ACTION_SAVE_CLOSE) ->getControlPrototype() ->setName('button') ->setHtml(' Save and close'); diff --git a/Mailer/extensions/mailer-module/src/Forms/JobFormFactory.php b/Mailer/extensions/mailer-module/src/Forms/JobFormFactory.php index 8ee179e57..4a8bfc6a7 100644 --- a/Mailer/extensions/mailer-module/src/Forms/JobFormFactory.php +++ b/Mailer/extensions/mailer-module/src/Forms/JobFormFactory.php @@ -69,7 +69,7 @@ public function create(int $jobId): Form ->setHtmlAttribute('data-live-search-normalize', 'true') ->setDefaultValue($job->segment_provider . '::' . $job->segment_code); - $form->addSubmit('save', 'Save') + $form->addSubmit('save') ->getControlPrototype() ->setName('button') ->setHtml(' Save'); diff --git a/Mailer/extensions/mailer-module/src/Forms/LayoutFormFactory.php b/Mailer/extensions/mailer-module/src/Forms/LayoutFormFactory.php index 95850544d..876c160de 100644 --- a/Mailer/extensions/mailer-module/src/Forms/LayoutFormFactory.php +++ b/Mailer/extensions/mailer-module/src/Forms/LayoutFormFactory.php @@ -87,12 +87,12 @@ public function create(?int $id = null): Form $form->setDefaults($defaults); - $form->addSubmit(self::FORM_ACTION_SAVE, self::FORM_ACTION_SAVE) + $form->addSubmit(self::FORM_ACTION_SAVE) ->getControlPrototype() ->setName('button') ->setHtml(' Save'); - $form->addSubmit(self::FORM_ACTION_SAVE_CLOSE, self::FORM_ACTION_SAVE_CLOSE) + $form->addSubmit(self::FORM_ACTION_SAVE_CLOSE) ->getControlPrototype() ->setName('button') ->setHtml(' Save and close'); diff --git a/Mailer/extensions/mailer-module/src/Forms/ListFormFactory.php b/Mailer/extensions/mailer-module/src/Forms/ListFormFactory.php index 427a5dfa9..83e173367 100644 --- a/Mailer/extensions/mailer-module/src/Forms/ListFormFactory.php +++ b/Mailer/extensions/mailer-module/src/Forms/ListFormFactory.php @@ -165,7 +165,7 @@ public function create(?int $id = null): Form $form->setDefaults($defaults); - $form->addSubmit('save', 'Save') + $form->addSubmit('save') ->getControlPrototype() ->setName('button') ->setHtml(' Save'); diff --git a/Mailer/extensions/mailer-module/src/Forms/NewBatchFormFactory.php b/Mailer/extensions/mailer-module/src/Forms/NewBatchFormFactory.php index 365767336..f5ce85114 100644 --- a/Mailer/extensions/mailer-module/src/Forms/NewBatchFormFactory.php +++ b/Mailer/extensions/mailer-module/src/Forms/NewBatchFormFactory.php @@ -118,13 +118,13 @@ public function create(?int $jobId) $form->addHidden('job_id', $jobId); - $form->addSubmit('save', 'Save') + $form->addSubmit('save') ->getControlPrototype() ->setName('button') ->setHtml(' Save'); if ($this->permissionManager->isAllowed($this->user, 'batch', 'start')) { - $form->addSubmit(self::FORM_ACTION_SAVE_START, 'Save and start sending') + $form->addSubmit(self::FORM_ACTION_SAVE_START) ->getControlPrototype() ->setName('button') ->setHtml(' Save and start'); diff --git a/Mailer/extensions/mailer-module/src/Forms/NewTemplateFormFactory.php b/Mailer/extensions/mailer-module/src/Forms/NewTemplateFormFactory.php index b2afdc7f4..4dbe34cf7 100644 --- a/Mailer/extensions/mailer-module/src/Forms/NewTemplateFormFactory.php +++ b/Mailer/extensions/mailer-module/src/Forms/NewTemplateFormFactory.php @@ -53,7 +53,7 @@ public function create($batchId) $form->addSelect('template_id', 'Email', $templateList); $form->addHidden('batch_id', $batchId); - $form->addSubmit('save', 'Save') + $form->addSubmit('save') ->getControlPrototype() ->setName('button') ->setHtml(' Save'); diff --git a/Mailer/extensions/mailer-module/src/Forms/SnippetFormFactory.php b/Mailer/extensions/mailer-module/src/Forms/SnippetFormFactory.php index f1f73108e..390c0a234 100644 --- a/Mailer/extensions/mailer-module/src/Forms/SnippetFormFactory.php +++ b/Mailer/extensions/mailer-module/src/Forms/SnippetFormFactory.php @@ -88,12 +88,12 @@ public function create(?int $id = null): Form $form->setDefaults($defaults); - $form->addSubmit(self::FORM_ACTION_SAVE, self::FORM_ACTION_SAVE) + $form->addSubmit(self::FORM_ACTION_SAVE) ->getControlPrototype() ->setName('button') ->setHtml(' Save'); - $form->addSubmit(self::FORM_ACTION_SAVE_CLOSE, self::FORM_ACTION_SAVE_CLOSE) + $form->addSubmit(self::FORM_ACTION_SAVE_CLOSE) ->getControlPrototype() ->setName('button') ->setHtml(' Save and close'); diff --git a/Mailer/extensions/mailer-module/src/Forms/SourceTemplateFormFactory.php b/Mailer/extensions/mailer-module/src/Forms/SourceTemplateFormFactory.php index 7e812d27d..8a809631c 100644 --- a/Mailer/extensions/mailer-module/src/Forms/SourceTemplateFormFactory.php +++ b/Mailer/extensions/mailer-module/src/Forms/SourceTemplateFormFactory.php @@ -98,12 +98,12 @@ public function create(?int $id = null): Form $form->setDefaults($defaults); - $form->addSubmit(self::FORM_ACTION_SAVE, self::FORM_ACTION_SAVE) + $form->addSubmit(self::FORM_ACTION_SAVE) ->getControlPrototype() ->setName('button') ->setHtml(' Save'); - $form->addSubmit(self::FORM_ACTION_SAVE_CLOSE, self::FORM_ACTION_SAVE_CLOSE) + $form->addSubmit(self::FORM_ACTION_SAVE_CLOSE) ->getControlPrototype() ->setName('button') ->setHtml(' Save and close'); diff --git a/Mailer/extensions/mailer-module/src/Forms/TemplateFormFactory.php b/Mailer/extensions/mailer-module/src/Forms/TemplateFormFactory.php index f87644d1c..d002afc15 100644 --- a/Mailer/extensions/mailer-module/src/Forms/TemplateFormFactory.php +++ b/Mailer/extensions/mailer-module/src/Forms/TemplateFormFactory.php @@ -136,12 +136,12 @@ public function create(?int $id = null, ?string $lang = null): Form $form->setDefaults($defaults); - $form->addSubmit(self::FORM_ACTION_SAVE, self::FORM_ACTION_SAVE) + $form->addSubmit(self::FORM_ACTION_SAVE) ->getControlPrototype() ->setName('button') ->setHtml(' Save'); - $form->addSubmit(self::FORM_ACTION_SAVE_CLOSE, self::FORM_ACTION_SAVE_CLOSE) + $form->addSubmit(self::FORM_ACTION_SAVE_CLOSE) ->getControlPrototype() ->setName('button') ->setHtml(' Save and close'); diff --git a/Mailer/extensions/mailer-module/src/Forms/TemplateTestFormFactory.php b/Mailer/extensions/mailer-module/src/Forms/TemplateTestFormFactory.php index b94e58433..51584466b 100644 --- a/Mailer/extensions/mailer-module/src/Forms/TemplateTestFormFactory.php +++ b/Mailer/extensions/mailer-module/src/Forms/TemplateTestFormFactory.php @@ -47,7 +47,7 @@ public function create(int $id): Form $form->setDefaults(['locale' => $this->localizationConfig->getDefaultLocale()]); } - $form->addSubmit('save', 'Send') + $form->addSubmit('save') ->getControlPrototype() ->setName('button') ->setHtml(' Send'); diff --git a/Mailer/extensions/mailer-module/src/Presenters/LogPresenter.php b/Mailer/extensions/mailer-module/src/Presenters/LogPresenter.php index da24592ac..81462b4cf 100644 --- a/Mailer/extensions/mailer-module/src/Presenters/LogPresenter.php +++ b/Mailer/extensions/mailer-module/src/Presenters/LogPresenter.php @@ -197,7 +197,7 @@ public function createComponentFilterLogsForm() $form->addText('created_at_to', 'Sent to')->setRequired('Field `Sent to` is required'); - $form->addSubmit('send', 'Filter') + $form->addSubmit('send') ->getControlPrototype() ->setName('button') ->setHtml(' Filter');