diff --git a/CHANGELOG.md b/CHANGELOG.md index a6a227a7..3f7d173c 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,15 @@ # Changelog +## v1.4.17 (2017-03-04) + +* New: Configurable month range for the Plays by month graph. (Thanks @Pbaboe) +* New: Option to chanage the week to start on Monday for the the Plays by day of week graph. (Thanks @Pbaboe) +* Fix: Invalid iOS icon file paths. (Thanks @demonbane) +* Fix: Plex Web 3.0 URLs on info pages and notifications. +* Fix: Update bitcoin donation link to Coinbase. +* Fix: Update init scripts. (Thanks @ampsonic) + + ## v1.4.16 (2016-11-25) * Fix: Websocket for new json response on PMS 1.3.0. diff --git a/data/interfaces/default/base.html b/data/interfaces/default/base.html index 8b0393c4..b319ae92 100644 --- a/data/interfaces/default/base.html +++ b/data/interfaces/default/base.html @@ -66,67 +66,67 @@ - - - - - - - - - - @@ -224,7 +224,7 @@
  • Support
  • Paypal
    • -
  • Bitcoin
    • +
  • Bitcoin
    • % if plexpy.CONFIG.CHECK_GITHUB:
  • Check for Updates
    • diff --git a/data/interfaces/default/css/plexpy.css b/data/interfaces/default/css/plexpy.css index 5a6d080e..d8790d57 100644 --- a/data/interfaces/default/css/plexpy.css +++ b/data/interfaces/default/css/plexpy.css @@ -2797,6 +2797,14 @@ pre::-webkit-scrollbar-thumb { width: 75px; height: 34px; } +#months-selection label { + margin-bottom: 0; +} +#graph-months { + margin: 0; + width: 75px; + height: 34px; +} .card-sortable { height: 36px; padding: 0 20px 0 0; diff --git a/data/interfaces/default/graphs.html b/data/interfaces/default/graphs.html index 6fae96d7..0ebdc28b 100644 --- a/data/interfaces/default/graphs.html +++ b/data/interfaces/default/graphs.html @@ -42,6 +42,11 @@ days +
    + +
    @@ -226,7 +231,7 @@ % endif
    -

    Plays by Month Last 12 months

    +

    Plays by month Last 12 months

    The combined total of tv, movies, and music by month.

    @@ -323,10 +328,12 @@ // Initial values for graph from config var yaxis = "${config['graph_type']}"; - var current_range = ${config['graph_days']}; + var current_day_range = ${config['graph_days']}; + var current_month_range = ${config['graph_months']}; var current_tab = "${'#' + config['graph_tab']}"; - $('.days').html(current_range); + $('.days').html(current_day_range); + $('.months').html(current_month_range); // Load user ids and names (for the selector) $.ajax({ @@ -358,6 +365,7 @@ function loadGraphsTab1(time_range, yaxis) { $('#days-selection').show(); + $('#months-selection').hide(); setGraphFormat(yaxis); @@ -448,6 +456,7 @@ function loadGraphsTab2(time_range, yaxis) { $('#days-selection').show(); + $('#months-selection').hide(); setGraphFormat(yaxis); @@ -531,15 +540,16 @@ }); } - function loadGraphsTab3(yaxis) { + function loadGraphsTab3(time_range, yaxis) { $('#days-selection').hide(); + $('#months-selection').show(); setGraphFormat(yaxis); $.ajax({ url: "get_plays_per_month", type: 'get', - data: { y_axis: yaxis, user_id: selected_user_id }, + data: { time_range: time_range, y_axis: yaxis, user_id: selected_user_id }, dataType: "json", success: function(data) { if (yaxis === 'duration') { dataSecondsToHours(data); } @@ -553,15 +563,15 @@ } // Set initial state - if (current_tab == '#tabs-1') { loadGraphsTab1(current_range, yaxis); } - if (current_tab == '#tabs-2') { loadGraphsTab2(current_range, yaxis); } - if (current_tab == '#tabs-3') { loadGraphsTab3(yaxis); } + if (current_tab == '#tabs-1') { loadGraphsTab1(current_day_range, yaxis); } + if (current_tab == '#tabs-2') { loadGraphsTab2(current_day_range, yaxis); } + if (current_tab == '#tabs-3') { loadGraphsTab3(current_month_range, yaxis); } // Tab1 opened $('#graph-tabs a[href="#tabs-1"]').on('shown.bs.tab', function (e) { e.preventDefault(); current_tab = $(this).attr('href'); - loadGraphsTab1(current_range, yaxis); + loadGraphsTab1(current_day_range, yaxis); $.ajax({ url: 'set_graph_config', data: { graph_tab: current_tab.replace('#','') }, @@ -573,7 +583,7 @@ $('#graph-tabs a[href="#tabs-2"]').on('shown.bs.tab', function (e) { e.preventDefault(); current_tab = $(this).attr('href'); - loadGraphsTab2(current_range, yaxis); + loadGraphsTab2(current_day_range, yaxis); $.ajax({ url: 'set_graph_config', data: { graph_tab: current_tab.replace('#','') }, @@ -585,7 +595,7 @@ $('#graph-tabs a[href="#tabs-3"]').on('shown.bs.tab', function (e) { e.preventDefault(); current_tab = $(this).attr('href'); - loadGraphsTab3(yaxis); + loadGraphsTab3(current_month_range, yaxis); $.ajax({ url: 'set_graph_config', data: { graph_tab: current_tab.replace('#','') }, @@ -595,17 +605,35 @@ // Date range changed $('#graph-days').on('change', function() { - current_range = $(this).val(); - if (current_range < 1) { + current_day_range = Math.round($(this).val()); + $(this).val(current_day_range); + if (current_day_range < 1) { $(this).val(7); - current_range = 7; + current_day_range = 7; } - if (current_tab == '#tabs-1') { loadGraphsTab1(current_range, yaxis); } - if (current_tab == '#tabs-2') { loadGraphsTab2(current_range, yaxis); } - $('.days').html(current_range); + if (current_tab == '#tabs-1') { loadGraphsTab1(current_day_range, yaxis); } + if (current_tab == '#tabs-2') { loadGraphsTab2(current_day_range, yaxis); } + $('.days').html(current_day_range); $.ajax({ url: 'set_graph_config', - data: { graph_days: current_range}, + data: { graph_days: current_day_range}, + async: true + }); + }); + + // Month range changed + $('#graph-months').on('change', function() { + current_month_range = Math.round($(this).val()); + $(this).val(current_month_range); + if (current_month_range < 1) { + $(this).val(12); + current_month_range = 12; + } + if (current_tab == '#tabs-3') { loadGraphsTab3(current_month_range, yaxis); } + $('.months').html(current_month_range); + $.ajax({ + url: 'set_graph_config', + data: { graph_months: current_month_range}, async: true }); }); @@ -613,17 +641,17 @@ // User changed $('#graph-user').on('change', function() { selected_user_id = $(this).val() || null; - if (current_tab == '#tabs-1') { loadGraphsTab1(current_range, yaxis); } - if (current_tab == '#tabs-2') { loadGraphsTab2(current_range, yaxis); } - if (current_tab == '#tabs-3') { loadGraphsTab3(yaxis); } + if (current_tab == '#tabs-1') { loadGraphsTab1(current_day_range, yaxis); } + if (current_tab == '#tabs-2') { loadGraphsTab2(current_day_range, yaxis); } + if (current_tab == '#tabs-3') { loadGraphsTab3(current_month_range, yaxis); } }); // Y-axis changed $('#yaxis-selection').on('change', function() { yaxis = $('input[name=yaxis-options]:checked', '#yaxis-selection').val(); - if (current_tab == '#tabs-1') { loadGraphsTab1(current_range, yaxis); } - if (current_tab == '#tabs-2') { loadGraphsTab2(current_range, yaxis); } - if (current_tab == '#tabs-3') { loadGraphsTab3(yaxis); } + if (current_tab == '#tabs-1') { loadGraphsTab1(current_day_range, yaxis); } + if (current_tab == '#tabs-2') { loadGraphsTab2(current_day_range, yaxis); } + if (current_tab == '#tabs-3') { loadGraphsTab3(current_month_range, yaxis); } $.ajax({ url: 'set_graph_config', data: { graph_type: yaxis}, diff --git a/data/interfaces/default/images/res/ios/Default-portrait@2x~iphone5.jpg b/data/interfaces/default/images/res/ios/Default-portrait@2x~iphone5.jpg deleted file mode 100644 index e4fe6de2..00000000 Binary files a/data/interfaces/default/images/res/ios/Default-portrait@2x~iphone5.jpg and /dev/null differ diff --git a/data/interfaces/default/info.html b/data/interfaces/default/info.html index a9beb510..c2500ea1 100644 --- a/data/interfaces/default/info.html +++ b/data/interfaces/default/info.html @@ -116,9 +116,9 @@ DOCUMENTATION :: END
    +
    + +

    Change the "Play by day of week" graph to start on Monday. Default is start on Sunday.

    +