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

Add photos to current activity

Browse Source 
* Also fix BIF fade in
This commit is contained in:
Jonathan Wong
2015-09-12 23:09:01 -07:00
parent e5535b6167
commit b860f9a5e8
2 changed files with 120 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
data/interfaces/default/current_activity.html
View File

@@ -93,6 +93,8 @@ DOCUMENTATION :: END
<div class="dashboard-activity-poster-face" style="background-image: url(pms_image_proxy?img=${a['thumb']}&width=500&height=280);"></div>
% endif
% endif
% elif a['type'] == 'photo':
<div class="dashboard-activity-poster-face bif" style="background-image: url(pms_image_proxy?img=${a['thumb']}&width=500&height=500);"></div>
% else:
<div class="dashboard-activity-cover-face" style="background-image: url(pms_image_proxy?img=${a['thumb']}&width=300&height=300&fallback=cover);"></div>
% endif
@@ -160,15 +162,29 @@ DOCUMENTATION :: END
% elif a['audio_decision'] == 'transcode':
Audio &nbsp;<strong>Transcode (${a['transcode_audio_codec']}) (${a['transcode_audio_channels']}ch)</strong>
% endif
% elif a['type'] == 'photo':
% if a['video_decision'] == 'direct play':
Stream &nbsp;<strong>Direct Play</strong>
% else:
Stream &nbsp;<strong>
Transcoding
(Speed: ${a['transcode_speed']})
% if a['throttled'] == '1':
(Throttled)
% endif
</strong>
% endif
% endif
<br>
</div>
</div>
% if a['type'] != 'photo':
<div class="dashboard-activity-poster-info-bar">
<div class="dashboard-activity-poster-info-time">
<span class="progress_time">${a['progress']}</span>/<span class="progress_time">${a['duration']}</span>
</div>
</div>
% endif
</div>
% if a['type'] == 'movie' or a['type'] == 'episode':
</a>
@@ -199,8 +215,10 @@ DOCUMENTATION :: END
${a['title']}
% elif a['type'] == 'track':
${a['grandparent_title']} - ${a['title']}
% elif a['type'] == 'photo':
${a['parent_title']}
% else:
${a['grandparent_title']} - ${a['title']}
${a['title']}
% endif
</div>
<div class="dashboard-activity-metadata-subtitle">
@@ -210,6 +228,8 @@ DOCUMENTATION :: END
${a['year']}
% elif a['type'] == 'track':
${a['parent_title']}
% elif a['type'] == 'photo':
${a['title']}
% else:
${a['year']}
% endif
@@ -231,7 +251,7 @@ DOCUMENTATION :: END
<script>
// When using bif indexes make the image transition a little smoother.
$('.bif').each(function() {
$(this).fadeIn(1000);
$(this).hide().fadeIn(1000);
});
// Convert timestamps to readable times