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

Display specials within seasons

Browse source
This commit is contained in:
Luke Pulverenti 2013-11-15 16:31:33 -05:00
parent 66ced0ebc8
commit 7fe1a3311d
4 changed files with 31 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

2
dashboard-ui/css/librarybrowser.css
View file

@ -129,7 +129,7 @@
.libraryViewNav a { .libraryViewNav a {
display: inline-block; display: inline-block;
padding: .25em .25em; padding: .5em .25em;
color: #eee!important; color: #eee!important;
text-decoration: none; text-decoration: none;
} }

11
dashboard-ui/css/search.css
View file

@ -8,7 +8,7 @@
vertical-align: middle; vertical-align: middle;
font: 13px arial,sans-serif; font: 13px arial,sans-serif;
margin: 0 .15em 0 0; margin: 0 .15em 0 0;
width: 150px; width: 80px;
padding: 0; padding: 0;
border: 1px solid #4d90fe; border: 1px solid #4d90fe;
} }
@ -108,13 +108,20 @@
padding: 2px 5px; padding: 2px 5px;
} }
@media all and (min-width: 340px) { @media all and (min-width: 300px) {
.headerSearch { .headerSearch {
display: inline-block; display: inline-block;
} }
} }
@media all and (min-width: 340px) {
.txtSearch {
width: 150px;
}
}
@media all and (min-width: 850px) { @media all and (min-width: 850px) {
.txtSearch { .txtSearch {

12
dashboard-ui/scripts/Itemdetailpage.js
View file

@ -505,6 +505,15 @@
Fields: "ItemCounts,DateCreated,AudioInfo" Fields: "ItemCounts,DateCreated,AudioInfo"
}; };
if (item.Type == "Season" && item.IndexNumber) {
query.ParentId = item.SeriesId;
query.Recursive = true;
query.IncludeItemTypes = "Episode";
query.AiredDuringSeason = item.IndexNumber;
query.SortBy = "PremiereDate,SortName";
}
if (item.Type == "Series" || item.Type == "Season") { if (item.Type == "Series" || item.Type == "Season") {
if (!user.Configuration.DisplayMissingEpisodes) { if (!user.Configuration.DisplayMissingEpisodes) {
query.IsMissing = false; query.IsMissing = false;
@ -532,7 +541,8 @@
items: result.Items, items: result.Items,
useAverageAspectRatio: true, useAverageAspectRatio: true,
shape: shape, shape: shape,
showParentName: false showParentName: false,
displayAsSpecial: item.Type == "Season" && item.IndexNumber
}); });
$('#childrenContent', page).html(html); $('#childrenContent', page).html(html);

14
dashboard-ui/scripts/librarybrowser.js
View file

@ -201,7 +201,7 @@
} }
} }
var name = LibraryBrowser.getPosterViewDisplayName(item); var name = LibraryBrowser.getPosterViewDisplayName(item, options.displayAsSpecial);
html += '<div class="tileName">' + name + '</div>'; html += '<div class="tileName">' + name + '</div>';
@ -972,11 +972,16 @@
return day; return day;
}, },
getPosterViewDisplayName: function (item) { getPosterViewDisplayName: function (item, displayAsSpecial) {
var name = item.Name; var name = item.Name;
if (item.Type == "Episode" && item.IndexNumber != null && item.ParentIndexNumber != null) { if (displayAsSpecial && item.Type == "Episode" && item.SpecialSeasonNumber) {
name = "Special - " + name;
}
else if (item.Type == "Episode" && item.IndexNumber != null && item.ParentIndexNumber != null) {
var displayIndexNumber = item.IndexNumber < 10 ? "0" + item.IndexNumber : item.IndexNumber; var displayIndexNumber = item.IndexNumber < 10 ? "0" + item.IndexNumber : item.IndexNumber;
@ -990,7 +995,8 @@
name = number + " - " + name; name = number + " - " + name;
} else { }
else {
if (item.IndexNumber != null && item.Type !== "Season") { if (item.IndexNumber != null && item.Type !== "Season") {
name = item.IndexNumber + " - " + name; name = item.IndexNumber + " - " + name;
} }