Revert "[enh] Directly login after postinstallation"

This reverts commit 09b9441e58.
This commit is contained in:
Kload 2014-05-17 23:11:00 +02:00
parent 09b9441e58
commit 5db95f08bc

View file

@ -188,21 +188,16 @@ app = Sammy('#main', function (sam) {
if (args.domain.match(/\.nohost\.me$/) || args.domain.match(/\.noho\.st$/)) {
$('#popup-title').text(y18n.t('installed'));
$('#popup-body p').text(y18n.t('installation_complete_dns'));
interval = 120000;
interval = 180000;
} else {
interval = 5000;
}
setInterval(function () {
$.post(store.get('url') +'/login', function(data) {
store.set('connected', true);
$('.logout-button').fadeIn();
c.flash('success', y18n.t('installation_complete'));
c.redirect('#/');
})
.fail(function() {
$('#popup').modal('hide');
c.flash('fail', y18n.t('error_occured'));
});
$('#popup-title').text(y18n.t('installation_complete'));
$('#popup-body').html(
'<p>'+ y18n.t('installation_complete_desc', ['https://'+ args.domain +'/yunohost/admin', args.domain +'/yunohost/admin']) +'</p>'
+ '<br>'
+ '<p><small>'+ y18n.t('installation_complete_help_dns') +'</small></p>');
}, interval);
} else {
$('#popup').modal('hide');