Move a form's title into the markup of its form

library/Icinga/Web/Form.php

@@ -909,16 +909,12 @@ class Form extends Zend_Form
                     'form'          => $this
                 ));
             } else {
-                $this->addDecorator('FormErrors', array('onlyCustomFormErrors' => true))
+                $this->addDecorator('Description', array('tag' => 'h1'))
+                    ->addDecorator('FormErrors', array('onlyCustomFormErrors' => true))
                     ->addDecorator('FormDescriptions')
                     ->addDecorator('FormElements')
                     //->addDecorator('HtmlTag', array('tag' => 'dl', 'class' => 'zend_form'))
-                    ->addDecorator('Form')
-                    ->addDecorator('Description', array(
-                        'placement' => 'prepend',
-                        'class' => 'form-title',
-                        'tag' => 'h1'
-                    ));
+                    ->addDecorator('Form');
             }
         }
 

modules/monitoring/public/css/module.less

@@ -190,7 +190,7 @@ div.selection-info {
   vertical-align: middle;
 }
 
-.object-command h1.form-title, .objects-command h1.form-title {
+.object-command form h1, .objects-command form h1 {
   border: none;
 }
 

modules/setup/application/views/scripts/form/setup-admin-account.phtml

@@ -6,8 +6,8 @@ $radioElem = $form->getElement('user_type');
 $showRadioBoxes = strpos(strtolower(get_class($radioElem)), 'radio') !== false;
 
 ?>
-<h1 class="form-title"><?= $this->translate('Administration', 'setup.page.title'); ?></h1>
 <form id="<?= $form->getName(); ?>" name="<?= $form->getName(); ?>" enctype="<?= $form->getEncType(); ?>" method="<?= $form->getMethod(); ?>" action="<?= $form->getAction(); ?>">
+  <h1><?= $this->translate('Administration', 'setup.page.title'); ?></h1>
   <ul class="descriptions">
     <li><?= $this->translatePlural(
       'Now it\'s time to configure your first administrative account for Icinga Web 2. Please follow the instructions below:',