anonfunc/JellyPy
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge branch 'nightly' into python3

Browse Source
This commit is contained in:
JonnyWong16
2020-03-02 10:12:28 -08:00
parent 5045e406a1 533b8076e4
commit f63c1c2f7f
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;
overflow: hidden;
text-overflow: ellipsis;
max-width: 140px;
max-width: 125px;
}
.dashboard-activity-info-time {
position: absolute;
@@ -3102,6 +3102,7 @@ div.dataTables_info {
border-left-color: #fff;
}
.tooltip-inner {
max-width: 250px;
color: #000;
background: #fff;
border: 0;

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

@@ -305,7 +305,11 @@ DOCUMENTATION :: END
% endif
<span id="location-${sk}">${data['location'].upper()}</span>:
% 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']:
<span data-toggle="tooltip" title="Plex Relay"><i class="fa fa-exclamation-circle"></i></span>
% else: