Add media info icons to info page
|
@ -1216,6 +1216,7 @@ a:hover .summary-poster-face-track .summary-poster-face-overlay span {
|
||||||
width: 250px;
|
width: 250px;
|
||||||
height: 1px;
|
height: 1px;
|
||||||
margin: 0 40px 20px 25px;
|
margin: 0 40px 20px 25px;
|
||||||
|
position: relative;
|
||||||
}
|
}
|
||||||
.summary-content {
|
.summary-content {
|
||||||
position: relative;
|
position: relative;
|
||||||
|
@ -1239,6 +1240,18 @@ a:hover .summary-poster-face-track .summary-poster-face-overlay span {
|
||||||
margin-left: 2px;
|
margin-left: 2px;
|
||||||
margin-right: 10px;
|
margin-right: 10px;
|
||||||
}
|
}
|
||||||
|
.summary-content-media-info-wrapper {
|
||||||
|
width: 100%;
|
||||||
|
position: absolute;
|
||||||
|
bottom: 0;
|
||||||
|
left: 0;
|
||||||
|
text-align: center;
|
||||||
|
}
|
||||||
|
.summary-content-media-info {
|
||||||
|
max-width: 75pt;
|
||||||
|
max-height: 20px;
|
||||||
|
margin: 0 10px;
|
||||||
|
}
|
||||||
.summary-content-summary {
|
.summary-content-summary {
|
||||||
overflow: hidden;
|
overflow: hidden;
|
||||||
color: #fff;
|
color: #fff;
|
||||||
|
@ -2525,8 +2538,7 @@ a .home-platforms-instance-list-oval:hover,
|
||||||
right: 0;
|
right: 0;
|
||||||
bottom: 0;
|
bottom: 0;
|
||||||
left: 0;
|
left: 0;
|
||||||
overflow-x: hidden;
|
overflow: auto;
|
||||||
overflow-y: scroll;
|
|
||||||
-webkit-overflow-scrolling: touch;
|
-webkit-overflow-scrolling: touch;
|
||||||
}
|
}
|
||||||
::-webkit-scrollbar {
|
::-webkit-scrollbar {
|
||||||
|
|
BIN
data/interfaces/default/images/media_info/1080.png
Normal file
After Width: | Height: | Size: 1.3 KiB |
BIN
data/interfaces/default/images/media_info/1ch.png
Normal file
After Width: | Height: | Size: 630 B |
BIN
data/interfaces/default/images/media_info/2ch.png
Normal file
After Width: | Height: | Size: 819 B |
BIN
data/interfaces/default/images/media_info/480.png
Normal file
After Width: | Height: | Size: 1.2 KiB |
BIN
data/interfaces/default/images/media_info/6ch.png
Normal file
After Width: | Height: | Size: 669 B |
BIN
data/interfaces/default/images/media_info/720.png
Normal file
After Width: | Height: | Size: 1.1 KiB |
BIN
data/interfaces/default/images/media_info/aac.png
Normal file
After Width: | Height: | Size: 1.8 KiB |
BIN
data/interfaces/default/images/media_info/ac3.png
Normal file
After Width: | Height: | Size: 1.2 KiB |
BIN
data/interfaces/default/images/media_info/dca-ma.png
Normal file
After Width: | Height: | Size: 1.1 KiB |
BIN
data/interfaces/default/images/media_info/dca.png
Normal file
After Width: | Height: | Size: 982 B |
BIN
data/interfaces/default/images/media_info/mp3.png
Normal file
After Width: | Height: | Size: 1 KiB |
BIN
data/interfaces/default/images/media_info/sd.png
Normal file
After Width: | Height: | Size: 861 B |
BIN
data/interfaces/default/images/media_info/vorbis.png
Normal file
After Width: | Height: | Size: 1 KiB |
BIN
data/interfaces/default/images/platforms/cloudsync.png
Normal file
After Width: | Height: | Size: 1.1 KiB |
BIN
data/interfaces/default/images/platforms/dlna.png
Normal file
After Width: | Height: | Size: 1.4 KiB |
BIN
data/interfaces/default/images/platforms/linux.png
Normal file
After Width: | Height: | Size: 1.8 KiB |
BIN
data/interfaces/default/images/platforms/osx.png
Normal file
After Width: | Height: | Size: 685 B |
|
@ -137,12 +137,52 @@ DOCUMENTATION :: END
|
||||||
</div>
|
</div>
|
||||||
<div class="summary-content-wrapper">
|
<div class="summary-content-wrapper">
|
||||||
<div class="col-md-9">
|
<div class="col-md-9">
|
||||||
% if data['media_type'] == 'movie' or data['media_type'] == 'show' or data['media_type'] == 'season':
|
% if data['media_type'] == 'movie':
|
||||||
|
<div class="summary-content-padding hidden-xs hidden-sm" style="height: 310px;">
|
||||||
|
<div class="summary-content-media-info-wrapper">
|
||||||
|
% if data['video_resolution']:
|
||||||
|
<img class="summary-content-media-info" src="interfaces/default/images/media_info/${data['video_resolution']}.png" />
|
||||||
|
% endif
|
||||||
|
% if data['audio_codec']:
|
||||||
|
<img class="summary-content-media-info" src="interfaces/default/images/media_info/${data['audio_codec']}.png" />
|
||||||
|
% endif
|
||||||
|
% if data['audio_channels']:
|
||||||
|
<img class="summary-content-media-info" src="interfaces/default/images/media_info/${data['audio_channels']}ch.png" />
|
||||||
|
% endif
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
% elif data['media_type'] == 'show' or data['media_type'] == 'season':
|
||||||
<div class="summary-content-padding hidden-xs hidden-sm" style="height: 275px;"></div>
|
<div class="summary-content-padding hidden-xs hidden-sm" style="height: 275px;"></div>
|
||||||
% elif data['media_type'] == 'episode':
|
% elif data['media_type'] == 'episode':
|
||||||
<div class="summary-content-padding hidden-xs hidden-sm" style="height: 40px;"></div>
|
<div class="summary-content-padding hidden-xs hidden-sm" style="height: 75px;">
|
||||||
% elif data['media_type'] == 'artist' or data['media_type'] == 'album' or data['media_type'] == 'track':
|
<div class="summary-content-media-info-wrapper">
|
||||||
|
% if data['video_resolution']:
|
||||||
|
<img class="summary-content-media-info" src="interfaces/default/images/media_info/${data['video_resolution']}.png" />
|
||||||
|
% endif
|
||||||
|
% if data['audio_codec']:
|
||||||
|
<img class="summary-content-media-info" src="interfaces/default/images/media_info/${data['audio_codec']}.png" />
|
||||||
|
% endif
|
||||||
|
% if data['audio_channels']:
|
||||||
|
<img class="summary-content-media-info" src="interfaces/default/images/media_info/${data['audio_channels']}ch.png" />
|
||||||
|
% endif
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
% elif data['media_type'] == 'artist' or data['media_type'] == 'album':
|
||||||
<div class="summary-content-padding hidden-xs hidden-sm" style="height: 150px;"></div>
|
<div class="summary-content-padding hidden-xs hidden-sm" style="height: 150px;"></div>
|
||||||
|
% elif data['media_type'] == 'track':
|
||||||
|
<div class="summary-content-padding hidden-xs hidden-sm" style="height: 185px;">
|
||||||
|
<div class="summary-content-media-info-wrapper">
|
||||||
|
% if data['video_resolution']:
|
||||||
|
<img class="summary-content-media-info" src="interfaces/default/images/media_info/${data['video_resolution']}.png" />
|
||||||
|
% endif
|
||||||
|
% if data['audio_codec']:
|
||||||
|
<img class="summary-content-media-info" src="interfaces/default/images/media_info/${data['audio_codec']}.png" />
|
||||||
|
% endif
|
||||||
|
% if data['audio_channels']:
|
||||||
|
<img class="summary-content-media-info" src="interfaces/default/images/media_info/${data['audio_channels']}ch.png" />
|
||||||
|
% endif
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
% else:
|
% else:
|
||||||
<div class="summary-content-padding hidden-xs hidden-sm"></div>
|
<div class="summary-content-padding hidden-xs hidden-sm"></div>
|
||||||
% endif
|
% endif
|
||||||
|
|
|
@ -744,9 +744,14 @@ class DataFactory(object):
|
||||||
'session_history_metadata.content_rating, session_history_metadata.summary, ' \
|
'session_history_metadata.content_rating, session_history_metadata.summary, ' \
|
||||||
'session_history_metadata.tagline, session_history_metadata.rating, session_history_metadata.duration, ' \
|
'session_history_metadata.tagline, session_history_metadata.rating, session_history_metadata.duration, ' \
|
||||||
'session_history_metadata.guid, session_history_metadata.directors, session_history_metadata.writers, ' \
|
'session_history_metadata.guid, session_history_metadata.directors, session_history_metadata.writers, ' \
|
||||||
'session_history_metadata.actors, session_history_metadata.genres, session_history_metadata.studio ' \
|
'session_history_metadata.actors, session_history_metadata.genres, session_history_metadata.studio, ' \
|
||||||
|
'session_history_media_info.container, session_history_media_info.bitrate, ' \
|
||||||
|
'session_history_media_info.video_codec, session_history_media_info.video_resolution, ' \
|
||||||
|
'session_history_media_info.video_framerate, session_history_media_info.audio_codec, ' \
|
||||||
|
'session_history_media_info.audio_channels ' \
|
||||||
'FROM session_history_metadata ' \
|
'FROM session_history_metadata ' \
|
||||||
'JOIN library_sections ON session_history_metadata.section_id = library_sections.section_id ' \
|
'JOIN library_sections ON session_history_metadata.section_id = library_sections.section_id ' \
|
||||||
|
'JOIN session_history_media_info ON session_history_metadata.id = session_history_media_info.id ' \
|
||||||
'WHERE session_history_metadata.rating_key = ?'
|
'WHERE session_history_metadata.rating_key = ?'
|
||||||
result = monitor_db.select(query=query, args=[rating_key])
|
result = monitor_db.select(query=query, args=[rating_key])
|
||||||
else:
|
else:
|
||||||
|
@ -789,7 +794,14 @@ class DataFactory(object):
|
||||||
'genres': genres,
|
'genres': genres,
|
||||||
'actors': actors,
|
'actors': actors,
|
||||||
'library_name': item['section_name'],
|
'library_name': item['section_name'],
|
||||||
'section_id': item['section_id']
|
'section_id': item['section_id'],
|
||||||
|
'container': item['container'],
|
||||||
|
'bitrate': item['bitrate'],
|
||||||
|
'video_codec': item['video_codec'],
|
||||||
|
'video_resolution': item['video_resolution'],
|
||||||
|
'video_framerate': item['video_framerate'],
|
||||||
|
'audio_codec': item['audio_codec'],
|
||||||
|
'audio_channels': item['audio_channels']
|
||||||
}
|
}
|
||||||
|
|
||||||
return metadata
|
return metadata
|
||||||
|
|
|
@ -1461,7 +1461,7 @@ class WebInterface(object):
|
||||||
metadata = data_factory.get_metadata_details(rating_key=rating_key)
|
metadata = data_factory.get_metadata_details(rating_key=rating_key)
|
||||||
else:
|
else:
|
||||||
pms_connect = pmsconnect.PmsConnect()
|
pms_connect = pmsconnect.PmsConnect()
|
||||||
result = pms_connect.get_metadata_details(rating_key=rating_key)
|
result = pms_connect.get_metadata_details(rating_key=rating_key, get_media_info=True)
|
||||||
if result:
|
if result:
|
||||||
metadata = result['metadata']
|
metadata = result['metadata']
|
||||||
|
|
||||||
|
|