diff --git a/application/views/scripts/form/setup-admin-account.phtml b/application/views/scripts/form/setup-admin-account.phtml index e037ab3b6..9a20658e8 100644 --- a/application/views/scripts/form/setup-admin-account.phtml +++ b/application/views/scripts/form/setup-admin-account.phtml @@ -60,6 +60,8 @@ $showRadioBoxes = strpos(strtolower(get_class($radioElem)), 'radio') !== false; getElement($form->getTokenElementName()); ?> getElement($form->getUidElementName()); ?> - getElement(Wizard::BTN_PREV); ?> - getElement(Wizard::BTN_NEXT); ?> +
+ getElement(Wizard::BTN_PREV); ?> + getElement(Wizard::BTN_NEXT); ?> +
\ No newline at end of file diff --git a/application/views/scripts/form/setup-requirements.phtml b/application/views/scripts/form/setup-requirements.phtml index 6c1bd713f..2a1117bc1 100644 --- a/application/views/scripts/form/setup-requirements.phtml +++ b/application/views/scripts/form/setup-requirements.phtml @@ -22,12 +22,14 @@ $requirements = $form->getRequirements();
getElement($form->getTokenElementName()); ?> getElement($form->getUidElementName()); ?> - getElement(Wizard::BTN_PREV); ?> - getElement(Wizard::BTN_NEXT); - if (false === $requirements->fulfilled()) { - $btn->setAttrib('disabled', 1); - } - echo $btn; - ?> +
+ getElement(Wizard::BTN_PREV); ?> + getElement(Wizard::BTN_NEXT); + if (false === $requirements->fulfilled()) { + $btn->setAttrib('disabled', 1); + } + echo $btn; + ?> +
\ No newline at end of file diff --git a/application/views/scripts/form/setup-summary.phtml b/application/views/scripts/form/setup-summary.phtml index 4380866ed..fa735a4d5 100644 --- a/application/views/scripts/form/setup-summary.phtml +++ b/application/views/scripts/form/setup-summary.phtml @@ -54,7 +54,9 @@ use Icinga\Web\Wizard;
getElement($form->getTokenElementName()); ?> getElement($form->getUidElementName()); ?> - getElement(Wizard::BTN_PREV); ?> - getElement(Wizard::BTN_NEXT)->setLabel(t('Install Icinga Web 2')); ?> +
+ getElement(Wizard::BTN_PREV); ?> + getElement(Wizard::BTN_NEXT)->setLabel(t('Install Icinga Web 2')); ?> +
\ No newline at end of file diff --git a/library/Icinga/Web/Wizard.php b/library/Icinga/Web/Wizard.php index d64558d9b..fe9f5c9a1 100644 --- a/library/Icinga/Web/Wizard.php +++ b/library/Icinga/Web/Wizard.php @@ -469,6 +469,17 @@ class Wizard ) ); } + + $page->addDisplayGroup( + array(static::BTN_PREV, static::BTN_NEXT), + 'buttons', + array( + 'decorators' => array( + 'FormElements', + array('HtmlTag', array('tag' => 'div', 'class' => 'buttons')) + ) + ) + ); } /** diff --git a/public/css/icinga/wizard.less b/public/css/icinga/wizard.less index b95993841..1abadf23c 100644 --- a/public/css/icinga/wizard.less +++ b/public/css/icinga/wizard.less @@ -1,3 +1,7 @@ +#wizard div.buttons { + margin: 1.5em 0 0 1.8em; +} + #wizard table.requirements { td { &.fulfilled {