YunoHost/yunohost-admin
1
0
Fork 0
mirror of https://github.com/YunoHost/yunohost-admin.git synced 2024-09-03 20:06:15 +02:00
Code Issues Projects Releases Packages Wiki Activity

Revert "[enh] Directly login after postinstallation"

Browse source 
This reverts commit 09b9441e58.
This commit is contained in:
Kload 2014-05-17 23:11:00 +02:00
parent 09b9441e58
commit 5db95f08bc
1 changed files with 6 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
js/app.js
View file

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