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

application/forms/AddShowRebroadcastDates.php

@@ -9,17 +9,18 @@ class Application_Form_AddShowRebroadcastDates extends Zend_Form_SubForm
             array('ViewScript', array('viewScript' => 'form/add-show-rebroadcast.phtml'))
         ));
 
+
+        $relativeDates = array();
+        $relativeDates[""] = "";
+        for($i=0; $i <=30; $i++) {
+           $relativeDates["$i days"] = "+$i days";  
+        }
+
         //Add date select
 		$this->addElement('select', 'add_show_rebroadcast_date_1', array(
             'required' => false,
             'class' => ' input_select',
-            'multiOptions' => array(
+            'multiOptions' => $relativeDates,
-                "" => "",
-                "0 days" => "+0 days",
-				"1 day" => "+1 day",
-                "2 days" => "+2 days",
-                "3 days" => "+3 days"
-            ),
             'decorators' => array(
                 'ViewHelper'
             )  
@@ -44,13 +45,7 @@ class Application_Form_AddShowRebroadcastDates extends Zend_Form_SubForm
 		$this->addElement('select', 'add_show_rebroadcast_date_2', array(
             'required' => false,
             'class' => ' input_select',
-            'multiOptions' => array(
+            'multiOptions' => $relativeDates,
-                "" => "",
-                "0 days" => "+0 days",
-				"1 day" => "+1 day",
-                "2 days" => "+2 days",
-                "3 days" => "+3 days"
-            ),
             'decorators' => array(
                 'ViewHelper'
             )  
@@ -75,13 +70,7 @@ class Application_Form_AddShowRebroadcastDates extends Zend_Form_SubForm
 		$this->addElement('select', 'add_show_rebroadcast_date_3', array(
             'required' => false,
             'class' => ' input_select',
-            'multiOptions' => array(
+            'multiOptions' => $relativeDates,
-                "" => "",
-                "0 days" => "+0 days",
-				"1 day" => "+1 day",
-                "2 days" => "+2 days",
-                "3 days" => "+3 days"
-            ),
             'decorators' => array(
                 'ViewHelper'
             )  
@@ -106,13 +95,7 @@ class Application_Form_AddShowRebroadcastDates extends Zend_Form_SubForm
 		$this->addElement('select', 'add_show_rebroadcast_date_4', array(
             'required' => false,
             'class' => ' input_select',
-            'multiOptions' => array(
+            'multiOptions' => $relativeDates,
-                "" => "",
-                "0 days" => "+0 days",
-				"1 day" => "+1 day",
-                "2 days" => "+2 days",
-                "3 days" => "+3 days"
-            ),
             'decorators' => array(
                 'ViewHelper'
             )  
@@ -137,13 +120,7 @@ class Application_Form_AddShowRebroadcastDates extends Zend_Form_SubForm
 		$this->addElement('select', 'add_show_rebroadcast_date_5', array(
             'required' => false,
             'class' => ' input_select',
-            'multiOptions' => array(
+            'multiOptions' => $relativeDates,
-                "" => "",
-                "0 days" => "+0 days",
-				"1 day" => "+1 day",
-                "2 days" => "+2 days",
-                "3 days" => "+3 days"
-            ),
             'decorators' => array(
                 'ViewHelper'
             )  

application/forms/AddShowWhat.php

@@ -16,7 +16,7 @@ class Application_Form_AddShowWhat extends Zend_Form_SubForm
 
          // Add URL element
         $this->addElement('text', 'add_show_url', array(
-            'label'      => 'Show URL:',
+            'label'      => 'Website:',
             'class'      => 'input_text',
             'required'   => false,
             'filters'    => array('StringTrim'),

application/views/scripts/schedule/add-show-form.phtml

@@ -1,7 +1,10 @@
 <div id="schedule-add-show" class="tabs ui-widget ui-widget-content block-shadow alpha-block padded">
     <div class="button-bar">
         <a href="#" id="add-show-close" class="icon-link"><span class="ui-icon ui-icon-circle-close"></span>Close</a>
-        <button id="add-show-submit" class="right-floated">Add this show</button>
+        <button aria-disabled="false" role="button" id="add-show-submit" class="right-floated ui-button ui-widget ui-state-default ui-button-text-icon-primary"> 
+            <span class="ui-icon ui-icon-plusthick"></span> 
+            <span class="ui-button-text">Add this show</span> 
+        </button>
     </div>
     <div class="clear"></div>
     <h3 class="collapsible-header"><span class="arrow-icon"></span>What</h3>

application/views/scripts/user/add-user.phtml

@@ -7,7 +7,9 @@
         <div id="users_wrapper" class="dataTables_wrapper">
           
         <div class="button-holder">
-         <button type="button" id="add_user_button" name="search_add_group" class="ui-button ui-widget ui-state-default ui-button-text-icon-primary"><span class="ui-button-text">New User</span></button>
+         <button type="button" id="add_user_button" name="search_add_group" class="ui-button ui-widget ui-state-default ui-button-text-icon-primary">
+            <span class="ui-icon ui-icon-plusthick"></span>
+            <span class="ui-button-text">New User</span></button>
         </div>
           
           <table cellspacing="0" cellpadding="0" style="" id="users_datatable" class="datatable">

public/js/airtime/schedule/add-show.js

@@ -182,7 +182,6 @@ function setAddShowEvents() {
 		});
 
 	form.find("#add-show-submit")
-		.button()
 		.click(function(event){
             event.preventDefault();
 

python_apps/pypo/scripts/ls_config.liq

@@ -44,5 +44,5 @@ icecast_description = "Airtime Radio!"
 icecast_genre = "genre"
 
 output_sound_device = false
-output_icecast_vorbis = true
+output_icecast_vorbis = false
 output_icecast_mp3 = true

python_apps/pypo/scripts/ls_lib.liq

@@ -6,9 +6,9 @@ end
 # A function applied to each metadata chunk
 def append_title(m) =  
   if !stream_metadata_type == 1 then
-    [("artist","#{!show_name} - #{m['title']}")]
+    [("artist","#{!show_name} - #{m['artist']}")]
-  #elsif !stream_metadata_type == 2 then
+  #####elsif !stream_metadata_type == 2 then
-  #  [("artist", ""), ("title", !show_name)]
+  #####  [("artist", ""), ("title", !show_name)]
   elsif !stream_metadata_type == 2 then
     [("artist",!station_name), ("title", !show_name)]
   else