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

airtime_mvc/application/controllers/PlaylistController.php

@@ -71,6 +71,7 @@ class PlaylistController extends Zend_Controller_Action
         $this->view->length = $formatter->format();
 
         $this->view->obj = $obj;
+        $this->view->contents = $obj->getContents();
         $this->view->html = $this->view->render('playlist/update.phtml');
         $this->view->name = $obj->getName();
         $this->view->description = $obj->getDescription();

airtime_mvc/application/views/scripts/playlist/playlist.phtml

@@ -1,7 +1,11 @@
+<?php
+$contents = $this->obj->getContents();
+$count = count($contents);
+?>
 <button id="spl_new" class="ui-button ui-widget ui-state-default" role="button" aria-disabled="false">New</button>
 <?php if (isset($this->obj)) : ?>
     <button id="spl_delete" class="ui-button ui-widget ui-state-default" role="button" aria-disabled="false">Delete</button>
-    <a href="#" id="spl_crossfade" class="ui-button ui-button-icon-only ui-widget ui-state-default crossfade-main-button">
+    <a href="#" id="spl_crossfade" class="ui-button ui-button-icon-only ui-widget ui-state-default crossfade-main-button" style="display:<?php echo $count > 0 ?"block;":"none;"?>">
         <span class="ui-icon crossfade-main-icon"></span><span class="ui-button-text">Playlist crossfade</span>
     </a>
 <?php endif; ?>
@@ -49,7 +53,8 @@
     <div class="clear"></div>
     <div class="" style="clear:both; float:none; width:100%;">
 	    <ul id="spl_sortable">
-            <?php echo $this->render('playlist/update.phtml') ?>
+            <?php  $this->contents = $contents;
+                echo $this->render('playlist/update.phtml') ?>
 	    </ul>
     </div>
 

airtime_mvc/application/views/scripts/playlist/smart-block.phtml

@@ -1,7 +1,11 @@
+<?php
+$contents = $this->obj->getContents();
+$count = count($contents);
+?>
 <button id="spl_new" class="ui-button ui-widget ui-state-default" role="button" aria-disabled="false">New</button>
 <?php if (isset($this->obj)) : ?>
     <button id="spl_delete" class="ui-button ui-widget ui-state-default" role="button" aria-disabled="false">Delete</button>
-    <a href="#" id="spl_crossfade" class="ui-button ui-button-icon-only ui-widget ui-state-default crossfade-main-button">
+    <a href="#" id="spl_crossfade" class="ui-button ui-button-icon-only ui-widget ui-state-default crossfade-main-button" style="display:<?php echo ($this->obj->isStatic() && $count > 0) ?"block;":"none;"?>">
         <span class="ui-icon crossfade-main-icon"></span><span class="ui-button-text">Playlist crossfade</span>
     </a>
 <?php endif; ?>
@@ -49,7 +53,8 @@
     <div class="clear"></div>
     <div class="" style="clear:both; float:none; width:100%;">
 	    <ul id="spl_sortable">
-            <?php echo $this->render('playlist/update.phtml') ?>
+            <?php $this->contents = $contents;
+                echo $this->render('playlist/update.phtml') ?>
 	    </ul>
     </div>
 

airtime_mvc/application/views/scripts/playlist/update.phtml

@@ -1,5 +1,5 @@
 <?php
-$items = $this->obj->getContents();
+$items = $this->contents;
 if (count($items)) : ?>
 <?php $i = 0; ?>
 <?php foreach($items as $item) :

airtime_mvc/public/js/airtime/library/spl.js

@@ -305,11 +305,19 @@ var AIRTIME = (function(AIRTIME){
 		$('#spl_sortable')
 			.empty()
 			.append(json.html);
-		
 		setModified(json.modified);
 		redrawLib();
 	}
 	
+	function setFadeIcon(){
+	    var empty = $(".spl_empty");
+	    if (empty.length > 0) {
+	        $("#spl_crossfade").hide();
+	    } else {
+	        $("#spl_crossfade").show();
+	    }
+	}
+	
 	function getId() {
 		return parseInt($("#obj_id").val(), 10);
 	}
@@ -804,6 +812,7 @@ var AIRTIME = (function(AIRTIME){
 		}
 		else {
 			setPlaylistContent(json);
+			setFadeIcon();
 		}
 		
 		mod.enableUI();

airtime_mvc/public/js/airtime/playlist/smart_playlistbuilder.js

@@ -209,6 +209,7 @@ function setSmartPlaylistEvents() {
         enableLoadingIcon();
         $.post(save_action, {format: "json", data: data, obj_id: obj_id}, function(data){
             callback(data, "save");
+            setFadeIcon();
             disableLoadingIcon();
         });
     });
@@ -284,6 +285,16 @@ function getRowIndex(ele) {
     return index;
 }
 
+function setFadeIcon(){
+    var contents = $("#spl_sortable");
+    var show = contents.is(":visible");
+    if (show) {
+        $("#spl_crossfade").show();
+    } else {
+        $("#spl_crossfade").hide();
+    }
+}
+
 /* This function appends a '+' button for the last
  * modifier row of each criteria.
  * If there are no modifier rows, the '+' button