mirrors/jellyfin-web
1
0
Fork 0
mirror of https://github.com/jellyfin/jellyfin-web synced 2025-03-30 19:56:21 +00:00
Code Activity

update series editor

Browse source
This commit is contained in:
Luke Pulverenti 2016-09-30 14:57:56 -04:00
parent 711b0541fa
commit 67a90b61b9
3 changed files with 7 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

6
dashboard-ui/bower_components/emby-webcomponents/cardbuilder/cardbuilder.js vendored
View file

@ -682,9 +682,9 @@ define(['datetime', 'imageLoader', 'connectionManager', 'itemHelper', 'mediaInfo
var cssClass = options.centerText && !options.cardLayout ? "cardText cardTextCentered" : "cardText"; var cssClass = options.centerText && !options.cardLayout ? "cardText cardTextCentered" : "cardText";
var lines = []; var lines = [];
var parentTitleUnderneath = item.Type == 'MusicAlbum' || item.Type == 'Audio' || item.Type == 'MusicVideo';
if (showOtherText) { if (showOtherText) {
var parentTitleUnderneath = item.Type == 'MusicAlbum' || item.Type == 'Audio' || item.Type == 'MusicVideo';
if ((options.showParentTitle || options.showParentTitleOrTitle) && !parentTitleUnderneath) { if ((options.showParentTitle || options.showParentTitleOrTitle) && !parentTitleUnderneath) {
if (isOuterFooter && item.Type == 'Episode' && item.SeriesName && item.SeriesId) { if (isOuterFooter && item.Type == 'Episode' && item.SeriesName && item.SeriesId) {
@ -698,7 +698,7 @@ define(['datetime', 'imageLoader', 'connectionManager', 'itemHelper', 'mediaInfo
} }
else { else {
var parentTitle = item.EpisodeTitle ? item.Name : (item.SeriesName || item.Album || item.AlbumArtist || item.GameSystem || ""); var parentTitle = item.Type == 'Program' ? item.Name : (item.SeriesName || item.Album || item.AlbumArtist || item.GameSystem || "");
if (parentTitle || options.showParentTitle) { if (parentTitle || options.showParentTitle) {
lines.push(parentTitle); lines.push(parentTitle);
@ -722,7 +722,7 @@ define(['datetime', 'imageLoader', 'connectionManager', 'itemHelper', 'mediaInfo
item.AlbumArtists[0].IsFolder = true; item.AlbumArtists[0].IsFolder = true;
lines.push(getTextActionButton(item.AlbumArtists[0])); lines.push(getTextActionButton(item.AlbumArtists[0]));
} else { } else {
lines.push(item.EpisodeTitle ? item.Name : (item.SeriesName || item.Album || item.AlbumArtist || item.GameSystem || "")); lines.push(item.Type == 'Program' ? item.Name : (item.SeriesName || item.Album || item.AlbumArtist || item.GameSystem || ""));
} }
} }

3
dashboard-ui/scripts/livetvcomponents.js
View file

@ -93,7 +93,8 @@
action: 'edit', action: 'edit',
cardFooterAside: 'none', cardFooterAside: 'none',
preferThumb: true, preferThumb: true,
coverImage: true coverImage: true,
overlayText: false
}); });
html += '</div>'; html += '</div>';

3
dashboard-ui/scripts/livetvitems.js
View file

@ -65,7 +65,8 @@
centerText: true, centerText: true,
lazy: true, lazy: true,
overlayText: false, overlayText: false,
showTitle: true, showParentTitleOrTitle: true,
showTitle: false,
showParentTitle: query.IsSeries !== false && !query.IsMovie, showParentTitle: query.IsSeries !== false && !query.IsMovie,
showAirTime: params.type != 'Recordings' && params.type != 'RecordingSeries', showAirTime: params.type != 'Recordings' && params.type != 'RecordingSeries',
showAirDateTime: params.type != 'Recordings' && params.type != 'RecordingSeries', showAirDateTime: params.type != 'Recordings' && params.type != 'RecordingSeries',