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

Navigation sidebar finalization

Browse source
This commit is contained in:
Albert Santoni 2015-08-19 14:59:33 -04:00
parent a3e9a7355c
commit f82558a5c0
13 changed files with 57 additions and 30 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -22,6 +22,7 @@ class ListenerstatController extends Zend_Controller_Action
$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/flot/jquery.flot.resize.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');
$this->view->headScript()->appendFile($baseUrl.'js/timepicker/jquery.ui.timepicker.js?'.$CC_CONFIG['airtime_version'],'text/javascript'); $this->view->headScript()->appendFile($baseUrl.'js/timepicker/jquery.ui.timepicker.js?'.$CC_CONFIG['airtime_version'],'text/javascript');
$this->view->headScript()->appendFile($baseUrl.'js/airtime/buttons/buttons.js?'.$CC_CONFIG['airtime_version'],'text/javascript'); $this->view->headScript()->appendFile($baseUrl.'js/airtime/buttons/buttons.js?'.$CC_CONFIG['airtime_version'],'text/javascript');

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

@ -118,18 +118,20 @@
<div class="usability_hint <?php if ($hint == "") { echo "hidden"; } ?>"><?php echo $hint; ?></div> <div class="usability_hint <?php if ($hint == "") { echo "hidden"; } ?>"><?php echo $hint; ?></div>
<div class="wrapper" id="content"> <div class="wrapper wrapper_panel" id="content">
<div id="sub-menu"> <div style="display: flex; width: 100%">
<h3><?php //parent_page is passed in from controller <div id="sub-menu">
echo $this->layout()->parent_page; ?></h3> <h3><?php //parent_page is passed in from controller
<hr> echo $this->layout()->parent_page; ?></h3>
<?php <hr>
$page = $this->navigation()->findOneBy('label', $this->layout()->parent_page); <?php
echo $this->navigation()->menu()->renderMenu($page); $page = $this->navigation()->findOneBy('label', $this->layout()->parent_page);
?> echo $this->navigation()->menu()->renderMenu($page);
</div> ?>
<div> </div>
<?php echo $this->layout()->content ?> <div id="sub-menu-content-panel">
<?php echo $this->layout()->content ?>
</div>
</div> </div>
</div> </div>

2
airtime_mvc/application/views/scripts/embeddablewidgets/player.phtml
View file

@ -1,4 +1,4 @@
<div id="player-widget" class="ui-widget ui-widget-content block-shadow simple-formblock embed-player-form clearfix padded-strong "> <div id="player-widget" class="ui-widget prefpanel simple-formblock embed-player-form clearfix padded-strong ">
<?php $baseUrl = Application_Common_OsPath::getBaseDir(); ?> <?php $baseUrl = Application_Common_OsPath::getBaseDir(); ?>

2
airtime_mvc/application/views/scripts/embeddablewidgets/schedule.phtml
View file

@ -1,4 +1,4 @@
<div id="weekly-schedule-widget" class="ui-widget ui-widget-content block-shadow simple-formblock clearfix padded-strong "> <div id="weekly-schedule-widget" class="prefpanel ui-widget simple-formblock clearfix padded-strong ">
<?php $baseUrl = Application_Common_OsPath::getBaseDir(); ?> <?php $baseUrl = Application_Common_OsPath::getBaseDir(); ?>

4
airtime_mvc/application/views/scripts/listenerstat/index.phtml
View file

@ -1,6 +1,6 @@
<div id="listenerstat_content" class="ui-widget ui-widget-content block-shadow alpha-block padded"> <div id="listenerstat_content" class="alpha-block padded">
<H2><?php echo _("Listeners")?></H2> <H2><?php echo _("Listeners")?></H2>
<div id="flot_placeholder" style="width:600px;height:300px;margin:0px 50px 0px 50px"></div> <div id="flot_placeholder" style="height:300px;margin:0px 50px 0px 50px"></div>
<div id="legend" style="width:600px;height:70px;margin:0px 50px 0px 50px"></div> <div id="legend" style="width:600px;height:70px;margin:0px 50px 0px 50px"></div>
<div id="date_form" style="float:left; margin:0px 0px"> <div id="date_form" style="float:left; margin:0px 0px">
<h3 style="padding-left: 0px">Date Range</h3> <h3 style="padding-left: 0px">Date Range</h3>

2
airtime_mvc/application/views/scripts/playouthistory/index.phtml
View file

@ -1,4 +1,4 @@
<div id="history_content" class="ui-widget ui-widget-content block-shadow alpha-block padded"> <div id="history_content" class=" alpha-block padded">
<h2><?php echo(_("Playout History"));?></h2> <h2><?php echo(_("Playout History"));?></h2>
<?php echo $this->date_form; ?> <?php echo $this->date_form; ?>

2
airtime_mvc/application/views/scripts/playouthistorytemplate/index.phtml
View file

@ -1,4 +1,4 @@
<div id="history_template" class="ui-widget ui-widget-content block-shadow alpha-block padded-strong"> <div id="history_template" class="prefpanel alpha-block padded-strong">
<div> <div>
<h2><?php echo(_("Playout History Templates"));?></h2> <h2><?php echo(_("Playout History Templates"));?></h2>

2
airtime_mvc/application/views/scripts/preference/index.phtml
View file

@ -1,4 +1,4 @@
<div class="ui-widget ui-widget-content block-shadow simple-formblock clearfix padded-strong preferences"> <div class="ui-widget prefpanel simple-formblock clearfix padded-strong preferences">
<h2 style="float:left"><?php echo _("General") ?></h2> <h2 style="float:left"><?php echo _("General") ?></h2>
<?php $baseUrl = Application_Common_OsPath::getBaseDir(); ?> <?php $baseUrl = Application_Common_OsPath::getBaseDir(); ?>
<form method="post" id="pref_form" enctype="multipart/form-data"> <form method="post" id="pref_form" enctype="multipart/form-data">

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

@ -1,4 +1,4 @@
<div class="ui-widget ui-widget-content block-shadow simple-formblock clearfix padded-strong stream-config"> <div class="ui-widget prefpanel simple-formblock clearfix padded-strong stream-config">
<h2 style="float:left"><?php echo _("Stream Settings") ?></h2> <h2 style="float:left"><?php echo _("Stream Settings") ?></h2>
<?php $baseUrl = Application_Common_OsPath::getBaseDir(); ?> <?php $baseUrl = Application_Common_OsPath::getBaseDir(); ?>
<form method="post" id="stream_form" enctype="application/x-www-form-urlencoded"> <form method="post" id="stream_form" enctype="application/x-www-form-urlencoded">

2
airtime_mvc/application/views/scripts/user/add-user.phtml
View file

@ -1,4 +1,4 @@
<div class="ui-widget ui-widget-content block-shadow clearfix padded-strong user-management"> <div class="ui-widget prefpanel clearfix padded-strong user-management">
<h2><?php echo _("Manage Users") ?></h2> <h2><?php echo _("Manage Users") ?></h2>
<div class="user-list-wrapper"> <div class="user-list-wrapper">

2
airtime_mvc/application/views/scripts/user/edit-user.phtml
View file

@ -1,4 +1,4 @@
<div class="ui-widget ui-widget-content block-shadow clearfix padded-strong edit-current-user"> <div class="prefpanel clearfix padded-strong edit-current-user">
<?php echo $this->successMessage ?> <?php echo $this->successMessage ?>
<?php echo $this->form?> <?php echo $this->form?>
</div> </div>

4
airtime_mvc/public/css/player-form.css
View file

@ -2,10 +2,6 @@
padding-right: 0px !important; padding-right: 0px !important;
width: 100% !important; width: 100% !important;
} }
.embed-player-form {
width: 40%;
margin: 0 auto;
}
.embed-player-form dd { .embed-player-form dd {
width: 100% !important; width: 100% !important;
float: left; float: left;

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

@ -123,7 +123,7 @@ fieldset {
} }
.edit-current-user label { .edit-current-user label {
font-weight: bold; font-weight: normal;
} }
.stream-player-label { .stream-player-label {
@ -1664,8 +1664,19 @@ h2#scheduled_playlist_name span {
top: 50%; top: 50%;
} }
.prefpanel
{
color: #CDCDCD;
}
.prefpanel a {
color: #b2b2b2;
}
/*---//////////////////// USERS ////////////////////---*/ /*---//////////////////// USERS ////////////////////---*/
.simple-formblock { .simple-formblock {
} }
@ -2335,6 +2346,7 @@ span.errors.sp-errors{
.stream-config { .stream-config {
min-width: 800px; min-width: 800px;
max-width: 1000px;
} }
#stream_save_bottom { #stream_save_bottom {
@ -3386,9 +3398,7 @@ dd .stream-status {
} }
#weekly-schedule-widget { #weekly-schedule-widget {
margin: 0 auto; width: 800px;
margin-bottom: 20px;
width: 60%;
} }
#widget-menu { #widget-menu {
@ -3405,6 +3415,7 @@ dd .stream-status {
#player-widget { #player-widget {
margin-bottom: 20px; margin-bottom: 20px;
width: 600px;
} }
.schedule_iframe_wrapper { .schedule_iframe_wrapper {
@ -3570,6 +3581,10 @@ button.btn-icon-text > i.icon-white {
transition: top 0.2s linear; transition: top 0.2s linear;
} }
.wrapper_panel {
background-color: #242424;
}
/* Usability hint */ /* Usability hint */
.usability_hint { .usability_hint {
@ -3605,11 +3620,14 @@ button.btn-icon-text > i.icon-white {
#sub-menu { #sub-menu {
width: 130px; width: 130px;
min-width: 130px;
flex-grow: 0;
border-right: 1px solid #5b5b5b; border-right: 1px solid #5b5b5b;
background: #212121; background: #212121;
font-size: 14px; font-size: 14px;
color: #cecece; color: #cecece;
padding: 10px; padding: 10px;
float: left;
} }
#sub-menu h3 { #sub-menu h3 {
@ -3639,8 +3657,14 @@ button.btn-icon-text > i.icon-white {
/*background-color: #252525;*/ /*background-color: #252525;*/
} }
#sub-menu-content-panel
{
flex-grow: 1
}
#listenerstat_content { #listenerstat_content {
width: 100%; width: 100%;
display: block;
} }
#listenerstat_content .legendLabel #listenerstat_content .legendLabel
@ -3648,6 +3672,10 @@ button.btn-icon-text > i.icon-white {
color: #d6d6d6; color: #d6d6d6;
} }
#listenerstat_content .tickLabel {
font-size: 12px;
}
.dashboard-btn { .dashboard-btn {
width: 50%; width: 50%;
} }