tyler.durden
/
icingaweb2
mirror of https://github.com/Icinga/icingaweb2.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Improve summary page layout a bit 

refs #7163
This commit is contained in:
Johannes Meyer 2014-10-23 15:16:25 +02:00
parent a6cbde54c5
commit d90d6fe6a9
2 changed files with 44 additions and 39 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
library/Icinga/Application/WebSetup.php
View File

@ -257,20 +257,6 @@ class WebSetup extends Wizard implements SetupWizard
))
);
if (isset($pageData['setup_db_resource']) || isset($pageData['setup_ldap_resource'])) {
$installer->addStep(
new ResourceStep(array(
'fileMode' => $pageData['setup_general_config']['global_filemode'],
'dbResourceConfig' => isset($pageData['setup_db_resource'])
? array_diff_key($pageData['setup_db_resource'], array('skip_validation' => null))
: null,
'ldapResourceConfig' => isset($pageData['setup_ldap_resource'])
? array_diff_key($pageData['setup_ldap_resource'], array('skip_validation' => null))
: null
))
);
}
$adminAccountType = $pageData['setup_admin_account']['user_type'];
$adminAccountData = array('username' => $pageData['setup_admin_account'][$adminAccountType]);
if ($adminAccountType === 'new_user' && ! $pageData['setup_db_resource']['skip_validation']
@ -293,6 +279,20 @@ class WebSetup extends Wizard implements SetupWizard
))
);
if (isset($pageData['setup_db_resource']) || isset($pageData['setup_ldap_resource'])) {
$installer->addStep(
new ResourceStep(array(
'fileMode' => $pageData['setup_general_config']['global_filemode'],
'dbResourceConfig' => isset($pageData['setup_db_resource'])
? array_diff_key($pageData['setup_db_resource'], array('skip_validation' => null))
: null,
'ldapResourceConfig' => isset($pageData['setup_ldap_resource'])
? array_diff_key($pageData['setup_ldap_resource'], array('skip_validation' => null))
: null
))
);
}
return $installer;
}

55
public/css/icinga/setup.less
View File

@ -199,40 +199,45 @@
}
}
#setup div.summary {
div.page {
float: left;
width: 30em;
padding: 0 1em 1em;
margin: 1em 2em 2em;
border-radius: 0.5em;
border: 1px dashed lightgrey;
#setup {
div.summary {
font-size: 90%;
h2 {
font-size: 1.2em;
}
div.page {
float: left;
width: 25em;
min-height: 20em;
padding: 0 1em 1em;
margin: 1em 1.5em 1.5em;
border-radius: 0.5em;
border: 1px dashed lightgrey;
div.topic {
margin-left: 2em;
h3 {
font-size: 1em;
h2 {
font-size: 1.2em;
}
ul {
list-style-type: circle;
}
table {
border-spacing: 0.5em;
border-collapse: separate;
font-size: 0.9em;
div.topic {
margin-left: 2em;
h3 {
font-size: 1em;
}
ul {
list-style-type: circle;
}
table {
border-spacing: 0.5em;
border-collapse: separate;
font-size: 0.9em;
margin-left: 2em;
}
}
}
}
form {
form#setup_summary {
clear: left;
}
}