1
0
Fork 0
mirror of https://github.com/jellyfin/jellyfin-web synced 2025-03-30 19:56:21 +00:00

update built in studio images

This commit is contained in:
Luke Pulverenti 2013-12-29 21:41:22 -05:00
parent 2137a2436f
commit 0c23a1a971
6 changed files with 65 additions and 36 deletions

View file

@ -16,9 +16,9 @@
} }
.posterItem:hover { .posterItem:hover {
-moz-box-shadow: 0 0 20px 3px #52B54B; -moz-box-shadow: 0 0 15px 8px #2572EB;
-webkit-box-shadow: 0 0 20px 3px #52B54B; -webkit-box-shadow: 0 0 25px 8px #2572EB;
box-shadow: 0 0 20px 3px #52B54B; box-shadow: 0 0 15px 8px #2572EB;
} }
@ -31,7 +31,7 @@
background-repeat: no-repeat; background-repeat: no-repeat;
background-position: center bottom; background-position: center bottom;
background-color: #000; background-color: #000;
border: 2px solid #1b1b1b; border: 2px solid #202020;
position: relative; position: relative;
} }
@ -81,18 +81,19 @@
right: 0; right: 0;
} }
.posterItemTextOverlay .posterItemText {
.posterItemText + .posterItemText {
padding-top: 2px;
}
.posterItemTextOverlay .posterItemText {
background-color: transparent; background-color: transparent;
padding-left: 5px; padding-left: 5px;
} padding: 0 5px 5px;
}
.posterItemTextOverlay .posterItemText:first-child { .posterItemTextOverlay .posterItemText:first-child {
font-weight: bold; font-weight: bold;
font-size: 14px;
}
.posterItemTextOverlay .posterItemText:last-child {
padding-bottom: 8px;
} }
.posterItemTextCentered { .posterItemTextCentered {

View file

@ -231,7 +231,11 @@
} }
else if (item.Type == "Genre" || item.Type == "Studio" || item.Type == "Person" || item.Type == "MusicArtist" || item.Type == "MusicGenre" || item.Type == "GameGenre") { else if (item.Type == "Genre" || item.Type == "Studio" || item.Type == "Person" || item.Type == "MusicArtist" || item.Type == "MusicGenre" || item.Type == "GameGenre") {
html += LibraryBrowser.getItemCountsHtml(options, item); var itemCountHtml = LibraryBrowser.getItemCountsHtml(options, item);
if (itemCountHtml) {
html += '<p class="itemMiscInfo">' + itemCountHtml + '</p>';
}
} }
else if (item.Type == "Game") { else if (item.Type == "Game") {
@ -335,7 +339,7 @@
} }
} }
return counts.length ? '<p class="itemMiscInfo">' + counts.join(' • ') + '</p>' : ''; return counts.join(' • ');
}, },
getSongHeaderCellHtml: function (text, cssClass, enableSorting, sortField, selectedSortField, sortDirection) { getSongHeaderCellHtml: function (text, cssClass, enableSorting, sortField, selectedSortField, sortDirection) {
@ -727,7 +731,7 @@
} }
else if (options.preferThumb && item.ParentThumbItemId) { else if (options.preferThumb && item.ParentThumbItemId) {
imgUrl = ApiClient.getThumbImageUrl(item, { imgUrl = ApiClient.getThumbImageUrl(item.ParentThumbItemId, {
type: "Thumb", type: "Thumb",
maxwidth: 576 maxwidth: 576
}); });
@ -790,7 +794,7 @@
} }
else if (item.ImageTags && item.ImageTags.Thumb) { else if (item.ImageTags && item.ImageTags.Thumb) {
imgUrl = ApiClient.getImageUrl(item, { imgUrl = ApiClient.getImageUrl(item.Id, {
type: "Thumb", type: "Thumb",
maxwidth: 576, maxwidth: 576,
tag: item.ImageTags.Thumb tag: item.ImageTags.Thumb
@ -913,6 +917,17 @@
html += "</div>"; html += "</div>";
} }
if (options.showItemCounts) {
var itemCountHtml = LibraryBrowser.getItemCountsHtml(options, item);
if (itemCountHtml) {
html += "<div class='" + cssclass + "'>";
html += itemCountHtml;
html += "</div>";
}
}
if (options.showPremiereDate && item.PremiereDate) { if (options.showPremiereDate && item.PremiereDate) {
try { try {

View file

@ -36,6 +36,16 @@
} }
} }
function exitFullScreen() {
if (document.exitFullscreen) {
document.exitFullscreen();
} else if (document.mozExitFullScreen) {
document.mozExitFullScreen();
} else if (document.webkitExitFullscreen) {
document.webkitExitFullscreen();
}
}
function isFullScreen() { function isFullScreen() {
return document.fullscreenEnabled || document.mozFullscreenEnabled || document.webkitIsFullScreen || document.mozFullScreen ? true : false; return document.fullscreenEnabled || document.mozFullscreenEnabled || document.webkitIsFullScreen || document.mozFullScreen ? true : false;
} }
@ -1316,6 +1326,9 @@
$('#nowPlayingBar').hide(); $('#nowPlayingBar').hide();
if (isFullScreen()) {
exitFullScreen();
}
}; };
self.isPlaying = function () { self.isPlaying = function () {

View file

@ -29,10 +29,13 @@
var checkSortOption = $('.radioSortBy:checked', page); var checkSortOption = $('.radioSortBy:checked', page);
$('.viewSummary', page).html(LibraryBrowser.getViewSummaryHtml(query, checkSortOption)).trigger('create'); $('.viewSummary', page).html(LibraryBrowser.getViewSummaryHtml(query, checkSortOption)).trigger('create');
html += LibraryBrowser.getPosterDetailViewHtml({ html = LibraryBrowser.getPosterViewHtml({
items: result.Items, items: result.Items,
context: "movies", shape: "backdrop",
shape: "backdrop" preferThumb: true,
context: 'movies',
showItemCounts: true,
centerText: true
}); });
html += LibraryBrowser.getPagingHtml(query, result.TotalRecordCount); html += LibraryBrowser.getPagingHtml(query, result.TotalRecordCount);

View file

@ -321,7 +321,7 @@ var Dashboard = {
var onclick = removeOnHide ? "$(\"#" + options.id + "\").remove();" : "$(\"#" + options.id + "\").hide();"; var onclick = removeOnHide ? "$(\"#" + options.id + "\").remove();" : "$(\"#" + options.id + "\").hide();";
if (options.allowHide !== false) { if (options.allowHide !== false) {
options.html += "<span style='margin-left: 1em;'><button type='button' onclick='" + onclick + "' data-icon='delete' data-iconpos='notext' data-mini='true' data-inline='true' data-theme='a'>Hide</button></span>"; options.html += "<span style='margin-left: 1em;'><button type='button' onclick='" + onclick + "' data-icon='delete' data-iconpos='notext' data-mini='true' data-inline='true' data-theme='b'>Hide</button></span>";
} }
if (options.forceShow) { if (options.forceShow) {

View file

@ -29,19 +29,16 @@
var checkSortOption = $('.radioSortBy:checked', page); var checkSortOption = $('.radioSortBy:checked', page);
$('.viewSummary', page).html(LibraryBrowser.getViewSummaryHtml(query, checkSortOption)).trigger('create'); $('.viewSummary', page).html(LibraryBrowser.getViewSummaryHtml(query, checkSortOption)).trigger('create');
//html += LibraryBrowser.getPosterViewHtml({ html += LibraryBrowser.getPosterViewHtml({
// items: result.Items,
// useAverageAspectRatio: true,
// shape: "backdrop",
// showTitle: false,
// overlayText: false,
// context: 'tv'
//});
html += LibraryBrowser.getPosterDetailViewHtml({
items: result.Items, items: result.Items,
context: "tv", useAverageAspectRatio: true,
shape: "backdrop" shape: "backdrop",
showTitle: false,
overlayText: false,
context: 'tv',
preferThumb: true,
showItemCounts: true,
centerText: true
}); });
html += LibraryBrowser.getPagingHtml(query, result.TotalRecordCount); html += LibraryBrowser.getPagingHtml(query, result.TotalRecordCount);