diff --git a/airtime_mvc/application/controllers/ListenerstatController.php b/airtime_mvc/application/controllers/ListenerstatController.php index 67ddd25f5..59cb4e15a 100644 --- a/airtime_mvc/application/controllers/ListenerstatController.php +++ b/airtime_mvc/application/controllers/ListenerstatController.php @@ -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.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/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'); diff --git a/airtime_mvc/application/layouts/scripts/page-sub-menu.phtml b/airtime_mvc/application/layouts/scripts/page-sub-menu.phtml index 2b999330f..29884d943 100644 --- a/airtime_mvc/application/layouts/scripts/page-sub-menu.phtml +++ b/airtime_mvc/application/layouts/scripts/page-sub-menu.phtml @@ -118,18 +118,20 @@
">
-
- -
- layout()->content ?> +
+
+ +
diff --git a/airtime_mvc/application/views/scripts/embeddablewidgets/player.phtml b/airtime_mvc/application/views/scripts/embeddablewidgets/player.phtml index e7af772ff..fb0658a6b 100644 --- a/airtime_mvc/application/views/scripts/embeddablewidgets/player.phtml +++ b/airtime_mvc/application/views/scripts/embeddablewidgets/player.phtml @@ -1,4 +1,4 @@ -
+
diff --git a/airtime_mvc/application/views/scripts/embeddablewidgets/schedule.phtml b/airtime_mvc/application/views/scripts/embeddablewidgets/schedule.phtml index 4f7ffbc87..7fac8533b 100644 --- a/airtime_mvc/application/views/scripts/embeddablewidgets/schedule.phtml +++ b/airtime_mvc/application/views/scripts/embeddablewidgets/schedule.phtml @@ -1,4 +1,4 @@ -
+
diff --git a/airtime_mvc/application/views/scripts/listenerstat/index.phtml b/airtime_mvc/application/views/scripts/listenerstat/index.phtml index 1222d960a..a521351a1 100644 --- a/airtime_mvc/application/views/scripts/listenerstat/index.phtml +++ b/airtime_mvc/application/views/scripts/listenerstat/index.phtml @@ -1,6 +1,6 @@ -
+

-
+

Date Range

diff --git a/airtime_mvc/application/views/scripts/playouthistory/index.phtml b/airtime_mvc/application/views/scripts/playouthistory/index.phtml index a666096a9..5bb2468e7 100644 --- a/airtime_mvc/application/views/scripts/playouthistory/index.phtml +++ b/airtime_mvc/application/views/scripts/playouthistory/index.phtml @@ -1,4 +1,4 @@ -
+

date_form; ?> diff --git a/airtime_mvc/application/views/scripts/playouthistorytemplate/index.phtml b/airtime_mvc/application/views/scripts/playouthistorytemplate/index.phtml index 674fd2de2..e7affa2c7 100644 --- a/airtime_mvc/application/views/scripts/playouthistorytemplate/index.phtml +++ b/airtime_mvc/application/views/scripts/playouthistorytemplate/index.phtml @@ -1,4 +1,4 @@ -
+

diff --git a/airtime_mvc/application/views/scripts/preference/index.phtml b/airtime_mvc/application/views/scripts/preference/index.phtml index 2a302307f..30979921a 100644 --- a/airtime_mvc/application/views/scripts/preference/index.phtml +++ b/airtime_mvc/application/views/scripts/preference/index.phtml @@ -1,4 +1,4 @@ -
+

diff --git a/airtime_mvc/application/views/scripts/preference/stream-setting.phtml b/airtime_mvc/application/views/scripts/preference/stream-setting.phtml index efd0057e6..320bb3b46 100644 --- a/airtime_mvc/application/views/scripts/preference/stream-setting.phtml +++ b/airtime_mvc/application/views/scripts/preference/stream-setting.phtml @@ -1,4 +1,4 @@ -
+

diff --git a/airtime_mvc/application/views/scripts/user/add-user.phtml b/airtime_mvc/application/views/scripts/user/add-user.phtml index f9c40137a..573eb476e 100644 --- a/airtime_mvc/application/views/scripts/user/add-user.phtml +++ b/airtime_mvc/application/views/scripts/user/add-user.phtml @@ -1,4 +1,4 @@ -
+

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