Merge branch 'saas-dev' of https://github.com/sourcefabric/Airtime into saas-dev

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

airtime_mvc/application/controllers/ThirdPartyController.php

@@ -49,7 +49,7 @@ abstract class ThirdPartyController extends Zend_Controller_Action {
     public function deauthorizeAction() {
         $function = $this->_SERVICE_TOKEN_ACCESSOR;
         Application_Model_Preference::$function("");
-        header('Location: ' . $this->_baseUrl . 'Preference');  // Redirect back to the Preference page
+        header('Location: ' . $this->_baseUrl . 'preference');  // Redirect back to the preference page
     }
 
     /**
@@ -61,7 +61,7 @@ abstract class ThirdPartyController extends Zend_Controller_Action {
     public function redirectAction() {
         $code = $_GET['code'];
         $this->_service->requestNewAccessToken($code);
-        header('Location: ' . $this->_baseUrl . 'Preference');  // Redirect back to the Preference page
+        header('Location: ' . $this->_baseUrl . 'preference');  // Redirect back to the preference page
     }
 
     /**

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

@@ -44,9 +44,9 @@ if (isset($this->obj)) {
             <button class="btn" title='<?php echo _("Shuffle playlist") ?>' type="button" id="playlist_shuffle_button"><?php echo _("Shuffle") ?></button>
         </div>
         <div class='btn-group'>
-            <a href="#" id="spl_crossfade" class="btn crossfade-main-button" style="display:<?php echo $count > 0 ?"inherit;":"none;"?>">
+            <button id="spl_crossfade" class="btn crossfade-main-button">
                 <i class='crossfade-main-icon'></i><span class="ui-button-text"><?php echo _("Playlist crossfade") ?></span>
-            </a>
+            </button>
         </div>
         <div class='btn-group'>
             <button class="btn btn-danger" title='<?php echo _("Empty playlist content") ?>' type="button" id="pl-bl-clear-content"><?php echo _("Clear") ?></button>

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

@@ -52,9 +52,9 @@ if (isset($this->obj)) {
             <?php echo $this->form->getElement('shuffle_button');?>
         </div>
         <div class='btn-group'>
-            <a href="#" id="spl_crossfade" class="btn crossfade-main-button" style="display:<?php echo ($this->obj->isStatic() && $count > 0) ?"inherit;":"none;"?>">
+            <button id="spl_crossfade" class="btn crossfade-main-button">
                 <i class='crossfade-main-icon'></i><span class="ui-button-text"><?php echo _("Playlist crossfade") ?></span>
-            </a>
+            </button>
         </div>
         <div class='btn-group'>
             <button class="btn btn-danger" title='<?php echo _("Remove all content from this smart block") ?>' type="button" id="pl-bl-clear-content"><?php echo _("Clear") ?></button>

airtime_mvc/public/css/dashboard.css

@@ -23,13 +23,13 @@
 
 @media screen and (max-width: 1600px) {
     #library_display_wrapper button:not(.dropdown-toggle):not(.btn-new) > span,
-    #show_builder button:not(.dropdown-toggle):not(.btn-new) > span,
+    #show_builder_table_wrapper button:not(.dropdown-toggle):not(.btn-new) > span,
-    #show_builder #sb_submit > span {
+    #show_builder_table_wrapper #sb_submit > span {
         display: none;
     }
     #library_display_wrapper button:not(.dropdown-toggle):not(.btn-new) > i,
-    #show_builder button:not(.dropdown-toggle):not(.btn-new) > i,
+    #show_builder_table_wrapper button:not(.dropdown-toggle):not(.btn-new) > i,
-    #show_builder #sb_submit > i {
+    #show_builder_table_wrapper #sb_submit > i {
         margin-right: 0 !important;
     }
 }

airtime_mvc/public/css/styles.css

@@ -3698,12 +3698,12 @@ button.btn-icon-text > i.icon-white {
     left: 152px;
     top: 102px;
     bottom: 0; /* Account for scrollbars */
-    min-width: 130px;
+    min-width: 150px;
     border-right: 1px solid #5b5b5b;
     background: #242424;
     font-size: 14px;
     color: #cecece;
-    padding: 10px;
+    padding: 10px 0;
     z-index: 1;
 
     -webkit-transition: top 0.2s linear;
@@ -3713,7 +3713,11 @@ button.btn-icon-text > i.icon-white {
 }
 
 #sub-menu h3 {
-    padding: 0;
+    padding: 0 10px 10px;
+}
+
+#sub-menu hr {
+    margin: 0 5px;
 }
 
 #sub-menu .navigation {
@@ -3721,12 +3725,17 @@ button.btn-icon-text > i.icon-white {
     padding-left: 0;
 }
 
-#sub-menu .navigation li {
+#sub-menu .navigation li.active {
-    padding-bottom: 10px;
+    color: #fff;
+    background-color: #333;
+    border-right: 1px solid #1ADEFF;
+    margin-right: -1px;
 }
 
 #sub-menu .navigation a {
+    display: block;
     color: #cecece;
+    padding: 10px;
     text-decoration: none;
 }
 

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

@@ -406,7 +406,7 @@ var AIRTIME = (function(AIRTIME){
         var empty = $pl.find(".spl_empty");
 
         if (!show || empty.length > 0) {
-            $pl.find("#spl_crossfade").hide();
+            $pl.find("#spl_crossfade").attr("disabled", "disabled");
         } else {
             //get list of playlist contents
             var list = contents.children();
@@ -416,9 +416,9 @@ var AIRTIME = (function(AIRTIME){
             var last = list.last();
             if (first.find(':first-child').children().attr('blockid') !== undefined &&
                 last.find(':first-child').children().attr('blockid') !== undefined) {
-                $pl.find("#spl_crossfade").hide();
+                $pl.find("#spl_crossfade").attr("disabled", "disabled");
             } else {
-                $pl.find("#spl_crossfade").show();
+                $pl.find("#spl_crossfade").removeAttr("disabled");
             }
         }
 
@@ -1094,7 +1094,7 @@ var AIRTIME = (function(AIRTIME){
                 aSelected = AIRTIME.library.getSelectedData();
 
                 for (i = 0, length = aSelected.length; i < length; i++) {
-                    console.log(aSelected[i]);
+                    //console.log(aSelected[i]);
                     aItems.push(new Array(aSelected[i].id, aSelected[i].ftype));
                 }