github/plexpy
1
0
Fork 0
mirror of https://github.com/Tautulli/Tautulli.git synced 2025-07-29 19:18:33 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fix styling on graphs page.

Browse source 
Remove debug logging on Pushover notifications.
This commit is contained in:
Tim 2015-08-03 23:34:12 +02:00
parent 9bd5a29d07
commit b68a7956c3
3 changed files with 75 additions and 68 deletions
Download patch file Download diff file Expand all files Collapse all files

15
data/interfaces/default/css/plexpy.css
View file

@ -111,13 +111,13 @@ img {
color: #eee;
}
.btn-dark {
color: #e5e5e5;
color: #d7d7d7;
background-color: #3B3B3B;
border-color: transparent;
}
.btn-dark:focus,
.btn-dark.focus {
color: #e5e5e5;
color: #d7d7d7;
background-color: #3B3B3B;
}
.btn-dark:hover {
@ -129,7 +129,8 @@ img {
.btn-dark.active,
.open > .dropdown-toggle.btn-dark {
color: #fff;
background-color: #3B3B3B;
background-color: #333;
border-color: #444;
}
.btn-dark:active:hover,
.btn-dark.active:hover,
@ -141,7 +142,7 @@ img {
.btn-dark.active.focus,
.open > .dropdown-toggle.btn-dark.focus {
color: #fff;
background-color: #3B3B3B;
background-color: #333;
}
.btn-dark:active,
.btn-dark.active,
@ -1232,11 +1233,11 @@ input[type="color"],
max-width: 350px;
}
.graphs-instance {
height: 340px;
height: 330px;
padding: 20px;
background-color: #282828;
margin-right: 20px;
background-color: #333;
margin-bottom: 20px;
border-radius: 8px;
}
.watch-chart {
margin-top: 10px;

70
data/interfaces/default/graphs.html
View file

@ -5,30 +5,36 @@
<%def name="body()">
<div class="container-fluid">
<div class="row">
<div class="col-md-12">
<div class='card-back-full'>
<div class='table-card-back'>
<div class="header-bar">
<span><i class="fa fa-bar-chart"></i> Graphs</span>
</div>
<div class="button-bar hidden-xs">
<div class="btn-group" data-toggle="buttons" id="days-selection">
<label class="btn btn-dark active">
<input type="radio" name="date-options" id="graph-30" value="30" autocomplete="off" checked> 30 days
</label>
<label class="btn btn-dark">
<input type="radio" name="date-options" id="graph-90" value="90" autocomplete="off"> 90 days
</label>
<label class="btn btn-dark">
<input type="radio" name="date-options" id="graph-365" value="365" autocomplete="off"> 1 year
</label>
</div>
</div>
</div>
</div>
<div class="container-fluid">
<div class="row">
<div class="col-md-8"><h4>Daily Watch History (Past <span class="days">30</span> days)</h4>
</div>
<div class="col-md-4" style="text-align: right; padding-right: 30px;">
<h5>
<a href="javascript:void(0)" id="graph-30"> 30 days</a> |
<a href="javascript:void(0)" id="graph-90"> 90 days</a> |
<a href="javascript:void(0)" id="graph-365"> 1 year</a>
</h5>
</div>
</div>
<div class='table-card-back'>
<ul class="nav nav-pills" role="tablist">
<li role="presentation" class="active"><a id="time-based-graphs" href="#tabs-1" aria-controls="tabs-1" role="tab" data-toggle="tab">Time Periods</a></li>
<!--<li role="presentation"><a id="all-time-graphs" href="#tabs-2" aria-controls="tabs-2" role="tab" data-toggle="tab">All Time</a></li>-->
</ul>
<div class="tab-content">
<div role="tabpanel" class="tab-pane active" id="tabs-1">
<div class="row">
<div class="col-md-12">
<div class="padded-header">
<h3><i class="fa fa-history"></i> Daily Watch History <small>Last <span class="days">30</span> days</small></h3>
</div>
<div class="graphs-instance">
<div class="watch-chart" id="chart_div_plays_by_day">
<div class="graphs-load"><i class="fa fa-refresh fa-spin"></i> Loading chart...</div>
@ -39,7 +45,9 @@
</div>
<div class="row">
<div class="col-md-6">
<h4>Watches by day of week (Past <span class="days">30</span> days)</h4>
<div class="padded-header">
<h3><i class="fa fa-calendar"></i> Watches by day of week <small>Last <span class="days">30</span> days</small></h3>
</div>
<div class="graphs-instance">
<div class="watch-chart" id="chart_div_plays_by_dayofweek" style="float: left;">
<div class="graphs-load"><i class="fa fa-refresh fa-spin"></i> Loading chart...
@ -49,7 +57,9 @@
</div>
</div>
<div class="col-md-6">
<h4>Watches by hour of day (Past <span class="days">30</span> days)</h4>
<div class="padded-header">
<h3><i class="fa fa-clock-o"></i> Watches by hour of day <small>Last <span class="days">30</span> days</small></h3>
</div>
<div class="graphs-instance">
<div class="watch-chart" id="chart_div_plays_by_hourofday">
<div class="graphs-load"><i class="fa fa-refresh fa-spin"></i> Loading chart...
@ -60,6 +70,13 @@
</div>
</div>
</div>
<div role="tabpanel" class="tab-pane" id="tabs-2">
</div>
</div>
</div>
</div>
</%def>
<%def name="javascriptIncludes()">
@ -123,23 +140,12 @@
// Set initial state
loadGraphs(current_range);
$('#graph-30').click(function() {
current_range = 30;
$('#days-selection').on('change', function() {
current_range = $('input[name=date-options]:checked', '#days-selection').val();
loadGraphs(current_range);
$('.days').html(current_range);
loadGraphs(30);
});
$('#graph-90').click(function() {
current_range = 90;
$('.days').html(current_range);
loadGraphs(90);
});
$('#graph-365').click(function() {
current_range = 365;
$('.days').html(current_range);
loadGraphs(365);
});
});
</script>

6
plexpy/notifiers.py
View file

@ -823,9 +823,9 @@ class PUSHOVER(object):
body=urlencode(data))
response = http_handler.getresponse()
request_status = response.status
logger.debug(u"Pushover response status: %r" % request_status)
logger.debug(u"Pushover response headers: %r" % response.getheaders())
logger.debug(u"Pushover response body: %r" % response.read())
# logger.debug(u"Pushover response status: %r" % request_status)
# logger.debug(u"Pushover response headers: %r" % response.getheaders())
# logger.debug(u"Pushover response body: %r" % response.read())
if request_status == 200:
logger.info(u"Pushover notifications sent.")