SAAS-948 - Frontend tweaks

airtime_mvc/public/css/media_library.css

@@ -205,7 +205,7 @@ td.library_bitrate {
 	-webkit-box-sizing: border-box;
 	-moz-box-sizing: border-box;
 	box-sizing: border-box;
-	height: 25px;
+	height: 26px;
 	vertical-align: middle;
 	margin: 0 !important;
 	line-height: 16px;
@@ -218,7 +218,7 @@ td.library_bitrate {
 	display: inline-block;
 	float: none !important;
 	margin: 0 !important;
-	height: 25px;
+	height: 26px;
 	outline: none;
 	vertical-align: middle !important;
 	}			

airtime_mvc/public/css/showbuilder-test.css

@@ -1,6 +1,6 @@
 /* Show Builder*/
 
-@media screen and (max-width: 1015px) {
+@media screen and (max-width: 1175px) {
     .lib-test, .sb-test, .media-builder-test, #media_type_nav {
         width: 100% !important;
     }
@@ -13,6 +13,10 @@
         text-align: center;
         margin: auto;
     }
+    #media_type_nav .dropdown-menu {
+        width: 100%;
+        text-align: center;
+    }
     #media_type_nav .media_type_selector {
         margin-top: .25em;
     }
@@ -59,25 +63,39 @@
     overflow: hidden !important;
 }
 
-.sb-test, .media-builder-test {
-    margin-top: 4.6em; /* Standardize this somehow */
-}
-
 .lib-test, .sb-test, .media-builder-test {
     /* 1em for the middle margin, 6 for half the width of the left pane */
     width: calc(50% - 8em);
     min-width: 470px;
 }
 
+/* Timeline */
+
+.sb-test {
+    margin-top: 1.5em;
+}
+
+#sb_submit {
+    text-decoration: none;
+    padding: .35em;
+    color: #efefef;
+}
+
+.sb-timerange {
+    margin-bottom: 5px;
+}
+
 /* Media builder */
 
 .media-builder-test {
     color: #efefef;
+    margin-top: 2em; /* Standardize this somehow */
 }
 
 #side_playlist {
     width: calc(50% - 8em);
     font-size: inherit;
+    overflow: hidden;
 }
 
 /* Media type selector */

airtime_mvc/public/js/airtime/showbuilder/builder_test.js

@@ -228,7 +228,7 @@ var AIRTIME = (function(AIRTIME){
     };
     
     mod.selectAll = function () {
-        var $trs = $sbTable.find("tr.lib-audio").not(".sb-past");
+        var $trs = $sbTable.find("tr.lib-audio").not(".sb-past, .sb-empty");
         $trs.addClass(SB_SELECTED_CLASS);
         
         mod.checkToolBarIcons();
@@ -643,7 +643,7 @@ var AIRTIME = (function(AIRTIME){
                 if (aData.scheduled === 1) {
                     $nRow.addClass(NOW_PLAYING_CLASS);
                 }
-                else if (aData.scheduled === 0) {
+                else if (aData.scheduled === 0 || aData.scheduled === undefined) {
                     $nRow.addClass("sb-past");
                 }
                 else {
@@ -739,7 +739,7 @@ var AIRTIME = (function(AIRTIME){
             "sAjaxSource": baseUrl+"showbuilder/builder-feed"  
         });
         
-        $sbTable.find("tbody").on("click", "tr:not(.sb-past)", function(ev) {
+        $sbTable.find("tbody").on("click", "tr:not(.sb-past, .sb-empty)", function(ev) {
 
             var $tr = $(this),
             // Get the ID of the selected row

airtime_mvc/public/js/airtime/showbuilder/main_builder_test.js

@@ -145,26 +145,9 @@ AIRTIME = (function(AIRTIME) {
 
     mod.onReady = function() {
         // Normally we would just use audio/*, but it includes file types that we can't handle (like .m4a)
-        var acceptedTypes = ["audio/ogg",
-                             "application/ogg",
-                             "audio/vorbis",
-                             "audio/mp3",
-                             "audio/mpeg",
-                             "audio/mpeg3",
-                             "audio/x-aac",
-                             "audio/aac",
-                             "audio/aacp",
-                             "audio/mp4",
-                             "audio/x-flac",
-                             "audio/wav",
-                             "audio/x-wav",
-                             "audio/mp2",
-                             "audio/mp1",
-                             "audio/x-ms-wma",
-                             "audio/basic"];
-
+        // We initialize the acceptedMimeTypes variable in Bootstrap so we don't have to duplicate the list
         Dropzone.options.uploadForm = {
-            acceptedFiles: acceptedTypes.join(),
+            acceptedFiles: acceptedMimeTypes.join(),
             init: function () {
                 this.on("sending", function (file, xhr, data) {
                     data.append("csrf_token", $("#csrf").val());