mirror/php-flarum
1
0
Fork 0
mirror of https://github.com/flarum/core.git synced 2025-08-10 10:24:46 +02:00
Code Issues Releases Wiki Activity

Tweak user email confirmation alert

Browse Source 
- Make sure is_activated is serialized to a bool (otherwise "0" will evaluate to true)
- Remove "error" class from message so it's more friendly
- Make the alert more prominent by mounting it into a new div at the top of the page
- Add loading UX to the resend button
This commit is contained in:
Toby Zerner
2016-03-23 22:17:42 +10:30
parent cb428f1e4a
commit a5c8ef0566
4 changed files with 78 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

55
js/forum/dist/app.js vendored
View File

@@ -28386,32 +28386,67 @@ System.register('flarum/helpers/userOnline', ['flarum/helpers/icon'], function (
});;
'use strict';
System.register('flarum/initializers/alertEmailConfirmation', ['flarum/components/Alert', 'flarum/components/Button'], function (_export, _context) {
var Alert, Button;
System.register('flarum/initializers/alertEmailConfirmation', ['flarum/components/Alert', 'flarum/components/Button', 'flarum/helpers/icon'], function (_export, _context) {
var Alert, Button, icon;
function alertEmailConfirmation(app) {
var user = app.session.user;
if (!user || user.isActivated()) return;
var alert = void 0;
var resendButton = Button.component({
className: 'Button Button--link',
children: app.translator.trans('core.forum.user_confirmation.resend_button'),
children: app.translator.trans('core.forum.user_email_confirmation.resend_button'),
onclick: function onclick() {
resendButton.props.loading = true;
m.redraw();
app.request({
method: 'POST',
url: app.forum.attribute('apiUrl') + '/users/' + user.id() + '/send-confirmation'
}).then(function () {
return app.alerts.dismiss(alert);
resendButton.props.loading = false;
resendButton.props.children = [icon('check'), ' ', app.translator.trans('core.forum.user_email_confirmation.sent_message')];
resendButton.props.disabled = true;
m.redraw();
}).catch(function () {
resendButton.props.loading = false;
m.redraw();
});
}
});
app.alerts.show(alert = new Alert({
type: 'error',
var ContainedAlert = function (_Alert) {
babelHelpers.inherits(ContainedAlert, _Alert);
function ContainedAlert() {
babelHelpers.classCallCheck(this, ContainedAlert);
return babelHelpers.possibleConstructorReturn(this, Object.getPrototypeOf(ContainedAlert).apply(this, arguments));
}
babelHelpers.createClass(ContainedAlert, [{
key: 'view',
value: function view() {
var vdom = babelHelpers.get(Object.getPrototypeOf(ContainedAlert.prototype), 'view', this).call(this);
vdom.children = [m(
'div',
{ className: 'container' },
vdom.children
)];
return vdom;
}
}]);
return ContainedAlert;
}(Alert);
m.mount($('<div/>').insertBefore('#content')[0], ContainedAlert.component({
dismissible: false,
children: app.translator.trans('core.forum.user_confirmation.alert_message'),
children: app.translator.trans('core.forum.user_email_confirmation.alert_message', { email: m(
'strong',
null,
user.email()
) }),
controls: [resendButton]
}));
}
@@ -28423,6 +28458,8 @@ System.register('flarum/initializers/alertEmailConfirmation', ['flarum/component
Alert = _flarumComponentsAlert.default;
}, function (_flarumComponentsButton) {
Button = _flarumComponentsButton.default;
}, function (_flarumHelpersIcon) {
icon = _flarumHelpersIcon.default;
}],
execute: function () {}
};