Merge branch 'devel' of dev.sourcefabric.org:airtime into devel

airtime_mvc/application/forms/PlaylistMetadata.php

@@ -1,32 +0,0 @@
-<?php
-
-class Application_Form_PlaylistMetadata extends Zend_Form{
-
-    public function init()
-    {
-		// Add username element
-        $this->addElement('text', 'title', array(
-            'label'      => 'Title:',
-            'class'      => 'input_text',
-            'required'   => false,
-            'filters'    => array('StringTrim'),
-            'validators' => array(
-                'NotEmpty',
-            )
-        ));
-
-		 // Add the comment element
-        $this->addElement('textarea', 'description', array(
-            'label'      => 'Description:',
-            'class'      => 'input_text_area',
-            'required'   => false,
-		));
-
-         // Add the comment element
-        $this->addElement('button', 'new_playlist_submit', array(
-            'label'      => 'Save',
-            'ignore'   => true
-		));
-    }
-}
-

airtime_mvc/application/forms/SoundcloudPreferences.php

@@ -23,7 +23,7 @@ class Application_Form_SoundcloudPreferences extends Zend_Form_SubForm
 
         //enable soundcloud uploads option
         $this->addElement('checkbox', 'UploadToSoundcloudOption', array(
-            'label'      => 'Enable Soundcloud Upload',
+            'label'      => 'Enable SoundCloud Upload',
             'required'   => false,
             'value' => Application_Model_Preference::GetUploadToSoundcloudOption(),
             'decorators' => array(