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

Merge pull request #1366 from felixbuenemann/fix-ipv6-display-in-activity

Browse source 
Fix display of IPv6 addresses in activity panes
This commit is contained in:
JonnyWong16 2020-03-02 10:11:42 -08:00 • committed by GitHub
commit 533b8076e4
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 7 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

3
data/interfaces/default/css/tautulli.css
View file

@ -973,7 +973,7 @@ a .users-poster-face:hover {
white-space: nowrap; white-space: nowrap;
overflow: hidden; overflow: hidden;
text-overflow: ellipsis; text-overflow: ellipsis;
max-width: 140px; max-width: 125px;
} }
.dashboard-activity-info-time { .dashboard-activity-info-time {
position: absolute; position: absolute;
@ -3102,6 +3102,7 @@ div.dataTables_info {
border-left-color: #fff; border-left-color: #fff;
} }
.tooltip-inner { .tooltip-inner {
max-width: 250px;
color: #000; color: #000;
background: #fff; background: #fff;
border: 0; border: 0;

6
data/interfaces/default/current_activity_instance.html
View file

@ -305,7 +305,11 @@ DOCUMENTATION :: END
% endif % endif
<span id="location-${sk}">${data['location'].upper()}</span>: <span id="location-${sk}">${data['location'].upper()}</span>:
% if data['ip_address'] != 'N/A': % if data['ip_address'] != 'N/A':
<span class="ip-container"><span class="ip-address">${data['ip_address']}</span></span> % if len(data['ip_address']) > 20:
<span class="ip-container"><span class="ip-address" data-toggle="tooltip" title="${data['ip_address']}">${data['ip_address']}</span></span>
% else:
<span class="ip-container"><span class="ip-address">${data['ip_address']}</span></span>
% endif
% if data['relayed']: % if data['relayed']:
<span data-toggle="tooltip" title="Plex Relay"><i class="fa fa-exclamation-circle"></i></span> <span data-toggle="tooltip" title="Plex Relay"><i class="fa fa-exclamation-circle"></i></span>
% else: % else: