From 53b835715ab9074ac0b485752f049ec064dc3e45 Mon Sep 17 00:00:00 2001
From: Duncan Sommerville <duncan.sommerville@sourcefabric.org>
Date: Thu, 3 Sep 2015 15:51:09 -0400
Subject: [PATCH] Fix responsiveness of upload page

---
 .../application/controllers/PluploadController.php     |  1 +
 .../application/views/scripts/plupload/index.phtml     |  4 ++--
 airtime_mvc/public/css/addmedia.css                    | 10 +++++++---
 airtime_mvc/public/css/styles.css                      |  2 +-
 4 files changed, 11 insertions(+), 6 deletions(-)

diff --git a/airtime_mvc/application/controllers/PluploadController.php b/airtime_mvc/application/controllers/PluploadController.php
index 4c46e5fde..3b20f71e1 100644
--- a/airtime_mvc/application/controllers/PluploadController.php
+++ b/airtime_mvc/application/controllers/PluploadController.php
@@ -26,6 +26,7 @@ class PluploadController extends Zend_Controller_Action
 
         $this->view->headLink()->appendStylesheet($baseUrl.'css/plupload.queue.css?'.$CC_CONFIG['airtime_version']);
         $this->view->headLink()->appendStylesheet($baseUrl.'css/addmedia.css?'.$CC_CONFIG['airtime_version']);
+        $this->view->headLink()->appendStylesheet($baseUrl.'css/dashboard.css?'.$CC_CONFIG['airtime_version']);
 
         $this->view->quotaLimitReached = false;
         if (Application_Model_Systemstatus::isDiskOverQuota()) {
diff --git a/airtime_mvc/application/views/scripts/plupload/index.phtml b/airtime_mvc/application/views/scripts/plupload/index.phtml
index ff3b68ade..a9e625794 100644
--- a/airtime_mvc/application/views/scripts/plupload/index.phtml
+++ b/airtime_mvc/application/views/scripts/plupload/index.phtml
@@ -18,7 +18,7 @@
     <div id="plupload_files"></div>	
 </form>
 -->
-<div id="upload_form" class="lib-content ui-widget ui-widget-content block-shadow padded wide-panel <?php if ($this->quotaLimitReached) { ?> hidden <?php } ?>">
+<div id="upload_form" class="lib-content ui-widget ui-widget-content block-shadow padded content-pane wide-panel<?php if ($this->quotaLimitReached) { ?> hidden <?php } ?>">
     <?php
     $partitions = Application_Model_Systemstatus::GetDiskInfo();
     $status = new StdClass;
@@ -58,7 +58,7 @@
 	<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 content-pane wide-panel">
     <div id="recent_uploads" class="outer-datatable-wrapper padded">
         <div id="recent_uploads_filter">
             <form>
diff --git a/airtime_mvc/public/css/addmedia.css b/airtime_mvc/public/css/addmedia.css
index 1186bb762..cd7070c5e 100644
--- a/airtime_mvc/public/css/addmedia.css
+++ b/airtime_mvc/public/css/addmedia.css
@@ -288,7 +288,12 @@ table#recent_uploads_table td
 }
 
 #upload_wrapper {
-	height: 100%;
+	/* height: 100%; */
+	position: absolute;
+	top: 8px;
+	bottom: 8px;
+	left: 8px;
+	right: 8px;
 
 	display: -webkit-box;
 	display: -moz-box;
@@ -296,8 +301,7 @@ table#recent_uploads_table td
 	display: -webkit-flex;
 	display: flex;
 	-webkit-flex-flow: column;
-	flex-flow: column;
-}
+	flex-flow: column;}
 
 .dropzone, .dropzone * {
 	box-sizing: border-box
diff --git a/airtime_mvc/public/css/styles.css b/airtime_mvc/public/css/styles.css
index 6d099d4fd..f4c3a11b1 100644
--- a/airtime_mvc/public/css/styles.css
+++ b/airtime_mvc/public/css/styles.css
@@ -3685,7 +3685,7 @@ button.btn-icon-text > i.icon-white {
     margin-right: 10px;
     height: 100%;
     position:relative;
-    max-width: 50%;
+    /*max-width: 50%;*/
 }
 
 #sub-menu-wrapper {