diff --git a/core/lib/Thelia/Controller/Install/BaseInstallController.php b/core/lib/Thelia/Controller/Install/BaseInstallController.php index fb04f85e8..a5cbbd506 100644 --- a/core/lib/Thelia/Controller/Install/BaseInstallController.php +++ b/core/lib/Thelia/Controller/Install/BaseInstallController.php @@ -41,17 +41,17 @@ class BaseInstallController extends BaseController $parser = $this->container->get("thelia.parser"); // Define the template thant shoud be used - $parser->setTemplate("install/default"); + $parser->setTemplate("install"); return $parser; } - public function render($templateName, $args) + public function render($templateName, $args = array()) { return new Response($this->renderRaw($templateName, $args)); } - public function renderRaw($templateName, $args) + public function renderRaw($templateName, $args = array()) { $data = $this->getParser()->render($templateName, $args); diff --git a/core/lib/Thelia/Controller/Install/InstallController.php b/core/lib/Thelia/Controller/Install/InstallController.php index 1d20bc9d6..0c7770e4b 100644 --- a/core/lib/Thelia/Controller/Install/InstallController.php +++ b/core/lib/Thelia/Controller/Install/InstallController.php @@ -31,4 +31,8 @@ use Thelia\Install\BaseInstall; */ class InstallController extends BaseInstallController { + public function index() + { + $this->render("index.html"); + } } \ No newline at end of file diff --git a/templates/install/includes/footer.inc.html b/templates/install/includes/footer.inc.html new file mode 100644 index 000000000..c20b84adc --- /dev/null +++ b/templates/install/includes/footer.inc.html @@ -0,0 +1,17 @@ + +
+ + + + \ No newline at end of file diff --git a/templates/install/includes/header.inc.html b/templates/install/includes/header.inc.html new file mode 100644 index 000000000..39d7c42da --- /dev/null +++ b/templates/install/includes/header.inc.html @@ -0,0 +1,24 @@ + + + + {intl l='Thelia Back Office'}{if ! empty($page_title)} - {$page_title}{/if} + + {images file='../../admin/default/assets/img/favicon.ico'}{/images} + + + + {stylesheets file='../../admin/default/assets/bootstrap/css/bootstrap.css' filters='cssembed'} + + {/stylesheets} + + {stylesheets file='../../admin/default/assets/bootstrap/css/bootstrap-responsive.css' filters='cssembed'} + + {/stylesheets} + + + {stylesheets file='../../admin/default/assets/css/*' filters='less,cssembed'} + + {/stylesheets} + + + diff --git a/templates/install/index.html b/templates/install/index.html new file mode 100644 index 000000000..e69de29bb