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

Align expand history icon

Browse source
This commit is contained in:
Jonathan Wong 2015-09-27 12:06:59 -07:00
parent 82b567f15f
commit b84f214030
3 changed files with 5 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

1
data/interfaces/default/css/plexpy.css
View file

@ -2378,7 +2378,6 @@ a .home-platforms-instance-list-oval:hover,
width: 100%; width: 100%;
} }
} }
table.display tr.shown + tr div.slider { table.display tr.shown + tr div.slider {
display: none; display: none;
} }

5
data/interfaces/default/js/tables/history_table.js
View file

@ -48,10 +48,11 @@ history_table_options = {
$(td).html('Currently watching...'); $(td).html('Currently watching...');
} else if (rowData['group_count'] > 1) { } else if (rowData['group_count'] > 1) {
date = moment(cellData, "X").format(date_format); date = moment(cellData, "X").format(date_format);
expand_history = '<span class="expand-history-tooltip" data-toggle="tooltip" title="Show Detailed History"><i class="fa fa-info-circle fa-fw"></i></span>'; expand_history = '<span class="expand-history-tooltip" data-toggle="tooltip" title="Show Detailed History"><i class="fa fa-plus-circle fa-fw"></i></span>';
$(td).html('<div><a href="#"><div style="float: left;">' + expand_history + '&nbsp;' + date + '</div></a></div>'); $(td).html('<div><a href="#"><div style="float: left;">' + expand_history + '&nbsp;' + date + '</div></a></div>');
} else { } else {
$(td).html(moment(cellData, "X").format(date_format)); date = moment(cellData, "X").format(date_format);
$(td).html('<div><a href="#"><div style="float: left;"><i class="fa fa-fw"></i>&nbsp;' + date + '</div></a></div>');
} }
}, },
"searchable": false, "searchable": false,

4
plexpy/datafactory.py
View file

@ -59,7 +59,7 @@ class DataFactory(object):
'((CASE WHEN view_offset IS NULL THEN 0.1 ELSE view_offset * 1.0 END) / \ '((CASE WHEN view_offset IS NULL THEN 0.1 ELSE view_offset * 1.0 END) / \
(CASE WHEN session_history_metadata.duration IS NULL THEN 1.0 ELSE session_history_metadata.duration * 1.0 END) * 100) AS percent_complete', (CASE WHEN session_history_metadata.duration IS NULL THEN 1.0 ELSE session_history_metadata.duration * 1.0 END) * 100) AS percent_complete',
'session_history_media_info.video_decision', 'session_history_media_info.video_decision',
'COUNT(*) AS group_count' 'COUNT(*) AS group_count',
'session_history_media_info.audio_decision', 'session_history_media_info.audio_decision',
'session_history.user_id as user_id' 'session_history.user_id as user_id'
] ]
@ -128,7 +128,7 @@ class DataFactory(object):
"thumb": thumb, "thumb": thumb,
"video_decision": item["video_decision"], "video_decision": item["video_decision"],
"watched_status": watched_status, "watched_status": watched_status,
"group_count": item["group_count"] "group_count": item["group_count"],
"audio_decision": item["audio_decision"], "audio_decision": item["audio_decision"],
"user_id": item["user_id"] "user_id": item["user_id"]
} }