diff --git a/administrator/components/com_users/forms/mail.xml b/administrator/components/com_users/forms/mail.xml index b49a4c0a98829..beb939dfc0390 100644 --- a/administrator/components/com_users/forms/mail.xml +++ b/administrator/components/com_users/forms/mail.xml @@ -46,6 +46,7 @@ type="text" label="COM_USERS_MAIL_FIELD_SUBJECT_LABEL" maxlength="150" + required="true" /> diff --git a/administrator/components/com_users/src/View/Mail/HtmlView.php b/administrator/components/com_users/src/View/Mail/HtmlView.php index aab66e9470043..213c82970dd85 100644 --- a/administrator/components/com_users/src/View/Mail/HtmlView.php +++ b/administrator/components/com_users/src/View/Mail/HtmlView.php @@ -14,6 +14,7 @@ use Joomla\CMS\Language\Text; use Joomla\CMS\MVC\View\HtmlView as BaseHtmlView; use Joomla\CMS\Router\Route; +use Joomla\CMS\Toolbar\Toolbar; use Joomla\CMS\Toolbar\ToolbarHelper; // phpcs:disable PSR1.Files.SideEffects @@ -70,7 +71,11 @@ protected function addToolbar() Factory::getApplication()->getInput()->set('hidemainmenu', true); ToolbarHelper::title(Text::_('COM_USERS_MASS_MAIL'), 'users massmail'); - ToolbarHelper::custom('mail.send', 'envelope', '', 'COM_USERS_TOOLBAR_MAIL_SEND_MAIL', false); + $toolbar = Toolbar::getInstance(); + $toolbar->standardButton('COM_USERS_TOOLBAR_MAIL_SEND_MAIL', 'COM_USERS_TOOLBAR_MAIL_SEND_MAIL', 'mail.send') + ->icon('icon-envelope') + ->formValidation(true); + ToolbarHelper::cancel('mail.cancel'); ToolbarHelper::divider(); ToolbarHelper::preferences('com_users'); diff --git a/administrator/components/com_users/tmpl/mail/default.php b/administrator/components/com_users/tmpl/mail/default.php index 209d5700f76db..5d1cf0a7d1b77 100644 --- a/administrator/components/com_users/tmpl/mail/default.php +++ b/administrator/components/com_users/tmpl/mail/default.php @@ -15,66 +15,48 @@ use Joomla\CMS\Language\Text; use Joomla\CMS\Router\Route; -Text::script('COM_USERS_MAIL_PLEASE_FILL_IN_THE_SUBJECT', true); -Text::script('COM_USERS_MAIL_PLEASE_SELECT_A_GROUP', true); -Text::script('COM_USERS_MAIL_PLEASE_FILL_IN_THE_MESSAGE', true); +/** @var Joomla\Component\Users\Administrator\View\Mail\HtmlView $this */ /** @var Joomla\CMS\WebAsset\WebAssetManager $wa */ $wa = $this->document->getWebAssetManager(); -$wa->useScript('com_users.admin-users-mail'); +$wa->useScript('keepalive') + ->useScript('form.validate'); $comUserParams = ComponentHelper::getParams('com_users'); ?> -
-
-
-
-
- form->getLabel('subject'); ?> - - get('mailSubjectPrefix'))) : ?> - get('mailSubjectPrefix'); ?> - - form->getInput('subject'); ?> - -
-
- form->getLabel('message'); ?> - form->getInput('message'); ?> - get('mailBodySuffix'))) : ?> -
-
- get('mailBodySuffix'); ?> -
-
+ +
+
+
+ form->getLabel('subject'); ?> + + get('mailSubjectPrefix'))) : ?> + get('mailSubjectPrefix'); ?> -
-
- - -
-
-
- form->getInput('recurse'); ?> - form->getLabel('recurse'); ?> -
-
- form->getInput('mode'); ?> - form->getLabel('mode'); ?> -
-
- form->getInput('disabled'); ?> - form->getLabel('disabled'); ?> + form->getInput('subject'); ?> +
-
- form->getInput('bcc'); ?> - form->getLabel('bcc'); ?> -
-
- form->getLabel('group'); ?> - form->getInput('group'); ?> +
+ form->getLabel('message'); ?> + form->getInput('message'); ?> + get('mailBodySuffix'))) : ?> +
+
+ get('mailBodySuffix'); ?> +
+
+
+
+ form->renderField('recurse'); ?> + form->renderField('mode'); ?> + form->renderField('disabled'); ?> + form->renderField('bcc'); ?> + form->renderField('group'); ?> +
+ + diff --git a/administrator/language/en-GB/com_users.ini b/administrator/language/en-GB/com_users.ini index 26b58b01cf92a..4f28f20acfd94 100644 --- a/administrator/language/en-GB/com_users.ini +++ b/administrator/language/en-GB/com_users.ini @@ -220,9 +220,13 @@ COM_USERS_MAIL_NO_USERS_COULD_BE_FOUND_IN_THIS_GROUP="No users could be found in COM_USERS_MAIL_ONLY_YOU_COULD_BE_FOUND_IN_THIS_GROUP="You are the only user in this group." COM_USERS_MAIL_PASSWORD_RESET_DESC="Sent to a user by the "Forgot your password?" link eg in a login form." COM_USERS_MAIL_PASSWORD_RESET_TITLE="Users: Password Reset" +; Deprecated, will be removed with 5.0 COM_USERS_MAIL_PLEASE_FILL_IN_THE_FORM_CORRECTLY="Please fill in the form correctly." +; Deprecated, will be removed with 5.0 COM_USERS_MAIL_PLEASE_FILL_IN_THE_MESSAGE="Please enter a message" +; Deprecated, will be removed with 5.0 COM_USERS_MAIL_PLEASE_FILL_IN_THE_SUBJECT="Please enter a subject" +; Deprecated, will be removed with 5.0 COM_USERS_MAIL_PLEASE_SELECT_A_GROUP="Please select a Group" COM_USERS_MAIL_REGISTRATION_ADMIN_NEW_NOTIFICATION_DESC="Notification to the admin that a new, activated account has been created." COM_USERS_MAIL_REGISTRATION_ADMIN_NEW_NOTIFICATION_TITLE="Users: New account notification to admin" diff --git a/build/media_source/com_users/js/admin-users-mail.es6.js b/build/media_source/com_users/js/admin-users-mail.es6.js deleted file mode 100644 index 237bdf786578d..0000000000000 --- a/build/media_source/com_users/js/admin-users-mail.es6.js +++ /dev/null @@ -1,34 +0,0 @@ -/** - * @copyright (C) 2018 Open Source Matters, Inc. - * @license GNU General Public License version 2 or later; see LICENSE.txt - */ - -(() => { - 'use strict'; - - document.addEventListener('DOMContentLoaded', () => { - Joomla.submitbutton = (pressbutton) => { - const form = document.adminForm; - const html = document.createElement('joomla-alert'); - - if (pressbutton === 'mail.cancel') { - Joomla.submitform(pressbutton); - return; - } - - // do field validation - if (form.jform_subject.value === '') { - html.innerText = Joomla.Text._('COM_USERS_MAIL_PLEASE_FILL_IN_THE_SUBJECT'); - form.insertAdjacentElement('afterbegin', html); - } else if (form.jform_group.value < 0) { - html.innerText = Joomla.Text._('COM_USERS_MAIL_PLEASE_SELECT_A_GROUP'); - form.insertAdjacentElement('afterbegin', html); - } else if (form.jform_message.value === '') { - html.innerText = Joomla.Text._('COM_USERS_MAIL_PLEASE_FILL_IN_THE_MESSAGE'); - form.insertAdjacentElement('afterbegin', html); - } else { - Joomla.submitform(pressbutton); - } - }; - }); -})();