+
-
diff --git a/dashboard-ui/css/librarybrowser.css b/dashboard-ui/css/librarybrowser.css
index 72bbab0240..1fbe481b04 100644
--- a/dashboard-ui/css/librarybrowser.css
+++ b/dashboard-ui/css/librarybrowser.css
@@ -928,7 +928,7 @@ a.itemTag:hover {
border: 0;
margin: 0;
height: 14px;
- border: 1px solid #222;
+ border: 0 solid #222;
border-radius: 0;
width: 50px;
margin-right: 5px;
diff --git a/dashboard-ui/css/posteritem.css b/dashboard-ui/css/posteritem.css
index 2219aef369..a4de72831e 100644
--- a/dashboard-ui/css/posteritem.css
+++ b/dashboard-ui/css/posteritem.css
@@ -103,7 +103,7 @@
.posterItemTextOverlay .posterItemText {
background-color: transparent;
padding-left: 5px;
- padding: 0 5px 5px;
+ padding: 0 5px 3px;
}
.posterItemTextOverlay .posterItemText:first-child {
@@ -171,7 +171,7 @@
.posterItemProgress .itemProgressBar {
height: 10px;
width: 100%;
- opacity: .6;
+ opacity: .7;
}
.miniPosterItemProgress {
@@ -184,6 +184,22 @@
opacity: 1;
}
+.sessionPosterItem .posterItemText:not(.posterItemName) {
+ color: #000;
+ text-align: left;
+}
+
+.sessionPosterItem .posterItemName {
+ color: #fff!important;
+ font-weight: normal !important;
+}
+
+.sessionPosterItem .posterItemDefaultText {
+ color: #000!important;
+ font-weight: normal !important;
+ top: 42%;
+}
+
@media all and (max-width: 600px) {
.packageReviewText {
diff --git a/dashboard-ui/css/site.css b/dashboard-ui/css/site.css
index 6d4e081c19..7489631e9e 100644
--- a/dashboard-ui/css/site.css
+++ b/dashboard-ui/css/site.css
@@ -330,6 +330,10 @@ h1 .imageLink {
height: 30px;
}
+.activeDevicesCollapsible .ui-collapsible-content {
+ padding: .5em .5em !important;
+}
+
@media all and (min-width: 450px) {
.currentUsername {
diff --git a/dashboard-ui/dashboard.html b/dashboard-ui/dashboard.html
index 2f4e89c23d..0c5ccd6dc0 100644
--- a/dashboard-ui/dashboard.html
+++ b/dashboard-ui/dashboard.html
@@ -60,11 +60,9 @@
-
Active Connections
-
-
-
+
+
diff --git a/dashboard-ui/itembynamedetails.html b/dashboard-ui/itembynamedetails.html
index 0f0eca14e6..435960a751 100644
--- a/dashboard-ui/itembynamedetails.html
+++ b/dashboard-ui/itembynamedetails.html
@@ -8,7 +8,9 @@
Active Devices
+
Suggested
+ Latest
Movies
+ Collections
Trailers
Genres
People
@@ -18,7 +20,9 @@
Suggested
+ Latest
Movies
+ Collections
Trailers
Genres
People
@@ -28,7 +32,9 @@
Suggested
+ Latest
Movies
+ Collections
Trailers
Genres
People
diff --git a/dashboard-ui/itemdetails.html b/dashboard-ui/itemdetails.html
index 44b6097f65..85327bbeb9 100644
--- a/dashboard-ui/itemdetails.html
+++ b/dashboard-ui/itemdetails.html
@@ -8,7 +8,9 @@
Suggested
+ Latest
Movies
+ Collections
Trailers
Genres
People
@@ -18,7 +20,9 @@
Suggested
+ Latest
Movies
+ Collections
Trailers
Genres
People
diff --git a/dashboard-ui/moviegenres.html b/dashboard-ui/moviegenres.html
index 9ac3ed18df..908d19238b 100644
--- a/dashboard-ui/moviegenres.html
+++ b/dashboard-ui/moviegenres.html
@@ -8,7 +8,9 @@
Suggested
+ Latest
Movies
+ Collections
Trailers
Genres
People
diff --git a/dashboard-ui/moviepeople.html b/dashboard-ui/moviepeople.html
index b5d10bd557..3d89919127 100644
--- a/dashboard-ui/moviepeople.html
+++ b/dashboard-ui/moviepeople.html
@@ -8,7 +8,9 @@
Suggested
+ Latest
Movies
+ Collections
Trailers
Genres
People
diff --git a/dashboard-ui/movies.html b/dashboard-ui/movies.html
index c47fb3ca3f..c21c4cd8e8 100644
--- a/dashboard-ui/movies.html
+++ b/dashboard-ui/movies.html
@@ -8,7 +8,9 @@
Suggested
+ Latest
Movies
+ Collections
Trailers
Genres
People
diff --git a/dashboard-ui/movieslatest.html b/dashboard-ui/movieslatest.html
new file mode 100644
index 0000000000..ab054049c7
--- /dev/null
+++ b/dashboard-ui/movieslatest.html
@@ -0,0 +1,42 @@
+
+
+
+ Media Browser
+
+
+
+
+
+
+
+
+
diff --git a/dashboard-ui/moviesrecommended.html b/dashboard-ui/moviesrecommended.html
index 600556bb1d..b26aa219f8 100644
--- a/dashboard-ui/moviesrecommended.html
+++ b/dashboard-ui/moviesrecommended.html
@@ -7,8 +7,10 @@
-
+
+
+
+
+
+ Latest Movies+ +
+
+
+
+
+ Latest Trailers+ +
+
+ |
+
Latest Movies
- -
-
-
-
-
diff --git a/dashboard-ui/moviestudios.html b/dashboard-ui/moviestudios.html
index 83435f0694..5e3bf02dd1 100644
--- a/dashboard-ui/moviestudios.html
+++ b/dashboard-ui/moviestudios.html
@@ -8,7 +8,9 @@
Latest Trailers
- -
-
+
Suggested
+ Latest
Movies
+ Collections
Trailers
Genres
People
diff --git a/dashboard-ui/movietrailers.html b/dashboard-ui/movietrailers.html
index 5139158368..7f5bc3ae35 100644
--- a/dashboard-ui/movietrailers.html
+++ b/dashboard-ui/movietrailers.html
@@ -8,7 +8,9 @@
Suggested
+ Latest
Movies
+ Collections
Trailers
Genres
People
diff --git a/dashboard-ui/scripts/dashboardpage.js b/dashboard-ui/scripts/dashboardpage.js
index a3aaf56d44..c416d355f5 100644
--- a/dashboard-ui/scripts/dashboardpage.js
+++ b/dashboard-ui/scripts/dashboardpage.js
@@ -7,7 +7,7 @@
var page = this;
DashboardPage.newsStartIndex = 0;
-
+
Dashboard.showLoadingMsg();
DashboardPage.pollForInfo(page);
DashboardPage.startInterval();
@@ -58,7 +58,7 @@
pagingHtml += '';
-
- html += '';
- html += DashboardPage.getClientType(connection);
- html += ' ';
-
- html += '';
-
- html += ' ';
-
- html += '';
- html += DashboardPage.getUsersHtml(connection);
- html += ' ';
+ html += ' ';
+ var onclick = connection.DeviceId == deviceId ? '' : ' onclick="RemoteControl.showMenu({sessionId:\'' + connection.Id + '\'});"';
+ html += '';
+
+ var defaultTextStyle = '';
+
+ if (nowPlayingItem) {
+ defaultTextStyle = "display:none;";
+ }
+ html += ' + ')
';
+
+ html += '';
+
+ html += '';
+ //html += DashboardPage.getClientType(connection);
+ //html += ' ';
+
+ //html += '';
+
+ //html += ' ';
+
+ //html += '';
+ //html += DashboardPage.getNowPlayingImage(nowPlayingItem);
+ //html += ' ';
+
+ //html += '';
+ //html += DashboardPage.getNowPlayingText(connection, nowPlayingItem);
+ //html += ' ';
+
+ html += '
';
}
- table.append(html).trigger('create');
+ container.append(html).trigger('create');
- $('.deadSession', table).remove();
+ $('.deadSession', container).remove();
+ },
+
+ getPlaybackProgress: function (session) {
+
+ if (session.NowPlayingItem) {
+ if (session.NowPlayingItem.RunTimeTicks) {
+
+ var pct = (session.NowPlayingPositionTicks || 0) / session.NowPlayingItem.RunTimeTicks;
+
+ return pct * 100;
+ }
+ }
+
+ return 0;
},
getUsersHtml: function (session) {
- var html = '';
+ var html = '';
pagingHtml += LibraryBrowser.getPagingHtml(query, result.TotalRecordCount, false, [], false);
pagingHtml += '
';
-
+
html = html.join('') + pagingHtml;
var elem = $('.latestNewsItems', page).html(html).trigger('create');
@@ -135,9 +135,9 @@
var html = '';
- var table = $('.tblConnections', page);
+ var container = $('.connections', page);
- $('.trSession', table).addClass('deadSession');
+ $('.sessionPosterItem', container).addClass('deadSession');
var deviceId = ApiClient.deviceId();
@@ -145,98 +145,181 @@
var connection = dashboardInfo.ActiveConnections[i];
- var rowId = 'trSession' + connection.Id;
+ var itemId = 'session' + connection.Id;
- var elem = $('#' + rowId, page);
+ var elem = $('#' + itemId, page);
if (elem.length) {
DashboardPage.updateSession(elem, connection);
continue;
}
- html += '';
-
- if (deviceId == connection.DeviceId) {
- html += connection.Client;
- } else {
- html += '' + connection.Client + '';
- }
- html += '
';
-
- html += '' + connection.ApplicationVersion + '
';
- html += '' + connection.DeviceName + '
';
- html += '';
var nowPlayingItem = connection.NowPlayingItem;
+ var imageUrl = DashboardPage.getNowPlayingImage(nowPlayingItem);
- html += '';
- html += DashboardPage.getNowPlayingImage(nowPlayingItem);
- html += ' ';
+ var style = "";
- html += '';
- html += DashboardPage.getNowPlayingText(connection, nowPlayingItem);
- html += ' ';
+ if (imageUrl) {
+ style += 'background-image:url(\'' + imageUrl + '\');';
+ }
- html += '
Nothing currently playing
';
+
+ html += '';
+
+ var itemNameStyle='';
+
+ if (!nowPlayingItem) {
+ itemNameStyle = "display:none;";
+ }
+ html += '
";
+
+ html += '' + (nowPlayingItem ? nowPlayingItem.Name : '') + '
';
+
+ var progressStyle='';
+
+ if (!nowPlayingItem) {
+ progressStyle = "display:none;";
+ }
+ html += "";
+
+ html += '';
+ html += "
";
+ html += "' + DashboardPage.getSessionItemText(connection) + '
';
+
+ //html += '';
+
+ //if (deviceId == connection.DeviceId) {
+ // html += connection.Client;
+ //} else {
+ // html += '' + connection.Client + '';
+ //}
+ //html += '
';
+
+ //html += '';
if (session.UserId) {
- html += '
' + session.UserName + '
';
+ html += session.UserName;
}
html += session.AdditionalUsers.map(function (currentSession) {
- return '
' + currentSession.UserName + '![Dashboard](" + imgUrl + ")
";
+ return imgUrl;
}
if (clientLowered == "mb-classic") {
- return "
";
+ return "css/images/clients/mbc.png";
}
if (clientLowered == "media browser theater") {
- return "
";
+ return "css/images/clients/mb.png";
}
if (clientLowered == "android") {
- return "
";
+ return "css/images/clients/android.png";
}
if (clientLowered == "roku") {
- return "
";
+ return "css/images/clients/roku.jpg";
}
if (clientLowered == "ios") {
- return "
";
+ return "css/images/clients/ios.png";
}
if (clientLowered == "windows rt") {
- return "
";
+ return "css/images/clients/windowsrt.png";
}
if (clientLowered == "windows phone") {
- return "
";
+ return "css/images/clients/windowsphone.png";
}
if (clientLowered == "dlna") {
- return "
";
+ return "css/images/clients/dlna.png";
}
if (clientLowered == "mbkinect") {
- return "
";
+ return "css/images/clients/mbkinect.png";
}
if (clientLowered == "xbmc") {
- return "
";
+ return "css/images/clients/xbmc.png";
}
- return connection.Client;
+ return "css/images/clients/mb.png";
},
getNowPlayingImage: function (item) {
+ if (item && item.ThumbItemId) {
+ return ApiClient.getImageUrl(item.ThumbItemId, {
+ type: "Thumb",
+ height: 300,
+ tag: item.ThumbImageTag
+ });
+ }
+
+ if (item && item.BackdropItemId) {
+ return ApiClient.getImageUrl(item.BackdropItemId, {
+ type: "Backdrop",
+ height: 300,
+ tag: item.BackdropImageTag
+ });
+ }
+
if (item && item.PrimaryImageTag) {
- var url = ApiClient.getImageUrl(item.Id, {
+ return ApiClient.getImageUrl(item.Id, {
type: "Primary",
- height: 100,
+ height: 300,
tag: item.PrimaryImageTag
});
-
- url += "&xxx=" + new Date().getTime();
-
- return "![" + item.Name + "](" + url + " "\" + item.Name + \"")
";
}
return "";
@@ -422,9 +517,9 @@
DashboardPage.renderPluginUpdateInfo(page, dashboardInfo);
DashboardPage.renderPendingInstallations(page, dashboardInfo.SystemInfo);
},
-
+
renderUrls: function (page, systemInfo) {
-
+
var url = ApiClient.serverAddress() + "/mediabrowser";
$('#bookmarkUrl', page).html(url).attr("href", url);
diff --git a/dashboard-ui/scripts/episodes.js b/dashboard-ui/scripts/episodes.js
index f4d7fcd760..862fcbd35b 100644
--- a/dashboard-ui/scripts/episodes.js
+++ b/dashboard-ui/scripts/episodes.js
@@ -7,7 +7,7 @@
SortOrder: "Ascending",
IncludeItemTypes: "Episode",
Recursive: true,
- Fields: "DateCreated,SeriesInfo,PrimaryImageAspectRatio",
+ Fields: "SeriesInfo,PrimaryImageAspectRatio",
StartIndex: 0,
IsMissing: false,
IsVirtualUnaired: false
diff --git a/dashboard-ui/scripts/itembynamedetailpage.js b/dashboard-ui/scripts/itembynamedetailpage.js
index c9a058a37a..24903bd467 100644
--- a/dashboard-ui/scripts/itembynamedetailpage.js
+++ b/dashboard-ui/scripts/itembynamedetailpage.js
@@ -396,7 +396,7 @@
SortOrder: "Ascending",
IncludeItemTypes: "",
Recursive: true,
- Fields: "DateCreated,AudioInfo,SeriesInfo,ParentId,PrimaryImageAspectRatio",
+ Fields: "AudioInfo,SeriesInfo,ParentId,PrimaryImageAspectRatio",
Limit: LibraryBrowser.getDefaultPageSize(),
StartIndex: 0
};
diff --git a/dashboard-ui/scripts/itemdetailpage.js b/dashboard-ui/scripts/itemdetailpage.js
index a6b54ae506..e4c90f9025 100644
--- a/dashboard-ui/scripts/itemdetailpage.js
+++ b/dashboard-ui/scripts/itemdetailpage.js
@@ -353,7 +353,7 @@
ApiClient.getItems(Dashboard.getCurrentUserId(), {
Ids: item.SoundtrackIds.join(","),
- ItemFields: "PrimaryImageAspectRatio,ItemCounts,DateCreated,AudioInfo",
+ ItemFields: "PrimaryImageAspectRatio,ItemCounts,AudioInfo",
SortBy: "SortName"
}).done(function (result) {
@@ -432,7 +432,7 @@
var options = {
userId: Dashboard.getCurrentUserId(),
limit: item.Type == "MusicAlbum" ? 4 : 5,
- fields: "PrimaryImageAspectRatio,DateCreated,UserData"
+ fields: "PrimaryImageAspectRatio,UserData"
};
if (item.Type == "Movie") {
@@ -534,7 +534,7 @@
function renderChildren(page, item, user) {
- var fields = "ItemCounts,DateCreated,AudioInfo,PrimaryImageAspectRatio";
+ var fields = "ItemCounts,AudioInfo,PrimaryImageAspectRatio";
var query = {
ParentId: item.Id,
diff --git a/dashboard-ui/scripts/librarymenu.js b/dashboard-ui/scripts/librarymenu.js
index 20dbd48c65..6ac1623634 100644
--- a/dashboard-ui/scripts/librarymenu.js
+++ b/dashboard-ui/scripts/librarymenu.js
@@ -92,10 +92,6 @@
html += '' + (view == 'games' ? selectedHtml : '') + 'Games';
}
- if (counts.MovieCount || counts.SeriesCount || counts.SongCount || counts.GameCount) {
- html += '' + (view == 'boxsets' ? selectedHtml : '') + 'Collections';
- }
-
$('.viewMenuRemoteControlButton', page).before(html);
}
@@ -133,6 +129,7 @@
html += getCollapsibleHtml('Movies', [
{ text: 'Suggested', href: 'moviesrecommended.html' },
+ { text: 'Latest', href: 'movieslatest.html' },
{ text: 'Movies', href: 'movies.html' },
{ text: 'Collections', href: 'collections.html' },
{ text: 'Trailers', href: 'movietrailers.html' },
diff --git a/dashboard-ui/scripts/moviecollections.js b/dashboard-ui/scripts/moviecollections.js
index 0b8e230ea0..cb065e1e93 100644
--- a/dashboard-ui/scripts/moviecollections.js
+++ b/dashboard-ui/scripts/moviecollections.js
@@ -7,7 +7,7 @@
SortOrder: "Ascending",
IncludeItemTypes: "BoxSet",
Recursive: true,
- Fields: "DateCreated,PrimaryImageAspectRatio",
+ Fields: "PrimaryImageAspectRatio",
StartIndex: 0
};
diff --git a/dashboard-ui/scripts/movies.js b/dashboard-ui/scripts/movies.js
index 69ae53e56d..4cb13540e9 100644
--- a/dashboard-ui/scripts/movies.js
+++ b/dashboard-ui/scripts/movies.js
@@ -9,7 +9,7 @@
SortOrder: "Ascending",
IncludeItemTypes: "Movie",
Recursive: true,
- Fields: "DateCreated,PrimaryImageAspectRatio",
+ Fields: "PrimaryImageAspectRatio",
StartIndex: 0
};
diff --git a/dashboard-ui/scripts/movieslatest.js b/dashboard-ui/scripts/movieslatest.js
new file mode 100644
index 0000000000..b2a0ed827d
--- /dev/null
+++ b/dashboard-ui/scripts/movieslatest.js
@@ -0,0 +1,60 @@
+(function ($, document) {
+
+ $(document).on('pagebeforeshow', "#moviesLatestPage", function () {
+
+ var screenWidth = $(window).width();
+
+ var page = this;
+
+ var options = {
+
+ SortBy: "DateCreated",
+ SortOrder: "Descending",
+ IncludeItemTypes: "Movie",
+ Limit: screenWidth >= 1920 ? 32 : (screenWidth >= 1440 ? 24 : (screenWidth >= 800 ? 18 : 12)),
+ Recursive: true,
+ Fields: "PrimaryImageAspectRatio",
+ Filters: "IsUnplayed"
+ };
+
+ ApiClient.getItems(Dashboard.getCurrentUserId(), options).done(function (result) {
+
+ $('#recentlyAddedItems', page).html(LibraryBrowser.getPosterViewHtml({
+ items: result.Items,
+ useAverageAspectRatio: true
+
+ })).createPosterItemHoverMenu();
+ });
+
+
+ options = {
+
+ SortBy: "DateCreated",
+ SortOrder: "Descending",
+ IncludeItemTypes: "Trailer",
+ Limit: screenWidth >= 1920 ? 8 : (screenWidth >= 1440 ? 8 : 6),
+ Recursive: true,
+ Fields: "PrimaryImageAspectRatio",
+ Filters: "IsUnplayed"
+ };
+
+ ApiClient.getItems(Dashboard.getCurrentUserId(), options).done(function (result) {
+
+ if (result.Items.length) {
+ $('#trailerSection', page).show();
+ } else {
+ $('#trailerSection', page).hide();
+ }
+
+ $('#trailerItems', page).html(LibraryBrowser.getPosterViewHtml({
+ items: result.Items,
+ useAverageAspectRatio: true
+
+ })).createPosterItemHoverMenu();
+
+ });
+
+ });
+
+
+})(jQuery, document);
\ No newline at end of file
diff --git a/dashboard-ui/scripts/moviesrecommended.js b/dashboard-ui/scripts/moviesrecommended.js
index 99d6ad1e06..8fee981033 100644
--- a/dashboard-ui/scripts/moviesrecommended.js
+++ b/dashboard-ui/scripts/moviesrecommended.js
@@ -1,5 +1,41 @@
(function ($, document) {
+ function getRecommendationHtml(recommendation) {
+
+ var html = '';
+
+ var title = '';
+
+ switch (recommendation.RecommendationType) {
+
+ case 'SimilarToRecentlyPlayed':
+ title = 'Because you watched ' + recommendation.BaselineItemName;
+ break;
+ case 'SimilarToLikedItem':
+ title = 'Because you like ' + recommendation.BaselineItemName;
+ break;
+ case 'HasDirectorFromRecentlyPlayed':
+ case 'HasLikedDirector':
+ title = 'Directed by ' + recommendation.BaselineItemName;
+ break;
+ case 'HasActorFromRecentlyPlayed':
+ case 'HasLikedActor':
+ title = 'Starring ' + recommendation.BaselineItemName;
+ break;
+ }
+
+ html += '
';
+ return ', ' + currentSession.UserName;
});
+ html += '
';
+
return html;
},
- updateSession: function (row, session) {
+ updateSession: function (elem, session) {
- row.removeClass('deadSession');
+ elem.removeClass('deadSession');
- $('.username', row).html(DashboardPage.getUsersHtml(session)).trigger('create');
+ $('.sessionItemText', elem).html(DashboardPage.getSessionItemText(session));
var nowPlayingItem = session.NowPlayingItem;
- $('.nowPlayingText', row).html(DashboardPage.getNowPlayingText(session, nowPlayingItem)).trigger('create');
+ if (nowPlayingItem) {
+ $('.posterItemDefaultText', elem).hide();
+ $('.posterItemProgress', elem).show();
+ $('.posterItemName', elem).show().html(nowPlayingItem.Name);
- var imageRow = $('.nowPlayingImage', row);
+ $('progress', elem).val(DashboardPage.getPlaybackProgress(session));
+ } else {
+ $('.posterItemDefaultText', elem).show();
+ $('.posterItemProgress', elem).hide();
+ $('.posterItemName', elem).hide().html('');
+ }
- var image = $('img', imageRow)[0];
+ var imageUrl = DashboardPage.getNowPlayingImage(nowPlayingItem);
- var nowPlayingItemId = nowPlayingItem ? nowPlayingItem.Id : null;
- var nowPlayingItemImageTag = nowPlayingItem ? nowPlayingItem.PrimaryImageTag : null;
+ var image = $('.posterItemImage', elem)[0];
- if (!image || image.getAttribute('data-itemid') != nowPlayingItemId || image.getAttribute('data-tag') != nowPlayingItemImageTag) {
- imageRow.html(DashboardPage.getNowPlayingImage(nowPlayingItem));
+ if (imageUrl && imageUrl != image.getAttribute('data-imageurl')) {
+
+ image.style.backgroundImage = 'url(\'' + imageUrl + '\')';
+ image.setAttribute('data-imageurl', imageUrl);
+
+ } else if (!imageUrl && image.getAttribute('data-imageurl')) {
+
+ image.style.backgroundImage = null;
+ image.setAttribute('data-imageurl', '');
}
},
- getClientType: function (connection) {
+ getSessionItemText: function (connection) {
+
+ var html = '';
+
+ html += '';
+ html += DashboardPage.getUsersHtml(connection);
+ html += '
';
+
+ //html += '' + connection.Client + '
';
+ //html += '' + connection.ApplicationVersion + '
';
+
+ html += '' + connection.DeviceName + '
';
+
+ return html;
+ },
+
+ getClientImage: function (connection) {
var clientLowered = connection.Client.toLowerCase();
@@ -262,64 +345,76 @@
imgUrl = 'css/images/clients/html5.png';
}
- return "";
+ return imgUrl;
}
if (clientLowered == "mb-classic") {
- return "";
+ return "css/images/clients/mbc.png";
}
if (clientLowered == "media browser theater") {
- return "";
+ return "css/images/clients/mb.png";
}
if (clientLowered == "android") {
- return "";
+ return "css/images/clients/android.png";
}
if (clientLowered == "roku") {
- return "";
+ return "css/images/clients/roku.jpg";
}
if (clientLowered == "ios") {
- return "";
+ return "css/images/clients/ios.png";
}
if (clientLowered == "windows rt") {
- return "";
+ return "css/images/clients/windowsrt.png";
}
if (clientLowered == "windows phone") {
- return "";
+ return "css/images/clients/windowsphone.png";
}
if (clientLowered == "dlna") {
- return "";
+ return "css/images/clients/dlna.png";
}
if (clientLowered == "mbkinect") {
- return "";
+ return "css/images/clients/mbkinect.png";
}
if (clientLowered == "xbmc") {
- return "";
+ return "css/images/clients/xbmc.png";
}
- return connection.Client;
+ return "css/images/clients/mb.png";
},
getNowPlayingImage: function (item) {
+ if (item && item.ThumbItemId) {
+ return ApiClient.getImageUrl(item.ThumbItemId, {
+ type: "Thumb",
+ height: 300,
+ tag: item.ThumbImageTag
+ });
+ }
+
+ if (item && item.BackdropItemId) {
+ return ApiClient.getImageUrl(item.BackdropItemId, {
+ type: "Backdrop",
+ height: 300,
+ tag: item.BackdropImageTag
+ });
+ }
+
if (item && item.PrimaryImageTag) {
- var url = ApiClient.getImageUrl(item.Id, {
+ return ApiClient.getImageUrl(item.Id, {
type: "Primary",
- height: 100,
+ height: 300,
tag: item.PrimaryImageTag
});
-
- url += "&xxx=" + new Date().getTime();
-
- return "' + title + '
'; + + html += '';
+ html += LibraryBrowser.getPosterViewHtml({
+ items: recommendation.Items,
+ useAverageAspectRatio: true
+ });
+ html += '
';
+
+ return html;
+ }
+
$(document).on('pagebeforeshow', "#moviesRecommendedPage", function () {
var screenWidth = $(window).width();
@@ -8,34 +44,13 @@
var options = {
- SortBy: "DateCreated",
- SortOrder: "Descending",
- IncludeItemTypes: "Movie",
- Limit: screenWidth >= 1920 ? 24 : (screenWidth >= 1440 ? 16 : 12),
- Recursive: true,
- Fields: "PrimaryImageAspectRatio,DateCreated,UserData",
- Filters: "IsUnplayed"
- };
-
- ApiClient.getItems(Dashboard.getCurrentUserId(), options).done(function (result) {
-
- $('#recentlyAddedItems', page).html(LibraryBrowser.getPosterViewHtml({
- items: result.Items,
- useAverageAspectRatio: true
-
- })).createPosterItemHoverMenu();
- });
-
-
- options = {
-
SortBy: "DatePlayed",
SortOrder: "Descending",
IncludeItemTypes: "Movie",
Filters: "IsResumable",
Limit: screenWidth >= 1920 ? 4 : (screenWidth >= 1440 ? 4 : 3),
Recursive: true,
- Fields: "DateCreated,UserData"
+ Fields: "PrimaryImageAspectRatio"
};
ApiClient.getItems(Dashboard.getCurrentUserId(), options).done(function (result) {
@@ -57,33 +72,26 @@
});
- options = {
-
- SortBy: "DateCreated",
- SortOrder: "Descending",
- IncludeItemTypes: "Trailer",
- Limit: screenWidth >= 1920 ? 8 : (screenWidth >= 1440 ? 8 : 6),
- Recursive: true,
- Fields: "PrimaryImageAspectRatio,DateCreated,UserData",
- Filters: "IsUnplayed"
- };
-
- ApiClient.getItems(Dashboard.getCurrentUserId(), options).done(function (result) {
-
- if (result.Items.length) {
- $('#trailerSection', page).show();
- } else {
- $('#trailerSection', page).hide();
- }
-
- $('#trailerItems', page).html(LibraryBrowser.getPosterViewHtml({
- items: result.Items,
- useAverageAspectRatio: true
-
- })).createPosterItemHoverMenu();
-
+ var url = ApiClient.getUrl("Movies/Recommendations", {
+
+ userId: Dashboard.getCurrentUserId(),
+ categoryLimit: screenWidth >= 1200 ? 6 : 3,
+ itemLimit: screenWidth >= 1920 ? 8 : (screenWidth >= 1440 ? 8 : 6),
+ Fields: "PrimaryImageAspectRatio"
});
+ $.getJSON(url).done(function(recommendations) {
+
+ if (!recommendations.length) {
+
+ $('.recommendations', page).html('No movie suggestions are currently available. Start watching and rating your movies, and then come back to view your recommendations.
'); + return; + } + + var html = recommendations.map(getRecommendationHtml).join(''); + + $('.recommendations', page).html(html).createPosterItemHoverMenu(); + }); }); diff --git a/dashboard-ui/scripts/movietrailers.js b/dashboard-ui/scripts/movietrailers.js index 978d3f4839..9f10aea207 100644 --- a/dashboard-ui/scripts/movietrailers.js +++ b/dashboard-ui/scripts/movietrailers.js @@ -7,7 +7,7 @@ SortOrder: "Ascending", IncludeItemTypes: "Trailer", Recursive: true, - Fields: "DateCreated,PrimaryImageAspectRatio", + Fields: "PrimaryImageAspectRatio", StartIndex: 0 }; diff --git a/dashboard-ui/scripts/musicalbums.js b/dashboard-ui/scripts/musicalbums.js index 54b353b97f..5cefbfc1e9 100644 --- a/dashboard-ui/scripts/musicalbums.js +++ b/dashboard-ui/scripts/musicalbums.js @@ -9,7 +9,7 @@ SortOrder: "Ascending", IncludeItemTypes: "MusicAlbum", Recursive: true, - Fields: "DateCreated,PrimaryImageAspectRatio", + Fields: "PrimaryImageAspectRatio", StartIndex: 0 }; diff --git a/dashboard-ui/scripts/songs.js b/dashboard-ui/scripts/songs.js index a3b64e01c9..774ab87f16 100644 --- a/dashboard-ui/scripts/songs.js +++ b/dashboard-ui/scripts/songs.js @@ -9,7 +9,7 @@ SortOrder: "Ascending", IncludeItemTypes: "Audio", Recursive: true, - Fields: "DateCreated,AudioInfo,ParentId", + Fields: "AudioInfo,ParentId", Limit: 200, StartIndex: 0 }; diff --git a/dashboard-ui/scripts/tvshows.js b/dashboard-ui/scripts/tvshows.js index 605c548684..aaa75b4d2e 100644 --- a/dashboard-ui/scripts/tvshows.js +++ b/dashboard-ui/scripts/tvshows.js @@ -9,7 +9,7 @@ SortOrder: "Ascending", IncludeItemTypes: "Series", Recursive: true, - Fields: "SeriesInfo,DateCreated,PrimaryImageAspectRatio", + Fields: "SeriesInfo,PrimaryImageAspectRatio", StartIndex: 0 };