tyler.durden/icingaweb2
1
0
Fork 0
mirror of https://github.com/Icinga/icingaweb2.git synced 2025-07-25 06:44:33 +02:00
Code Issues Packages Projects Releases Wiki Activity

Fix Bootstrap typed wrong

Browse Source 
refs #4601
This commit is contained in:
Eric Lippmann 2013-09-04 17:12:44 +02:00
parent 2b10782d6b
commit 05d08fb0b8
5 changed files with 20 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
application/controllers/StaticController.php
View File

@ -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) private function setCacheHeader($maxAge)
{ {

2
application/layouts/scripts/body.phtml
View File

@ -21,7 +21,7 @@
<!-- Make some space at the end of the page --> <!-- Make some space at the end of the page -->
<div class="panel"> <div class="panel">
<div class="panel-body text-center"> <div class="panel-body text-center">
Icinga2-Web &copy; 2013 Icinga Team Icinga 2 Web &copy; 2013 Icinga Team
</div> </div>
</div> </div>

14
library/Icinga/Web/Form.php
View File

@ -567,16 +567,16 @@ class Form extends Zend_Form
/** /**
* Add a new element * Add a new element
* *
* Additionally, all DtDd tags will be removed and the Boostrap compatible * Additionally, all DtDd tags will be removed and the Bootstrap compatible
* BoostrapFormDecorator will be added to the forms * BootstrapForm decorator will be added to the elements
* *
* *
* @param string|\Zend_Form_Element $element The element or elementtype to add * @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 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 array $options The settings for the element if $element is a string
* *
* @return Form * @return Form
* @see Zend_Form * @see Zend_Form::addElement()
*/ */
public function addElement($element, $name = null, $options = null) public function addElement($element, $name = null, $options = null)
{ {
@ -607,7 +607,7 @@ class Form extends Zend_Form
$decorators = $this->getDecorators(); $decorators = $this->getDecorators();
if (empty($decorators)) { if (empty($decorators)) {
$this->addDecorator('FormElements') $this->addDecorator('FormElements')
->addDecorator('Form'); ->addDecorator('Form');
} }
return $this; return $this;
} }

4
library/Icinga/Web/Form/Decorator/BootstrapForm.php
View File

@ -30,8 +30,8 @@ namespace Icinga\Web\Form\Decorator;
use Zend_Form_Decorator_Abstract; 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. * This component replaces the dt/dd wrapping of elements with the approach used by bootstrap.
* *

14
library/Icinga/Web/Widget/SortBox.php
View File

@ -97,7 +97,7 @@ class SortBox implements Widget
/** /**
* Apply the parameters from the given request on this SortBox * 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) public function applyRequest($request)
{ {
@ -105,10 +105,11 @@ class SortBox implements Widget
} }
/** /**
* Create a submitbutton that is hidden via the @see ConditionalDecorator * Create a submit button that is hidden via the ConditionalDecorator
* in order to allow sorting changes to be sumbitted in a JavaScript-less environment * 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() private function createFallbackSubmitButton()
{ {
@ -130,8 +131,9 @@ class SortBox implements Widget
* Renders this widget via the given view and returns the * Renders this widget via the given view and returns the
* HTML as a string * HTML as a string
* *
* @param Zend_View_Abstract $view * @param Zend_View_Abstract $view
* @return string *
* @return string
*/ */
public function render(Zend_View_Abstract $view) public function render(Zend_View_Abstract $view)
{ {