Commands: Use native form title and description support where appropriate

refs #7947
refs #7976

modules/monitoring/application/controllers/HostController.php

@@ -66,8 +66,9 @@ class Monitoring_HostController extends MonitoredObjectController
     {
         $this->assertPermission('monitoring/command/acknowledge-problem');
 
-        $this->view->title = $this->translate('Acknowledge Host Problem');
+        $form = new AcknowledgeProblemCommandForm();
-        $this->handleCommandForm(new AcknowledgeProblemCommandForm());
+        $form->setTitle($this->translate('Acknowledge Host Problem'));
+        $this->handleCommandForm($form);
     }
 
     /**
@@ -77,8 +78,9 @@ class Monitoring_HostController extends MonitoredObjectController
     {
         $this->assertPermission('monitoring/command/comment/add');
 
-        $this->view->title = $this->translate('Add Host Comment');
+        $form = new AddCommentCommandForm();
-        $this->handleCommandForm(new AddCommentCommandForm());
+        $form->setTitle($this->translate('Add Host Comment'));
+        $this->handleCommandForm($form);
     }
 
     /**
@@ -88,8 +90,9 @@ class Monitoring_HostController extends MonitoredObjectController
     {
         $this->assertPermission('monitoring/command/schedule-check');
 
-        $this->view->title = $this->translate('Reschedule Host Check');
+        $form = new ScheduleHostCheckCommandForm();
-        $this->handleCommandForm(new ScheduleHostCheckCommandForm());
+        $form->setTitle($this->translate('Reschedule Host Check'));
+        $this->handleCommandForm($form);
     }
 
     /**
@@ -99,8 +102,9 @@ class Monitoring_HostController extends MonitoredObjectController
     {
         $this->assertPermission('monitoring/command/downtime/schedule');
 
-        $this->view->title = $this->translate('Schedule Host Downtime');
+        $form = new ScheduleHostDowntimeCommandForm();
-        $this->handleCommandForm(new ScheduleHostDowntimeCommandForm());
+        $form->setTitle($this->translate('Schedule Host Downtime'));
+        $this->handleCommandForm($form);
     }
 
     /**
@@ -110,7 +114,8 @@ class Monitoring_HostController extends MonitoredObjectController
     {
         $this->assertPermission('monitoring/command/process-check-result');
 
-        $this->view->title = $this->translate('Submit Passive Host Check Result');
+        $form = new ProcessCheckResultCommandForm();
-        $this->handleCommandForm(new ProcessCheckResultCommandForm());
+        $form->setTitle($this->translate('Submit Passive Host Check Result'));
+        $this->handleCommandForm($form);
     }
 }

modules/monitoring/application/controllers/HostsController.php

@@ -175,8 +175,9 @@ class Monitoring_HostsController extends Controller
     {
         $this->assertPermission('monitoring/command/acknowledge-problem');
 
-        $this->view->title = $this->translate('Acknowledge Host Problems');
+        $form = new AcknowledgeProblemCommandForm();
-        $this->handleCommandForm(new AcknowledgeProblemCommandForm());
+        $form->setTitle($this->translate('Acknowledge Host Problems'));
+        $this->handleCommandForm($form);
     }
 
     /**
@@ -186,8 +187,9 @@ class Monitoring_HostsController extends Controller
     {
         $this->assertPermission('monitoring/command/schedule-check');
 
-        $this->view->title = $this->translate('Reschedule Host Checks');
+        $form = new ScheduleHostCheckCommandForm();
-        $this->handleCommandForm(new ScheduleHostCheckCommandForm());
+        $form->setTitle($this->translate('Reschedule Host Checks'));
+        $this->handleCommandForm($form);
     }
 
     /**
@@ -197,8 +199,9 @@ class Monitoring_HostsController extends Controller
     {
         $this->assertPermission('monitoring/command/downtime/schedule');
 
-        $this->view->title = $this->translate('Schedule Host Downtimes');
+        $form = new ScheduleHostDowntimeCommandForm();
-        $this->handleCommandForm(new ScheduleHostDowntimeCommandForm());
+        $form->setTitle($this->translate('Schedule Host Downtimes'));
+        $this->handleCommandForm($form);
     }
 
     /**
@@ -208,7 +211,8 @@ class Monitoring_HostsController extends Controller
     {
         $this->assertPermission('monitoring/command/process-check-result');
 
-        $this->view->title = $this->translate('Submit Passive Host Check Results');
+        $form = new ProcessCheckResultCommandForm();
-        $this->handleCommandForm(new ProcessCheckResultCommandForm());
+        $form->setTitle($this->translate('Submit Passive Host Check Results'));
+        $this->handleCommandForm($form);
     }
 }

modules/monitoring/application/controllers/ServiceController.php

@@ -43,8 +43,9 @@ class Monitoring_ServiceController extends MonitoredObjectController
     {
         $this->assertPermission('monitoring/command/acknowledge-problem');
 
-        $this->view->title = $this->translate('Acknowledge Service Problem');
+        $form = new AcknowledgeProblemCommandForm();
-        $this->handleCommandForm(new AcknowledgeProblemCommandForm());
+        $form->setTitle($this->translate('Acknowledge Service Problem'));
+        $this->handleCommandForm($form);
     }
 
     /**
@@ -54,8 +55,9 @@ class Monitoring_ServiceController extends MonitoredObjectController
     {
         $this->assertPermission('monitoring/command/comment/add');
 
-        $this->view->title = $this->translate('Add Service Comment');
+        $form = new AddCommentCommandForm();
-        $this->handleCommandForm(new AddCommentCommandForm());
+        $form->setTitle($this->translate('Add Service Comment'));
+        $this->handleCommandForm($form);
     }
 
     /**
@@ -65,8 +67,9 @@ class Monitoring_ServiceController extends MonitoredObjectController
     {
         $this->assertPermission('monitoring/command/schedule-check');
 
-        $this->view->title = $this->translate('Reschedule Service Check');
+        $form = new ScheduleServiceCheckCommandForm();
-        $this->handleCommandForm(new ScheduleServiceCheckCommandForm());
+        $form->setTitle($this->translate('Reschedule Service Check'));
+        $this->handleCommandForm($form);
     }
 
     /**
@@ -76,8 +79,9 @@ class Monitoring_ServiceController extends MonitoredObjectController
     {
         $this->assertPermission('monitoring/command/downtime/schedule');
 
-        $this->view->title = $this->translate('Schedule Service Downtime');
+        $form = new ScheduleServiceDowntimeCommandForm();
-        $this->handleCommandForm(new ScheduleServiceDowntimeCommandForm());
+        $form->setTitle($this->translate('Schedule Service Downtime'));
+        $this->handleCommandForm($form);
     }
 
     /**
@@ -87,7 +91,8 @@ class Monitoring_ServiceController extends MonitoredObjectController
     {
         $this->assertPermission('monitoring/command/process-check-result');
 
-        $this->view->title = $this->translate('Submit Passive Service Check Result');
+        $form = new ProcessCheckResultCommandForm();
-        $this->handleCommandForm(new ProcessCheckResultCommandForm());
+        $form->setTitle($this->translate('Submit Passive Service Check Result'));
+        $this->handleCommandForm($form);
     }
 }

modules/monitoring/application/controllers/ServicesController.php

@@ -224,8 +224,9 @@ class Monitoring_ServicesController extends Controller
     {
         $this->assertPermission('monitoring/command/acknowledge-problem');
 
-        $this->view->title = $this->translate('Acknowledge Service Problems');
+        $form = new AcknowledgeProblemCommandForm();
-        $this->handleCommandForm(new AcknowledgeProblemCommandForm());
+        $form->setTitle($this->translate('Acknowledge Service Problems'));
+        $this->handleCommandForm($form);
     }
 
     /**
@@ -235,8 +236,9 @@ class Monitoring_ServicesController extends Controller
     {
         $this->assertPermission('monitoring/command/schedule-check');
 
-        $this->view->title = $this->translate('Reschedule Service Checks');
+        $form = new ScheduleServiceCheckCommandForm();
-        $this->handleCommandForm(new ScheduleServiceCheckCommandForm());
+        $form->setTitle($this->translate('Reschedule Service Checks'));
+        $this->handleCommandForm($form);
     }
 
     /**
@@ -246,8 +248,9 @@ class Monitoring_ServicesController extends Controller
     {
         $this->assertPermission('monitoring/command/downtime/schedule');
 
-        $this->view->title = $this->translate('Schedule Service Downtimes');
+        $form = new ScheduleServiceDowntimeCommandForm();
-        $this->handleCommandForm(new ScheduleServiceDowntimeCommandForm());
+        $form->setTitle($this->translate('Schedule Service Downtimes'));
+        $this->handleCommandForm($form);
     }
 
     /**
@@ -257,7 +260,8 @@ class Monitoring_ServicesController extends Controller
     {
         $this->assertPermission('monitoring/command/process-check-result');
 
-        $this->view->title = $this->translate('Submit Passive Service Check Results');
+        $form = new ProcessCheckResultCommandForm();
-        $this->handleCommandForm(new ProcessCheckResultCommandForm());
+        $form->setTitle($this->translate('Submit Passive Service Check Results'));
+        $this->handleCommandForm($form);
     }
 }

modules/monitoring/application/forms/Command/Instance/DisableNotificationsExpireCommandForm.php

@@ -22,17 +22,9 @@ class DisableNotificationsExpireCommandForm extends CommandForm
     {
         $this->setRequiredCue(null);
         $this->setSubmitLabel($this->translate('Disable Notifications'));
-    }
+        $this->addDescription($this->translate(
-
-    /**
-     * (non-PHPDoc)
-     * @see \Icinga\Module\Monitoring\Forms\Command\CommandForm::getHelp() For the method documentation.
-     */
-    public function getHelp()
-    {
-        return $this->translate(
             'This command is used to disable host and service notifications for a specific time.'
-        );
+        ));
     }
 
     /**

modules/monitoring/application/forms/Command/Object/AcknowledgeProblemCommandForm.php

@@ -13,28 +13,25 @@ use Icinga\Web\Notification;
  */
 class AcknowledgeProblemCommandForm extends ObjectsCommandForm
 {
+    /**
+     * Initialize this form
+     */
+    public function init()
+    {
+        $this->addDescription($this->translate(
+            'This command is used to acknowledge host or service problems. When a problem is acknowledged,'
+            . ' future notifications about problems are temporarily disabled until the host or service'
+            . ' recovers.'
+        ));
+    }
+
     /**
      * (non-PHPDoc)
      * @see \Icinga\Web\Form::getSubmitLabel() For the method documentation.
      */
     public function getSubmitLabel()
     {
-        return mtp(
+        return $this->translatePlural('Acknowledge problem', 'Acknowledge problems', count($this->objects));
-            'monitoring', 'Acknowledge problem', 'Acknowledge problems', count($this->objects)
-        );
-    }
-
-    /**
-     * (non-PHPDoc)
-     * @see \Icinga\Module\Monitoring\Forms\Command\CommandForm::getHelp() For the method documentation.
-     */
-    public function getHelp()
-    {
-        return $this->translate(
-            'This command is used to acknowledge host or service problems. When a problem is acknowledged,'
-            . ' future notifications about problems are temporarily disabled until the host or service'
-            . ' recovers.'
-        );
     }
 
     /**
@@ -156,8 +153,7 @@ class AcknowledgeProblemCommandForm extends ObjectsCommandForm
             }
             $this->getTransport($this->request)->send($ack);
         }
-        Notification::success(mtp(
+        Notification::success($this->translatePlural(
-            'monitoring',
             'Acknowledging problem..',
             'Acknowledging problems..',
             count($this->objects)

modules/monitoring/application/forms/Command/Object/AddCommentCommandForm.php

@@ -11,26 +11,21 @@ use Icinga\Web\Notification;
  */
 class AddCommentCommandForm extends ObjectsCommandForm
 {
+    /**
+     * Initialize this form
+     */
+    public function init()
+    {
+        $this->addDescription($this->translate('This command is used to add host or service comments.'));
+    }
+
     /**
      * (non-PHPDoc)
      * @see \Icinga\Web\Form::getSubmitLabel() For the method documentation.
      */
     public function getSubmitLabel()
     {
-        return mtp(
+        return $this->translatePlural('Add comment', 'Add comments', count($this->objects));
-            'monitoring', 'Add comment', 'Add comments', count($this->objects)
-        );
-    }
-
-    /**
-     * (non-PHPDoc)
-     * @see \Icinga\Module\Monitoring\Forms\Command\CommandForm::getHelp() For the method documentation.
-     */
-    public function getHelp()
-    {
-        return $this->translate(
-            'This command is used to add host or service comments.'
-        );
     }
 
     /**
@@ -84,8 +79,7 @@ class AddCommentCommandForm extends ObjectsCommandForm
             $comment->setPersistent($this->getElement('persistent')->isChecked());
             $this->getTransport($this->request)->send($comment);
         }
-        Notification::success(mtp(
+        Notification::success($this->translatePlural(
-            'monitoring',
             'Adding comment..',
             'Adding comments..',
             count($this->objects)

modules/monitoring/application/forms/Command/Object/ProcessCheckResultCommandForm.php

@@ -11,25 +11,24 @@ use Icinga\Module\Monitoring\Command\Object\ProcessCheckResultCommand;
  */
 class ProcessCheckResultCommandForm extends ObjectsCommandForm
 {
+    /**
+     * Initialize this form
+     */
+    public function init()
+    {
+        $this->addDescription($this->translate(
+            'This command is used to submit passive host or service check results.'
+        ));
+    }
+
     /**
      * (non-PHPDoc)
      * @see \Icinga\Web\Form::getSubmitLabel() For the method documentation.
      */
     public function getSubmitLabel()
     {
-        return mtp(
+        return $this->translatePlural(
-            'monitoring', 'Submit Passive Check Result', 'Submit Passive Check Results', count($this->objects)
+            'Submit Passive Check Result', 'Submit Passive Check Results', count($this->objects)
-        );
-    }
-
-    /**
-     * (non-PHPDoc)
-     * @see \Icinga\Module\Monitoring\Forms\Command\CommandForm::getHelp() For the method documentation.
-     */
-    public function getHelp()
-    {
-        return $this->translate(
-            'This command is used to submit passive host or service check results.'
         );
     }
 
@@ -108,8 +107,7 @@ class ProcessCheckResultCommandForm extends ObjectsCommandForm
             $this->getTransport($this->request)->send($command);
         }
 
-        Notification::success(mtp(
+        Notification::success($this->translatePlural(
-            'monitoring',
             'Processing check result..',
             'Processing check results..',
             count($this->objects)

modules/monitoring/application/forms/Command/Object/ScheduleHostCheckCommandForm.php

@@ -47,8 +47,7 @@ class ScheduleHostCheckCommandForm extends ScheduleServiceCheckCommandForm
                 ->setOfAllServices($this->getElement('all_services')->isChecked());
             $this->scheduleCheck($check, $this->request);
         }
-        Notification::success(mtp(
+        Notification::success($this->translatePlural(
-            'monitoring',
             'Scheduling host check..',
             'Scheduling host checks..',
             count($this->objects)

modules/monitoring/application/forms/Command/Object/ScheduleHostDowntimeCommandForm.php

@@ -7,7 +7,6 @@ use Icinga\Module\Monitoring\Command\Object\PropagateHostDowntimeCommand;
 use Icinga\Module\Monitoring\Command\Object\ScheduleHostDowntimeCommand;
 use Icinga\Module\Monitoring\Command\Object\ScheduleServiceDowntimeCommand;
 use Icinga\Web\Notification;
-use Icinga\Web\Request;
 
 /**
  * Form for scheduling host downtimes
@@ -83,8 +82,7 @@ class ScheduleHostDowntimeCommandForm extends ScheduleServiceDowntimeCommandForm
             $hostDowntime->setObject($object);
             $this->scheduleDowntime($hostDowntime, $this->request);
         }
-        Notification::success(mtp(
+        Notification::success($this->translatePlural(
-            'monitoring',
             'Scheduling host downtime..',
             'Scheduling host downtimes..',
             count($this->objects)

modules/monitoring/application/forms/Command/Object/ScheduleServiceCheckCommandForm.php

@@ -14,27 +14,24 @@ use Icinga\Web\Request;
  */
 class ScheduleServiceCheckCommandForm extends ObjectsCommandForm
 {
+    /**
+     * Initialize this form
+     */
+    public function init()
+    {
+        $this->addDescription($this->translate(
+            'This command is used to schedule the next check of hosts or services. Icinga will re-queue the'
+            . ' hosts or services to be checked at the time you specify.'
+        ));
+    }
+
     /**
      * (non-PHPDoc)
      * @see \Icinga\Web\Form::getSubmitLabel() For the method documentation.
      */
     public function getSubmitLabel()
     {
-        return mtp(
+        return $this->translatePlural('Schedule check', 'Schedule checks', count($this->objects));
-            'monitoring', 'Schedule check', 'Schedule checks', count($this->objects)
-        );
-    }
-
-    /**
-     * (non-PHPDoc)
-     * @see \Icinga\Module\Monitoring\Forms\Command\CommandForm::getHelp() For the method documentation.
-     */
-    public function getHelp()
-    {
-        return $this->translate(
-            'This command is used to schedule the next check of hosts or services. Icinga will re-queue the'
-            . ' hosts or services to be checked at the time you specify.'
-        );
     }
 
     /**
@@ -99,8 +96,7 @@ class ScheduleServiceCheckCommandForm extends ObjectsCommandForm
             $check->setObject($object);
             $this->scheduleCheck($check, $this->request);
         }
-        Notification::success(mtp(
+        Notification::success($this->translatePlural(
-            'monitoring',
             'Scheduling service check..',
             'Scheduling service checks..',
             count($this->objects)

modules/monitoring/application/forms/Command/Object/ScheduleServiceDowntimeCommandForm.php

@@ -25,29 +25,26 @@ class ScheduleServiceDowntimeCommandForm extends ObjectsCommandForm
     const FLEXIBLE = 'flexible';
 
     /**
-     * (non-PHPDoc)
+     * Initialize this form
-     * @see \Icinga\Web\Form::getSubmitLabel() For the method documentation.
      */
-    public function getSubmitLabel()
+    public function init()
     {
-        return mtp(
+        $this->addDescription($this->translate(
-            'monitoring', 'Schedule downtime', 'Schedule downtimes', count($this->objects)
-        );
-    }
-
-    /**
-     * (non-PHPDoc)
-     * @see \Icinga\Module\Monitoring\Forms\Command\CommandForm::getHelp() For the method documentation.
-     */
-    public function getHelp()
-    {
-        return $this->translate(
             'This command is used to schedule host and service downtimes. During the specified downtime,'
             . ' Icinga will not send notifications out about the hosts and services. When the scheduled'
             . ' downtime expires, Icinga will send out notifications for the hosts and services as it'
             . ' normally would. Scheduled downtimes are preserved across program shutdowns and'
             . ' restarts.'
-        );
+        ));
+    }
+
+    /**
+     * (non-PHPDoc)
+     * @see \Icinga\Web\Form::getSubmitLabel() For the method documentation.
+     */
+    public function getSubmitLabel()
+    {
+        return $this->translatePlural('Schedule downtime', 'Schedule downtimes', count($this->objects));
     }
 
     /**
@@ -206,8 +203,7 @@ class ScheduleServiceDowntimeCommandForm extends ObjectsCommandForm
             $downtime->setObject($object);
             $this->scheduleDowntime($downtime, $this->request);
         }
-        Notification::success(mtp(
+        Notification::success($this->translatePlural(
-            'monitoring',
             'Scheduling service downtime..',
             'Scheduling service downtimes..',
             count($this->objects)

modules/monitoring/application/views/scripts/partials/command/object-command-form.phtml

@@ -7,7 +7,6 @@
     <hr class="command-separator">
   <?php endif ?>
 </div>
-<div class="content">
+<div class="content object-command">
-    <h1 class="command-title"><?= $title; ?> <?= /** @var \Icinga\Module\Monitoring\Forms\Command\CommandForm $form */ $this->icon('help', $form->getHelp()); ?></h1>
+    <?= $form; ?>
-    <?= $form ?>
 </div>

modules/monitoring/application/views/scripts/partials/command/objects-command-form.phtml

@@ -5,7 +5,7 @@
     <?= $this->render('partials/host/objects-header.phtml'); ?>
   <?php endif ?>
 </div>
-<div class="content">
+<div class="content objects-command">
     <table class="objectlist">
         <thead>
             <tr>
@@ -27,6 +27,5 @@
         </tbody>
     </table>
     <hr class="command-separator">
-    <h1 class="command-title"><?= $title ?> <?= /** @var \Icinga\Module\Monitoring\Forms\Command\CommandForm $form */ $this->icon('help', $form->getHelp()) ?></h1>
+    <?= $form; ?>
-    <?= $form ?>
 </div>

modules/monitoring/application/views/scripts/process/disable-notifications.phtml

@@ -2,7 +2,7 @@
     <?= $this->tabs->showOnlyCloseButton() ?>
 </div>
 <div class="content">
-    <h1><?= $title ?> <?= $this->icon('help', $form->getHelp()) ?></h1>
+    <h1><?= $title; ?></h1>
     <?php if ((bool) $programStatus->notifications_enabled === false): ?>
     <div>
         <?= $this->translate('Host and service notifications are already disabled.') ?>
@@ -13,6 +13,6 @@
         <?php endif; ?>
     </div>
     <?php else: ?>
-    <?= $form ?>
+    <?= $form; ?>
     <?php endif ?>
 </div>

modules/monitoring/public/css/module.less

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