tyler.durden/icingaweb2
1
0
Fork 0
mirror of https://github.com/Icinga/icingaweb2.git synced 2025-07-26 15:24:05 +02:00
Code Issues Packages Projects Releases Wiki Activity

Framework: Rename DateTime form element to DateTimePicker

Browse Source 
refs #4440
This commit is contained in:
Eric Lippmann 2013-08-06 16:08:15 +02:00
parent 94ea09b552
commit 1f10cb3124
4 changed files with 10 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
library/Icinga/Web/Form/Element/DateTime.php → library/Icinga/Web/Form/Element/DateTimePicker.php
View File

@ -33,7 +33,7 @@ use Zend_Form_Element_Xhtml;
/** /**
* Datetime form element * Datetime form element
*/ */
class DateTime extends Zend_Form_Element_Xhtml class DateTimePicker extends Zend_Form_Element_Xhtml
{ {
/** /**
* Default form view helper to use for rendering * Default form view helper to use for rendering

6
modules/monitoring/application/forms/Command/AcknowledgeForm.php
View File

@ -28,7 +28,7 @@
namespace Monitoring\Form\Command; namespace Monitoring\Form\Command;
use Icinga\Web\Form\Element\DateTime; use Icinga\Web\Form\Element\DateTimePicker;
use \DateTime as PhpDateTime; use \DateTime as PhpDateTime;
use \DateInterval; use \DateInterval;
use Icinga\Web\Form\Element\Note; use Icinga\Web\Form\Element\Note;
@ -94,14 +94,14 @@ class AcknowledgeForm extends CommandForm
$interval = new DateInterval('PT1H'); // Add 3600 seconds $interval = new DateInterval('PT1H'); // Add 3600 seconds
$now->add($interval); $now->add($interval);
$expireTime = new DateTime( $expireTime = new DateTimePicker(
array( array(
'name' => 'expiretime', 'name' => 'expiretime',
'label' => t('Expire time'), 'label' => t('Expire time'),
'value' => $now->format($this->getDateFormat()) 'value' => $now->format($this->getDateFormat())
) )
); );
$this->addElements(array($expireNote, $expireCheck, $expireTime)); $this->addElements(array($expireNote, $expireCheck, $expireTime));
} else { } else {
$this->addElements(array($expireNote, $expireCheck)); $this->addElements(array($expireNote, $expireCheck));

5
modules/monitoring/application/forms/Command/RescheduleNextCheckForm.php
View File

@ -28,7 +28,7 @@
namespace Monitoring\Form\Command; namespace Monitoring\Form\Command;
use Icinga\Web\Form\Element\DateTime; use Icinga\Web\Form\Element\DateTimePicker;
use Zend_Form_Element_Checkbox; use Zend_Form_Element_Checkbox;
use DateTime as PhpDateTime; use DateTime as PhpDateTime;
@ -45,8 +45,7 @@ class RescheduleNextCheckForm extends WithChildrenCommandForm
{ {
$now = new PhpDateTime(); $now = new PhpDateTime();
$dateElement = new DateTimePicker(
$dateElement = new DateTime(
array( array(
'name' => 'checktime', 'name' => 'checktime',
'label' => t('Check time'), 'label' => t('Check time'),

8
modules/monitoring/application/forms/Command/ScheduleDowntimeForm.php
View File

@ -28,7 +28,7 @@
namespace Monitoring\Form\Command; namespace Monitoring\Form\Command;
use Icinga\Web\Form\Element\DateTime; use Icinga\Web\Form\Element\DateTimePicker;
use Icinga\Protocol\Commandpipe\Downtime; use Icinga\Protocol\Commandpipe\Downtime;
use Icinga\Protocol\Commandpipe\Comment; use Icinga\Protocol\Commandpipe\Comment;
use \DateTime as PhpDateTime; use \DateTime as PhpDateTime;
@ -146,7 +146,7 @@ class ScheduleDowntimeForm extends WithChildrenCommandForm
list($timestampStart, $timestampEnd) = $this->generateDefaultTimestamps(); list($timestampStart, $timestampEnd) = $this->generateDefaultTimestamps();
$dateTimeStart = new DateTime( $dateTimeStart = new DateTimePicker(
array( array(
'name' => 'starttime', 'name' => 'starttime',
'label' => t('Start time'), 'label' => t('Start time'),
@ -156,7 +156,7 @@ class ScheduleDowntimeForm extends WithChildrenCommandForm
$dateTimeStart->setRequired(true); $dateTimeStart->setRequired(true);
$dateTimeStart->addValidator($this->createDateTimeValidator(), true); $dateTimeStart->addValidator($this->createDateTimeValidator(), true);
$dateTimeEnd = new DateTime( $dateTimeEnd = new DateTimePicker(
array( array(
'name' => 'endtime', 'name' => 'endtime',
'label' => t('End time'), 'label' => t('End time'),
@ -188,7 +188,7 @@ class ScheduleDowntimeForm extends WithChildrenCommandForm
); );
$this->enableAutoSubmit(array('type')); $this->enableAutoSubmit(array('type'));
if ($this->getRequest()->getPost('type') === self::TYPE_FLEXIBLE) { if ($this->getRequest()->getPost('type') === self::TYPE_FLEXIBLE) {
$hoursText = new Zend_Form_Element_Text('hours'); $hoursText = new Zend_Form_Element_Text('hours');
$hoursText->setLabel(t('Flexible duration')); $hoursText->setLabel(t('Flexible duration'));