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

airtime_mvc/application/controllers/LocaleController.php

@@ -61,6 +61,8 @@ class LocaleController extends Zend_Controller_Action
             "Deselect this page" => _("Deselect this page"),
             "Deselect all" => _("Deselect all"),
             "Are you sure you want to delete the selected item(s)?" => _("Are you sure you want to delete the selected item(s)?"),
+            "Scheduled" => _("Scheduled"),
+            "Playlist" => _("Playlist"),
             "Title" => _("Title"),
             "Creator" => _("Creator"),
             "Album" => _("Album"),

airtime_mvc/application/models/Schedule.php

@@ -460,12 +460,12 @@ ORDER BY si_starts,
 SQL;
 
         $map = array(
-        	":ts_1" => $p_track_start,
-        	":ts_2" => $p_track_end,
-        	":ts_3" => $p_track_start,
-        	":ts_4" => $p_track_end,
-        	":ts_5" => $p_track_start,
-        	":ts_6" => $p_track_end,
+        	":ts_1" => $p_start_str,
+        	":ts_2" => $p_end_str,
+        	":ts_3" => $p_start_str,
+        	":ts_4" => $p_end_str,
+        	":ts_5" => $p_start_str,
+        	":ts_6" => $p_end_str,
         );
         $paramMap = $paramMap + $map;
         

airtime_mvc/application/views/scripts/playlist/set-fade.phtml

@@ -3,7 +3,7 @@
 	  <input type="button" class="pl-waveform-fades-btn" value="<?php echo _("Show Waveform")?>"></input>
 	</dd>
     <?php if ($this->item1Type == 0) {?>
-    <dt><? echo _("Fade out: "); ?><span class='spl_cue_hint'><? echo _("(ss.t)")?></span></dt>
+    <dt><?php echo _("Fade out: "); ?><span class='spl_cue_hint'><?php echo _("(ss.t)")?></span></dt>
     <dd id="spl_fade_out_<?php echo $this->item1; ?>" class="spl_fade_out" 
     	data-fadeout="<?php echo $this->item1Url; ?>"
     	data-cuein="<?php echo $this->cueIn1; ?>" 
@@ -16,7 +16,7 @@
     <dd class="edit-error"></dd>
     <?php }
     if (isset($this->item2Url)) {?>
-    <dt><? echo _("Fade in: "); ?><span class='spl_cue_hint'><? echo _("(ss.t)")?></span></dt>
+    <dt><?php echo _("Fade in: "); ?><span class='spl_cue_hint'><?php echo _("(ss.t)")?></span></dt>
     <dd id="spl_fade_in_<?php echo $this->item2; ?>" class="spl_fade_in" 
     	data-fadein="<?php echo $this->item2Url; ?>" 
     	data-offset="<?php if ($this->item1Type == 0) { echo $this->offset; } else { echo 0; } ?>"

airtime_mvc/public/css/waveform.css

@@ -29,7 +29,7 @@
   position: absolute;
   margin: 0;
   padding: 0;
-  background: #3e3e3e;
+  background: #6e6e6e;
 }
 
 .state-select {

airtime_mvc/public/js/waveformplaylist/config.js

@@ -21,7 +21,7 @@ var Config = function(params) {
 
             UITheme: "default", // bootstrap || jQueryUI || default
 
-            waveColor: 'grey',
+            waveColor: '#c7c7c7',
             progressColor: 'orange',
             loadingColor: 'purple',
             cursorColor: 'green',