Congegni/sintonia
7
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge branch 'devel' into CC-3174

Browse source
This commit is contained in:
Naomi Aro 2012-04-10 15:57:13 +02:00
commit b998a04c2e
40 changed files with 354 additions and 234 deletions
Download patch file Download diff file Expand all files Collapse all files

3
airtime_mvc/application/forms/AddShowAbsoluteRebroadcastDates.php
View file

@ -36,8 +36,7 @@ class Application_Form_AddShowAbsoluteRebroadcastDates extends Zend_Form_SubForm
{
if ($element->getType() != 'Zend_Form_Element_Hidden')
{
$element->setAttrib('readonly',true);
$element->setAttribs(array('style' => 'color: #B1B1B1; '));
$element->setAttrib('disabled','disabled');
}
}
}

4
airtime_mvc/application/forms/AddShowLiveStream.php
View file

@ -8,7 +8,7 @@ class Application_Form_AddShowLiveStream extends Zend_Form_SubForm
{
$description1 = "This follows the same security pattern for the shows: if no users are explicitly set for the show, then anyone with a valid airtime login can connect to the stream, otherwise if there are users assigned to the show, then only those users can connect.";
$cb_airtime_auth = new Zend_Form_Element_Checkbox("cb_airtime_auth");
$cb_airtime_auth->setLabel("Connect using Airtime username & password")
$cb_airtime_auth->setLabel("Use Airtime Authentication")
->setDescription($description1)
->setRequired(false)
->setDecorators(array('ViewHelper'));
@ -16,7 +16,7 @@ class Application_Form_AddShowLiveStream extends Zend_Form_SubForm
$description2 = "Specifiy custom athentification which will work for only the show.";
$cb_custom_auth = new Zend_Form_Element_Checkbox("cb_custom_auth");
$cb_custom_auth ->setLabel("Custom")
$cb_custom_auth ->setLabel("Use Custom Authentication")
->setDescription($description2)
->setRequired(false)
->setDecorators(array('ViewHelper'));

3
airtime_mvc/application/forms/AddShowRR.php
View file

@ -24,8 +24,7 @@ class Application_Form_AddShowRR extends Zend_Form_SubForm
{
if ($element->getType() != 'Zend_Form_Element_Hidden')
{
$element->setAttrib('readonly',true);
$element->setAttribs(array('style' => 'color: #B1B1B1; '));
$element->setAttrib('disabled','disabled');
}
}
}

3
airtime_mvc/application/forms/AddShowRebroadcastDates.php
View file

@ -41,8 +41,7 @@ class Application_Form_AddShowRebroadcastDates extends Zend_Form_SubForm
{
if ($element->getType() != 'Zend_Form_Element_Hidden')
{
$element->setAttrib('readonly',true);
$element->setAttribs(array('style' => 'color: #B1B1B1; '));
$element->setAttrib('disabled','disabled');
}
}
}

3
airtime_mvc/application/forms/AddShowRepeats.php
View file

@ -62,8 +62,7 @@ class Application_Form_AddShowRepeats extends Zend_Form_SubForm
{
if ($element->getType() != 'Zend_Form_Element_Hidden')
{
$element->setAttrib('readonly',true);
$element->setAttribs(array('style' => 'color: #B1B1B1; '));
$element->setAttrib('disabled','disabled');
}
}
}

3
airtime_mvc/application/forms/AddShowStyle.php
View file

@ -40,8 +40,7 @@ class Application_Form_AddShowStyle extends Zend_Form_SubForm
{
if ($element->getType() != 'Zend_Form_Element_Hidden')
{
$element->setAttrib('readonly',true);
$element->setAttribs(array('style' => 'color: #B1B1B1; '));
$element->setAttrib('disabled','disabled');
}
}
}

3
airtime_mvc/application/forms/AddShowWhat.php
View file

@ -66,8 +66,7 @@ class Application_Form_AddShowWhat extends Zend_Form_SubForm
{
if ($element->getType() != 'Zend_Form_Element_Hidden')
{
$element->setAttrib('readonly',true);
$element->setAttribs(array('style' => 'color: #B1B1B1; '));
$element->setAttrib('disabled','disabled');
}
}
}

6
airtime_mvc/application/forms/AddShowWhen.php
View file

@ -119,8 +119,7 @@ class Application_Form_AddShowWhen extends Zend_Form_SubForm
{
if ($element->getType() != 'Zend_Form_Element_Hidden')
{
$element->setAttrib('readonly',true);
$element->setAttribs(array('style' => 'color: #B1B1B1; '));
$element->setAttrib('disabled','disabled');
}
}
}
@ -129,8 +128,7 @@ class Application_Form_AddShowWhen extends Zend_Form_SubForm
$element = $this->getElement('add_show_repeats');
if ($element->getType() != 'Zend_Form_Element_Hidden')
{
$element->setAttrib('readonly',true);
$element->setAttribs(array('style' => 'color: #B1B1B1; '));
$element->setAttrib('disabled','disabled');
}
}
}

3
airtime_mvc/application/forms/AddShowWho.php
View file

@ -33,8 +33,7 @@ class Application_Form_AddShowWho extends Zend_Form_SubForm
{
if ($element->getType() != 'Zend_Form_Element_Hidden')
{
$element->setAttrib('readonly',true);
$element->setAttribs(array('style' => 'color: #B1B1B1; '));
$element->setAttrib('disabled','disabled');
}
}
}

3
airtime_mvc/application/forms/EditAudioMD.php
View file

@ -87,7 +87,8 @@ class Application_Form_EditAudioMD extends Zend_Form
$this->addElement('text', 'bpm', array(
'label' => 'BPM:',
'class' => 'input_text',
'filters' => array('StringTrim')
'filters' => array('StringTrim'),
'validators' => array(array('StringLength', false, array(0, 8)))
));
// Add copyright field

2
airtime_mvc/application/forms/GeneralPreferences.php
View file

@ -11,7 +11,7 @@ class Application_Form_GeneralPreferences extends Zend_Form_SubForm
$defaultFade = Application_Model_Preference::GetDefaultFade();
if($defaultFade == ""){
$defaultFade = '00.000000';
$defaultFade = '0.500000';
}
//Station name