Replace Zend Note Element through Icingas Note Element

fixes #7318 fixes #7309 fixes #7307
Icinga · Sep 26, 2014 · 285d10e · 285d10e
1 parent b2f12e1
commit 285d10e
Show file tree

Hide file tree

Showing 7 changed files with 19 additions and 17 deletions.
diff --git a/...s/monitoring/application/forms/Command/Instance/DisableNotificationsExpireCommandForm.php b/...s/monitoring/application/forms/Command/Instance/DisableNotificationsExpireCommandForm.php
@@ -9,6 +9,7 @@
 use Icinga\Module\Monitoring\Command\Instance\DisableNotificationsExpireCommand;
 use Icinga\Module\Monitoring\Form\Command\CommandForm;
 use Icinga\Web\Form\Element\DateTimePicker;
+use Icinga\Web\Form\Element\Note;
 use Icinga\Web\Notification;
 use Icinga\Web\Request;
 
@@ -33,12 +34,13 @@ public function init()
     public function createElements(array $formData = array())
     {
         $this->addElement(
-            'note',
-            'command-info',
-            array(
-                'value' => mt(
-                    'monitoring',
-                    'This command is used to disable host and service notifications for a specific time.'
+            new Note(
+                'command-info',
+                array(
+                    'value' => mt(
+                        'monitoring',
+                        'This command is used to disable host and service notifications for a specific time.'
+                    )
                 )
             )
         );

diff --git a/modules/monitoring/application/forms/Command/Object/AcknowledgeProblemCommandForm.php b/modules/monitoring/application/forms/Command/Object/AcknowledgeProblemCommandForm.php
@@ -8,6 +8,7 @@
 use DateInterval;
 use Icinga\Module\Monitoring\Command\Object\AcknowledgeProblemCommand;
 use Icinga\Web\Form\Element\DateTimePicker;
+use Icinga\Web\Form\Element\Note;
 use Icinga\Web\Notification;
 use Icinga\Web\Request;
 
@@ -34,8 +35,7 @@ public function getSubmitLabel()
     public function createElements(array $formData = array())
     {
         $this->addElements(array(
-            array(
-                'note',
+            new Note(
                 'command-info',
                 array(
                     'value' => mt(

diff --git a/modules/monitoring/application/forms/Command/Object/AddCommentCommandForm.php b/modules/monitoring/application/forms/Command/Object/AddCommentCommandForm.php
@@ -5,6 +5,7 @@
 namespace Icinga\Module\Monitoring\Form\Command\Object;
 
 use Icinga\Module\Monitoring\Command\Object\AddCommentCommand;
+use Icinga\Web\Form\Element\Note;
 use Icinga\Web\Notification;
 use Icinga\Web\Request;
 
@@ -31,8 +32,7 @@ public function getSubmitLabel()
     public function createElements(array $formData = array())
     {
         $this->addElements(array(
-            array(
-                'note',
+            new Note(
                 'command-info',
                 array(
                     'value' => mt(

diff --git a/modules/monitoring/application/forms/Command/Object/CheckNowCommandForm.php b/modules/monitoring/application/forms/Command/Object/CheckNowCommandForm.php
@@ -6,6 +6,7 @@
 
 use Icinga\Module\Monitoring\Command\Object\ScheduleHostCheckCommand;
 use Icinga\Module\Monitoring\Command\Object\ScheduleServiceCheckCommand;
+use Icinga\Web\Form\Element\Note;
 use Icinga\Web\Notification;
 use Icinga\Web\Request;
 
@@ -30,8 +31,7 @@ public function init()
     public function addSubmitButton()
     {
         $this->addElements(array(
-            array(
-                'note', // Bogus
+            new Note(
                 'icon', // Bogus
                 array(
                     'decorators' => array(array(

diff --git a/modules/monitoring/application/forms/Command/Object/ScheduleServiceCheckCommandForm.php b/modules/monitoring/application/forms/Command/Object/ScheduleServiceCheckCommandForm.php
@@ -8,6 +8,7 @@
 use DateInterval;
 use Icinga\Module\Monitoring\Command\Object\ScheduleServiceCheckCommand;
 use Icinga\Web\Form\Element\DateTimePicker;
+use Icinga\Web\Form\Element\Note;
 use Icinga\Web\Notification;
 use Icinga\Web\Request;
 
@@ -36,8 +37,7 @@ public function createElements(array $formData = array())
         $checkTime = new DateTime();
         $checkTime->add(new DateInterval('PT1H'));
         $this->addElements(array(
-            array(
-                'note',
+            new Note(
                 'command-info',
                 array(
                     'value' => mt(

diff --git a/modules/monitoring/application/forms/Command/Object/ScheduleServiceDowntimeCommandForm.php b/modules/monitoring/application/forms/Command/Object/ScheduleServiceDowntimeCommandForm.php
@@ -8,6 +8,7 @@
 use DateInterval;
 use Icinga\Module\Monitoring\Command\Object\ScheduleServiceDowntimeCommand;
 use Icinga\Web\Form\Element\DateTimePicker;
+use Icinga\Web\Form\Element\Note;
 use Icinga\Web\Form\Element\Number;
 use Icinga\Web\Notification;
 use Icinga\Web\Request;
@@ -48,8 +49,7 @@ public function createElements(array $formData = array())
         $end = clone $start;
         $end->add(new DateInterval('PT1H'));
         $this->addElements(array(
-            array(
-                'note',
+            new Note(
                 'command-info',
                 array(
                     'value' => mt(

diff --git a/modules/monitoring/application/forms/Config/Instance/RemoteInstanceForm.php b/modules/monitoring/application/forms/Config/Instance/RemoteInstanceForm.php
@@ -51,7 +51,7 @@ public function createElements(array $formData)
                     'Enter the username to use for connecting to the remote machine or leave blank for default'
                 )
             )
-        );
+        );clear
         $this->addElement(
             'text',
             'path',