From 642fa44fce3f38b0398c708d3dd23efdad4ea548 Mon Sep 17 00:00:00 2001
From: Johannes Meyer <johannes.meyer@netways.de>
Date: Tue, 3 Mar 2015 09:53:25 +0100
Subject: [PATCH] Move a form's title into the markup of its form

---
 library/Icinga/Web/Form.php                            | 10 +++-------
 modules/monitoring/public/css/module.less              |  2 +-
 .../views/scripts/form/setup-admin-account.phtml       |  2 +-
 3 files changed, 5 insertions(+), 9 deletions(-)

diff --git a/library/Icinga/Web/Form.php b/library/Icinga/Web/Form.php
index 2cce16f76..f70ab7351 100644
--- a/library/Icinga/Web/Form.php
+++ b/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');
             }
         }
 
diff --git a/modules/monitoring/public/css/module.less b/modules/monitoring/public/css/module.less
index 02ef9be6c..cc820f7a1 100644
--- a/modules/monitoring/public/css/module.less
+++ b/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;
 }
 
diff --git a/modules/setup/application/views/scripts/form/setup-admin-account.phtml b/modules/setup/application/views/scripts/form/setup-admin-account.phtml
index 83d01d43b..55767e96f 100644
--- a/modules/setup/application/views/scripts/form/setup-admin-account.phtml
+++ b/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:',