diff --git a/dashboard-ui/scripts/edititemmetadata.js b/dashboard-ui/scripts/edititemmetadata.js
index b383543b52..42c9bd18a4 100644
--- a/dashboard-ui/scripts/edititemmetadata.js
+++ b/dashboard-ui/scripts/edititemmetadata.js
@@ -665,12 +665,6 @@
$('#fldMusicBrainzReleaseGroupId', page).hide();
}
- if (item.Type == "Series") {
- $('#collapsibleSeriesDIsplaySettings', page).show();
- } else {
- $('#collapsibleSeriesDIsplaySettings', page).hide();
- }
-
if (item.Type == "Episode") {
$('#collapsibleDvdEpisodeInfo', page).show();
} else {
@@ -780,6 +774,32 @@
} else {
$('#fldParentIndexNumber', page).hide();
}
+
+ if (item.Type == "Series") {
+ $('#fldDisplaySpecialsInline', page).show();
+ } else {
+ $('#fldDisplaySpecialsInline', page).hide();
+ }
+
+ if (item.Type == "BoxSet") {
+ $('#fldDisplayOrder', page).show();
+
+ $('#labelDisplayOrder', page).html('Movie display order:');
+ $('#selectDisplayOrder', page).html('
').selectmenu('refresh');
+ } else {
+ $('#fldDisplayOrder', page).hide();
+ }
+
+ var displaySettingFields = $('.fldDisplaySetting', page);
+ if (displaySettingFields.filter(function (index) {
+
+ return displaySettingFields[index].style.display != 'none';
+
+ }).length) {
+ $('#collapsibleDisplaySettings', page).show();
+ } else {
+ $('#collapsibleDisplaySettings', page).hide();
+ }
}
function fillItemInfo(page, item) {
@@ -850,6 +870,8 @@
$('#txtAlbum', page).val(item.Album || "");
$('#txtAlbumArtist', page).val(item.AlbumArtist || "");
+ $('#selectDisplayOrder', page).val(item.DisplayOrder || "").selectmenu('refresh');
+
var artists = item.Artists || [];
$('#txtArtist', page).val(artists.join(';'));
@@ -1116,6 +1138,7 @@
AirsAfterSeasonNumber: $('#txtAirsAfterSeason', form).val(),
AirsBeforeEpisodeNumber: $('#txtAirsBeforeEpisode', form).val(),
ParentIndexNumber: $('#txtParentIndexNumber', form).val(),
+ DisplayOrder: $('#selectDisplayOrder', form).val(),
Players: $('#txtPlayers', form).val(),
Album: $('#txtAlbum', form).val(),
AlbumArtist: $('#txtAlbumArtist', form).val(),
diff --git a/dashboard-ui/scripts/librarybrowser.js b/dashboard-ui/scripts/librarybrowser.js
index b308e6a145..c047ab57db 100644
--- a/dashboard-ui/scripts/librarybrowser.js
+++ b/dashboard-ui/scripts/librarybrowser.js
@@ -1,6 +1,6 @@
var LibraryBrowser = (function (window, document, $, screen, localStorage) {
- var defaultBackground = "#444";
+ var defaultBackground = "#333";
return {
@@ -832,10 +832,9 @@
if (item.Name && options.showTitle) {
imgUrl = 'css/images/items/list/audio.png';
- background = defaultBackground;
- } else {
- background = defaultBackground;
}
+ background = defaultBackground;
+
}
else if (item.Type == "Recording" || item.Type == "Program") {
@@ -849,10 +848,15 @@
if (item.Name && options.showTitle) {
imgUrl = 'css/images/items/list/video.png';
- background = defaultBackground;
- } else {
- background = defaultBackground;
}
+ background = defaultBackground;
+ }
+ else if (item.Type == "Person") {
+
+ if (item.Name && options.showTitle) {
+ imgUrl = 'css/images/items/list/person.png';
+ }
+ background = defaultBackground;
}
else {
if (item.Name && options.showTitle) {
diff --git a/dashboard-ui/scripts/livetvrecordinglist.js b/dashboard-ui/scripts/livetvrecordinglist.js
index 07342ca5ec..f63508a9b9 100644
--- a/dashboard-ui/scripts/livetvrecordinglist.js
+++ b/dashboard-ui/scripts/livetvrecordinglist.js
@@ -25,7 +25,7 @@
html += LibraryBrowser.getPosterViewHtml({
items: result.Items,
- shape: "square",
+ shape: "backdrop",
showTitle: true,
showParentTitle: true,
overlayText: true,
diff --git a/dashboard-ui/scripts/livetvrecordings.js b/dashboard-ui/scripts/livetvrecordings.js
index a37be9919c..683d6ff7f7 100644
--- a/dashboard-ui/scripts/livetvrecordings.js
+++ b/dashboard-ui/scripts/livetvrecordings.js
@@ -52,7 +52,7 @@
$('.recordingItems', elem).html(LibraryBrowser.getPosterViewHtml({
items: recordings,
- shape: "square",
+ shape: "backdrop",
showTitle: true,
showParentTitle: true,
overlayText: true,
@@ -79,7 +79,7 @@
apiClient.getLiveTvRecordings({
userId: Dashboard.getCurrentUserId(),
- limit: 15,
+ limit: 12,
isRecording: false
}).done(function (result) {
diff --git a/dashboard-ui/scripts/mediaplayer.js b/dashboard-ui/scripts/mediaplayer.js
index d5ac238e38..2767dfe0c5 100644
--- a/dashboard-ui/scripts/mediaplayer.js
+++ b/dashboard-ui/scripts/mediaplayer.js
@@ -982,7 +982,7 @@
var href = LibraryBrowser.getHref(item.CurrentProgram || item);
- html += "

";
+ html += "
";
if (item.SeriesName || item.Album || item.CurrentProgram) {
html += '
' + seriesName + '
' + name + '
';
diff --git a/dashboard-ui/scripts/moviepeople.js b/dashboard-ui/scripts/moviepeople.js
index 782b81cf4e..e8fd55a317 100644
--- a/dashboard-ui/scripts/moviepeople.js
+++ b/dashboard-ui/scripts/moviepeople.js
@@ -30,9 +30,14 @@
var checkSortOption = $('.radioSortBy:checked', page);
$('.viewSummary', page).html(LibraryBrowser.getViewSummaryHtml(query, checkSortOption)).trigger('create');
- html += LibraryBrowser.getPosterDetailViewHtml({
+ html = LibraryBrowser.getPosterViewHtml({
items: result.Items,
- context: "movies"
+ shape: "portrait",
+ context: 'movies',
+ useAverageAspectRatio: true,
+ showTitle: true,
+ showItemCounts: true,
+ coverImage: true
});
html += LibraryBrowser.getPagingHtml(query, result.TotalRecordCount);
diff --git a/dashboard-ui/scripts/tvpeople.js b/dashboard-ui/scripts/tvpeople.js
index 783de30f64..1f7cfd97b4 100644
--- a/dashboard-ui/scripts/tvpeople.js
+++ b/dashboard-ui/scripts/tvpeople.js
@@ -30,9 +30,14 @@
var checkSortOption = $('.radioSortBy:checked', page);
$('.viewSummary', page).html(LibraryBrowser.getViewSummaryHtml(query, checkSortOption)).trigger('create');
- html += LibraryBrowser.getPosterDetailViewHtml({
+ html = LibraryBrowser.getPosterViewHtml({
items: result.Items,
- context: "tv"
+ shape: "portrait",
+ context: 'tv',
+ useAverageAspectRatio: true,
+ showTitle: true,
+ showItemCounts: true,
+ coverImage: true
});
html += LibraryBrowser.getPagingHtml(query, result.TotalRecordCount);