Merge branch 'master' of dev.sourcefabric.org:airtime

application/forms/AddShowRepeats.php

@@ -39,6 +39,7 @@ class Application_Form_AddShowRepeats extends Zend_Form_SubForm
         $this->addElement('text', 'add_show_end_date', array(
             'label'      => 'Date End:',
             'class'      => 'input_text',
+            'value'     => date("Y-m-d"),
             'required'   => false,
             'filters'    => array('StringTrim'),
 			'validators' => array(

application/forms/AddShowWhen.php

@@ -10,6 +10,7 @@ class Application_Form_AddShowWhen extends Zend_Form_SubForm
             'label'      => 'Date Start:',
             'class'      => 'input_text',
             'required'   => true,
+            'value'     => date("Y-m-d"),
             'filters'    => array('StringTrim'),
             'validators' => array(
 				'NotEmpty',

application/forms/PlaylistMetadata.php

@@ -8,7 +8,7 @@ class Application_Form_PlaylistMetadata extends Zend_Form
 		// Add username element
         $this->addElement('text', 'title', array(
             'label'      => 'Title:',
-            'required'   => true,
+            'required'   => false,
             'filters'    => array('StringTrim'),
             'validators' => array(
                 'NotEmpty',

application/forms/Preferences.php

@@ -16,6 +16,16 @@ class Application_Form_Preferences extends Zend_Form
             'validators' => array('NotEmpty'),
             'value' => Application_Model_Preference::GetValue("station_name")
         ));
+
+         // Add login element
+        $this->addElement('text', 'stationDefaultFade', array(
+            'class'      => 'input_text',
+            'label'      => 'Default Fade:',
+            'required'   => false,
+            'filters'    => array('StringTrim'),
+            'validators' => array(array('regex', false, array('/^[0-2][0-3]:[0-5][0-9]:[0-5][0-9](\.\d{1,6})?$/', 'messages' => 'enter a time 00:00:00{.000000}'))),
+            'value' => Application_Model_Preference::GetValue("default_fade")
+        ));
             
         $this->addElement('submit', 'submit', array(
             'class'    => 'ui-button ui-state-default',
@@ -24,4 +34,4 @@ class Application_Form_Preferences extends Zend_Form
         ));
     }
 }
-
+///^[0-2][0-3]:[0-5][0-9]:[0-5][0-9]{.}[0-9]{0-6}/i