Skip to content

Commit 62793f9

Browse files
rootpdrootpd
committed
Merge branch '1138-submit-captions' into 'master'
Use HTML content of submit button instead of caption See merge request remp/remp!669
2 parents d14595b + 21940ae commit 62793f9

20 files changed

+33
-32
lines changed

‎CHANGELOG.md‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,7 @@ The format is based on [Keep a Changelog](http://keepachangelog.com/) and this p
1919
- Fixed deprecated warning because of using `Latte#addFilter()` method. remp/remp#1135
2020
- Fixed the filter loading issue. remp/remp#1135
2121
- Fixed Latte deprecation issues introduced in the latest version of the templating engine. remp/remp#1136
22+
- Removed captions from the submit buttons in favor of HTML content with icons. remp/remp#1138
2223

2324
## [0.32.2] - 2022-05-11
2425

‎Mailer/app/Forms/ArticleUrlParserTemplateFormFactory.php‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -134,13 +134,13 @@ public function create()
134134
$form->setDefaults($defaults);
135135

136136
if ($this->permissionManager->isAllowed($this->user, 'batch', 'start')) {
137-
$withJobs = $form->addSubmit('generate_emails_jobs', 'system.save');
137+
$withJobs = $form->addSubmit('generate_emails_jobs');
138138
$withJobs->getControlPrototype()
139139
->setName('button')
140140
->setHtml('Generate newsletter batch and start sending');
141141
}
142142

143-
$withJobsCreated = $form->addSubmit('generate_emails_jobs_created', 'system.save');
143+
$withJobsCreated = $form->addSubmit('generate_emails_jobs_created');
144144
$withJobsCreated->getControlPrototype()
145145
->setName('button')
146146
->setHtml('Generate newsletter batch');

‎Mailer/app/Forms/DennikeTemplateFormFactory.php‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -115,13 +115,13 @@ public function create()
115115
$form->setDefaults($defaults);
116116

117117
if ($this->permissionManager->isAllowed($this->user, 'batch', 'start')) {
118-
$withJobs = $form->addSubmit('generate_emails_jobs', 'system.save');
118+
$withJobs = $form->addSubmit('generate_emails_jobs');
119119
$withJobs->getControlPrototype()
120120
->setName('button')
121121
->setHtml('Generate newsletter batch and start sending');
122122
}
123123

124-
$withJobsCreated = $form->addSubmit('generate_emails_jobs_created', 'system.save');
124+
$withJobsCreated = $form->addSubmit('generate_emails_jobs_created');
125125
$withJobsCreated->getControlPrototype()
126126
->setName('button')
127127
->setHtml('Generate newsletter batch');

‎Mailer/app/Forms/MMSTemplateFormFactory.php‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -106,13 +106,13 @@ public function create(): Form
106106
$form->setDefaults($defaults);
107107

108108
if ($this->permissionManager->isAllowed($this->user, 'batch', 'start')) {
109-
$withJobs = $form->addSubmit('generate_emails_jobs', 'system.save');
109+
$withJobs = $form->addSubmit('generate_emails_jobs');
110110
$withJobs->getControlPrototype()
111111
->setName('button')
112112
->setHtml('Generate newsletter batch and start sending');
113113
}
114114

115-
$withJobsCreated = $form->addSubmit('generate_emails_jobs_created', 'system.save');
115+
$withJobsCreated = $form->addSubmit('generate_emails_jobs_created');
116116
$withJobsCreated->getControlPrototype()
117117
->setName('button')
118118
->setHtml('Generate newsletter batch');

‎Mailer/app/Forms/MediaBriefingTemplateFormFactory.php‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -105,13 +105,13 @@ public function create(): Form
105105
$form->setDefaults($defaults);
106106

107107
if ($this->permissionManager->isAllowed($this->user, 'batch', 'start')) {
108-
$withJobs = $form->addSubmit('generate_emails_jobs', 'system.save');
108+
$withJobs = $form->addSubmit('generate_emails_jobs');
109109
$withJobs->getControlPrototype()
110110
->setName('button')
111111
->setHtml('Generate newsletter batch and start sending');
112112
}
113113

114-
$withJobsCreated = $form->addSubmit('generate_emails_jobs_created', 'system.save');
114+
$withJobsCreated = $form->addSubmit('generate_emails_jobs_created');
115115
$withJobsCreated->getControlPrototype()
116116
->setName('button')
117117
->setHtml('Generate newsletter batch');

‎Mailer/app/Forms/NewsfilterTemplateFormFactory.php‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -333,13 +333,13 @@ public function create()
333333
$form->setDefaults($defaults);
334334

335335
if ($this->permissionManager->isAllowed($this->user, 'batch', 'start')) {
336-
$withJobs = $form->addSubmit('generate_emails_jobs', 'system.save');
336+
$withJobs = $form->addSubmit('generate_emails_jobs');
337337
$withJobs->getControlPrototype()
338338
->setName('button')
339339
->setHtml('Generate newsletter batch and start sending');
340340
}
341341

342-
$withJobsCreated = $form->addSubmit('generate_emails_jobs_created', 'system.save');
342+
$withJobsCreated = $form->addSubmit('generate_emails_jobs_created');
343343
$withJobsCreated->getControlPrototype()
344344
->setName('button')
345345
->setHtml('Generate newsletter batch');

‎Mailer/app/Forms/NovydenikNewsfilterTemplateFormFactory.php‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -188,13 +188,13 @@ public function create(): Form
188188
$form->setDefaults($defaults);
189189

190190
if ($this->permissionManager->isAllowed($this->user, 'batch', 'start')) {
191-
$withJobs = $form->addSubmit('generate_emails_jobs', 'system.save');
191+
$withJobs = $form->addSubmit('generate_emails_jobs');
192192
$withJobs->getControlPrototype()
193193
->setName('button')
194194
->setHtml('Generate newsletter batch and start sending');
195195
}
196196

197-
$withJobsCreated = $form->addSubmit('generate_emails_jobs_created', 'system.save');
197+
$withJobsCreated = $form->addSubmit('generate_emails_jobs_created');
198198
$withJobsCreated->getControlPrototype()
199199
->setName('button')
200200
->setHtml('Generate newsletter batch');

‎Mailer/app/Forms/TldrTemplateFormFactory.php‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -105,13 +105,13 @@ public function create(): Form
105105
$form->setDefaults($defaults);
106106

107107
if ($this->permissionManager->isAllowed($this->user, 'batch', 'start')) {
108-
$withJobs = $form->addSubmit('generate_emails_jobs', 'system.save');
108+
$withJobs = $form->addSubmit('generate_emails_jobs');
109109
$withJobs->getControlPrototype()
110110
->setName('button')
111111
->setHtml('Generate newsletter batch and start sending');
112112
}
113113

114-
$withJobsCreated = $form->addSubmit('generate_emails_jobs_created', 'system.save');
114+
$withJobsCreated = $form->addSubmit('generate_emails_jobs_created');
115115
$withJobsCreated->getControlPrototype()
116116
->setName('button')
117117
->setHtml('Generate newsletter batch');

‎Mailer/extensions/mailer-module/src/Forms/ConfigFormFactory.php‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -136,7 +136,7 @@ public function create(): Form
136136
}
137137
}
138138

139-
$form->addSubmit('save', 'Save')
139+
$form->addSubmit('save')
140140
->getControlPrototype()
141141
->setName('button')
142142
->setHtml('<i class="zmdi zmdi-mail-send"></i> Save');

‎Mailer/extensions/mailer-module/src/Forms/EditBatchFormFactory.php‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -63,12 +63,12 @@ public function create(ActiveRow $batch): Form
6363

6464
$form->addHidden('id', $batch->id);
6565

66-
$form->addSubmit(self::FORM_ACTION_SAVE, self::FORM_ACTION_SAVE)
66+
$form->addSubmit(self::FORM_ACTION_SAVE)
6767
->getControlPrototype()
6868
->setName('button')
6969
->setHtml('<i class="zmdi zmdi-check"></i> Save');
7070

71-
$form->addSubmit(self::FORM_ACTION_SAVE_CLOSE, self::FORM_ACTION_SAVE_CLOSE)
71+
$form->addSubmit(self::FORM_ACTION_SAVE_CLOSE)
7272
->getControlPrototype()
7373
->setName('button')
7474
->setHtml('<i class="zmdi zmdi-mail-send"></i> Save and close');

0 commit comments

Comments
 (0)