+
+
diff --git a/dashboard-ui/scripts/Itemdetailpage.js b/dashboard-ui/scripts/Itemdetailpage.js
index c8f1471999..a15f421664 100644
--- a/dashboard-ui/scripts/Itemdetailpage.js
+++ b/dashboard-ui/scripts/Itemdetailpage.js
@@ -116,7 +116,7 @@
enableCustomHeader(page, "Music");
$('#standardLogo', page).hide();
}
- else if (item.MediaType == "Game") {
+ else if (item.MediaType == "Game" || item.Type == "GamePlatform") {
enableCustomHeader(page, "Games");
$('#standardLogo', page).hide();
}
@@ -125,44 +125,38 @@
$('#standardLogo', page).show();
}
+ $('.itemTabs', page).hide();
+
if (item.Type == "MusicAlbum") {
$('#albumTabs', page).show();
- } else {
- $('#albumTabs', page).hide();
}
if (item.Type == "Audio") {
$('#songTabs', page).show();
- } else {
- $('#songTabs', page).hide();
}
if (item.Type == "Movie") {
$('#movieTabs', page).show();
- } else {
- $('#movieTabs', page).hide();
}
if (item.MediaType == "Game") {
$('#gameTabs', page).show();
- } else {
- $('#gameTabs', page).hide();
+ }
+
+ if (item.Type == "GamePlatform") {
+ $('#gameSystemTabs', page).show();
}
if (item.Type == "BoxSet") {
$('#boxsetTabs', page).show();
- } else {
- $('#boxsetTabs', page).hide();
}
+
if (item.Type == "Trailer") {
$('#trailerTabs', page).show();
- } else {
- $('#trailerTabs', page).hide();
}
+
if (item.Type == "Episode" || item.Type == "Season" || item.Type == "Series") {
$('#tvShowsTabs', page).show();
- } else {
- $('#tvShowsTabs', page).hide();
}
}
@@ -221,14 +215,14 @@
}
$('#themeSongsCollapsible', page).hide();
- $('#videoBackdropsCollapsible', page).hide();
+ $('#themeVideosCollapsible', page).hide();
ApiClient.getThemeSongs(Dashboard.getCurrentUserId(), item.Id).done(function (result) {
renderThemeSongs(page, item, result);
});
- ApiClient.getVideoBackdrops(Dashboard.getCurrentUserId(), item.Id).done(function (result) {
- renderVideoBackdrops(page, item, result);
+ ApiClient.getThemeVideos(Dashboard.getCurrentUserId(), item.Id).done(function (result) {
+ renderThemeVideos(page, item, result);
});
}
@@ -275,9 +269,13 @@
$('#itemSongs', page).html(LibraryBrowser.getSongTableHtml(result.Items, { showArtist: true })).trigger('create');
} else {
+
+ var shape = "poster";
+
var html = LibraryBrowser.getPosterDetailViewHtml({
items: result.Items,
- useAverageAspectRatio: true
+ useAverageAspectRatio: true,
+ shape: shape
});
$('#childrenContent', page).html(html);
@@ -297,6 +295,9 @@
else if (item.Type == "MusicAlbum") {
$('#childrenTitle', page).html('Tracks (' + item.ChildCount + ')');
}
+ else if (item.Type == "GamePlatform") {
+ $('#childrenTitle', page).html('Games (' + item.ChildCount + ')');
+ }
else {
$('#childrenTitle', page).html('Items (' + item.ChildCount + ')');
}
@@ -315,13 +316,13 @@
}
}
- function renderVideoBackdrops(page, item, result) {
+ function renderThemeVideos(page, item, result) {
if (result.Items.length) {
- $('#videoBackdropsCollapsible', page).show();
+ $('#themeVideosCollapsible', page).show();
- $('#videoBackdropsContent', page).html(getVideosHtml(result.Items)).trigger('create');
+ $('#themeVideosContent', page).html(getVideosHtml(result.Items)).trigger('create');
}
}
diff --git a/dashboard-ui/scripts/gamesrecommendedpage.js b/dashboard-ui/scripts/gamesrecommendedpage.js
index 37f77492e1..62ebfc51c5 100644
--- a/dashboard-ui/scripts/gamesrecommendedpage.js
+++ b/dashboard-ui/scripts/gamesrecommendedpage.js
@@ -20,7 +20,8 @@
$('#recentlyAddedItems', page).html(LibraryBrowser.getPosterViewHtml({
items: result.Items,
useAverageAspectRatio: true,
- showNewIndicator: false
+ showNewIndicator: false,
+ transparent: true
}));
});
@@ -40,7 +41,8 @@
$('#resumableItems', page).html(LibraryBrowser.getPosterViewHtml({
items: result.Items,
- useAverageAspectRatio: true
+ useAverageAspectRatio: true,
+ transparent: true
}));
});
diff --git a/dashboard-ui/scripts/gamesystempage.js b/dashboard-ui/scripts/gamesystempage.js
deleted file mode 100644
index 314f256546..0000000000
--- a/dashboard-ui/scripts/gamesystempage.js
+++ /dev/null
@@ -1,53 +0,0 @@
-
-(function ($, document, LibraryBrowser) {
-
- function reload(page) {
-
- var id = getParameterByName('id');
-
- Dashboard.showLoadingMsg();
-
- ApiClient.getItem(Dashboard.getCurrentUserId(), id).done(function (item) {
-
- var name = item.Name;
-
- $('#itemImage', page).html(LibraryBrowser.getDetailImageHtml(item));
-
- Dashboard.setPageTitle(name);
-
- $('#itemName', page).html(name);
-
- renderDetails(page, item);
-
- Dashboard.hideLoadingMsg();
- });
- }
-
- function renderDetails(page, item) {
-
- LibraryBrowser.renderOverview($('#itemOverview', page), item);
-
- if (item.CommunityRating) {
- $('#itemCommunityRating', page).html(LibraryBrowser.getStarRatingHtml(item)).show().attr('title', item.CommunityRating);
- } else {
- $('#itemCommunityRating', page).hide();
- }
-
- $('#itemMiscInfo', page).html(LibraryBrowser.getMiscInfoHtml(item));
-
- LibraryBrowser.renderGenres($('#itemGenres', page), item, "games");
- LibraryBrowser.renderStudios($('#itemStudios', page), item, "games");
- renderUserDataIcons(page, item);
- LibraryBrowser.renderLinks($('#itemLinks', page), item);
- }
-
- function renderUserDataIcons(page, item) {
- $('#itemRatings', page).html(LibraryBrowser.getUserDataIconsHtml(item));
- }
-
- $(document).on('pageshow', "#gamesystemPage", function () {
- reload(this);
- });
-
-
-})(jQuery, document, LibraryBrowser);
\ No newline at end of file
diff --git a/dashboard-ui/scripts/itembynamedetailpage.js b/dashboard-ui/scripts/itembynamedetailpage.js
index 837c8c6f23..b4d6cd6020 100644
--- a/dashboard-ui/scripts/itembynamedetailpage.js
+++ b/dashboard-ui/scripts/itembynamedetailpage.js
@@ -126,6 +126,12 @@
if (context == "music" && item.Type == "Artist") {
$('#artistTabs', page).show();
}
+ if (context == "games" && item.Type == "Genre") {
+ $('#gameGenreTabs', page).show();
+ }
+ if (context == "games" && item.Type == "Studio") {
+ $('#gameStudioTabs', page).show();
+ }
}
function renderTabs(page, item) {
diff --git a/dashboard-ui/scripts/librarybrowser.js b/dashboard-ui/scripts/librarybrowser.js
index 987cbdb6ea..1df48b5ab9 100644
--- a/dashboard-ui/scripts/librarybrowser.js
+++ b/dashboard-ui/scripts/librarybrowser.js
@@ -163,6 +163,12 @@
html += '
' + childText + '
';
}
+ else if (item.Type == "GamePlatform") {
+
+ childText = item.ChildCount == 1 ? "1 Game" : item.ChildCount + " Games";
+
+ html += '
' + childText + '
';
+ }
else if (item.Type == "MusicAlbum") {
childText = item.ChildCount == 1 ? "1 Song" : item.ChildCount + " Songs";
@@ -299,6 +305,9 @@
if (item.Type == "MusicAlbum") {
return "itemdetails.html?id=" + id;
}
+ if (item.Type == "GamePlatform") {
+ return "itemdetails.html?id=" + id;
+ }
if (item.Type == "Genre") {
return "itembynamedetails.html?genre=" + encodeName(item.Name) + "&context=" + itemByNameContext;
}
@@ -425,7 +434,16 @@
}
}
- html += '
';
+
+ var cssClass = "posterItem";
+
+ if (options.transparent) {
+ cssClass += " transparentPosterItem";
+ }
+
+ cssClass += ' ' + options.shape + 'PosterItem';
+
+ html += '';
var style = "";
@@ -1093,7 +1111,7 @@
else {
url = "css/images/items/detail/video.png";
useBackgroundColor = true;
- maxwidth = 150;
+ maxwidth = 150;p
}
if (url) {
diff --git a/packages.config b/packages.config
index 56ad5f6568..ef2a6b2f1d 100644
--- a/packages.config
+++ b/packages.config
@@ -1,6 +1,6 @@
-
+
\ No newline at end of file
Games