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

Media type clip fixes

Browse Source
This commit is contained in:
JonnyWong16
2017-02-26 16:11:18 -08:00
parent a46b24213b
commit 989ebcd3b7
2 changed files with 5 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -148,7 +148,7 @@ DOCUMENTATION :: END
Stream &nbsp;<strong>Direct Play</strong>
% endif
<br />
% if data['media_type'] in ('movie', 'episode'):
% if data['media_type'] in ('movie', 'episode', 'clip'):
% if data['video_decision'] == 'transcode':
Video &nbsp;<strong>Transcode (${data['transcode_video_codec']}) (${data['transcode_width']}x${data['transcode_height']})</strong>
% elif data['video_decision'] == 'copy':
@@ -158,7 +158,7 @@ DOCUMENTATION :: END
% endif
<br />
% endif
% if data['media_type'] in ('movie', 'episode', 'track'):
% if data['media_type'] in ('movie', 'episode', 'clip', 'track'):
% if data['audio_decision'] == 'transcode':
Audio &nbsp;<strong>Transcode (${data['transcode_audio_codec']}) (${data['transcode_audio_channels']}ch)</strong>
% elif data['audio_decision'] == 'copy':

4
data/interfaces/default/js/tables/history_table.js
View File

@@ -161,8 +161,10 @@ history_table_options = {
media_type = '<span class="media-type-tooltip" data-toggle="tooltip" title="Track"><i class="fa fa-music fa-fw"></i></span>';
thumb_popover = '<span class="thumb-tooltip" data-toggle="popover" data-img="pms_image_proxy?img=' + rowData['thumb'] + '&width=300&height=300&fallback=cover" data-height="80" data-width="80">' + cellData + parent_info + '</span>'
$(td).html('<div class="history-title"><a href="info?' + source + 'rating_key=' + rowData['rating_key'] + '"><div style="float: left;">' + media_type + '&nbsp;' + thumb_popover + '</div></a></div>');
} else {
} else if (/^[0-9]+$/.test(rowData['rating_key'])) {
$(td).html('<a href="info?rating_key=' + rowData['rating_key'] + '">' + cellData + '</a>');
} else {
$(td).html(cellData);
}
}
},