tyler.durden/icingaweb2
1
0
Fork 0
mirror of https://github.com/Icinga/icingaweb2.git synced 2025-07-30 17:24:16 +02:00
Code Issues Packages Projects Releases Wiki Activity

setup: Apply new icinga form style

Browse Source
This commit is contained in:
Johannes Meyer 2019-07-19 14:27:14 +02:00
parent 47a4d8d410
commit 212606de78
4 changed files with 42 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
library/Icinga/Web/Wizard.php
View File

@ -605,7 +605,7 @@ class Wizard
'button', 'button',
static::BTN_NEXT, static::BTN_NEXT,
array( array(
'class' => 'control-button', 'class' => 'control-button btn-primary',
'type' => 'submit', 'type' => 'submit',
'value' => $pages[1]->getName(), 'value' => $pages[1]->getName(),
'label' => t('Next'), 'label' => t('Next'),
@ -629,7 +629,7 @@ class Wizard
'button', 'button',
static::BTN_NEXT, static::BTN_NEXT,
array( array(
'class' => 'control-button', 'class' => 'control-button btn-primary',
'type' => 'submit', 'type' => 'submit',
'value' => $pages[$index + 1]->getName(), 'value' => $pages[$index + 1]->getName(),
'label' => t('Next'), 'label' => t('Next'),
@ -653,7 +653,7 @@ class Wizard
'button', 'button',
static::BTN_NEXT, static::BTN_NEXT,
array( array(
'class' => 'control-button', 'class' => 'control-button btn-primary',
'type' => 'submit', 'type' => 'submit',
'value' => $page->getName(), 'value' => $page->getName(),
'label' => t('Finish'), 'label' => t('Finish'),

11
modules/setup/application/views/scripts/form/setup-modules.phtml
View File

@ -9,6 +9,7 @@ use Icinga\Web\Wizard;
enctype="<?= $form->getEncType(); ?>" enctype="<?= $form->getEncType(); ?>"
method="<?= $form->getMethod(); ?>" method="<?= $form->getMethod(); ?>"
action="<?= $form->getAction(); ?>" action="<?= $form->getAction(); ?>"
class="icinga-controls"
data-progress-element="<?= Wizard::PROGRESS_ELEMENT; ?>" data-progress-element="<?= Wizard::PROGRESS_ELEMENT; ?>"
> >
<h2><?= $this->translate('Modules', 'setup.page.title'); ?></h2> <h2><?= $this->translate('Modules', 'setup.page.title'); ?></h2>
@ -16,9 +17,13 @@ use Icinga\Web\Wizard;
<?php foreach ($form->getElements() as $element): ?> <?php foreach ($form->getElements() as $element): ?>
<?php if (! in_array($element->getName(), array(Wizard::BTN_PREV, Wizard::BTN_NEXT, Wizard::PROGRESS_ELEMENT, $form->getTokenElementName(), $form->getUidElementName()))): ?> <?php if (! in_array($element->getName(), array(Wizard::BTN_PREV, Wizard::BTN_NEXT, Wizard::PROGRESS_ELEMENT, $form->getTokenElementName(), $form->getUidElementName()))): ?>
<div class="module"> <div class="module">
<h3><label for="<?= $element->getId(); ?>"><strong><?= $element->getLabel(); ?></strong></label></h3> <div class="header">
<label for="<?= $element->getId(); ?>"><?= $element->getDescription(); ?></label> <h3><label for="<?= $element->getId(); ?>"><strong><?= $element->getLabel(); ?></strong></label></h3>
<?= $element; ?> <div class="element">
<?= $element; ?>
</div>
</div>
<label class="description" for="<?= $element->getId(); ?>"><?= $element->getDescription(); ?></label>
</div> </div>
<?php endif ?> <?php endif ?>
<?php endforeach ?> <?php endforeach ?>

2
modules/setup/application/views/scripts/form/setup-welcome.phtml
View File

@ -63,7 +63,7 @@ if (! (false === ($distro = Platform::getLinuxDistro(1)) || $distro === 'linux')
. ' finished you are able to log in and to explore all the new and stunning features!' . ' finished you are able to log in and to explore all the new and stunning features!'
); ?></p> ); ?></p>
<?php endif ?> <?php endif ?>
<form id="<?= $form->getName(); ?>" name="<?= $form->getName(); ?>" enctype="<?= $form->getEncType(); ?>" method="<?= $form->getMethod(); ?>" action="<?= $form->getAction(); ?>"> <form id="<?= $form->getName(); ?>" name="<?= $form->getName(); ?>" enctype="<?= $form->getEncType(); ?>" method="<?= $form->getMethod(); ?>" action="<?= $form->getAction(); ?>" class="icinga-controls">
<?= $form->getElement('token'); ?> <?= $form->getElement('token'); ?>
<?= $form->getElement($form->getTokenElementName()); ?> <?= $form->getElement($form->getTokenElementName()); ?>
<?= $form->getElement($form->getUidElementName()); ?> <?= $form->getElement($form->getUidElementName()); ?>

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

@ -6,11 +6,11 @@
#setup { #setup {
.header { > .header {
width: 100%; width: 100%;
height: 5.5em; height: 5.5em;
background-color: @icinga-blue; background-color: @icinga-blue;
border-bottom: 1px solid #d9d9d9d; border-bottom: 1px solid #d9d9d9;
text-align: center; text-align: center;
@ -124,6 +124,11 @@
} }
} }
.setup-content .control-group > * {
display: inline-block;
margin-right: 1em;
}
#setup div.buttons { #setup div.buttons {
margin-top: 1.5em; // Yes, -top and -bottom, keep it like that... margin-top: 1.5em; // Yes, -top and -bottom, keep it like that...
margin-bottom: 1.5em; margin-bottom: 1.5em;
@ -133,9 +138,18 @@
left: -1337px; left: -1337px;
} }
.control-button,
input[type="submit"] {
.button();
}
button.finish, a.button-like.login { button.finish, a.button-like.login {
min-width: 25em; min-width: 25em;
} }
.spinner {
margin-left: 1em;
}
} }
#setup div.buttons + ul.hints { #setup div.buttons + ul.hints {
@ -391,30 +405,35 @@ form#setup_requirements {
#setup_modules { #setup_modules {
div.module { div.module {
float: left; float: left;
//width: 15em; width: 15em;
height: 15em; height: 15em;
margin: 1em; margin: 1em;
padding: 0.3em; padding: 0.3em;
border: 1px solid #ccc; border: 1px solid #ccc;
background-color: snow; background-color: snow;
.header {
height: 2.5em;
display: flex;
justify-content: space-between;
}
h3 { h3 {
margin: 0;
border: none; border: none;
margin: 0.5em 0; overflow: hidden;
text-align: center; text-overflow: ellipsis;
label { label {
margin: 0;
width: 15em;
cursor: pointer; cursor: pointer;
} }
} }
h3 + label { label.description {
display: inline-block; display: inline-block;
width: 13.5em; width: 14.4em;
height: 13.9em; height: 12em;
overflow: visible; overflow: auto;
cursor: pointer; cursor: pointer;
font-weight: normal; font-weight: normal;
} }