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

Fixed styling on Listener Stats page

Browse source
This commit is contained in:
Albert Santoni 2015-08-17 16:08:58 -04:00
parent 3aee9a49bc
commit 74a1e0929d
6 changed files with 34 additions and 21 deletions
Download patch file Download diff file Expand all files Collapse all files

4
airtime_mvc/application/views/scripts/form/daterange.phtml
View file

@ -3,7 +3,7 @@
<?php echo $this->element->getElement('his_time_start') ?>
<?php echo $this->element->getElement('his_date_end') ?>
<?php echo $this->element->getElement('his_time_end') ?>
<div id="his_submit" class="ui-button ui-state-default" title="<?php echo _("Filter History")?>">
<span class="ui-icon ui-icon-search"></span>
<div id="his_submit" class=" btn btn-small" title="<?php echo _("Filter History")?>">
<i class="icon-white icon-search"></i><span><?php echo _("Filter History")?></span>
</div>
</div>

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

@ -1,13 +1,16 @@
<div id="listenerstat_content" class="ui-widget ui-widget-content block-shadow alpha-block padded">
<?php echo _("Listener Count Over Time")?><br>
<H2><?php echo _("Listeners")?></H2>
<div id="flot_placeholder" style="width:600px;height:300px;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 50px 0px 50px"><?php echo $this->date_form; ?></div>
<div id="date_form" style="float:left; margin:0px 0px">
<h3 style="padding-left: 0px">Date Range</h3>
<?php echo $this->date_form; ?>
</div>
<div id="errorStatus" style="float:right; width: 400px">
<h3><?php echo _("Stream Data Collection Status")?></h3>
<fieldset class="padded stream-setting-global">
<legend><?php echo _("Status")?></legend>
<?php foreach ($this->errorStatus as $k=>$v) {?>
<div class='stream-status <?php echo ($v == 'OK')? 'status-good' : 'status-error' ?>'><h3><?php echo $k?>: <?php echo $v?></h3></div>
<div class='stream-status <?php echo ($v == 'OK')? 'status-good' : 'status-error' ?>'><p><?php echo $k?>: <?php echo $v?></p></div>
<?php }?>
</fieldset>
</div>

2
airtime_mvc/application/views/scripts/partialviews/header.phtml
View file

@ -1,5 +1,5 @@
<div id="master-panel">
<div class="logo"></div>
<img class="logo" src="/css/images/airtime_logo_med.png">
<div class="now-playing-block">
<div class="text-row"><strong><?php echo _("Previous:"); ?></strong> <span id='previous'></span> <span id='prev-length'></span></div>
<div class="now-playing-info song">

4
airtime_mvc/public/css/redmond/jquery-ui-1.8.8.custom.css vendored
View file

@ -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 {

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

@ -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;
}

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

@ -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 = '<input style="float:left;" class="legendCB" type="checkbox" ';
if (series.data.length > 0){