-
+
diff --git a/data/interfaces/default/user.html b/data/interfaces/default/user.html
index 4727be64..c2176a10 100644
--- a/data/interfaces/default/user.html
+++ b/data/interfaces/default/user.html
@@ -40,8 +40,7 @@ from plexpy import helpers
% endfor
% else:
diff --git a/data/interfaces/default/users.html b/data/interfaces/default/users.html
index 37cf9bc7..df36a858 100644
--- a/data/interfaces/default/users.html
+++ b/data/interfaces/default/users.html
@@ -12,6 +12,11 @@
All Users
@@ -19,6 +24,7 @@
Episode ${a['index']}
diff --git a/data/interfaces/default/js/graphs/plays_by_month.js b/data/interfaces/default/js/graphs/plays_by_month.js
index febe8bbe..d8cf6ebd 100644
--- a/data/interfaces/default/js/graphs/plays_by_month.js
+++ b/data/interfaces/default/js/graphs/plays_by_month.js
@@ -25,11 +25,7 @@ var hc_plays_by_month_options = {
},
colors: ['#F9AA03', '#FFFFFF'],
xAxis: {
- type: 'datetime',
labels: {
- formatter: function() {
- return moment(this.value).format("MMM YYYY");
- },
style: {
color: '#aaa'
}
diff --git a/data/interfaces/default/js/tables/history_table.js b/data/interfaces/default/js/tables/history_table.js
index 9898cc1b..3e4b9d43 100644
--- a/data/interfaces/default/js/tables/history_table.js
+++ b/data/interfaces/default/js/tables/history_table.js
@@ -1,5 +1,6 @@
var date_format = 'YYYY-MM-DD';
var time_format = 'hh:mm a';
+var history_to_delete = [];
$.ajax({
url: 'get_date_formats',
@@ -18,7 +19,7 @@ history_table_options = {
"info":"Showing _START_ to _END_ of _TOTAL_ history items",
"infoEmpty":"Showing 0 to 0 of 0 entries",
"infoFiltered":"(filtered from _MAX_ total entries)",
- "emptyTable": "No data in table",
+ "emptyTable": "No data in table"
},
"pagingType": "bootstrap",
"stateSave": true,
@@ -32,7 +33,7 @@ history_table_options = {
"targets": [0],
"data": null,
"createdCell": function (td, cellData, rowData, row, col) {
- $(td).html('');
+ $(td).html('');
},
"width": "5%",
"className": "delete-control no-wrap hidden",
@@ -98,11 +99,11 @@ history_table_options = {
if (cellData !== '') {
var transcode_dec = '';
if (rowData['video_decision'] === 'transcode') {
- transcode_dec = ' ';
+ transcode_dec = '';
} else if (rowData['video_decision'] === 'copy') {
- transcode_dec = ' ';
+ transcode_dec = '';
} else if (rowData['video_decision'] === 'direct play' || rowData['video_decision'] === '') {
- transcode_dec = ' ';
+ transcode_dec = '';
}
$(td).html('');
}
@@ -119,16 +120,16 @@ history_table_options = {
var thumb_popover = '';
if (rowData['media_type'] === 'movie') {
media_type = '';
- thumb_popover = '' + cellData + ' (' + rowData['year'] + ')'
+ thumb_popover = '' + cellData + ' (' + rowData['year'] + ')'
$(td).html('');
} else if (rowData['media_type'] === 'episode') {
media_type = '';
- thumb_popover = '' + cellData + ' \
+ thumb_popover = '' + cellData + ' \
(S' + ('00' + rowData['parent_media_index']).slice(-2) + 'E' + ('00' + rowData['media_index']).slice(-2) + ')'
$(td).html('');
} else if (rowData['media_type'] === 'track') {
media_type = '';
- thumb_popover = '' + cellData + ' (' + rowData['parent_title'] + ')'
+ thumb_popover = '' + cellData + ' (' + rowData['parent_title'] + ')'
$(td).html('');
} else {
$(td).html('' + cellData + '');
@@ -225,7 +226,7 @@ history_table_options = {
trigger: 'hover',
placement: 'right',
content: function () {
- return '';
+ return '';
}
});
@@ -238,6 +239,11 @@ history_table_options = {
"preDrawCallback": function(settings) {
var msg = "
+ ' + media_type + ' ' + thumb_popover + '
Fetching rows...
";
showMsg(msg, false, false, 0)
+ },
+ "rowCallback": function (row, rowData) {
+ if ($.inArray(rowData['id'], history_to_delete) !== -1) {
+ $(row).find('button[data-id="' + rowData['id'] + '"]').toggleClass('btn-warning').toggleClass('btn-danger');
+ }
}
}
@@ -287,16 +293,11 @@ $('#history_table').on('click', 'td.delete-control > button', function () {
var row = history_table.row( tr );
var rowData = row.data();
- $(this).prop('disabled', true);
- $(this).html(' Delete');
-
- $.ajax({
- url: 'delete_history_rows',
- data: {row_id: rowData['id']},
- async: true,
- success: function(data) {
- history_table.ajax.reload(null, false);
- }
- });
-
+ var index = $.inArray(rowData['id'], history_to_delete);
+ if (index === -1) {
+ history_to_delete.push(rowData['id']);
+ } else {
+ history_to_delete.splice(index, 1);
+ }
+ $(this).toggleClass('btn-warning').toggleClass('btn-danger');
});
\ No newline at end of file
diff --git a/data/interfaces/default/js/tables/users.js b/data/interfaces/default/js/tables/users.js
index c3d1ae1e..8a5154df 100644
--- a/data/interfaces/default/js/tables/users.js
+++ b/data/interfaces/default/js/tables/users.js
@@ -11,44 +11,62 @@ users_list_table_options = {
"processing": false,
"serverSide": true,
"pageLength": 10,
- "order": [ 1, 'asc'],
+ "order": [ 2, 'asc'],
"autoWidth": true,
"stateSave": true,
"pagingType": "bootstrap",
"columnDefs": [
{
"targets": [0],
+ "data": null,
+ "createdCell": function (td, cellData, rowData, row, col) {
+ $(td).html(' ' +
+ ' ' +
+ ' ');
+ // Show/hide user currently doesn't work
+ //'');
+ },
+ "width": "7%",
+ "className": "edit-control no-wrap hidden",
+ "searchable": false,
+ "orderable": false
+ },
+ {
+ "targets": [1],
"data": "user_thumb",
"createdCell": function (td, cellData, rowData, row, col) {
if (cellData === '') {
- $(td).html('
');
+ $(td).html('');
} else {
- $(td).html('
');
+ $(td).html('');
}
},
"orderable": false,
"searchable": false,
"width": "5%",
- "className": "users-poster-face"
+ "className": "users-thumbs"
},
{
- "targets": [1],
+ "targets": [2],
"data": "friendly_name",
"createdCell": function (td, cellData, rowData, row, col) {
if (cellData !== '') {
if (rowData['user_id'] > 0) {
- $(td).html('' + cellData + '');
+ $(td).html('
');
+ $(td).html('');
} else {
- $(td).html('' + cellData + '' +
+ '
');
} else {
- $(td).html('' + cellData + '');
+ $(td).html('' + cellData + '' +
+ '
');
}
} else {
$(td).html(cellData);
}
},
- "width": "15%"
+ "width": "12%",
+ "className": "edit-user-control no-wrap"
},
{
- "targets": [2],
+ "targets": [3],
"data": "last_seen",
"render": function ( data, type, full ) {
if (data) {
@@ -58,11 +76,11 @@ users_list_table_options = {
}
},
"searchable": false,
- "width": "15%",
+ "width": "12%",
"className": "no-wrap hidden-xs"
},
{
- "targets": [3],
+ "targets": [4],
"data": "ip_address",
"createdCell": function (td, cellData, rowData, row, col) {
if (cellData) {
@@ -79,32 +97,32 @@ users_list_table_options = {
$(td).html('n/a');
}
},
- "width": "15%",
+ "width": "12%",
"className": "no-wrap hidden-md hidden-sm hidden-xs modal-control-ip"
},
{
- "targets": [4],
+ "targets": [5],
"data":"platform",
"createdCell": function (td, cellData, rowData, row, col) {
if (cellData) {
var transcode_dec = '';
if (rowData['video_decision'] === 'transcode') {
- transcode_dec = ' ';
+ transcode_dec = '';
} else if (rowData['video_decision'] === 'copy') {
- transcode_dec = ' ';
+ transcode_dec = '';
} else if (rowData['video_decision'] === 'direct play' || rowData['video_decision'] === '') {
- transcode_dec = ' ';
+ transcode_dec = '';
}
$(td).html('');
} else {
$(td).html('n/a');
}
},
- "width": "15%",
+ "width": "12%",
"className": "no-wrap hidden-md hidden-sm hidden-xs modal-control"
},
{
- "targets": [5],
+ "targets": [6],
"data":"last_watched",
"createdCell": function (td, cellData, rowData, row, col) {
if (cellData !== '') {
@@ -129,14 +147,15 @@ users_list_table_options = {
}
}
},
+ "width": "30%",
"className": "hidden-sm hidden-xs"
},
{
- "targets": [6],
+ "targets": [7],
"data": "plays",
"searchable": false,
"width": "10%"
- }
+ }
],
"drawCallback": function (settings) {
@@ -145,6 +164,8 @@ users_list_table_options = {
$('#ajaxMsg').fadeOut();
// Create the tooltips.
+ $('.purge-tooltip').tooltip();
+ $('.edit-tooltip').tooltip();
$('.transcode-tooltip').tooltip();
$('.media-type-tooltip').tooltip();
$('.watched-tooltip').tooltip();
@@ -157,6 +178,11 @@ users_list_table_options = {
}
});
+ if ($('#row-edit-mode').hasClass('active')) {
+ $('.edit-control').each(function () {
+ $(this).removeClass('hidden');
+ });
+ }
},
"preDrawCallback": function(settings) {
var msg = " Fetching rows...
";
@@ -204,4 +230,50 @@ $('#users_list_table').on('click', 'td.modal-control-ip', function () {
}
getUserLocation(rowData['ip_address']);
+});
+
+$('#users_list_table').on('change', 'td.edit-control > .edit-user-toggles > input, td.edit-user-control > .edit-user-name > input', function () {
+ var tr = $(this).parents('tr');
+ var row = users_list_table.row(tr);
+ var rowData = row.data();
+
+ var do_notify = 0;
+ var keep_history = 0;
+ if ($('#do_notify-' + rowData['user_id']).is(':checked')) {
+ do_notify = 1;
+ }
+ if ($('#keep_history-' + rowData['user_id']).is(':checked')) {
+ keep_history = 1;
+ }
+
+ friendly_name = tr.find('td.edit-user-control > .edit-user-name > input').val();
+
+ $.ajax({
+ url: 'edit_user',
+ data: {
+ user_id: rowData['user_id'],
+ friendly_name: friendly_name,
+ do_notify: do_notify,
+ keep_history: keep_history,
+ thumb: rowData['user_thumb']
+ },
+ cache: false,
+ async: true,
+ success: function (data) {
+ var msg = "User updated";
+ showMsg(msg, false, true, 2000);
+ }
+ });
+});
+
+$('#users_list_table').on('click', 'td.edit-control > .edit-user-toggles > button', function () {
+ var tr = $(this).parents('tr');
+ var row = users_list_table.row(tr);
+ var rowData = row.data();
+
+ if ($(this).hasClass('active')) {
+ $(this).toggleClass('btn-warning').toggleClass('btn-danger');
+ } else {
+ $(this).toggleClass('btn-danger').toggleClass('btn-warning');
+ }
});
\ No newline at end of file
diff --git a/data/interfaces/default/settings.html b/data/interfaces/default/settings.html
index dcc8e164..3145c4ae 100644
--- a/data/interfaces/default/settings.html
+++ b/data/interfaces/default/settings.html
@@ -83,6 +83,25 @@ available_notification_agents = notifiers.available_notification_agents()
Set your preferred time format. Click here to see the parameter list.
+
+
+ Homepage Statistics
+
+
+
+
+
+
+
+
+ Specify the number of days for the statistics on the home page. Default is 30 days.
+
+
+
Use play duration instead of play count to generate statistics.
+
@@ -221,9 +240,24 @@ available_notification_agents = notifiers.available_notification_agents()
+ Force PlexPy to connect to your Plex Server via SSL. Your server needs to have remote access enabled.
+
+
+ Plex Logs
+
+
+
+
+
+
+
+
+
+ Set the folder where your Plex Server logs are. This is required if you enable IP logging.
Click here for help.
@@ -278,41 +312,6 @@ available_notification_agents = notifiers.available_notification_agents()
- If you have media indexing enabled on your server, use these on the activity pane.
-
-
- Homepage Statistics
-
-
-
-
-
-
-
-
- Specify the number of days for the statistics on the home page. Default is 30 days.
-
-
-
-
- Use play duration instead of play count to generate statistics.
-
-
-
- Plex Logs
-
-
-
-
-
-
-
-
-
- Set the folder where your Plex Server logs are. This is required if you enable IP logging.
Click here for help.
PlexWatch Import Tool
-
+
@@ -368,13 +389,36 @@ from plexpy import helpers
});
});
- // Delete mode button
- $('#row-edit-mode').click(function() {
+ $('#row-edit-mode').on('click', function() {
+ $('#delete-message').popover();
+
if ($(this).hasClass('active')) {
- $('.delete-control').each(function() {
+ if (history_to_delete.length > 0) {
+ $('#deleteCount').text(history_to_delete.length);
+ $('#confirm-modal').modal();
+ $('#confirm-modal').one('click', '#confirm-delete', function () {
+ for (var i = 0; i < history_to_delete.length; i++) {
+ $.ajax({
+ url: 'delete_history_rows',
+ data: { row_id: history_to_delete[i] },
+ async: true,
+ success: function (data) {
+ var msg = "User history purged";
+ showMsg(msg, false, true, 2000);
+ }
+ });
+ }
+ history_table.draw();
+ });
+ }
+
+ $('.delete-control').each(function () {
+ $(this).find('button.btn-danger').toggleClass('btn-warning').toggleClass('btn-danger');
$(this).addClass('hidden');
});
+
} else {
+ history_to_delete = [];
$('.delete-control').each(function() {
$(this).removeClass('hidden');
});
diff --git a/data/interfaces/default/user_platform_stats.html b/data/interfaces/default/user_platform_stats.html
index c281b48b..afd1d6b3 100644
--- a/data/interfaces/default/user_platform_stats.html
+++ b/data/interfaces/default/user_platform_stats.html
@@ -34,7 +34,7 @@ DOCUMENTATION :: END
- 
+
@@ -227,6 +230,24 @@ from plexpy import helpers
+
+
+
+ | Edit | User | Last Seen | @@ -35,6 +41,25 @@
|---|