Let the setup's view scripts be a bit more generic

refs #7163
This commit is contained in:
Johannes Meyer 2014-10-06 16:04:58 +02:00
parent ac255eeda0
commit b50c780bcf
7 changed files with 13 additions and 10 deletions

View File

@ -34,11 +34,9 @@ class SetupController extends ActionController
$this->view->success = $success;
$this->view->report = $installer->getReport();
$this->render('install');
} else {
$wizard->handleRequest();
$this->view->wizard = $wizard;
$this->render('wizard');
}
}
}

View File

@ -0,0 +1,7 @@
<div id="setup" class="container">
<?php if (isset($wizard)): ?>
<?= $this->render('setup/parts/wizard.phtml'); ?>
<?php else: ?>
<?= $this->render('setup/parts/install.phtml'); ?>
<?php endif ?>
</div>

View File

@ -0,0 +1 @@
<?= $wizard->getForm()->render(); ?>

View File

@ -1,3 +0,0 @@
<div id="wizard" class="container">
<?= $wizard->getForm()->render(); ?>
</div>

View File

@ -19,7 +19,7 @@ class StyleSheet
'css/icinga/main-content.less',
'css/icinga/tabs.less',
'css/icinga/forms.less',
'css/icinga/wizard.less',
'css/icinga/setup.less',
'css/icinga/widgets.less',
'css/icinga/pagination.less',
'css/icinga/monitoring-colors.less',

View File

@ -2,14 +2,14 @@
overflow: auto; // TODO: Shouldn't be necessary, here, IMHO
}
#wizard div.buttons {
#setup div.buttons {
margin: 1.5em 0 0 1.8em;
}
#wizard table.requirements {
#setup table.requirements {
td {
&.fulfilled {
background-color: lime;
background-color: green;
}
&.not-available {
@ -35,7 +35,7 @@
}
}
#wizard div.summary {
#setup div.summary {
div.page {
h2 {
font-size: 1.2em;