From b68a7956c329d32915ae22496de9843944c1b780 Mon Sep 17 00:00:00 2001 From: Tim Date: Mon, 3 Aug 2015 23:34:12 +0200 Subject: [PATCH] Fix styling on graphs page. Remove debug logging on Pushover notifications. --- data/interfaces/default/css/plexpy.css | 15 +-- data/interfaces/default/graphs.html | 122 +++++++++++++------------ plexpy/notifiers.py | 6 +- 3 files changed, 75 insertions(+), 68 deletions(-) diff --git a/data/interfaces/default/css/plexpy.css b/data/interfaces/default/css/plexpy.css index d643f297..6acbfdd2 100644 --- a/data/interfaces/default/css/plexpy.css +++ b/data/interfaces/default/css/plexpy.css @@ -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; diff --git a/data/interfaces/default/graphs.html b/data/interfaces/default/graphs.html index 88778544..3ace31b0 100644 --- a/data/interfaces/default/graphs.html +++ b/data/interfaces/default/graphs.html @@ -5,58 +5,75 @@ <%def name="body()">
-
-
-
-
- Graphs -
+
+
+ Graphs +
+
-
-
-
-

Daily Watch History (Past 30 days)

-
-
-
- 30 days | - 90 days | - 1 year -
-
-
-
-
-
-
-
Loading chart...
-
-
-
-
-
-
-
-

Watches by day of week (Past 30 days)

-
-
-
Loading chart... +
+ +
+
+
+
+
+

Daily Watch History Last 30 days

+
+
+
+
Loading chart...
+
+
+
-
-
-
-
-

Watches by hour of day (Past 30 days)

-
-
-
Loading chart... +
+
+
+

Watches by day of week Last 30 days

+
+
+
+
Loading chart... +
+
+
+
+
+
+
+

Watches by hour of day Last 30 days

+
+
+
+
Loading chart... +
+
+
+
-
+ +
+
+
@@ -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); - }); }); diff --git a/plexpy/notifiers.py b/plexpy/notifiers.py index b3d9a3a5..2e28f13a 100644 --- a/plexpy/notifiers.py +++ b/plexpy/notifiers.py @@ -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.")