diff options
| author | Simon | 2011-05-09 15:07:04 +0200 |
|---|---|---|
| committer | Simon | 2011-05-09 15:07:04 +0200 |
| commit | 4aaecf1421d69a4dbfb5f886e0ade67d3a31b817 (patch) | |
| tree | c787eb11d799a145885874911308ddf5c28fe323 /application | |
| parent | datepicker in filterentry (diff) | |
| download | pbs2-4aaecf1421d69a4dbfb5f886e0ade67d3a31b817.tar.gz pbs2-4aaecf1421d69a4dbfb5f886e0ade67d3a31b817.tar.xz pbs2-4aaecf1421d69a4dbfb5f886e0ade67d3a31b817.zip | |
Datepicker, Timepicker und DaySelect in Filterentry geändert
Diffstat (limited to 'application')
| -rw-r--r-- | application/Bootstrap.php | 1 | ||||
| -rw-r--r-- | application/modules/user/forms/FilterEntry.php | 50 | ||||
| -rw-r--r-- | application/modules/user/layouts/user.phtml | 1 |
3 files changed, 41 insertions, 11 deletions
diff --git a/application/Bootstrap.php b/application/Bootstrap.php index 3d6e8e5..45931e8 100644 --- a/application/Bootstrap.php +++ b/application/Bootstrap.php @@ -58,6 +58,7 @@ class Bootstrap extends Zend_Application_Bootstrap_Bootstrap $view->headMeta()->appendHttpEquiv('Content-Type', 'text/html;charset=utf-8'); $view->headLink()->appendStylesheet('/media/css/style.css'); $view->headLink()->appendStylesheet('/media/css/jquery-ui.css'); + $view->headLink()->appendStylesheet('/media/css/jquery-ui-timepicker.css'); #$this->headScript()->appendFile('/media/js/jquery.min.js'); #$this->headScript()->appendFile('/media/js/jquery-ui.min.js'); diff --git a/application/modules/user/forms/FilterEntry.php b/application/modules/user/forms/FilterEntry.php index 674667f..12fd00c 100644 --- a/application/modules/user/forms/FilterEntry.php +++ b/application/modules/user/forms/FilterEntry.php @@ -113,13 +113,6 @@ class user_Form_FilterEntry extends Zend_Form 'required' => true, 'id' => 'val2' )); - echo ' - <script> - $(function() { - $( "#val1" ).datepicker("option", "dateFormat","dd.mm.yy); - $( "#val2" ).datepicker("option", "dateFormat","dd.mm.yy); - }); - </script>'; break; case "2": $desc = "You can set one Mac-Adress or an Mac-Range"; @@ -261,6 +254,18 @@ class user_Form_FilterEntry extends Zend_Form 'required' => true, 'id' => 'val2' )); + echo '<script type="text/javascript"> + $(function() { + $( "#val1" ).timepicker({ + showPeriod: false, + showPeriodLabels: false + }); + $( "#val2" ).timepicker({ + showPeriod: false, + showPeriodLabels: false + }); + }); + </script>'; break; case "8": $desc = "Select a Client"; @@ -293,7 +298,9 @@ class user_Form_FilterEntry extends Zend_Form $label1 = 'Start Day:'; $label2 = 'End Day:'; - $filtervalue1 = $this->createElement('text', 'filtervalue', array( + + + $filtervalue1 = $this->createElement('select','filtervalue', array( 'label' => $label1, 'validators' => array( array( @@ -311,7 +318,16 @@ class user_Form_FilterEntry extends Zend_Form 'required' => true, 'id' => 'val1' )); - $filtervalue2 = $this->createElement('text', 'filtervalue2', array( + $filtervalue1->addMultiOption(1, "Monday") + ->addMultiOption(2, "Tuesday") + ->addMultiOption(3, "Wednesday") + ->addMultiOption(4, "Thursday") + ->addMultiOption(5, "Friday") + ->addMultiOption(6, "Saturday") + ->addMultiOption(7, "Sunday"); + + + $filtervalue2 = $this->createElement('select', 'filtervalue2', array( 'label' => $label2, 'validators' => array( array( @@ -329,6 +345,13 @@ class user_Form_FilterEntry extends Zend_Form 'required' => true, 'id' => 'val2' )); + $filtervalue2->addMultiOption(1, "Monday") + ->addMultiOption(2, "Tuesday") + ->addMultiOption(3, "Wednesday") + ->addMultiOption(4, "Thursday") + ->addMultiOption(5, "Friday") + ->addMultiOption(6, "Saturday") + ->addMultiOption(7, "Sunday"); break; case "11": $desc = "Specify the date or a day range of the filter"; @@ -347,8 +370,13 @@ class user_Form_FilterEntry extends Zend_Form 'required' => true, 'id' => 'val2' )); - $filtervalue2->addValidator('Date',false, array('format'=>'dd.MM.yyyy')); - + $filtervalue2->addValidator('Date',false, array('format'=>'dd.MM.yyyy')); + echo '<script type="text/javascript"> + $(function() { + $( "#val1" ).datepicker({ dateFormat: "dd.mm.yy"}); + $( "#val2" ).datepicker({ dateFormat: "dd.mm.yy"}); + }); + </script>'; break; } $filtertypes->setDescription($desc); diff --git a/application/modules/user/layouts/user.phtml b/application/modules/user/layouts/user.phtml index 526345e..6e29106 100644 --- a/application/modules/user/layouts/user.phtml +++ b/application/modules/user/layouts/user.phtml @@ -13,6 +13,7 @@ echo $this->headScript()."\n"; ?> <script type="text/javascript" src='/media/js/jquery.min.js'></script> <script type="text/javascript" src='/media/js/jquery-ui.min.js'></script> +<script type="text/javascript" src='/media/js/jquery.ui.timepicker.js'></script> <script type="text/javascript" src='/media/js/script.js'></script> <script type="text/javascript" src='/media/js/user.js'></script> </head> |