From 74a1e0929d1a3a5aa135b93c8cc1b460c54c7550 Mon Sep 17 00:00:00 2001 From: Albert Santoni Date: Mon, 17 Aug 2015 16:08:58 -0400 Subject: [PATCH] Fixed styling on Listener Stats page --- .../views/scripts/form/daterange.phtml | 4 +-- .../views/scripts/listenerstat/index.phtml | 11 +++++--- .../views/scripts/partialviews/header.phtml | 2 +- .../css/redmond/jquery-ui-1.8.8.custom.css | 4 +-- airtime_mvc/public/css/styles.css | 25 +++++++++++++------ .../js/airtime/listenerstat/listenerstat.js | 9 ++++--- 6 files changed, 34 insertions(+), 21 deletions(-) diff --git a/airtime_mvc/application/views/scripts/form/daterange.phtml b/airtime_mvc/application/views/scripts/form/daterange.phtml index b3435e284..284e3dd3d 100644 --- a/airtime_mvc/application/views/scripts/form/daterange.phtml +++ b/airtime_mvc/application/views/scripts/form/daterange.phtml @@ -3,7 +3,7 @@ element->getElement('his_time_start') ?> element->getElement('his_date_end') ?> element->getElement('his_time_end') ?> -
"> - +
"> +
\ No newline at end of file diff --git a/airtime_mvc/application/views/scripts/listenerstat/index.phtml b/airtime_mvc/application/views/scripts/listenerstat/index.phtml index fba9380f9..1222d960a 100644 --- a/airtime_mvc/application/views/scripts/listenerstat/index.phtml +++ b/airtime_mvc/application/views/scripts/listenerstat/index.phtml @@ -1,13 +1,16 @@
-
+

-
date_form; ?>
+
+

Date Range

+ date_form; ?> +
+

- errorStatus as $k=>$v) {?> -
'>

:

+
'>

:

diff --git a/airtime_mvc/application/views/scripts/partialviews/header.phtml b/airtime_mvc/application/views/scripts/partialviews/header.phtml index 7cc96499e..879ec73ea 100644 --- a/airtime_mvc/application/views/scripts/partialviews/header.phtml +++ b/airtime_mvc/application/views/scripts/partialviews/header.phtml @@ -1,5 +1,5 @@
- +
diff --git a/airtime_mvc/public/css/redmond/jquery-ui-1.8.8.custom.css b/airtime_mvc/public/css/redmond/jquery-ui-1.8.8.custom.css index c91abd98b..8e5dfa25c 100644 --- a/airtime_mvc/public/css/redmond/jquery-ui-1.8.8.custom.css +++ b/airtime_mvc/public/css/redmond/jquery-ui-1.8.8.custom.css @@ -111,13 +111,13 @@ border: 1px solid #202020; border-top: 1px solid #353535; border-left: 1px solid #2a2a2a; + background-color: #242424; + color: #e2e2e2; -webkit-box-shadow: inset 0 0 6px rgba(0,0,0,.65); -moz-box-shadow: inset 0 0 6px rgba(0,0,0,.65); box-shadow: inset 0 0 6px rgba(0,0,0,.65); - background-color: #242424; - color: #e2e2e2; } .ui-widget-content a { diff --git a/airtime_mvc/public/css/styles.css b/airtime_mvc/public/css/styles.css index b9a9c4f24..a4b4521a2 100644 --- a/airtime_mvc/public/css/styles.css +++ b/airtime_mvc/public/css/styles.css @@ -47,8 +47,6 @@ h3 { color: #efefef; padding: 10px; margin:0; - background-color: #5E5E5E; - border-top:1px solid #9d9d9d; } a, a:focus { outline:none; @@ -62,6 +60,8 @@ select { border:1px solid #9d9d9d; } + + /* Fix for Firefox */ fieldset { clear: both; @@ -70,8 +70,6 @@ fieldset { .logo { position: absolute; float: left; - - background: transparent url(images/airtime_logo_med.png) no-repeat 0 0; height: 46px; width: 120px; left: 5px; @@ -1078,7 +1076,6 @@ fieldset { border: 1px solid #222; margin: 0; padding: 0; - background-color: #333; } fieldset.plain { @@ -1719,6 +1716,11 @@ h2#scheduled_playlist_name span { width: 100%; } +#stream_form h3 { + background-color: #5E5E5E; + border-top:1px solid #9d9d9d; +} + .stream-setting-content dd.block-display { /*width: 60%;*/ } @@ -3533,7 +3535,6 @@ button.btn-icon-text > i.icon-white { .wrapper { position: absolute; - /*background: #242424;*/ top: 102px; left: 130px; right: 0; @@ -3541,8 +3542,6 @@ button.btn-icon-text > i.icon-white { padding: 5px 10px 40px; border: none; - background: #111; - -webkit-box-sizing: border-box; -moz-box-sizing: border-box; box-sizing: border-box; @@ -3621,6 +3620,16 @@ button.btn-icon-text > i.icon-white { width: 100%; } +#listenerstat_content .legendLabel +{ + color: #d6d6d6; +} + .dashboard-btn { width: 50%; } + +#his_submit { + height: 19px; + margin-top: -2px; +} \ No newline at end of file diff --git a/airtime_mvc/public/js/airtime/listenerstat/listenerstat.js b/airtime_mvc/public/js/airtime/listenerstat/listenerstat.js index dbc81b658..8507c876e 100644 --- a/airtime_mvc/public/js/airtime/listenerstat/listenerstat.js +++ b/airtime_mvc/public/js/airtime/listenerstat/listenerstat.js @@ -17,7 +17,6 @@ $(document).ready(function() { var oRange = AIRTIME.utilities.fnGetScheduleRange(dateStartId, timeStartId, dateEndId, timeEndId); var start = oRange.start; var end = oRange.end; - getDataAndPlot(start, end); }); }); @@ -90,11 +89,12 @@ function plot(datasets){ tickSize = (lastTimestamp.getTime() - firstTimestamp.getTime())/1000/numOfTicks; plot = $.plot($("#flot_placeholder"), data, { - yaxis: { min: 0, tickDecimals: 0 }, - xaxis: { mode: "time", timeformat:"%y/%m/%0d %H:%M", tickSize: [tickSize, "second"] }, + yaxis: { min: 0, tickDecimals: 0, color: '#d6d6d6', tickColor: '#d6d6d6' }, + xaxis: { mode: "time", timeformat:"%y/%m/%0d %H:%M", tickSize: [tickSize, "second"], + color: '#d6d6d6', tickColor: '#d6d6d6' }, grid: { hoverable: true, - backgroundColor: { colors: ["#888888", "#999999"] } + backgroundColor: { colors: ["#333", "#555"] } }, series: { lines: { @@ -106,6 +106,7 @@ function plot(datasets){ legend: { container: $('#legend'), noColumns: 5, + color: '#c0c0c0', labelFormatter: function (label, series) { var cb = ' 0){