diff --git a/install-dev/classes/controllerHttp.php b/install-dev/classes/controllerHttp.php index 5804a08a2..d22ebf197 100644 --- a/install-dev/classes/controllerHttp.php +++ b/install-dev/classes/controllerHttp.php @@ -64,6 +64,11 @@ abstract class InstallControllerHttp */ public $next_button = true; + /** + * @var bool If false, disable previous button access + */ + public $previous_button = true; + /** * @var InstallAbstractModel */ diff --git a/install-dev/controllers/http/process.php b/install-dev/controllers/http/process.php index 0ef88946f..6d3050363 100644 --- a/install-dev/controllers/http/process.php +++ b/install-dev/controllers/http/process.php @@ -34,6 +34,8 @@ class InstallControllerHttpProcess extends InstallControllerHttp */ protected $model_install; + public $previous_button = false; + public function init() { require_once _PS_INSTALL_MODELS_PATH_.'install.php'; diff --git a/install-dev/theme/js/process.js b/install-dev/theme/js/process.js index 8d21b2053..d11a224e5 100644 --- a/install-dev/theme/js/process.js +++ b/install-dev/theme/js/process.js @@ -42,6 +42,7 @@ function process_install(step) if (current_step >= process_steps.length) { $('#progress_bar .total .progress').animate({'width': '100%'}, 500); + $('#progress_bar .total span').html('100%'); // Installation finished setTimeout(function() @@ -52,6 +53,7 @@ function process_install(step) else { $('#progress_bar .total .progress').animate({'width': '+='+process_percent+'%'}, 500); + $('#progress_bar .total span').html(Math.ceil(current_step * process_percent)+'%'); // Process next step process_install(process_steps[current_step]); @@ -98,6 +100,7 @@ function install_error(step, errors) function install_success() { + $('#progress_bar .total span').hide(); $('.installing').html(install_is_done); is_installing = false; $('#install_process_form').slideUp(); diff --git a/install-dev/theme/view.css b/install-dev/theme/view.css index 5476cbd72..1710df2d9 100644 --- a/install-dev/theme/view.css +++ b/install-dev/theme/view.css @@ -692,6 +692,9 @@ ul#optional_update {list-style-type:none;} } /* STEP 5 ******************************************/ +#install_process_form{ + height: 260px; +} #progress_bar { display: none; } @@ -700,8 +703,17 @@ ul#optional_update {list-style-type:none;} height: 30px; border: 1px solid #999999; background-color: #eeeeee; + text-align: center; } + #progress_bar .total span{ + font-size: 16px; + font-weight: bold; + margin-top: 5px; + position: absolute; + text-align: center; + } + #progress_bar .total .progress { width: 0px; height: 30px; diff --git a/install-dev/theme/views/footer.phtml b/install-dev/theme/views/footer.phtml index bffcac677..1ede4d068 100644 --- a/install-dev/theme/views/footer.phtml +++ b/install-dev/theme/views/footer.phtml @@ -10,7 +10,7 @@ - isFirstStep()): ?> + isFirstStep() && $this->previous_button): ?> diff --git a/install-dev/theme/views/process.phtml b/install-dev/theme/views/process.phtml index 7b642216e..78e2776a9 100644 --- a/install-dev/theme/views/process.phtml +++ b/install-dev/theme/views/process.phtml @@ -13,6 +13,7 @@ var process_percent = process_steps) ?>;
+ 0%
@@ -54,26 +55,24 @@ var process_percent = process_steps) ?>;

l('WARNING: For security purposes, you must delete the "install" folder.') ?>

- -

l('Back Office'); ?>

-

l('Manage your store using your Back Office. Manage your orders and customers, add modules, change themes, etc.') ?>

- l('Manage your store') ?> + +

l('Back Office'); ?>

+

l('Manage your store using your Back Office. Manage your orders and customers, add modules, change themes, etc.') ?>

+ l('Manage your store') ?>
- -

l('Front Office'); ?>

-

l('Discover your store as your future customers will see it!') ?>

- l('Discover your store') ?> + +

l('Front Office'); ?>

+

l('Discover your store as your future customers will see it!') ?>

+ l('Discover your store') ?>
- + + + - - - + displayTemplate('footer') ?> \ No newline at end of file