Congegni/sintonia
7
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

SAAS-1019: Re-work Navigation Menu

Browse source
This commit is contained in:
drigato 2015-08-17 12:46:32 -04:00
parent 68523d9e02
commit 3aee9a49bc
14 changed files with 301 additions and 80 deletions
Download patch file Download diff file Expand all files Collapse all files

81
airtime_mvc/application/configs/navigation.php
View file

@ -8,27 +8,6 @@
* the navigation container below. * the navigation container below.
*/ */
$pages = array( $pages = array(
/*array(
'label' => _('Now Playing'),
'module' => 'default',
'controller' => 'Showbuilder',
'action' => 'index',
'resource' => 'showbuilder'
),*/
array(
'label' => _('Add Media'),
'module' => 'default',
'controller' => 'Plupload',
'action' => 'index',
'resource' => 'plupload'
),/*
array(
'label' => _('Library'),
'module' => 'default',
'controller' => 'Library',
'action' => 'index',
'resource' => 'playlist'
),*/
array( array(
'label' => _('Calendar'), 'label' => _('Calendar'),
'module' => 'default', 'module' => 'default',
@ -44,9 +23,11 @@ $pages = array(
) )
), ),
array( array(
'label' => _('System'), 'label' => _("Settings"),
'uri' => '#',
'resource' => 'preference', 'resource' => 'preference',
'action' => 'index',
'module' => 'default',
'controller' => 'preference',
'pages' => array( 'pages' => array(
array( array(
'label' => _('Preferences'), 'label' => _('Preferences'),
@ -60,26 +41,21 @@ $pages = array(
'action' => 'add-user', 'action' => 'add-user',
'resource' => 'user' 'resource' => 'user'
), ),
array(
'label' => _('Media Folders'),
'module' => 'default',
'controller' => 'Preference',
'action' => 'directory-config',
'id' => 'manage_folder'
),
array( array(
'label' => _('Streams'), 'label' => _('Streams'),
'module' => 'default', 'module' => 'default',
'controller' => 'Preference', 'controller' => 'Preference',
'action' => 'stream-setting' 'action' => 'stream-setting'
)
)
), ),
array( array(
'label' => _('Status'), 'label' => _("Analytics"),
'module' => 'default', 'module' => 'default',
'controller' => 'systemstatus', 'controller' => 'listenerstat',
'action' => 'index', 'action' => 'index',
'resource' => 'systemstatus' 'resource' => 'listenerstat',
), 'pages' => array(
array( array(
'label' => _('Listener Stats'), 'label' => _('Listener Stats'),
'module' => 'default', 'module' => 'default',
@ -87,19 +63,6 @@ $pages = array(
'action' => 'index', 'action' => 'index',
'resource' => 'listenerstat' 'resource' => 'listenerstat'
), ),
array(
'label' => _('Embeddable Widgets'),
'module' => 'default',
'controller' => 'embeddablewidgets',
'action' => 'index'
)
)
),
array(
'label' => _('History'),
'uri' => '#',
'resource' => 'playouthistory',
'pages' => array(
array( array(
'label' => _('Playout History'), 'label' => _('Playout History'),
'module' => 'default', 'module' => 'default',
@ -113,19 +76,21 @@ $pages = array(
'controller' => 'playouthistorytemplate', 'controller' => 'playouthistorytemplate',
'action' => 'index', 'action' => 'index',
'resource' => 'playouthistorytemplate' 'resource' => 'playouthistorytemplate'
), )
) )
), ),
array(
'label' => _('Widgets'),
'module' => 'default',
'controller' => 'embeddablewidgets',
'action' => 'index'
),
array( array(
'label' => _('Help'), 'label' => _('Help'),
'uri' => '#', 'controller' => 'dashboard',
'action' => 'help',
'resource' => 'dashboard', 'resource' => 'dashboard',
'pages' => array( 'pages' => array(
array(
'label' => _('Help Center'),
'uri' => HELP_URL,
'target' => "_blank"
),
array( array(
'label' => _('Getting Started'), 'label' => _('Getting Started'),
'module' => 'default', 'module' => 'default',
@ -133,6 +98,11 @@ $pages = array(
'action' => 'help', 'action' => 'help',
'resource' => 'dashboard' 'resource' => 'dashboard'
), ),
array(
'label' => _('Help Center'),
'uri' => HELP_URL,
'target' => "_blank"
),
array( array(
'label' => _('FAQ'), 'label' => _('FAQ'),
'uri' => FAQ_URL, 'uri' => FAQ_URL,
@ -159,7 +129,8 @@ $pages = array(
), ),
array( array(
'label' => _('Billing'), 'label' => _('Billing'),
'uri' => '#', 'controller' => 'billing',
'action' => 'client',
'resource' => 'billing', 'resource' => 'billing',
'pages' => array( 'pages' => array(
array( array(

10
airtime_mvc/application/controllers/BillingController.php
View file

@ -21,6 +21,10 @@ class BillingController extends Zend_Controller_Action {
public function upgradeAction() public function upgradeAction()
{ {
$this->_helper->layout->setLayout("page-sub-menu");
Zend_Layout::getMvcInstance()->assign('parent_page', 'Billing');
$CC_CONFIG = Config::getConfig(); $CC_CONFIG = Config::getConfig();
$baseUrl = Application_Common_OsPath::getBaseDir(); $baseUrl = Application_Common_OsPath::getBaseDir();
$this->view->headLink()->appendStylesheet($baseUrl.'css/billing.css?'.$CC_CONFIG['airtime_version']); $this->view->headLink()->appendStylesheet($baseUrl.'css/billing.css?'.$CC_CONFIG['airtime_version']);
@ -207,6 +211,9 @@ class BillingController extends Zend_Controller_Action {
public function clientAction() public function clientAction()
{ {
$this->_helper->layout->setLayout("page-sub-menu");
Zend_Layout::getMvcInstance()->assign('parent_page', 'Billing');
$CC_CONFIG = Config::getConfig(); $CC_CONFIG = Config::getConfig();
$baseUrl = Application_Common_OsPath::getBaseDir(); $baseUrl = Application_Common_OsPath::getBaseDir();
$this->view->headLink()->appendStylesheet($baseUrl.'css/billing.css?'.$CC_CONFIG['airtime_version']); $this->view->headLink()->appendStylesheet($baseUrl.'css/billing.css?'.$CC_CONFIG['airtime_version']);
@ -257,6 +264,9 @@ class BillingController extends Zend_Controller_Action {
public function invoicesAction() public function invoicesAction()
{ {
$this->_helper->layout->setLayout("page-sub-menu");
Zend_Layout::getMvcInstance()->assign('parent_page', 'Billing');
$CC_CONFIG = Config::getConfig(); $CC_CONFIG = Config::getConfig();
$baseUrl = Application_Common_OsPath::getBaseDir(); $baseUrl = Application_Common_OsPath::getBaseDir();
$this->view->headLink()->appendStylesheet($baseUrl.'css/billing.css?'.$CC_CONFIG['airtime_version']); $this->view->headLink()->appendStylesheet($baseUrl.'css/billing.css?'.$CC_CONFIG['airtime_version']);

5
airtime_mvc/application/controllers/DashboardController.php
View file

@ -108,11 +108,14 @@ class DashboardController extends Zend_Controller_Action
public function helpAction() public function helpAction()
{ {
// action body $this->_helper->layout->setLayout("page-sub-menu");
Zend_Layout::getMvcInstance()->assign('parent_page', 'Help');
} }
public function aboutAction() 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(); $this->view->airtime_version = Application_Model_Preference::GetAirtimeVersion();
} }

3
airtime_mvc/application/controllers/ListenerstatController.php
View file

@ -17,6 +17,9 @@ class ListenerstatController extends Zend_Controller_Action
$request = $this->getRequest(); $request = $this->getRequest();
$baseUrl = Application_Common_OsPath::getBaseDir(); $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'); $this->view->headScript()->appendFile($baseUrl.'js/flot/jquery.flot.js?'.$CC_CONFIG['airtime_version'],'text/javascript');
$this->view->headScript()->appendFile($baseUrl.'js/flot/jquery.flot.crosshair.js?'.$CC_CONFIG['airtime_version'],'text/javascript'); $this->view->headScript()->appendFile($baseUrl.'js/flot/jquery.flot.crosshair.js?'.$CC_CONFIG['airtime_version'],'text/javascript');
$this->view->headScript()->appendFile($baseUrl.'js/airtime/listenerstat/listenerstat.js?'.$CC_CONFIG['airtime_version'],'text/javascript'); $this->view->headScript()->appendFile($baseUrl.'js/airtime/listenerstat/listenerstat.js?'.$CC_CONFIG['airtime_version'],'text/javascript');

3
airtime_mvc/application/controllers/PlayouthistoryController.php
View file

@ -24,6 +24,9 @@ class PlayouthistoryController extends Zend_Controller_Action
$CC_CONFIG = Config::getConfig(); $CC_CONFIG = Config::getConfig();
$baseUrl = Application_Common_OsPath::getBaseDir(); $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()); list($startsDT, $endsDT) = Application_Common_HTTPHelper::getStartEndFromRequest($this->getRequest());
$userTimezone = new DateTimeZone(Application_Model_Preference::GetUserTimezone()); $userTimezone = new DateTimeZone(Application_Model_Preference::GetUserTimezone());

6
airtime_mvc/application/controllers/PlayouthistorytemplateController.php
View file

@ -18,6 +18,9 @@ class PlayouthistorytemplateController extends Zend_Controller_Action
$CC_CONFIG = Config::getConfig(); $CC_CONFIG = Config::getConfig();
$baseUrl = Application_Common_OsPath::getBaseDir(); $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'); $this->view->headScript()->appendFile($baseUrl.'js/airtime/playouthistory/template.js?'.$CC_CONFIG['airtime_version'],'text/javascript');
$this->view->headLink()->appendStylesheet($baseUrl.'css/history_styles.css?'.$CC_CONFIG['airtime_version']); $this->view->headLink()->appendStylesheet($baseUrl.'css/history_styles.css?'.$CC_CONFIG['airtime_version']);
@ -32,6 +35,9 @@ class PlayouthistorytemplateController extends Zend_Controller_Action
$CC_CONFIG = Config::getConfig(); $CC_CONFIG = Config::getConfig();
$baseUrl = Application_Common_OsPath::getBaseDir(); $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'); $this->view->headScript()->appendFile($baseUrl.'js/airtime/playouthistory/configuretemplate.js?'.$CC_CONFIG['airtime_version'],'text/javascript');
$this->view->headLink()->appendStylesheet($baseUrl.'css/history_styles.css?'.$CC_CONFIG['airtime_version']); $this->view->headLink()->appendStylesheet($baseUrl.'css/history_styles.css?'.$CC_CONFIG['airtime_version']);

6
airtime_mvc/application/controllers/PreferenceController.php
View file

@ -24,6 +24,9 @@ class PreferenceController extends Zend_Controller_Action
$CC_CONFIG = Config::getConfig(); $CC_CONFIG = Config::getConfig();
$request = $this->getRequest(); $request = $this->getRequest();
$this->_helper->layout->setLayout("page-sub-menu");
Zend_Layout::getMvcInstance()->assign('parent_page', 'Settings');
$baseUrl = Application_Common_OsPath::getBaseDir(); $baseUrl = Application_Common_OsPath::getBaseDir();
$this->view->headScript()->appendFile($baseUrl.'js/airtime/preferences/preferences.js?'.$CC_CONFIG['airtime_version'],'text/javascript'); $this->view->headScript()->appendFile($baseUrl.'js/airtime/preferences/preferences.js?'.$CC_CONFIG['airtime_version'],'text/javascript');
@ -143,6 +146,9 @@ class PreferenceController extends Zend_Controller_Action
$request = $this->getRequest(); $request = $this->getRequest();
$this->_helper->layout->setLayout("page-sub-menu");
Zend_Layout::getMvcInstance()->assign('parent_page', 'Settings');
$baseUrl = Application_Common_OsPath::getBaseDir(); $baseUrl = Application_Common_OsPath::getBaseDir();
$this->view->headScript()->appendFile($baseUrl.'js/airtime/preferences/streamsetting.js?'.$CC_CONFIG['airtime_version'],'text/javascript'); $this->view->headScript()->appendFile($baseUrl.'js/airtime/preferences/streamsetting.js?'.$CC_CONFIG['airtime_version'],'text/javascript');

4
airtime_mvc/application/controllers/UserController.php
View file

@ -22,6 +22,10 @@ class UserController extends Zend_Controller_Action
$CC_CONFIG = Config::getConfig(); $CC_CONFIG = Config::getConfig();
$request = $this->getRequest(); $request = $this->getRequest();
$this->_helper->layout->setLayout("page-sub-menu");
Zend_Layout::getMvcInstance()->assign('parent_page', 'Settings');
$baseUrl = Application_Common_OsPath::getBaseDir(); $baseUrl = Application_Common_OsPath::getBaseDir();
$js_files = array( $js_files = array(

7
airtime_mvc/application/layouts/scripts/layout.phtml
View file

@ -79,7 +79,7 @@ j=d.createElement(s),dl=l!='dataLayer'?'&l='+l:'';j.async=true;j.src=
<div id="media_type_nav"> <!-- class="content-pane" --> <div id="media_type_nav"> <!-- class="content-pane" -->
<div class="btn-group"> <div class="btn-group">
<button id="new_media_selector" class="btn btn-small dropdown-toggle" data-toggle="dropdown"> <button id="new_media_selector" class="btn btn-small dropdown-toggle dashboard-btn" data-toggle="dropdown">
New <span class="caret"></span> New <span class="caret"></span>
</button> </button>
<ul class="dropdown-menu"> <ul class="dropdown-menu">
@ -93,6 +93,9 @@ j=d.createElement(s),dl=l!='dataLayer'?'&l='+l:'';j.async=true;j.src=
<a href="#"><?php echo _("Webstream") ?></a> <a href="#"><?php echo _("Webstream") ?></a>
</li> </li>
</ul> </ul>
<a href="/Plupload">
<button id="add_media_btn" class="btn btn-small dashboard-btn">Upload</button>
</a>
</div> </div>
<div class="media_type_selector" selection_id="1"> <div class="media_type_selector" selection_id="1">
<a href="/show-builder#"><?php echo _("Dashboard") ?></a></div> <a href="/show-builder#"><?php echo _("Dashboard") ?></a></div>
@ -106,7 +109,7 @@ j=d.createElement(s),dl=l!='dataLayer'?'&l='+l:'';j.async=true;j.src=
<a href="/show-builder#webstreams"><?php echo _("Webstreams") ?></a></div> <a href="/show-builder#webstreams"><?php echo _("Webstreams") ?></a></div>
<hr style="margin-left: 5px; margin-right: 5px"> <hr style="margin-left: 5px; margin-right: 5px">
<div id="nav"> <div id="nav">
<?php echo $this->navigation()->menu() ?> <?php echo $this->navigation()->menu(); ?>
</div> </div>
</div> </div>

178
airtime_mvc/application/layouts/scripts/page-sub-menu.phtml Normal file
View file

@ -0,0 +1,178 @@
<?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>
<!-- 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 id="nav">
<div class="logo"></div>
<div class="personal-block solo">
<ol>
<li>
<a id="current-user" href=<?php /*echo $baseUrl . "user/edit-user"*/?>><span class="name"><?php /*echo $this->escape($this->loggedInAs()); */?></span></a>
| <a href=<?php /*echo $baseUrl . "login/logout"*/?>><?php /*echo _("Logout")*/?></a>
</li>
</ol>
</div>
<div id="mobile-nav">
<div class="menu-btn" id="menu-btn">
<div></div>
<span></span>
<span></span>
<span></span>
</div>
</div>
<div class="responsive-menu">
<?php /*echo $this->navigation()->menu() */?>
</div>
<div style="clear:both;"></div>
</div>-->
<?php endif; //suspended ?>
</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="/show-builder"><?php echo _("Dashboard") ?></a></div>
<div class="media_type_selector dashboard_sub_nav" selection_id="1">
<a href="/show-builder#files"><?php echo _("Files") ?></a></div>
<div class="media_type_selector dashboard_sub_nav" selection_id="2">
<a href="/show-builder#playlists"><?php echo _("Playlists") ?></a></div>
<div class="media_type_selector dashboard_sub_nav" selection_id="3">
<a href="/show-builder#smart-blocks"><?php echo _("Smart Blocks") ?></a></div>
<div class="media_type_selector dashboard_sub_nav" selection_id="4">
<a href="/show-builder#webstreams"><?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 "style='display:none'"; } ?>><?php echo $hint; ?></div>
<div class="wrapper" id="content">
<div id="sub-menu">
<?php echo $this->layout()->parent_page; ?>
<hr>
<?php
$page = $this->navigation()->findOneBy('label',$this->layout()->parent_page);
echo $this->navigation()->menu()->renderMenu($page);
?>
</div>
<div style="width:87%">
<?php echo $this->layout()->content ?></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>

4
airtime_mvc/application/views/scripts/preference/stream-setting.phtml
View file

@ -6,7 +6,7 @@
<?php echo $this->form->getElement('csrf') ?> <?php echo $this->form->getElement('csrf') ?>
<div style="clear:both"></div> <div style="clear:both"></div>
<?php echo $this->statusMsg;?> <?php echo $this->statusMsg;?>
<div style="float: left; margin-right: 10px; width: 490px; overflow: auto;"> <div style="float: left; margin-right: 10px; width: 50%; overflow: auto;">
<h3><?php echo _("Global") ?></h3> <h3><?php echo _("Global") ?></h3>
<fieldset class="padded stream-setting-global"> <fieldset class="padded stream-setting-global">
@ -102,7 +102,7 @@
</fieldset> </fieldset>
<?php echo $this->form->getSubform('live_stream_subform'); ?> <?php echo $this->form->getSubform('live_stream_subform'); ?>
</div> </div>
<div style="float: left; width: 600px;"> <div style="float: left; width: 48%;">
<h3><?php echo _("Output Streams") ?></h3> <h3><?php echo _("Output Streams") ?></h3>
<fieldset class="padded"> <fieldset class="padded">
<?php <?php

6
airtime_mvc/public/css/pro_dropdown_3.css
View file

@ -51,7 +51,9 @@ way to fit your requirements.
float:left; float:left;
display:block; display:block;
padding:0 28px 0 0px; padding:0 28px 0 0px;
/* Hide the drop down sub menu
background:url(images/down_arrow.png) no-repeat right 50%; background:url(images/down_arrow.png) no-repeat right 50%;
*/
} }
#nav li:hover a.top_link, #nav li.active a.top_link, #nav li.active:hover a.top_link { #nav li:hover a.top_link, #nav li.active a.top_link, #nav li.active:hover a.top_link {
@ -64,9 +66,11 @@ way to fit your requirements.
#nav li:hover a.top_link span { #nav li:hover a.top_link span {
} }
/* Hide the drop down sub menu
#nav li:hover a.top_link span.down { #nav li:hover a.top_link span.down {
background:url(images/down_arrow.png) no-repeat right 50%; background:url(images/down_arrow.png) no-repeat right 50%;
} }
*/
/* Default list styling */ /* Default list styling */
#nav li:hover { #nav li:hover {
@ -86,6 +90,8 @@ way to fit your requirements.
-moz-border-radius: 3px; -moz-border-radius: 3px;
-webkit-border-radius: 3px; -webkit-border-radius: 3px;
border-radius: 3px; border-radius: 3px;
/* Hide the drop down sub menu */
display:none;
} }
#nav li:hover ul.sub li { #nav li:hover ul.sub li {

32
airtime_mvc/public/css/styles.css
View file

@ -2333,7 +2333,7 @@ span.errors.sp-errors{
} }
.stream-config { .stream-config {
width: 1100px; width: 85%;
} }
#stream_save_bottom { #stream_save_bottom {
@ -3485,7 +3485,6 @@ button.btn-icon-text > i.icon-white {
} }
#new_media_selector { #new_media_selector {
width: 100%;
font-size: 14px; font-size: 14px;
} }
@ -3596,3 +3595,32 @@ button.btn-icon-text > i.icon-white {
margin-bottom: 10px; margin-bottom: 10px;
} }
#sub-menu {
width: 10%;
border-right: 1px solid #5b5b5b;
font-size: 14px;
color: #cecece;
padding: 10px;
}
#sub-menu .navigation {
list-style: none;
padding-left: 0px;
}
#sub-menu .navigation li {
padding-bottom: 10px;
}
#sub-menu .navigation a {
color: #cecece;
text-decoration: none;
}
#listenerstat_content {
width: 100%;
}
.dashboard-btn {
width: 50%;
}

4
airtime_mvc/public/js/airtime/listenerstat/listenerstat.js
View file

@ -6,8 +6,8 @@ $(document).ready(function() {
timeEndId = "#his_time_end"; timeEndId = "#his_time_end";
// set width dynamically // set width dynamically
var width = $("#content").width(); var width = $("#listenerstat_content").width();
width = width - 120; width = width * .91;
$("#listenerstat_content").find("#flot_placeholder").width(width); $("#listenerstat_content").find("#flot_placeholder").width(width);
$("#listenerstat_content").find("#legend").width(width); $("#listenerstat_content").find("#legend").width(width);