github/plexpy
1
0
Fork 0
mirror of https://github.com/Tautulli/Tautulli.git synced 2025-08-20 05:13:21 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

fixed conflicts

Browse source
This commit is contained in:
Tim 2015-08-29 00:32:52 +02:00
commit 5705e677d4
8 changed files with 246 additions and 29 deletions
Download patch file Download diff file Expand all files Collapse all files

18
data/interfaces/default/current_activity.html
View file

@ -68,21 +68,22 @@ DOCUMENTATION :: END
<a href="info?item_id=${a['rating_key']}">
% endif
<div class="dashboard-activity-poster">
<script>console.log('${a['indexes']}');</script>
% if a['type'] == 'movie' and not a['indexes']:
<div class="dashboard-activity-poster-face" style="background-image: url(pms_image_proxy?img=${a['art']}&width=500&height=280);"></div>
% elif a['type'] == 'episode' and not a['indexes']:
<div class="dashboard-activity-poster-face" style="background-image: url(pms_image_proxy?img=${a['art']}&width=500&height=280);"></div>
% elif a['indexes']:
<div class="dashboard-activity-poster-face bif" style="background-image: url(pms_image_proxy?img=${a['bif_thumb']}&width=300&height=280); display: none;"></div>
<div class="dashboard-activity-poster-face bif" style="background-image: url(pms_image_proxy?img=${a['bif_thumb']}&width=500&height=280); display: none;"></div>
% else:
% if a['type'] == 'episode':
<div class="dashboard-activity-poster-face" style="background-image: url(pms_image_proxy?img=${a['thumb']}&width=500&height=280&fallback=cover);"></div>
% elif a['type'] == 'track':
% if a['type'] == 'track':
<div class="dashboard-activity-cover-face-bg" style="background-image: url(pms_image_proxy?img=${a['thumb']}&width=300&height=300);"></div>
<div class="dashboard-activity-cover-face" style="background-image: url(pms_image_proxy?img=${a['thumb']}&width=300&height=300);"></div>
% elif a['type'] == 'clip':
<div class="dashboard-activity-clip-face-bg" style="background-image: url(${a['thumb']});"></div>
<div class="dashboard-activity-clip-face" style="background-image: url(${a['thumb']});"></div>
% else:
<div class="dashboard-activity-cover-face" style="background-image: url(pms_image_proxy?img=${a['thumb']}&width=500&height=280&fallback=cover);"></div>
<div class="dashboard-activity-cover-face" style="background-image: url(pms_image_proxy?img=${a['thumb']}&width=300&height=300&fallback=cover);"></div>
% endif
% endif
<div class="dashboard-activity-button-info">
@ -209,11 +210,6 @@ DOCUMENTATION :: END
$(this).html(millisecondsToMinutes($(this).text(), false));
});
// Tooltips
$('.dashboard-activity-metadata-platform').each(function() {
$(this).tooltip();
});
// Show/Hide activity info
$('.btn-activity-info').on('click', function(e) {
e.preventDefault();
@ -227,4 +223,4 @@ DOCUMENTATION :: END
<div class="text-muted">There was an error communicating with your Plex Server. Please check your <a
href="settings">settings</a>.
</div><br>
% endif
% endif