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

Merge branch 'saas-dev' into saas-tunein

Browse source 
Conflicts:
	airtime_mvc/application/views/scripts/form/preferences.phtml
This commit is contained in:
drigato 2015-05-19 15:50:16 -04:00
commit a2a9e54553
18 changed files with 238 additions and 76 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -28,6 +28,9 @@ class Application_Form_Preferences extends Zend_Form
$soundcloud_pref = new Application_Form_SoundcloudPreferences();
$this->addSubForm($soundcloud_pref, 'preferences_soundcloud');
$danger_pref = new Application_Form_DangerousPreferences();
$this->addSubForm($danger_pref, 'preferences_danger');
$submit = new Zend_Form_Element_Submit('submit');
$submit->setLabel(_('Save'));
//$submit->removeDecorator('Label');