Merge branch 'saas-dev' into saas-dev-publishing

Conflicts:
	airtime_mvc/application/controllers/plugins/PageLayoutInitPlugin.php
	airtime_mvc/public/css/dashboard.css
	airtime_mvc/public/js/airtime/library/spl.js

airtime_mvc/public/css/addmedia.css

@@ -30,6 +30,10 @@
 	overflow-x: hidden;
 }
 
+#recent_uploads_table_wrapper > .dataTables_scrolling {
+	border: 0;
+}
+
 #recent_uploads_table_wrapper > .fg-toolbar
 {
 	position: absolute;
@@ -56,10 +60,6 @@ table#recent_uploads_table td
 	margin-top: 5px;
 	margin-right: 3px;
 }
-#recent_uploads_table_length
-{
-	margin: 5px;
-}
 
 /** Vertically align radio buttons with the labels */
 #recent_uploads_filter input[type='radio'] {

airtime_mvc/public/css/billing.css

@@ -225,6 +225,14 @@
 	color: #ff0000;
 }
 
+.invoice-status-good {
+	background: #e3ffc9 url(images/stream_status.png) no-repeat 10px 10px;
+	border-color: #54b300;
+	padding: 2px 12px 4px 32px;
+	margin: 2px 1px 10px 0px;
+	color: #330;
+}
+
 /** This form is the separate one on the Billing Account Details page (BillingClient.php) */
 #clientdetails_form {
 	width: 500px;

airtime_mvc/public/css/dashboard.css

@@ -94,7 +94,7 @@
 }
 
 .dataTables_length {
-    padding: 6px;
+    padding: 5px 6px;
 }
 
 .dataTables_length label {
@@ -426,6 +426,7 @@ textarea {
 
     font-size: 14px;
     margin: 0 0 10px;
+    max-width: 280px;
 }
 
 /* Playlist/Block/Webstream Editors */

airtime_mvc/public/css/playlist_builder.css

@@ -8,6 +8,15 @@
     float: left;
 }
 
+#edit-md-dialog ul.errors {
+    clear: both;
+    float: none;
+}
+
+#edit-md-dialog dd input.input_text {
+    width: auto;
+}
+
 .spl_sortable,.spl_sortable>li,.side_playlist>div,#spl_editor,.spl_artist,.spl_cue_in,.spl_fade_in,.spl_cue_out,.spl_fade_out
     {
     clear: left;

airtime_mvc/public/css/styles.css

@@ -3781,6 +3781,11 @@ hr {
     margin-right: 4px;
 }
 
+.icon-orange {
+    margin-right: 4px;
+    background-image: url("img/glyphicons-halflings-orange.png");
+}
+
 .nav-ui-icon-formatter {
     width:16px !important;
     display:inline;
@@ -3815,10 +3820,8 @@ hr {
 }
 
 .disk_usage_progress_bar {
-    position: absolute;
-    left: 4px;
-    right: 4px;
-    /* width: 118px; */
+    float: left;
+    width: 100%;
     height: 13px;
     background: #444444;
     background: -moz-linear-gradient(top, #464646 0, #3e3e3e 100%);
@@ -3844,7 +3847,7 @@ hr {
     background: -webkit-gradient(linear, left top, left bottom, color-stop(0, #ff6f01), color-stop(100%, #bc5200));
     height:13px;
     z-index: 2;
-    position:absolute;
+    position: relative;
 }
 
 .dropdown-menu li > a:hover, .dropdown-menu li > a:focus, .dropdown-submenu:hover > a
@@ -4002,4 +4005,4 @@ li .ui-state-hover {
 .published-sources > .checked-icon {
     height: 26px;
     padding-right: 8px;
-}
+}