From 05d08fb0b8c5ff3c2c8de434be86c84d924b9e69 Mon Sep 17 00:00:00 2001
From: Eric Lippmann <eric.lippmann@netways.de>
Date: Wed, 4 Sep 2013 17:12:44 +0200
Subject: [PATCH] Fix Bootstrap typed wrong

refs #4601
---
 application/controllers/StaticController.php       |  4 ++--
 application/layouts/scripts/body.phtml             |  2 +-
 library/Icinga/Web/Form.php                        | 14 +++++++-------
 .../Icinga/Web/Form/Decorator/BootstrapForm.php    |  4 ++--
 library/Icinga/Web/Widget/SortBox.php              | 14 ++++++++------
 5 files changed, 20 insertions(+), 18 deletions(-)

diff --git a/application/controllers/StaticController.php b/application/controllers/StaticController.php
index ba2837fdb..33dc029bc 100644
--- a/application/controllers/StaticController.php
+++ b/application/controllers/StaticController.php
@@ -137,9 +137,9 @@ class StaticController extends ActionController
     }
 
     /**
-     * Set cache header for this resspone
+     * Set cache header for this respone
      *
-     * @param integer $maxAge       The maximum age to set
+     * @param integer $maxAge The maximum age to set
      */
     private function setCacheHeader($maxAge)
     {
diff --git a/application/layouts/scripts/body.phtml b/application/layouts/scripts/body.phtml
index 388572f16..908108689 100755
--- a/application/layouts/scripts/body.phtml
+++ b/application/layouts/scripts/body.phtml
@@ -21,7 +21,7 @@
 <!-- Make some space at the end of the page -->
 <div class="panel">
   <div class="panel-body text-center">
-      Icinga2-Web &copy; 2013 Icinga Team
+      Icinga 2 Web &copy; 2013 Icinga Team
   </div>
 </div>
 
diff --git a/library/Icinga/Web/Form.php b/library/Icinga/Web/Form.php
index a39c46b07..5a8096885 100644
--- a/library/Icinga/Web/Form.php
+++ b/library/Icinga/Web/Form.php
@@ -567,16 +567,16 @@ class Form extends Zend_Form
     /**
      * Add a new element
      *
-     * Additionally, all DtDd tags will be removed and the Boostrap compatible
-     * BoostrapFormDecorator will be added to the forms
+     * Additionally, all DtDd tags will be removed and the Bootstrap compatible
+     * BootstrapForm decorator will be added to the elements
      *
      *
-     * @param string|\Zend_Form_Element $element    The element or elementtype to add
-     * @param string $name                          The name of the element to add if $element is a string
-     * @param array $options                        The settings for the element if $element is a string
+     * @param   string|Zend_Form_Element    $element    String element type, or an object of type Zend_Form_Element
+     * @param   string                      $name       The name of the element to add if $element is a string
+     * @param   array                       $options    The settings for the element if $element is a string
      *
      * @return  Form
-     * @see     Zend_Form
+     * @see     Zend_Form::addElement()
      */
     public function addElement($element, $name = null, $options = null)
     {
@@ -607,7 +607,7 @@ class Form extends Zend_Form
         $decorators = $this->getDecorators();
         if (empty($decorators)) {
             $this->addDecorator('FormElements')
-                  ->addDecorator('Form');
+                 ->addDecorator('Form');
         }
         return $this;
     }
diff --git a/library/Icinga/Web/Form/Decorator/BootstrapForm.php b/library/Icinga/Web/Form/Decorator/BootstrapForm.php
index b7fbdd12d..3e7525456 100644
--- a/library/Icinga/Web/Form/Decorator/BootstrapForm.php
+++ b/library/Icinga/Web/Form/Decorator/BootstrapForm.php
@@ -30,8 +30,8 @@ namespace Icinga\Web\Form\Decorator;
 
 use Zend_Form_Decorator_Abstract;
 
- /**
- *  Decorator that styles forms in the DOM boostrap wants for it's forms
+/**
+ *  Decorator that styles forms in the DOM Bootstrap wants for it's forms
  *
  *  This component replaces the dt/dd wrapping of elements with the approach used by bootstrap.
  *
diff --git a/library/Icinga/Web/Widget/SortBox.php b/library/Icinga/Web/Widget/SortBox.php
index 0591262cf..287a1f1f6 100644
--- a/library/Icinga/Web/Widget/SortBox.php
+++ b/library/Icinga/Web/Widget/SortBox.php
@@ -97,7 +97,7 @@ class SortBox implements Widget
     /**
      * Apply the parameters from the given request on this SortBox
      *
-     * @param Request $request      The request to use for populating the form
+     * @param Request $request The request to use for populating the form
      */
     public function applyRequest($request)
     {
@@ -105,10 +105,11 @@ class SortBox implements Widget
     }
 
     /**
-     * Create a submitbutton that is hidden via the @see ConditionalDecorator
-     * in order to allow sorting changes to be sumbitted in a JavaScript-less environment
+     * Create a submit button that is hidden via the ConditionalDecorator
+     * in order to allow sorting changes to be submitted in a JavaScript-less environment
      *
-     * @return Zend_Form_Element_Submit         The submit button that is hidden by default
+     * @return  Zend_Form_Element_Submit    The submit button that is hidden by default
+     * @see     ConditionalDecorator
      */
     private function createFallbackSubmitButton()
     {
@@ -130,8 +131,9 @@ class SortBox implements Widget
      * Renders this widget via the given view and returns the
      * HTML as a string
      *
-     * @param Zend_View_Abstract $view
-     * @return string
+     * @param   Zend_View_Abstract $view
+     *
+     * @return  string
      */
     public function render(Zend_View_Abstract $view)
     {