diff --git a/data/interfaces/default/css/plexpy.css b/data/interfaces/default/css/plexpy.css index cfbf5933..5673d854 100644 --- a/data/interfaces/default/css/plexpy.css +++ b/data/interfaces/default/css/plexpy.css @@ -2520,4 +2520,38 @@ table[id^='history_child'] thead th { -ms-transition: background 0.3s; -o-transition: background 0.3s; transition: background 0.3s; +} + +.notification-params { + margin-top: 10px; + background-color: #282828; +} +.notification-params th { + padding-left: 10px; + height: 30px; +} +.notification-params td { + height: 25px; +} +.notification-params td:first-child { + padding-left: 10px; + width: 200px; +} +.notification-params td:not(:first-child) { + padding-right: 10px; +} +.notification-params tr:nth-child(odd) td { + background-color: rgba(255,255,255,0.035); +} +.notification-params tr:nth-child(even) td { + background-color: rgba(255,255,255,0.010); +} + +#days-selection label { + margin-bottom: 0; +} +#graph-days { + margin: 0; + width: 75px; + height: 34px; } \ No newline at end of file diff --git a/data/interfaces/default/current_activity_header.html b/data/interfaces/default/current_activity_header.html index 0727e558..04d8f65b 100644 --- a/data/interfaces/default/current_activity_header.html +++ b/data/interfaces/default/current_activity_header.html @@ -17,12 +17,10 @@ DOCUMENTATION :: END % if data != None: % if data == '0':

Activity

+ % elif data == '1': +

Activity ${data} stream

% else: - % if data == '1': -

Activity ${data} stream

- % else: -

Activity ${data} streams

- % endif +

Activity ${data} streams

% endif % else:

Activity

diff --git a/data/interfaces/default/graphs.html b/data/interfaces/default/graphs.html index 8f114b67..9143bb5a 100644 --- a/data/interfaces/default/graphs.html +++ b/data/interfaces/default/graphs.html @@ -13,110 +13,132 @@
+ % if config['graph_tab'] != 'tabs-2' and config['graph_tab'] != 'tabs-3':
-
-
-

Daily Play count Last 30 days

-

- The total play count or duration of tv, movies, and music played per day. Click a graph point to open up a list of items played for that specific date. -

-
-
-
Loading chart...
-
+ % else: +
+ % endif +
+
+

Daily Play count Last 30 days

+

+ The total play count or duration of tv, movies, and music played per day. Click a graph point to open up a list of items played for that specific date. +

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

Play count by day of week Last 30 days

+

+ The combined total of tv, movies, and music played per day of the week. +

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

Play count by hour of day Last 30 days

+

+ The combined total of tv, movies, and music played per hour of the day. +

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

Play count by top 10 platforms Last 30 days

+

+ The combined total of tv, movies, and music played by top 10 most active platforms. +

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

Play count by top 10 users Last 30 days

+

+ The combined total of tv, movies, and music played by top 10 most active users. +

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

Play count by day of week Last 30 days

-

- The combined total of tv, movies, and music played per day of the week. -

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

Play count by hour of day Last 30 days

-

- The combined total of tv, movies, and music played per hour of the day. -

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

Play count by top 10 platforms Last 30 days

-

- The combined total of tv, movies, and music played by top 10 most active platforms. -

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

Play count by top 10 users Last 30 days

-

- The combined total of tv, movies, and music played by top 10 most active users. -

-
-
-
Loading chart... -
-
-
-
-
-
-
+ % if config['graph_tab'] == 'tabs-2': +
+ % else:
+ % endif

Daily Stream type breakdown Last 30 days

@@ -189,7 +211,11 @@
+ % if config['graph_tab'] == 'tabs-3': +
+ % else:
+ % endif

Plays by Month Last 12 months

@@ -263,36 +289,12 @@ + + +

${top_stat['rows'][0]['count']}

+

streams

+
+
+
+
+
+ +
% endif % endfor diff --git a/data/interfaces/default/images/home-stat_most-concurrent.png b/data/interfaces/default/images/home-stat_most-concurrent.png new file mode 100644 index 00000000..085dc93e Binary files /dev/null and b/data/interfaces/default/images/home-stat_most-concurrent.png differ diff --git a/data/interfaces/default/js/tables/history_table.js b/data/interfaces/default/js/tables/history_table.js index 1cafd218..516ed0bc 100644 --- a/data/interfaces/default/js/tables/history_table.js +++ b/data/interfaces/default/js/tables/history_table.js @@ -18,7 +18,7 @@ history_table_options = { "lengthMenu":"Show _MENU_ entries per page", "info":"Showing _START_ to _END_ of _TOTAL_ history items", "infoEmpty":"Showing 0 to 0 of 0 entries", - "infoFiltered":"(filtered from _MAX_ total entries)", + "infoFiltered":"", "emptyTable": "No data in table" }, "pagingType": "bootstrap", @@ -265,6 +265,9 @@ history_table_options = { createChildTable(this, rowData) } }); + + $("#history_table_info").append(''); }, "preDrawCallback": function(settings) { var msg = " Fetching rows..."; diff --git a/data/interfaces/default/notification_config.html b/data/interfaces/default/notification_config.html index 9d8ab9a1..b9859ae1 100644 --- a/data/interfaces/default/notification_config.html +++ b/data/interfaces/default/notification_config.html @@ -6,7 +6,7 @@ from plexpy import helpers
- +
@@ -84,24 +84,29 @@ from plexpy import helpers % endif