mirror of
https://github.com/jellyfin/jellyfin-web
synced 2025-03-30 19:56:21 +00:00
move collections back under movies. add movie suggestions page.
This commit is contained in:
parent
07308ea9a7
commit
9db8c276cc
27 changed files with 398 additions and 155 deletions
|
@ -4,8 +4,18 @@
|
|||
<title>Media Browser</title>
|
||||
</head>
|
||||
<body>
|
||||
<div id="boxsetsPage" data-role="page" class="page libraryPage" data-theme="b" data-view="boxsets">
|
||||
<div id="boxsetsPage" data-role="page" class="page libraryPage" data-theme="b" data-view="movies">
|
||||
|
||||
<div class="libraryViewNav">
|
||||
<a href="moviesrecommended.html">Suggested</a>
|
||||
<a href="movieslatest.html">Latest</a>
|
||||
<a href="movies.html">Movies</a>
|
||||
<a href="#" class="ui-btn-active">Collections</a>
|
||||
<a href="movietrailers.html">Trailers</a>
|
||||
<a href="moviegenres.html">Genres</a>
|
||||
<a href="moviepeople.html">People</a>
|
||||
<a href="moviestudios.html">Studios</a>
|
||||
</div>
|
||||
<div class="alphabetPicker">
|
||||
</div>
|
||||
<div data-role="content">
|
||||
|
|
|
@ -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;
|
||||
|
|
|
@ -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 {
|
||||
|
|
|
@ -330,6 +330,10 @@ h1 .imageLink {
|
|||
height: 30px;
|
||||
}
|
||||
|
||||
.activeDevicesCollapsible .ui-collapsible-content {
|
||||
padding: .5em .5em !important;
|
||||
}
|
||||
|
||||
@media all and (min-width: 450px) {
|
||||
|
||||
.currentUsername {
|
||||
|
|
|
@ -60,11 +60,9 @@
|
|||
</div>
|
||||
</div>
|
||||
|
||||
<div data-role="collapsible" data-collapsed="false" style="margin-top: 2em;">
|
||||
<h3>Active Connections</h3>
|
||||
<div>
|
||||
<table class="tblConnections" style="border-collapse: collapse;">
|
||||
</table>
|
||||
<div class="activeDevicesCollapsible" data-role="collapsible" data-collapsed="false" style="margin-top: 2em;">
|
||||
<h3>Active Devices</h3>
|
||||
<div class="connections">
|
||||
</div>
|
||||
</div>
|
||||
|
||||
|
|
|
@ -8,7 +8,9 @@
|
|||
<div id="movieGenreTabs" class="itemTabs" style="display: none;">
|
||||
<div class="libraryViewNav">
|
||||
<a href="moviesrecommended.html">Suggested</a>
|
||||
<a href="movieslatest.html">Latest</a>
|
||||
<a href="movies.html">Movies</a>
|
||||
<a href="collections.html">Collections</a>
|
||||
<a href="movietrailers.html">Trailers</a>
|
||||
<a href="moviegenres.html" class="ui-btn-active">Genres</a>
|
||||
<a href="moviepeople.html">People</a>
|
||||
|
@ -18,7 +20,9 @@
|
|||
<div id="moviePeopleTabs" class="itemTabs" style="display: none;">
|
||||
<div class="libraryViewNav">
|
||||
<a href="moviesrecommended.html">Suggested</a>
|
||||
<a href="movieslatest.html">Latest</a>
|
||||
<a href="movies.html">Movies</a>
|
||||
<a href="collections.html">Collections</a>
|
||||
<a href="movietrailers.html">Trailers</a>
|
||||
<a href="moviegenres.html">Genres</a>
|
||||
<a href="moviepeople.html" class="ui-btn-active">People</a>
|
||||
|
@ -28,7 +32,9 @@
|
|||
<div id="movieStudioTabs" class="itemTabs" style="display: none;">
|
||||
<div class="libraryViewNav">
|
||||
<a href="moviesrecommended.html">Suggested</a>
|
||||
<a href="movieslatest.html">Latest</a>
|
||||
<a href="movies.html">Movies</a>
|
||||
<a href="collections.html">Collections</a>
|
||||
<a href="movietrailers.html">Trailers</a>
|
||||
<a href="moviegenres.html">Genres</a>
|
||||
<a href="moviepeople.html">People</a>
|
||||
|
|
|
@ -8,7 +8,9 @@
|
|||
<div id="movieTabs" class="itemTabs" style="display: none;">
|
||||
<div class="libraryViewNav">
|
||||
<a href="moviesrecommended.html">Suggested</a>
|
||||
<a href="movieslatest.html">Latest</a>
|
||||
<a href="movies.html" class="ui-btn-active">Movies</a>
|
||||
<a href="collections.html">Collections</a>
|
||||
<a href="movietrailers.html">Trailers</a>
|
||||
<a href="moviegenres.html">Genres</a>
|
||||
<a href="moviepeople.html">People</a>
|
||||
|
@ -18,7 +20,9 @@
|
|||
<div id="trailerTabs" class="itemTabs" style="display: none;">
|
||||
<div class="libraryViewNav">
|
||||
<a href="moviesrecommended.html">Suggested</a>
|
||||
<a href="movieslatest.html">Latest</a>
|
||||
<a href="movies.html">Movies</a>
|
||||
<a href="collections.html">Collections</a>
|
||||
<a href="movietrailers.html" class="ui-btn-active">Trailers</a>
|
||||
<a href="moviegenres.html">Genres</a>
|
||||
<a href="moviepeople.html">People</a>
|
||||
|
|
|
@ -8,7 +8,9 @@
|
|||
|
||||
<div class="libraryViewNav">
|
||||
<a href="moviesrecommended.html">Suggested</a>
|
||||
<a href="movieslatest.html">Latest</a>
|
||||
<a href="movies.html">Movies</a>
|
||||
<a href="collections.html">Collections</a>
|
||||
<a href="movietrailers.html">Trailers</a>
|
||||
<a href="moviegenres.html" class="ui-btn-active">Genres</a>
|
||||
<a href="moviepeople.html">People</a>
|
||||
|
|
|
@ -8,7 +8,9 @@
|
|||
|
||||
<div class="libraryViewNav">
|
||||
<a href="moviesrecommended.html">Suggested</a>
|
||||
<a href="movieslatest.html">Latest</a>
|
||||
<a href="movies.html">Movies</a>
|
||||
<a href="collections.html">Collections</a>
|
||||
<a href="movietrailers.html">Trailers</a>
|
||||
<a href="moviegenres.html">Genres</a>
|
||||
<a href="moviepeople.html" class="ui-btn-active">People</a>
|
||||
|
|
|
@ -8,7 +8,9 @@
|
|||
|
||||
<div class="libraryViewNav">
|
||||
<a href="moviesrecommended.html">Suggested</a>
|
||||
<a href="movieslatest.html">Latest</a>
|
||||
<a href="movies.html" class="ui-btn-active">Movies</a>
|
||||
<a href="collections.html">Collections</a>
|
||||
<a href="movietrailers.html">Trailers</a>
|
||||
<a href="moviegenres.html">Genres</a>
|
||||
<a href="moviepeople.html">People</a>
|
||||
|
|
42
dashboard-ui/movieslatest.html
Normal file
42
dashboard-ui/movieslatest.html
Normal file
|
@ -0,0 +1,42 @@
|
|||
<!DOCTYPE html>
|
||||
<html>
|
||||
<head>
|
||||
<title>Media Browser</title>
|
||||
</head>
|
||||
<body>
|
||||
<div id="moviesLatestPage" data-role="page" class="page libraryPage" data-theme="b" data-view="movies">
|
||||
|
||||
<div class="libraryViewNav">
|
||||
<a href="moviesrecommended.html">Suggested</a>
|
||||
<a href="#" class="ui-btn-active">Latest</a>
|
||||
<a href="movies.html">Movies</a>
|
||||
<a href="collections.html">Collections</a>
|
||||
<a href="movietrailers.html">Trailers</a>
|
||||
<a href="moviegenres.html">Genres</a>
|
||||
<a href="moviepeople.html">People</a>
|
||||
<a href="moviestudios.html">Studios</a>
|
||||
</div>
|
||||
|
||||
<div data-role="content">
|
||||
|
||||
<table class="ehsContent">
|
||||
<tr>
|
||||
<td>
|
||||
<h1 class="listHeader">Latest Movies</h1>
|
||||
|
||||
<div id="recentlyAddedItems">
|
||||
</div>
|
||||
|
||||
<div id="trailerSection" style="display: none;">
|
||||
<h1 class="listHeader">Latest Trailers</h1>
|
||||
|
||||
<div id="trailerItems">
|
||||
</div>
|
||||
</div>
|
||||
</td>
|
||||
</tr>
|
||||
</table>
|
||||
</div>
|
||||
</div>
|
||||
</body>
|
||||
</html>
|
|
@ -7,8 +7,10 @@
|
|||
<div id="moviesRecommendedPage" data-role="page" class="page libraryPage" data-theme="b" data-view="movies">
|
||||
|
||||
<div class="libraryViewNav">
|
||||
<a href="moviesrecommended.html" class="ui-btn-active">Suggested</a>
|
||||
<a href="#" class="ui-btn-active">Suggested</a>
|
||||
<a href="movieslatest.html">Latest</a>
|
||||
<a href="movies.html">Movies</a>
|
||||
<a href="collections.html">Collections</a>
|
||||
<a href="movietrailers.html">Trailers</a>
|
||||
<a href="moviegenres.html">Genres</a>
|
||||
<a href="moviepeople.html">People</a>
|
||||
|
@ -27,16 +29,7 @@
|
|||
</div>
|
||||
</div>
|
||||
|
||||
<h1 class="listHeader">Latest Movies</h1>
|
||||
|
||||
<div id="recentlyAddedItems">
|
||||
</div>
|
||||
|
||||
<div id="trailerSection" style="display: none;">
|
||||
<h1 class="listHeader">Latest Trailers</h1>
|
||||
|
||||
<div id="trailerItems">
|
||||
</div>
|
||||
<div class="recommendations">
|
||||
</div>
|
||||
</td>
|
||||
</tr>
|
||||
|
|
|
@ -8,7 +8,9 @@
|
|||
|
||||
<div class="libraryViewNav">
|
||||
<a href="moviesrecommended.html">Suggested</a>
|
||||
<a href="movieslatest.html">Latest</a>
|
||||
<a href="movies.html">Movies</a>
|
||||
<a href="collections.html">Collections</a>
|
||||
<a href="movietrailers.html">Trailers</a>
|
||||
<a href="moviegenres.html">Genres</a>
|
||||
<a href="moviepeople.html">People</a>
|
||||
|
|
|
@ -8,7 +8,9 @@
|
|||
|
||||
<div class="libraryViewNav">
|
||||
<a href="moviesrecommended.html">Suggested</a>
|
||||
<a href="movieslatest.html">Latest</a>
|
||||
<a href="movies.html">Movies</a>
|
||||
<a href="collections.html">Collections</a>
|
||||
<a href="movietrailers.html" class="ui-btn-active">Trailers</a>
|
||||
<a href="moviegenres.html">Genres</a>
|
||||
<a href="moviepeople.html">People</a>
|
||||
|
|
|
@ -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 += '<tr class="trSession" id="' + rowId + '">';
|
||||
|
||||
html += '<td class="clientType" style="text-align:center;">';
|
||||
html += DashboardPage.getClientType(connection);
|
||||
html += '</td>';
|
||||
|
||||
html += '<td>';
|
||||
|
||||
html += '<div>';
|
||||
|
||||
if (deviceId == connection.DeviceId) {
|
||||
html += connection.Client;
|
||||
} else {
|
||||
html += '<a href="#" onclick="RemoteControl.showMenu({sessionId:\'' + connection.Id + '\'});">' + connection.Client + '</a>';
|
||||
}
|
||||
html += '</div>';
|
||||
|
||||
html += '<div>' + connection.ApplicationVersion + '</div>';
|
||||
html += '<div>' + connection.DeviceName + '</div>';
|
||||
html += '</td>';
|
||||
|
||||
html += '<td class="username">';
|
||||
html += DashboardPage.getUsersHtml(connection);
|
||||
html += '</td>';
|
||||
html += '<div class="sessionPosterItem posterItem squarePosterItem" id="' + itemId + '" style="vertical-align:top;margin-bottom:2em;">';
|
||||
|
||||
var nowPlayingItem = connection.NowPlayingItem;
|
||||
var imageUrl = DashboardPage.getNowPlayingImage(nowPlayingItem);
|
||||
|
||||
html += '<td class="nowPlayingImage">';
|
||||
html += DashboardPage.getNowPlayingImage(nowPlayingItem);
|
||||
html += '</td>';
|
||||
|
||||
html += '<td class="nowPlayingText">';
|
||||
html += DashboardPage.getNowPlayingText(connection, nowPlayingItem);
|
||||
html += '</td>';
|
||||
|
||||
html += '</tr>';
|
||||
var style = "";
|
||||
|
||||
if (imageUrl) {
|
||||
style += 'background-image:url(\'' + imageUrl + '\');';
|
||||
}
|
||||
|
||||
table.append(html).trigger('create');
|
||||
var onclick = connection.DeviceId == deviceId ? '' : ' onclick="RemoteControl.showMenu({sessionId:\'' + connection.Id + '\'});"';
|
||||
|
||||
$('.deadSession', table).remove();
|
||||
html += '<a' + onclick + ' data-imageurl="' + imageUrl + '" href="#" class="posterItemImage coveredPosterItemImage" style="' + style + 'background-color:#f2f2f2;display:block;">';
|
||||
|
||||
var defaultTextStyle = '';
|
||||
|
||||
if (nowPlayingItem) {
|
||||
defaultTextStyle = "display:none;";
|
||||
}
|
||||
html += '<div class="posterItemDefaultText" style="' + defaultTextStyle + '">Nothing currently playing</div>';
|
||||
|
||||
html += '<div class="posterItemTextOverlay">';
|
||||
|
||||
var itemNameStyle='';
|
||||
|
||||
if (!nowPlayingItem) {
|
||||
itemNameStyle = "display:none;";
|
||||
}
|
||||
html += '<div class="posterItemText posterItemName" style="' + itemNameStyle + '">' + (nowPlayingItem ? nowPlayingItem.Name : '') + '</div>';
|
||||
|
||||
var progressStyle='';
|
||||
|
||||
if (!nowPlayingItem) {
|
||||
progressStyle = "display:none;";
|
||||
}
|
||||
html += "<div class='posterItemText posterItemProgress' style='" + progressStyle + "'>";
|
||||
|
||||
html += '<progress class="itemProgressBar" min="0" max="100" value="' + DashboardPage.getPlaybackProgress(connection) + '"></progress>';
|
||||
html += "</div>";
|
||||
html += "</div>";
|
||||
|
||||
html += '<img src="' + DashboardPage.getClientImage(connection) + '" style="top:10px;left:10px;height:24px;position:absolute;opacity: .95;" />';
|
||||
|
||||
html += '</a>';
|
||||
|
||||
html += '<div class="sessionItemText">' + DashboardPage.getSessionItemText(connection) + '</div>';
|
||||
|
||||
//html += '<td class="clientType" style="text-align:center;">';
|
||||
//html += DashboardPage.getClientType(connection);
|
||||
//html += '</td>';
|
||||
|
||||
//html += '<td>';
|
||||
|
||||
//html += '<div>';
|
||||
|
||||
//if (deviceId == connection.DeviceId) {
|
||||
// html += connection.Client;
|
||||
//} else {
|
||||
// html += '<a href="#" onclick="RemoteControl.showMenu({sessionId:\'' + connection.Id + '\'});">' + connection.Client + '</a>';
|
||||
//}
|
||||
//html += '</div>';
|
||||
|
||||
//html += '</td>';
|
||||
|
||||
//html += '<td class="nowPlayingImage">';
|
||||
//html += DashboardPage.getNowPlayingImage(nowPlayingItem);
|
||||
//html += '</td>';
|
||||
|
||||
//html += '<td class="nowPlayingText">';
|
||||
//html += DashboardPage.getNowPlayingText(connection, nowPlayingItem);
|
||||
//html += '</td>';
|
||||
|
||||
html += '</div>';
|
||||
}
|
||||
|
||||
container.append(html).trigger('create');
|
||||
|
||||
$('.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 = '<div>';
|
||||
|
||||
if (session.UserId) {
|
||||
html += '<div><a href="useredit.html?userid=' + session.UserId + '">' + session.UserName + '</a><div>';
|
||||
html += session.UserName;
|
||||
}
|
||||
|
||||
html += session.AdditionalUsers.map(function (currentSession) {
|
||||
|
||||
return '<div><a href="useredit.html?userid=' + currentSession.UserId + '">' + currentSession.UserName + '</a><div>';
|
||||
return ', ' + currentSession.UserName;
|
||||
});
|
||||
|
||||
html += '</div>';
|
||||
|
||||
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 += '<div class="posterItemText">';
|
||||
html += DashboardPage.getUsersHtml(connection);
|
||||
html += '</div>';
|
||||
|
||||
//html += '<div class="posterItemText">' + connection.Client + '</div>';
|
||||
//html += '<div class="posterItemText">' + connection.ApplicationVersion + '</div>';
|
||||
|
||||
html += '<div class="posterItemText">' + connection.DeviceName + '</div>';
|
||||
|
||||
return html;
|
||||
},
|
||||
|
||||
getClientImage: function (connection) {
|
||||
|
||||
var clientLowered = connection.Client.toLowerCase();
|
||||
|
||||
|
@ -262,64 +345,76 @@
|
|||
imgUrl = 'css/images/clients/html5.png';
|
||||
}
|
||||
|
||||
return "<img src='" + imgUrl + "' alt='Dashboard' />";
|
||||
return imgUrl;
|
||||
}
|
||||
if (clientLowered == "mb-classic") {
|
||||
|
||||
return "<img src='css/images/clients/mbc.png' alt='Media Browser Classic' />";
|
||||
return "css/images/clients/mbc.png";
|
||||
}
|
||||
if (clientLowered == "media browser theater") {
|
||||
|
||||
return "<img src='css/images/clients/mb.png' alt='Media Browser Theater' />";
|
||||
return "css/images/clients/mb.png";
|
||||
}
|
||||
if (clientLowered == "android") {
|
||||
|
||||
return "<img src='css/images/clients/android.png' alt='Android' />";
|
||||
return "css/images/clients/android.png";
|
||||
}
|
||||
if (clientLowered == "roku") {
|
||||
|
||||
return "<img src='css/images/clients/roku.jpg' alt='Roku' />";
|
||||
return "css/images/clients/roku.jpg";
|
||||
}
|
||||
if (clientLowered == "ios") {
|
||||
|
||||
return "<img src='css/images/clients/ios.png' alt='iOS' />";
|
||||
return "css/images/clients/ios.png";
|
||||
}
|
||||
if (clientLowered == "windows rt") {
|
||||
|
||||
return "<img src='css/images/clients/windowsrt.png' alt='Windows RT' />";
|
||||
return "css/images/clients/windowsrt.png";
|
||||
}
|
||||
if (clientLowered == "windows phone") {
|
||||
|
||||
return "<img src='css/images/clients/windowsphone.png' alt='Windows Phone' />";
|
||||
return "css/images/clients/windowsphone.png";
|
||||
}
|
||||
if (clientLowered == "dlna") {
|
||||
|
||||
return "<img src='css/images/clients/dlna.png' alt='Dlna' />";
|
||||
return "css/images/clients/dlna.png";
|
||||
}
|
||||
if (clientLowered == "mbkinect") {
|
||||
|
||||
return "<img src='css/images/clients/mbkinect.png' alt='MB Kinect' />";
|
||||
return "css/images/clients/mbkinect.png";
|
||||
}
|
||||
if (clientLowered == "xbmc") {
|
||||
|
||||
return "<img src='css/images/clients/xbmc.png' alt='Xbmc' />";
|
||||
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 "<img data-itemid='" + item.Id + "' data-tag='" + item.PrimaryImageTag + "' class='clientNowPlayingImage' src='" + url + "' alt='" + item.Name + "' title='" + item.Name + "' />";
|
||||
}
|
||||
|
||||
return "";
|
||||
|
|
|
@ -7,7 +7,7 @@
|
|||
SortOrder: "Ascending",
|
||||
IncludeItemTypes: "Episode",
|
||||
Recursive: true,
|
||||
Fields: "DateCreated,SeriesInfo,PrimaryImageAspectRatio",
|
||||
Fields: "SeriesInfo,PrimaryImageAspectRatio",
|
||||
StartIndex: 0,
|
||||
IsMissing: false,
|
||||
IsVirtualUnaired: false
|
||||
|
|
|
@ -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
|
||||
};
|
||||
|
|
|
@ -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,
|
||||
|
|
|
@ -92,10 +92,6 @@
|
|||
html += '<a class="viewMenuLink viewMenuTextLink desktopViewMenuLink' + (view == 'games' ? selectedCssClass : '') + '" href="gamesrecommended.html">' + (view == 'games' ? selectedHtml : '') + '<span class="viewName">Games</span></a>';
|
||||
}
|
||||
|
||||
if (counts.MovieCount || counts.SeriesCount || counts.SongCount || counts.GameCount) {
|
||||
html += '<a class="viewMenuLink viewMenuTextLink desktopViewMenuLink' + (view == 'boxsets' ? selectedCssClass : '') + '" href="collections.html">' + (view == 'boxsets' ? selectedHtml : '') + '<span class="viewName">Collections</span></a>';
|
||||
}
|
||||
|
||||
$('.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' },
|
||||
|
|
|
@ -7,7 +7,7 @@
|
|||
SortOrder: "Ascending",
|
||||
IncludeItemTypes: "BoxSet",
|
||||
Recursive: true,
|
||||
Fields: "DateCreated,PrimaryImageAspectRatio",
|
||||
Fields: "PrimaryImageAspectRatio",
|
||||
StartIndex: 0
|
||||
};
|
||||
|
||||
|
|
|
@ -9,7 +9,7 @@
|
|||
SortOrder: "Ascending",
|
||||
IncludeItemTypes: "Movie",
|
||||
Recursive: true,
|
||||
Fields: "DateCreated,PrimaryImageAspectRatio",
|
||||
Fields: "PrimaryImageAspectRatio",
|
||||
StartIndex: 0
|
||||
};
|
||||
|
||||
|
|
60
dashboard-ui/scripts/movieslatest.js
Normal file
60
dashboard-ui/scripts/movieslatest.js
Normal file
|
@ -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);
|
|
@ -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 += '<h1 class="listHeader">' + title + '</h1>';
|
||||
|
||||
html += '<div>';
|
||||
html += LibraryBrowser.getPosterViewHtml({
|
||||
items: recommendation.Items,
|
||||
useAverageAspectRatio: true
|
||||
});
|
||||
html += '</div>';
|
||||
|
||||
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('<br/><p>No movie suggestions are currently available. Start watching and rating your movies, and then come back to view your recommendations.</p>');
|
||||
return;
|
||||
}
|
||||
|
||||
var html = recommendations.map(getRecommendationHtml).join('');
|
||||
|
||||
$('.recommendations', page).html(html).createPosterItemHoverMenu();
|
||||
});
|
||||
});
|
||||
|
||||
|
||||
|
|
|
@ -7,7 +7,7 @@
|
|||
SortOrder: "Ascending",
|
||||
IncludeItemTypes: "Trailer",
|
||||
Recursive: true,
|
||||
Fields: "DateCreated,PrimaryImageAspectRatio",
|
||||
Fields: "PrimaryImageAspectRatio",
|
||||
StartIndex: 0
|
||||
};
|
||||
|
||||
|
|
|
@ -9,7 +9,7 @@
|
|||
SortOrder: "Ascending",
|
||||
IncludeItemTypes: "MusicAlbum",
|
||||
Recursive: true,
|
||||
Fields: "DateCreated,PrimaryImageAspectRatio",
|
||||
Fields: "PrimaryImageAspectRatio",
|
||||
StartIndex: 0
|
||||
};
|
||||
|
||||
|
|
|
@ -9,7 +9,7 @@
|
|||
SortOrder: "Ascending",
|
||||
IncludeItemTypes: "Audio",
|
||||
Recursive: true,
|
||||
Fields: "DateCreated,AudioInfo,ParentId",
|
||||
Fields: "AudioInfo,ParentId",
|
||||
Limit: 200,
|
||||
StartIndex: 0
|
||||
};
|
||||
|
|
|
@ -9,7 +9,7 @@
|
|||
SortOrder: "Ascending",
|
||||
IncludeItemTypes: "Series",
|
||||
Recursive: true,
|
||||
Fields: "SeriesInfo,DateCreated,PrimaryImageAspectRatio",
|
||||
Fields: "SeriesInfo,PrimaryImageAspectRatio",
|
||||
StartIndex: 0
|
||||
};
|
||||
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue