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

airtime_mvc/application/views/scripts/plupload/index.phtml

@@ -18,9 +18,17 @@
     <div id="plupload_files"></div>	
 </form>
 -->
-<div id="upload_form" class="lib-content ui-widget ui-widget-content block-shadow padded <?php if ($this->quotaLimitReached) { ?> hidden <?php } ?>">
+<div id="upload_form" class="lib-content ui-widget ui-widget-content block-shadow padded wide-panel <?php if ($this->quotaLimitReached) { ?> hidden <?php } ?>">
     <H2>Upload Audio Files</H2>
-    <div>
+    <?php
+    $partitions = Application_Model_Systemstatus::GetDiskInfo();
+    $status = new StdClass;
+    $partitions = $partitions;
+    $disk = $partitions[0];
+    $used = $disk->totalSpace-$disk->totalFreeSpace;
+    $total = $disk->totalSpace;
+    ?>
+    <div style="height:100%">
         <form action="/rest/media" method="post" id="add-media-dropzone" class="dropzone dz-clickable">
             <?php echo $this->form->getElement('csrf') ?>
             <div class="dz-message">
@@ -37,14 +45,24 @@
         </div>
         -->
     </div>
+    <div id="disk_usage" style="position:absolute;width:95%; margin-top:10px; bottom: 10px;">
+        <div style="padding-bottom: 2px;">Storage</div>
+        <div class="disk_usage_progress_bar" style="width:98%"></div>
+        <div class="disk_usage_percent_in_use" style="width:98%"><?php echo sprintf("%01.1f%% ", $used/$total*100) .  _("in use") ?></div>
+        <div class="disk_usage_used" style="width:<?php echo sprintf("%01.1f%%", $used/$total*100) ?>;"></div>
+
+        <div style="margin-top: 17px; font-size: 12px;"><?php echo sprintf("%01.1fGB of %01.1fGB", $used/pow(2, 30), $total/pow(2, 30)); ?></div>
+
+    </div>
 </div>
+
 <div id="plupload_error">
 	<table></table>
 </div>
 
+<div id="recent_uploads_wrapper" class="lib-content ui-widget ui-widget-content block-shadow wide-panel">
 
-<div id="recent_uploads_wrapper" class="lib-content ui-widget ui-widget-content block-shadow">
-    <div id="recent_uploads" class="padded">
+    <div id="recent_uploads" class="outer-datatable-wrapper padded">
     
             <div id="recent_uploads_filter">
             <form>
@@ -54,8 +72,10 @@
             </form>        
         </div>
         <H2><?php echo _("Recent Uploads")?></H2>
+        <div class="dataTables_scrolling padded">
         <table id="recent_uploads_table" class="datatable lib-content ui-widget ui-widget-content block-shadow alpha-block "
                cellpadding="0" cellspacing="0"></table>
+        </div>
     </div>
     <div style="clear: both;"></div>
-</div>
+</div>

airtime_mvc/public/css/_showbuilder.css

@@ -20,25 +20,6 @@
     background-color: #242424;
 }
 
-.wide-panel {
-    display: -webkit-box;
-    display: -moz-box;
-    display: -ms-flexbox;
-    display: -webkit-flex;
-    display: flex;
-    -webkit-flex-flow: column;
-    flex-flow: column;
-
-    /* Account for the left pane */
-    flex: 6 auto;
-    min-width: 555px;
-}
-
-.outer-datatable-wrapper {
-    position: relative;
-    flex: 1;
-}
-
 @media screen and (max-width: 1280px) {
     .wrapper {
         -webkit-flex-flow: column !important;
@@ -146,14 +127,6 @@ div.btn > span {
     left: 4px;
 }
 
-.dataTables_scrolling {
-    position: absolute;
-    bottom: 37px; /* 36 px is the size of the header/footer + 1px because there's no internal border */
-    top: 37px;
-    left: 0;
-    right: 0;
-}
-
 #library_display, #show_builder_table {
     border: none;
 }

airtime_mvc/public/css/addmedia.css

@@ -2,18 +2,20 @@
 
 #recent_uploads_wrapper
 {
-	width: 100%;
-	margin-bottom: 40px;
+	position: relative;
+	min-height: 500px;
+
 }
 
 #recent_uploads_table
 {
 	width: 100%;
+	table-layout: fixed;
 }
 
 #recent_uploads_table_wrapper
 {
-	width: 100%;
+	position: absolute;
 }
 
 table#recent_uploads_table td
@@ -263,16 +265,16 @@ table#recent_uploads_table td
 }
 
 .dropzone {
-	min-height: 150px;
+	min-height: 30%;
 	border: 2px solid rgba(0, 0, 0, 0.3);
 	background: #333;
 	padding: 20px 20px;
-	max-height: 300px;
+	max-height: 75%;
 	overflow-y: auto;
 }
 
 .dropzone.dz-clickable {
-	cursor: pointer
+	cursor: pointer;
 }
 
 .dropzone.dz-clickable * {
@@ -303,7 +305,7 @@ table#recent_uploads_table td
 	border: 2px dashed rgba(255, 255, 255, 0.2);
 	border-radius: 15px;
 	display: block;
-	width: 50%;
+	position: relative;
 	background-color: rgba(0, 0, 0, 0.1);
 
 	-webkit-box-shadow: inset 0px -7px 27px -4px rgba(0,0,0,0.55);
@@ -319,7 +321,6 @@ table#recent_uploads_table td
 	display: inline-block;
 	vertical-align: top;
 	margin: 16px;
-	/*min-height: 100px*/
 }
 
 .dropzone .dz-preview:hover {

airtime_mvc/public/css/styles.css

@@ -3605,9 +3605,13 @@ button.btn-icon-text > i.icon-white {
 /* Uploads/Dropzone */
 
 #upload_form {
-    width: 100%;
-    min-width: 555px;
+   /* width: 100%;
+    min-width: 555px;*/
     margin-bottom: 10px;
+    margin-right: 10px;
+    height: 100%;
+    position:relative;
+    max-width: 50%;
 }
 
 #sub-menu-wrapper {
@@ -3756,3 +3760,29 @@ li .ui-state-hover {
     border: 0px;
 }
 
+.wide-panel {
+    display: -webkit-box;
+    display: -moz-box;
+    display: -ms-flexbox;
+    display: -webkit-flex;
+    display: flex;
+    -webkit-flex-flow: column;
+    flex-flow: column;
+
+    /* Account for the left pane */
+    flex: 6 auto;
+    min-width: 500px;
+}
+
+.outer-datatable-wrapper {
+    position: relative;
+    flex: 1;
+}
+
+.dataTables_scrolling {
+    position: absolute;
+    bottom: 37px; /* 36 px is the size of the header/footer + 1px because there's no internal border */
+    top: 37px;
+    left: 0;
+    right: 0;
+}