Merge branch '1138-submit-captions' into 'master'

Use HTML content of submit button instead of caption See merge request remp/remp!669
remp2020 · May 27, 2022 · 62793f9 · 62793f9
2 parents d14595b + 21940ae
commit 62793f9
Show file tree

Hide file tree

Showing 20 changed files with 33 additions and 32 deletions.
diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -136,7 +136,7 @@ public function create(): Form
             }
         }
 
-        $form->addSubmit('save', 'Save')
+        $form->addSubmit('save')
             ->getControlPrototype()
             ->setName('button')
             ->setHtml('<i class="zmdi zmdi-mail-send"></i> Save');

diff --git 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('<i class="zmdi zmdi-check"></i> Save');
 
-        $form->addSubmit(self::FORM_ACTION_SAVE_CLOSE, self::FORM_ACTION_SAVE_CLOSE)
+        $form->addSubmit(self::FORM_ACTION_SAVE_CLOSE)
             ->getControlPrototype()
             ->setName('button')
             ->setHtml('<i class="zmdi zmdi-mail-send"></i> Save and close');

diff --git 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('<i class="zmdi zmdi-mail-send"></i> Save');

diff --git 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('<i class="zmdi zmdi-check"></i> Save');
 
-        $form->addSubmit(self::FORM_ACTION_SAVE_CLOSE, self::FORM_ACTION_SAVE_CLOSE)
+        $form->addSubmit(self::FORM_ACTION_SAVE_CLOSE)
             ->getControlPrototype()
             ->setName('button')
             ->setHtml('<i class="zmdi zmdi-mail-send"></i> Save and close');

diff --git 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('<i class="zmdi zmdi-mail-send"></i> Save');

diff --git 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('<i class="zmdi zmdi-mail-send"></i> 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('<i class="zmdi zmdi-mail-send"></i> Save and start');

diff --git 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('<i class="zmdi zmdi-mail-send"></i> Save');

diff --git 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('<i class="zmdi zmdi-check"></i> Save');
 
-        $form->addSubmit(self::FORM_ACTION_SAVE_CLOSE, self::FORM_ACTION_SAVE_CLOSE)
+        $form->addSubmit(self::FORM_ACTION_SAVE_CLOSE)
             ->getControlPrototype()
             ->setName('button')
             ->setHtml('<i class="zmdi zmdi-mail-send"></i> Save and close');

diff --git 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('<i class="zmdi zmdi-check"></i> Save');
 
-        $form->addSubmit(self::FORM_ACTION_SAVE_CLOSE, self::FORM_ACTION_SAVE_CLOSE)
+        $form->addSubmit(self::FORM_ACTION_SAVE_CLOSE)
             ->getControlPrototype()
             ->setName('button')
             ->setHtml('<i class="zmdi zmdi-mail-send"></i> Save and close');

diff --git 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('<i class="zmdi zmdi-check"></i> Save');
 
-        $form->addSubmit(self::FORM_ACTION_SAVE_CLOSE, self::FORM_ACTION_SAVE_CLOSE)
+        $form->addSubmit(self::FORM_ACTION_SAVE_CLOSE)
             ->getControlPrototype()
             ->setName('button')
             ->setHtml('<i class="zmdi zmdi-mail-send"></i> Save and close');

diff --git 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('<i class="zmdi zmdi-mail-send"></i> Send');

diff --git 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('<i class="fa fa-filter"></i> Filter');