diff --git a/module/install/control.php b/module/install/control.php index 79a65ce44d..fbf06cd7c0 100644 --- a/module/install/control.php +++ b/module/install/control.php @@ -19,7 +19,8 @@ class install extends control */ public function __construct() { - if(!defined('IN_INSTALL')) helper::end(); + if(!defined('IN_INSTALL') && !isonlybody()) helper::end(); + parent::__construct(); $this->app->loadLang('user'); $this->app->loadLang('admin'); diff --git a/module/install/js/progress.js b/module/install/js/progress.js index 5fc55b149d..02381eb7ed 100644 --- a/module/install/js/progress.js +++ b/module/install/js/progress.js @@ -45,7 +45,7 @@ $(function() if(res.logs.hasOwnProperty(cloudApp.chart)) { if(!shownLogs.hasOwnProperty(cloudApp.chart)) shownLogs[cloudApp.chart] = []; - + var logs = res.logs[cloudApp.chart] for(var j in logs) { @@ -67,7 +67,8 @@ $(function() else { $('#retryInstallBtn').show(); - $('#skipInstallBtn').show(); + $('#skipInstallBtn').removeClass('btn-primary'); + $('#skipInstallBtn').text(skipLang); $('#cancelInstallBtn').hide(); $('.progress.loading').hide(); @@ -117,7 +118,8 @@ $(function() if(!result) return; $('#retryInstallBtn').hide(); - $('#skipInstallBtn').hide(); + $('#skipInstallBtn').text(backgroundLang); + $('#skipInstallBtn').addClass('btn-primary'); $('#cancelInstallBtn').show(); $('.error-message').text(''); $('.progress.loading').show(); @@ -142,7 +144,6 @@ $(function() }); $('#retryInstallBtn').hide(); - $('#skipInstallBtn').hide(); $('#cancelInstallBtn').show(); if('true' === startInstall) @@ -154,4 +155,4 @@ $(function() term.open(document.getElementById('terminal')); }); -var shownLogs = []; \ No newline at end of file +var shownLogs = []; diff --git a/module/install/view/progress.html.php b/module/install/view/progress.html.php index 6064645375..98f8ae9655 100644 --- a/module/install/view/progress.html.php +++ b/module/install/view/progress.html.php @@ -19,18 +19,29 @@ solution->install);?> solution->config);?> +install->solution->skip);?> +solution->background);?> + + + +