tyler.durden/icingaweb2
1
0
Fork 0
mirror of https://github.com/Icinga/icingaweb2.git synced 2025-07-26 23:34:08 +02:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source 
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
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
application/controllers/SetupController.php
View File

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

7
application/views/scripts/setup/index.phtml Normal file
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>

0
application/views/scripts/setup/install.phtml → application/views/scripts/setup/parts/install.phtml
View File

1
application/views/scripts/setup/parts/wizard.phtml Normal file
View File

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

3
application/views/scripts/setup/wizard.phtml
View File

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

2
library/Icinga/Web/StyleSheet.php
View File

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

8
public/css/icinga/wizard.less → public/css/icinga/setup.less
View File

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