mirror of
https://github.com/jellyfin/jellyfin-web
synced 2025-03-30 19:56:21 +00:00
renamed video backdrops to theme videos
This commit is contained in:
parent
9d42877d91
commit
4457c0b818
7 changed files with 34 additions and 17 deletions
|
@ -1733,7 +1733,7 @@ MediaBrowser.ApiClient = function ($, navigator, JSON, WebSocket, setTimeout) {
|
||||||
});
|
});
|
||||||
};
|
};
|
||||||
|
|
||||||
self.getVideoBackdrops = function (userId, itemId) {
|
self.getThemeVideos = function (userId, itemId) {
|
||||||
|
|
||||||
if (!userId) {
|
if (!userId) {
|
||||||
throw new Error("null userId");
|
throw new Error("null userId");
|
||||||
|
@ -1742,7 +1742,7 @@ MediaBrowser.ApiClient = function ($, navigator, JSON, WebSocket, setTimeout) {
|
||||||
throw new Error("null itemId");
|
throw new Error("null itemId");
|
||||||
}
|
}
|
||||||
|
|
||||||
var url = self.getUrl("Users/" + userId + "/Items/" + itemId + "/VideoBackdrops");
|
var url = self.getUrl("Users/" + userId + "/Items/" + itemId + "/ThemeVideos");
|
||||||
|
|
||||||
return self.ajax({
|
return self.ajax({
|
||||||
type: "GET",
|
type: "GET",
|
||||||
|
|
|
@ -21,7 +21,7 @@
|
||||||
background-size: contain;
|
background-size: contain;
|
||||||
background-repeat: no-repeat;
|
background-repeat: no-repeat;
|
||||||
background-position: center bottom;
|
background-position: center bottom;
|
||||||
background-color: #000;
|
background-color: #333;
|
||||||
}
|
}
|
||||||
|
|
||||||
.transparentPosterItem .posterItemImage {
|
.transparentPosterItem .posterItemImage {
|
||||||
|
|
|
@ -171,9 +171,9 @@
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
<div>
|
<div>
|
||||||
<div data-role="collapsible" id="videoBackdropsCollapsible" style="display: none;" data-mini="true" data-collapsed="false" data-corners="false">
|
<div data-role="collapsible" id="themeVideosCollapsible" style="display: none;" data-mini="true" data-collapsed="false" data-corners="false">
|
||||||
<h3>Video Backdrops</h3>
|
<h3>Theme Videos</h3>
|
||||||
<div id="videoBackdropsContent"></div>
|
<div id="themeVideosContent"></div>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
|
|
|
@ -221,14 +221,14 @@
|
||||||
}
|
}
|
||||||
|
|
||||||
$('#themeSongsCollapsible', page).hide();
|
$('#themeSongsCollapsible', page).hide();
|
||||||
$('#videoBackdropsCollapsible', page).hide();
|
$('#themeVideosCollapsible', page).hide();
|
||||||
|
|
||||||
ApiClient.getThemeSongs(Dashboard.getCurrentUserId(), item.Id).done(function (result) {
|
ApiClient.getThemeSongs(Dashboard.getCurrentUserId(), item.Id).done(function (result) {
|
||||||
renderThemeSongs(page, item, result);
|
renderThemeSongs(page, item, result);
|
||||||
});
|
});
|
||||||
|
|
||||||
ApiClient.getVideoBackdrops(Dashboard.getCurrentUserId(), item.Id).done(function (result) {
|
ApiClient.getThemeVideos(Dashboard.getCurrentUserId(), item.Id).done(function (result) {
|
||||||
renderVideoBackdrops(page, item, result);
|
renderThemeVideos(page, item, result);
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -315,13 +315,13 @@
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
function renderVideoBackdrops(page, item, result) {
|
function renderThemeVideos(page, item, result) {
|
||||||
|
|
||||||
if (result.Items.length) {
|
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');
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -20,7 +20,8 @@
|
||||||
$('#recentlyAddedItems', page).html(LibraryBrowser.getPosterViewHtml({
|
$('#recentlyAddedItems', page).html(LibraryBrowser.getPosterViewHtml({
|
||||||
items: result.Items,
|
items: result.Items,
|
||||||
useAverageAspectRatio: true,
|
useAverageAspectRatio: true,
|
||||||
showNewIndicator: false
|
showNewIndicator: false,
|
||||||
|
transparent: true
|
||||||
}));
|
}));
|
||||||
|
|
||||||
});
|
});
|
||||||
|
@ -40,7 +41,8 @@
|
||||||
|
|
||||||
$('#resumableItems', page).html(LibraryBrowser.getPosterViewHtml({
|
$('#resumableItems', page).html(LibraryBrowser.getPosterViewHtml({
|
||||||
items: result.Items,
|
items: result.Items,
|
||||||
useAverageAspectRatio: true
|
useAverageAspectRatio: true,
|
||||||
|
transparent: true
|
||||||
}));
|
}));
|
||||||
|
|
||||||
});
|
});
|
||||||
|
|
|
@ -163,6 +163,12 @@
|
||||||
|
|
||||||
html += '<p class="itemMiscInfo">' + childText + '</p>';
|
html += '<p class="itemMiscInfo">' + childText + '</p>';
|
||||||
}
|
}
|
||||||
|
else if (item.Type == "GamePlatform") {
|
||||||
|
|
||||||
|
childText = item.ChildCount == 1 ? "1 Game" : item.ChildCount + " Games";
|
||||||
|
|
||||||
|
html += '<p class="itemMiscInfo">' + childText + '</p>';
|
||||||
|
}
|
||||||
else if (item.Type == "MusicAlbum") {
|
else if (item.Type == "MusicAlbum") {
|
||||||
|
|
||||||
childText = item.ChildCount == 1 ? "1 Song" : item.ChildCount + " Songs";
|
childText = item.ChildCount == 1 ? "1 Song" : item.ChildCount + " Songs";
|
||||||
|
@ -425,7 +431,16 @@
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
html += '<a class="posterItem ' + options.shape + 'PosterItem" href="' + LibraryBrowser.getHref(item, options.context) + '">';
|
|
||||||
|
var cssClass = "posterItem";
|
||||||
|
|
||||||
|
if (options.transparent) {
|
||||||
|
cssClass += " transparentPosterItem";
|
||||||
|
}
|
||||||
|
|
||||||
|
cssClass += ' ' + options.shape + 'PosterItem';
|
||||||
|
|
||||||
|
html += '<a class="' + cssClass + '" href="' + LibraryBrowser.getHref(item, options.context) + '">';
|
||||||
|
|
||||||
var style = "";
|
var style = "";
|
||||||
|
|
||||||
|
@ -1093,7 +1108,7 @@
|
||||||
else {
|
else {
|
||||||
url = "css/images/items/detail/video.png";
|
url = "css/images/items/detail/video.png";
|
||||||
useBackgroundColor = true;
|
useBackgroundColor = true;
|
||||||
maxwidth = 150;
|
maxwidth = 150;p
|
||||||
}
|
}
|
||||||
|
|
||||||
if (url) {
|
if (url) {
|
||||||
|
|
|
@ -1,6 +1,6 @@
|
||||||
<?xml version="1.0" encoding="utf-8"?>
|
<?xml version="1.0" encoding="utf-8"?>
|
||||||
<packages>
|
<packages>
|
||||||
<package id="MediaBrowser.ApiClient.Javascript" version="3.0.87" targetFramework="net45" />
|
<package id="MediaBrowser.ApiClient.Javascript" version="3.0.88" targetFramework="net45" />
|
||||||
<package id="ServiceStack.Common" version="3.9.43" targetFramework="net45" />
|
<package id="ServiceStack.Common" version="3.9.43" targetFramework="net45" />
|
||||||
<package id="ServiceStack.Text" version="3.9.43" targetFramework="net45" />
|
<package id="ServiceStack.Text" version="3.9.43" targetFramework="net45" />
|
||||||
</packages>
|
</packages>
|
Loading…
Add table
Add a link
Reference in a new issue