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

Conflicts:
	airtime_mvc/application/layouts/scripts/page-sub-menu.phtml

airtime_mvc/application/configs/navigation.php

@@ -8,6 +8,13 @@
 * the navigation container below.
 */
 $pages = array(
+    array(
+        'label' => "<i class='icon-globe icon-white'></i>"._('Radio Page'),
+        'uri' => '/',
+        'resource' => '',
+        'pages' => array(
+        )
+    ),
     array(
         'label'      => "<i class='icon-calendar icon-white'></i>"._('Calendar'),
         'module'     => 'default',
@@ -16,10 +23,24 @@ $pages = array(
         'resource'   =>    'schedule'
     ),
     array(
-        'label' => "<i class='icon-globe icon-white'></i>"._('Radio Page'),
+        'label'      =>  "<i class='icon-wrench icon-white'></i>"._('Widgets'),
-        'uri' => '/',
+        'module'     => 'default',
-        'resource' => '',
+        'controller' => 'embeddablewidgets',
+        'action'     => 'player',
+        'title' => 'Widgets',
         'pages' => array(
+            array(
+                'label'      => _('Player'),
+                'module'     => 'default',
+                'controller' => 'embeddablewidgets',
+                'action'     => 'player',
+            ),
+            array(
+                'label'      => _('Weekly Schedule'),
+                'module'     => 'default',
+                'controller' => 'embeddablewidgets',
+                'action'     => 'schedule',
+            )
         )
     ),
     array(
@@ -88,23 +109,32 @@ $pages = array(
         )
     ),
     array(
-        'label'      =>  "<i class='icon-wrench icon-white'></i>"._('Widgets'),
+        'label' =>  "<i class='icon-briefcase icon-white'></i>"._('Billing'),
-        'module'     => 'default',
+        'controller' => 'billing',
-        'controller' => 'embeddablewidgets',
+        'action' => 'client',
-        'action'     => 'player',
+        'resource' => 'billing',
-        'title' => 'Widgets',
+        'title' => 'Billing',
         'pages' => array(
             array(
-                'label'      => _('Player'),
+                'label' => _('Account Details'),
                 'module' => 'default',
-                'controller' => 'embeddablewidgets',
+                'controller' => 'billing',
-                'action'     => 'player',
+                'action' => 'client',
+                'resource' => 'billing'
             ),
             array(
-                'label'      => _('Weekly Schedule'),
+                'label' => _('Account Plans'),
                 'module' => 'default',
-                'controller' => 'embeddablewidgets',
+                'controller' => 'billing',
-                'action'     => 'schedule',
+                'action' => 'upgrade',
+                'resource' => 'billing'
+            ),
+            array(
+                'label' => _('View Invoices'),
+                'module' => 'default',
+                'controller' => 'billing',
+                'action' => 'invoices',
+                'resource' => 'billing'
             )
         )
     ),
@@ -149,36 +179,6 @@ $pages = array(
             )
         )
     ),
-    array(
-        'label' =>  "<i class='icon-user icon-white'></i>"._('Billing'),
-        'controller' => 'billing',
-        'action' => 'client',
-        'resource' => 'billing',
-        'title' => 'Billing',
-        'pages' => array(
-            array(
-                'label' => _('Account Details'),
-                'module' => 'default',
-                'controller' => 'billing',
-                'action' => 'client',
-                'resource' => 'billing'
-            ),
-            array(
-                'label' => _('Account Plans'),
-                'module' => 'default',
-                'controller' => 'billing',
-                'action' => 'upgrade',
-                'resource' => 'billing'
-            ),
-            array(
-                'label' => _('View Invoices'),
-                'module' => 'default',
-                'controller' => 'billing',
-                'action' => 'invoices',
-                'resource' => 'billing'
-            )
-        )
-    )
 );
 
 

airtime_mvc/application/controllers/BillingController.php

@@ -22,7 +22,6 @@ class BillingController extends Zend_Controller_Action {
     public function upgradeAction()
     {
 
-        $this->_helper->layout->setLayout("page-sub-menu");
         Zend_Layout::getMvcInstance()->assign('parent_page', 'Billing');
 
         $CC_CONFIG = Config::getConfig();
@@ -211,7 +210,6 @@ class BillingController extends Zend_Controller_Action {
 
     public function clientAction()
     {
-        $this->_helper->layout->setLayout("page-sub-menu");
         Zend_Layout::getMvcInstance()->assign('parent_page', 'Billing');
 
         $CC_CONFIG = Config::getConfig();
@@ -264,7 +262,6 @@ class BillingController extends Zend_Controller_Action {
 
     public function invoicesAction()
     {
-        $this->_helper->layout->setLayout("page-sub-menu");
         Zend_Layout::getMvcInstance()->assign('parent_page', 'Billing');
 
         $CC_CONFIG = Config::getConfig();

airtime_mvc/application/controllers/DashboardController.php

@@ -108,13 +108,11 @@ class DashboardController extends Zend_Controller_Action
 
     public function helpAction()
     {
-        $this->_helper->layout->setLayout("page-sub-menu");
         Zend_Layout::getMvcInstance()->assign('parent_page', 'Help');
     }
 
     public function aboutAction()
     {
-        $this->_helper->layout->setLayout("page-sub-menu");
         Zend_Layout::getMvcInstance()->assign('parent_page', 'Help');
         $this->view->airtime_version = Application_Model_Preference::GetAirtimeVersion();
     }

airtime_mvc/application/controllers/EmbeddablewidgetsController.php

@@ -10,7 +10,6 @@ class EmbeddableWidgetsController extends Zend_Controller_Action
 
     public function playerAction()
     {
-        $this->_helper->layout->setLayout("page-sub-menu");
         Zend_Layout::getMvcInstance()->assign('parent_page', 'Widgets');
 
         $CC_CONFIG = Config::getConfig();
@@ -34,7 +33,6 @@ class EmbeddableWidgetsController extends Zend_Controller_Action
 
     public function scheduleAction()
     {
-        $this->_helper->layout->setLayout("page-sub-menu");
         Zend_Layout::getMvcInstance()->assign('parent_page', 'Widgets');
 
         $apiEnabled = Application_Model_Preference::GetAllow3rdPartyApi();

airtime_mvc/application/controllers/ListenerstatController.php

@@ -17,7 +17,6 @@ class ListenerstatController extends Zend_Controller_Action
         $request = $this->getRequest();
         $baseUrl = Application_Common_OsPath::getBaseDir();
 
-        $this->_helper->layout->setLayout("page-sub-menu");
         Zend_Layout::getMvcInstance()->assign('parent_page', 'Analytics');
 
         $this->view->headScript()->appendFile($baseUrl.'js/flot/jquery.flot.js?'.$CC_CONFIG['airtime_version'],'text/javascript');

airtime_mvc/application/controllers/PlayouthistoryController.php

@@ -24,7 +24,6 @@ class PlayouthistoryController extends Zend_Controller_Action
         $CC_CONFIG = Config::getConfig();
         $baseUrl = Application_Common_OsPath::getBaseDir();
 
-        $this->_helper->layout->setLayout("page-sub-menu");
         Zend_Layout::getMvcInstance()->assign('parent_page', 'Analytics');
 
         list($startsDT, $endsDT) = Application_Common_HTTPHelper::getStartEndFromRequest($this->getRequest());

airtime_mvc/application/controllers/PlayouthistorytemplateController.php

@@ -18,7 +18,6 @@ class PlayouthistorytemplateController extends Zend_Controller_Action
 		$CC_CONFIG = Config::getConfig();
 		$baseUrl = Application_Common_OsPath::getBaseDir();
 
-		$this->_helper->layout->setLayout("page-sub-menu");
 		Zend_Layout::getMvcInstance()->assign('parent_page', 'Analytics');
 	
 		$this->view->headScript()->appendFile($baseUrl.'js/airtime/playouthistory/template.js?'.$CC_CONFIG['airtime_version'],'text/javascript');
@@ -35,7 +34,6 @@ class PlayouthistorytemplateController extends Zend_Controller_Action
 		$CC_CONFIG = Config::getConfig();
 		$baseUrl = Application_Common_OsPath::getBaseDir();
 
-		$this->_helper->layout->setLayout("page-sub-menu");
 		Zend_Layout::getMvcInstance()->assign('parent_page', 'Analytics');
 	
 		$this->view->headScript()->appendFile($baseUrl.'js/airtime/playouthistory/configuretemplate.js?'.$CC_CONFIG['airtime_version'],'text/javascript');

airtime_mvc/application/controllers/PreferenceController.php

@@ -24,7 +24,6 @@ class PreferenceController extends Zend_Controller_Action
         $CC_CONFIG = Config::getConfig();
         $request = $this->getRequest();
 
-        $this->_helper->layout->setLayout("page-sub-menu");
         Zend_Layout::getMvcInstance()->assign('parent_page', 'Settings');
                 
         $baseUrl = Application_Common_OsPath::getBaseDir();
@@ -146,7 +145,6 @@ class PreferenceController extends Zend_Controller_Action
 
         $request = $this->getRequest();
 
-        $this->_helper->layout->setLayout("page-sub-menu");
         Zend_Layout::getMvcInstance()->assign('parent_page', 'Settings');
 
         $baseUrl = Application_Common_OsPath::getBaseDir();

airtime_mvc/application/controllers/UserController.php

@@ -23,7 +23,6 @@ class UserController extends Zend_Controller_Action
 
         $request = $this->getRequest();
 
-        $this->_helper->layout->setLayout("page-sub-menu");
         Zend_Layout::getMvcInstance()->assign('parent_page', 'Settings');
 
         $baseUrl = Application_Common_OsPath::getBaseDir();
@@ -125,7 +124,6 @@ class UserController extends Zend_Controller_Action
     
     public function editUserAction()
     {
-        $this->_helper->layout->setLayout("page-sub-menu");
         Zend_Layout::getMvcInstance()->assign('parent_page', 'Settings');
 
         session_start(); //Reopen session for writing.

airtime_mvc/application/layouts/scripts/layout.phtml

@@ -88,14 +88,52 @@ j=d.createElement(s),dl=l!='dataLayer'?'&l='+l:'';j.async=true;j.src=
         <?php echo $this->navigation()->menu(); ?>
     </div>
 
+    <?php
+    $partitions = Application_Model_Systemstatus::GetDiskInfo();
+    $status = new StdClass;
+    $partitions = $partitions;
+    $disk = $partitions[0];
+    $used = $disk->totalSpace-$disk->totalFreeSpace;
+    $total = $disk->totalSpace;
+    ?>
+    <div id="disk_usage" style="height: 13px; position:fixed; bottom: 5px; left: 10px;">
+        <!--<div style="padding-bottom: 2px;">Disk Usage</div>-->
+        <div class="disk_usage_progress_bar"></div>
+        <div class="disk_usage_percent_in_use"><?php echo sprintf("%01.1fGB of %01.1fGB", $used/pow(2, 30), $total/pow(2, 30)); ?></div>
+        <div class="disk_usage_used" style="width:<?php echo sprintf("%01.1f%%", $used/$total*100) ?>;"></div>
+
+        <!--<div style="margin-top: 15px; font-size: 12px;">
+            <?php //echo sprintf("%01.1fGB of %01.1fGB", $used/pow(2, 30), $total/pow(2, 30)); ?>
+        </div>-->
+
+    </div>
+
 </div>
 
 <?php $hint = Application_Common_UsabilityHints::getUsabilityHint(); ?>
 <div class="usability_hint <?php if ($hint == "") { echo "hidden"; } ?>"><?php echo $hint; ?></div>
 
-<div class="wrapper" id="content">
+<div class="wrapper <?php if (isset($this->layout()->parent_page)) echo "wrapper_panel";?>" id="content">
+    <?php if (isset($this->layout()->parent_page)) { ?>
+    <div style="display: flex; width: 100%">
+        <div style="flex: 0 140px;"> <!-- placeholder object so we can fixed position the submenu -->
+            <div id="sub-menu">
+                <h3><?php //parent_page is passed in from controller
+                    echo $this->layout()->parent_page; ?></h3>
+                <hr>
+                <?php
+                $page = $this->navigation()->findOneBy('title', $this->layout()->parent_page);
+                echo $this->navigation()->menu()->renderMenu($page);
+                ?>
+            </div>
+        </div>
+        <div id="sub-menu-content-panel">
             <?php echo $this->layout()->content ?>
         </div>
+    </div>
+    <?php } else { echo $this->layout()->content; } ?>
+
+</div>
 
 <script id="tmpl-pl-cues" type="text/template">
 <div class="waveform-cues">

airtime_mvc/application/layouts/scripts/page-sub-menu.phtml

@@ -1,171 +0,0 @@
-<?php echo $this->doctype() ?>
-<html xmlns="http://www.w3.org/1999/xhtml">
-<head>
-    <meta http-equiv="Content-Type" content="text/html; charset=utf-8"/>
-    <?php echo $this->headTitle() ?>
-    <?php echo $this->headLink() ?>
-    <?php echo $this->headScript() ?>
-    <?php echo isset($this->google_analytics) ? $this->google_analytics : "" ?>
-    <?php $baseUrl = Application_Common_OsPath::getBaseDir(); ?>
-</head>
-<body class="page-sub-menu">
-<!-- Google Tag Manager -->
-<noscript>
-    <iframe src="//www.googletagmanager.com/ns.html?id=GTM-55N6NH"
-            height="0" width="0" style="display:none;visibility:hidden"></iframe>
-</noscript>
-<script>(function (w, d, s, l, i) {
-        w[l] = w[l] || [];
-        w[l].push({
-            'gtm.start': new Date().getTime(), event: 'gtm.js'
-        });
-        var f = d.getElementsByTagName(s)[0],
-            j = d.createElement(s), dl = l != 'dataLayer' ? '&l=' + l : '';
-        j.async = true;
-        j.src =
-            '//www.googletagmanager.com/gtm.js?id=' + i + dl;
-        f.parentNode.insertBefore(j, f);
-    })(window, document, 'script', 'dataLayer', 'GTM-55N6NH');</script>
-<!-- End Google Tag Manager -->
-
-<?php echo $this->partial('partialviews/trialBox.phtml', array("is_trial" => $this->isTrial(), "trial_remain" => $this->trialRemaining())) ?>
-
-<div id="Panel" class="sticky">
-    <?php if ($this->suspended) { ?>
-        <?php echo $this->partial('partialviews/suspended.phtml'); ?>
-    <?php } else { ?>
-
-    <?php echo $this->versionNotify();
-    $sss = $this->SourceSwitchStatus();
-    $scs = $this->SourceConnectionStatus();
-    ?>
-    <?php echo $this->partial('partialviews/header.phtml', array(
-        "live_dj_switch" => $sss['live_dj'], "live_dj_connection" => $scs['live_dj'], "master_dj_switch" => $sss['master_dj'], "master_dj_connection" => $scs['master_dj'],
-        "scheduled_play_switch" => $sss['scheduled_play']
-    )) ?>
-    <?php $partial = array('menu.phtml', 'default');
-    $this->navigation()->menu()->setPartial($partial); ?>
-
-
-    <script type="text/javascript">
-        var schedulePreLoaded = <?php
-        //Awful hack to speed up loading - Embed the schedule in the response so that the dashboard
-        //doesn't have to make a separate AJAX request to get this data.
-    require_once("ScheduleController.php");
-    ScheduleController::printCurrentPlaylistForEmbedding();
- }?>;
-        //The DOM elements that these calls depend on exist by this point:
-        parseItems(schedulePreLoaded.entries);
-        parseSourceStatus(schedulePreLoaded.source_status);
-        parseSwitchStatus(schedulePreLoaded.switch_status);
-
-    </script>
-</div>
-
-<div id="media_type_nav"> <!-- class="content-pane" -->
-    <div class="btn-group">
-        <button id="new_media_selector" class="btn btn-small dropdown-toggle" data-toggle="dropdown">
-            New <span class="caret"></span>
-        </button>
-        <ul class="dropdown-menu">
-            <li id="new-playlist">
-                <a href="#"><?php echo _("Playlist") ?></a>
-            </li>
-            <li id="new-smart-block">
-                <a href="#"><?php echo _("Smart Block") ?></a>
-            </li>
-            <li id="new-webstream">
-                <a href="#"><?php echo _("Webstream") ?></a>
-            </li>
-        </ul>
-        <a href="/Plupload">
-            <button id="add_media_btn" class="btn btn-small dashboard-btn">Upload</button>
-        </a>
-    </div>
-    <div class="media_type_selector" selection_id="1">
-        <a href="/showbuilder#"><i class='icon-home icon-white'></i><?php echo _("Dashboard") ?></a></div>
-    <div class="media_type_selector dashboard_sub_nav" selection_id="1">
-        <a href="/showbuilder#files"><i class='icon-file icon-white'></i><?php echo _("Files") ?></a></div>
-    <div class="media_type_selector dashboard_sub_nav" selection_id="2">
-        <a href="/showbuilder#playlists"><i class='icon-list icon-white'></i><?php echo _("Playlists") ?></a></div>
-    <div class="media_type_selector dashboard_sub_nav" selection_id="3">
-        <a href="/showbuilder#smart-blocks"><i class='icon-time icon-white'></i><?php echo _("Smart Blocks") ?></a>
-    </div>
-    <div class="media_type_selector dashboard_sub_nav" selection_id="4">
-        <a href="/showbuilder#webstreams"><i class='icon-random icon-white'></i><?php echo _("Webstreams") ?></a></div>
-    <hr style="margin-left: 5px; margin-right: 5px">
-    <div id="nav">
-        <?php echo $this->navigation()->menu(); ?>
-    </div>
-</div>
-
-<?php $hint = Application_Common_UsabilityHints::getUsabilityHint(); ?>
-<div class="usability_hint <?php if ($hint == "") {
-    echo "hidden";
-} ?>"><?php echo $hint; ?></div>
-
-
-<div class="wrapper wrapper_panel" id="content">
-<!--    <div style="display: flex; width: 100%">-->
-<!--        <div id="sub-menu-content-panel">-->
-            <?php echo $this->layout()->content ?>
-<!--        </div>-->
-<!--    </div>-->
-</div>
-<!-- Since we're position fixing the submenu, we don't need it to be inside the page wrapper -->
-<div id="sub-menu-wrapper"> <!-- placeholder object so we can fixed position the submenu -->
-    <div id="sub-menu">
-        <h3><?php //parent_page is passed in from controller
-            echo $this->layout()->parent_page; ?></h3>
-        <hr>
-        <?php
-            $page = $this->navigation()->findOneBy('title', $this->layout()->parent_page);
-            echo $this->navigation()->menu()->renderMenu($page);
-        ?>
-    </div>
-</div>
-
-<script id="tmpl-pl-cues" type="text/template">
-    <div class="waveform-cues">
-        <div class="playlist-time-scale"></div>
-        <div class="playlist-tracks"></div>
-        <div class="playlist-controls">
-            <a class="btn btn-small btn_play"><i class="icon-play icon-white"></i><?php echo _("Play"); ?></a>
-            <a class="btn btn-small btn_stop"><i class="icon-stop icon-white"></i><?php echo _("Stop"); ?></a>
-            <label class="audio audio_pos">00:00:00.0</label>
-        </div>
-        <div class="set-cue">
-            <label for="editor-cue-in"><?php echo _("Cue In"); ?></label>
-            <input type="text" class="audio_start">
-            <input type="button" class="btn btn-small set-cue-in" value="<?php echo _("Set Cue In"); ?>">
-            <label class="audio editor-cue-in">00:00:00.0</label>
-            <span style="display:none" class="cue-in-error"></span>
-        </div>
-        <div class="set-cue">
-            <label for="editor-cue-out"><?php echo _("Cue Out"); ?></label>
-            <input type="text" class="audio_end">
-            <input type="button" class="btn btn-small set-cue-out" value="<?php echo _("Set Cue Out"); ?>">
-            <label class="audio editor-cue-out">00:00:00.0</label>
-            <span style="display:none" class="cue-out-error"></span>
-        </div>
-    </div>
-</script>
-
-<script id="tmpl-pl-fades" type="text/template">
-    <div class="waveform-fades">
-        <div class="playlist-time-scale"></div>
-        <div class="playlist-tracks"></div>
-        <div class="playlist-controls left-floated">
-            <a class="btn btn-small btn_play"><i class="icon-play icon-white"></i><?php echo _("Play"); ?></a>
-            <a class="btn btn-small btn_stop"><i class="icon-stop icon-white"></i><?php echo _("Stop"); ?></a>
-            <label class="audio audio_pos">00:00:00.0</label>
-        </div>
-        <div class="set-fade left-floated">
-            <a type="button" class="btn btn-small btn_cursor" data-state="cursor"><?php echo _("Cursor"); ?></a>
-            <a type="button" class="btn btn-small btn_fadein" data-state="fadein"><?php echo _("Fade In"); ?></a>
-            <a type="button" class="btn btn-small btn_fadeout" data-state="fadeout"><?php echo _("Fade Out"); ?></a>
-        </div>
-    </div>
-</script>
-</body>
-</html>

airtime_mvc/public/css/styles.css

@@ -98,7 +98,7 @@ select {
     left: 23px;
     top: 30px;
     width: 100px;
-    height: 46px;
+    height: 42px;
 }
 
 /* Version Notification Starts*/
@@ -2959,23 +2959,7 @@ tfoot tr th    {
     -moz-border-radius: 4px;
     font-size:13px;
 }
-.statustable .big    {
+
-    width:120px;
-    height:10px;
-    background:#444444;
-    background: -moz-linear-gradient(top, #464646 0, #3e3e3e 100%);
-    background: -webkit-gradient(linear, left top, left bottom, color-stop(0, #3e3e3e), color-stop(100%, #464646));
-    border-bottom:1px solid #fff;
-    margin: 0 auto;
-    padding: 1px;
-    display:inline-block;
-}
-.diskspace    {
-    background-color:#e76400;
-    background: -moz-linear-gradient(top, #ff6f01 0, #bc5200 100%);
-    background: -webkit-gradient(linear, left top, left bottom, color-stop(0, #ff6f01), color-stop(100%, #bc5200));
-    height:10px;
-}
 .statustable a            {
     color: #222;
     text-decoration: underline;
@@ -3023,8 +3007,8 @@ tfoot tr th    {
     height:38px;
     display:block;
     position:fixed;
-    left:20px;
+    left:160px;
-    bottom:10px;
+    bottom:0px;
     background-color:#222;
     background-color:rgba(0, 0, 0, 0.7);
     z-index:101;
@@ -3662,10 +3646,6 @@ button.btn-icon-text > i.icon-white {
     text-decoration: none;
 }
 
-.page-sub-menu {
-    /*background-color: #252525;*/
-}
-
 #sub-menu-content-panel
 {
     flex-grow: 1
@@ -3710,3 +3690,46 @@ hr {
     display:inline;
     margin-right:4px
 }
+
+#disk_usage {
+    border-radius: 1px;
+    /*position: fixed;
+    bottom: 5px;
+    left: 10px;*/
+    width: 118px;
+    font-size: 14px;
+    text-align: center;
+    padding: 5px 5px;
+    background-color: #242424;
+    border: 1px solid #5b5b5b;
+    color: #ccc;
+}
+
+.disk_usage_progress_bar {
+    width:118px;
+    height:13px;
+    background:#444444;
+    background: -moz-linear-gradient(top, #464646 0, #3e3e3e 100%);
+    background: -webkit-gradient(linear, left top, left bottom, color-stop(0, #3e3e3e), color-stop(100%, #464646));
+    margin: 0 auto;
+    z-index: 1;
+    position:absolute;
+}
+
+.disk_usage_percent_in_use {
+    color: #fff;
+    font-size: 10px;
+    z-index: 3;
+    position:absolute;
+    width: 120px;
+    line-height: 13px;
+}
+
+.disk_usage_used {
+    background-color:#e76400;
+    background: -moz-linear-gradient(top, #ff6f01 0, #bc5200 100%);
+    background: -webkit-gradient(linear, left top, left bottom, color-stop(0, #ff6f01), color-stop(100%, #bc5200));
+    height:13px;
+    z-index: 2;
+    position:absolute;
+}