From db4cfa7df62d5911bc5a0edcdc59236c39aede08 Mon Sep 17 00:00:00 2001 From: CHItA Date: Thu, 11 Jun 2015 19:32:11 +0200 Subject: [ticket/13740] Add navigation bar support for the installer Also added various UI elements and texts. [ci skip] PHPBB3-13740 --- phpBB/install/module/install_data/module.php | 8 +++++++- phpBB/install/module/install_database/module.php | 8 +++++++- phpBB/install/module/install_filesystem/module.php | 8 +++++++- phpBB/install/module/install_finish/module.php | 8 +++++++- phpBB/install/module/obtain_data/module.php | 8 ++++++++ phpBB/install/module/requirements/module.php | 17 +++++++++++++++++ 6 files changed, 53 insertions(+), 4 deletions(-) (limited to 'phpBB/install/module') diff --git a/phpBB/install/module/install_data/module.php b/phpBB/install/module/install_data/module.php index 231bcb0866..77f1f73f1f 100644 --- a/phpBB/install/module/install_data/module.php +++ b/phpBB/install/module/install_data/module.php @@ -18,5 +18,11 @@ namespace phpbb\install\module\install_data; */ class module extends \phpbb\install\module_base { - + /** + * {@inheritdoc} + */ + public function get_navigation_stage_path() + { + return array('install', 0, 'install'); + } } diff --git a/phpBB/install/module/install_database/module.php b/phpBB/install/module/install_database/module.php index d31c5573ec..0d8b33087f 100644 --- a/phpBB/install/module/install_database/module.php +++ b/phpBB/install/module/install_database/module.php @@ -18,5 +18,11 @@ namespace phpbb\install\module\install_database; */ class module extends \phpbb\install\module_base { - + /** + * {@inheritdoc} + */ + public function get_navigation_stage_path() + { + return array('install', 0, 'install'); + } } diff --git a/phpBB/install/module/install_filesystem/module.php b/phpBB/install/module/install_filesystem/module.php index 9562c957fd..7215449664 100644 --- a/phpBB/install/module/install_filesystem/module.php +++ b/phpBB/install/module/install_filesystem/module.php @@ -18,5 +18,11 @@ namespace phpbb\install\module\install_filesystem; */ class module extends \phpbb\install\module_base { - + /** + * {@inheritdoc} + */ + public function get_navigation_stage_path() + { + return array('install', 0, 'install'); + } } diff --git a/phpBB/install/module/install_finish/module.php b/phpBB/install/module/install_finish/module.php index 98c99d7cff..3a7544b84f 100644 --- a/phpBB/install/module/install_finish/module.php +++ b/phpBB/install/module/install_finish/module.php @@ -18,5 +18,11 @@ namespace phpbb\install\module\install_finish; */ class module extends \phpbb\install\module_base { - + /** + * {@inheritdoc} + */ + public function get_navigation_stage_path() + { + return array('install', 0, 'install'); + } } diff --git a/phpBB/install/module/obtain_data/module.php b/phpBB/install/module/obtain_data/module.php index a181c5231a..0e008796c5 100644 --- a/phpBB/install/module/obtain_data/module.php +++ b/phpBB/install/module/obtain_data/module.php @@ -15,6 +15,14 @@ namespace phpbb\install\module\obtain_data; class module extends \phpbb\install\module_base { + /** + * {@inheritdoc} + */ + public function get_navigation_stage_path() + { + return array('install', 0, 'obtain_data'); + } + /** * {@inheritdoc} */ diff --git a/phpBB/install/module/requirements/module.php b/phpBB/install/module/requirements/module.php index 5de6bd70b9..d87ca15128 100644 --- a/phpBB/install/module/requirements/module.php +++ b/phpBB/install/module/requirements/module.php @@ -61,6 +61,15 @@ class module extends \phpbb\install\module_base if (!$tests_passed) { // If requirements are not met, exit form installer + // Set up UI for retesting + $this->iohandler->add_user_form_group('', array( + 'install' => array( + 'label' => 'RETEST_REQUIREMENTS', + 'type' => 'submit', + ), + )); + + // Send the response and quit $this->iohandler->send_response(); throw new user_interaction_required_exception(); } @@ -77,4 +86,12 @@ class module extends \phpbb\install\module_base { return 0; } + + /** + * {@inheritdoc} + */ + public function get_navigation_stage_path() + { + return array('install', 0, 'requirements'); + } } -- cgit v1.2.1