github/plexpy
1
0
Fork 0
mirror of https://github.com/Tautulli/Tautulli.git synced 2025-07-10 15:32:38 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fix header on user IP modal

Browse source 
Return more user data to the info screen.
Some other backend changes
This commit is contained in:
Tim 2015-07-01 22:44:30 +02:00
parent 2d822c8468
commit 4830cc7d68
6 changed files with 63 additions and 32 deletions
Download patch file Download diff file Expand all files Collapse all files

2
data/interfaces/default/js/tables/user_ips.js
View file

@ -94,7 +94,7 @@ $('#user_ip_table').on('click', 'td.modal-control', function () {
type: 'GET',
dataType: 'json',
success: function(data) {
$('#ip_address').html(ip_address);
$('#modal_header_ip_address').html(ip_address);
$('#country').html(data.country);
$('#city').html(data.city);
$('#region').html(data.regionName);

45
data/interfaces/default/user.html
View file

@ -5,12 +5,18 @@ For Mako templating syntax documentation please visit: http://docs.makotemplates
Filename: user.html
Version: 0.1
Variable names: user [string]
Variable names: data [list]
user :: Usable parameters
data :: Usable parameters
user Returns the name of the user.
user_id Returns the user id of the user.
username Returns the user's username.
friendly_name Returns the friendly name of the user.
email Returns the user's email address.
thumb Returns the thumbnail for the user.
is_home_user Returns bool value for whether the user is part of a Plex Home.
is_allow_sync Returns bool value for whether the user has sync rights.
is_restricted Returns bool value for whether the user account is restricted.
DOCUMENTATION :: END
@ -33,10 +39,10 @@ from plexpy import helpers
<div class="span12">
<div class="user-info-wrapper">
<div class="user-info-poster-face" id="user-gravatar">
<img src="interfaces/default/images/gravatar-default-80x80.png">
<img src="${data['thumb']}" height="80px" width="80px">
</div>
<div class="user-info-username">
<span class="set-username">${friendly_name}</span> <a href="#edit-user-modal" data-toggle="modal" id="toggle-edit-user-modal"><i class="fa fa-pencil"></i></a>
<span class="set-username">${data['friendly_name']}</span> <a href="#edit-user-modal" data-toggle="modal" id="toggle-edit-user-modal"><i class="fa fa-pencil"></i></a>
</div>
<div class="user-info-nav">
<ul class="user-info-nav">
@ -112,7 +118,7 @@ from plexpy import helpers
<div class="span12">
<div class="table-card-back">
<h3>IP Addresses for <strong>
<span class="set-username">${friendly_name}</span>
<span class="set-username">${data['friendly_name']}</span>
</strong></h3>
</div>
<div class="table-card-back">
@ -168,7 +174,7 @@ from plexpy import helpers
<div class="span12">
<div class="table-card-back">
<h3>Watch History for <strong>
<span class="set-username">${friendly_name}</span>
<span class="set-username">${data['friendly_name']}</span>
</strong></h3>
</div>
<div class="table-card-back">
@ -220,7 +226,7 @@ from plexpy import helpers
$.ajax({
url: 'get_user_watch_time_stats',
async: true,
data: { user: '${user}' },
data: { user: '${data['username']}' },
complete: function(xhr, status) {
$("#user-time-stats").html(xhr.responseText);
}
@ -230,7 +236,7 @@ from plexpy import helpers
$.ajax({
url: 'get_user_platform_stats',
async: true,
data: { user: '${user}' },
data: { user: '${data['username']}' },
complete: function(xhr, status) {
$("#user-platform-stats").html(xhr.responseText);
}
@ -240,7 +246,7 @@ from plexpy import helpers
$.ajax({
url: 'get_user_recently_watched',
async: true,
data: { user: '${user}' },
data: { user: '${data['username']}' },
complete: function(xhr, status) {
$("#user-recently-watched").html(xhr.responseText);
}
@ -251,7 +257,7 @@ from plexpy import helpers
history_table_options.ajax = {
"url": "get_history",
"data": function(d) {
d.user = "${user}";
d.user = "${data['username']}";
}
}
history_table = $('#history_table').DataTable(history_table_options);
@ -263,30 +269,17 @@ from plexpy import helpers
user_ip_table_options.ajax = {
"url": "get_user_ips",
"data": function(d) {
d.user = "${user}";
d.user = "${data['username']}";
}
}
user_ip_table = $('#user_ip_table').DataTable(user_ip_table_options);
});
// Load user gravatar image
$.ajax({
url: 'get_user_gravatar_image',
async: true,
data: { user: '${user}' },
success: function(data) {
if (data.user_thumb !== '') {
thumb = data.user_thumb;
$('#user-gravatar').html('<img src="' + thumb + '">');
}
}
});
// Load edit user modal
$("#toggle-edit-user-modal").click(function() {
$.ajax({
url: 'edit_user',
data: {user: '${user}'},
data: {user: '${data['username']}'},
cache: false,
async: true,
complete: function(xhr, status) {

2
data/interfaces/default/users.html
View file

@ -14,7 +14,7 @@ from plexpy import helpers
<div class="span12">
<div class="wellheader-bg">
<div class="dashboard-wellheader-no-chevron">
<div class="span9"><h2><i class="fa fa-group"></i> Users</h2></div>
<div class="span9"><h2><i class="fa fa-group"></i> Active Users</h2></div>
<div class="span3">
<div class="pull-right">
<h5><a href="refresh_users_list"><i class="fa fa-refresh"></i> Refresh users</a></h5>