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

fix movie screens

Browse source
This commit is contained in:
Luke Pulverenti 2016-07-30 01:58:07 -04:00
parent e0faf75197
commit a273215243
4 changed files with 61 additions and 19 deletions
Download patch file Download diff file Expand all files Collapse all files

2
dashboard-ui/movies.html
View file

@ -71,7 +71,7 @@
<div class="alphaPicker alphabetPicker vertical">
</div>
<div is="emby-itemscontainer" class="itemsContainer itemsContainerWithAlphaPicker">
<div is="emby-itemscontainer" class="itemsContainer itemsContainerWithAlphaPicker vertical-wrap">
</div>
<div style="text-align: center; display: flex; flex-wrap: wrap; align-items: center; justify-content: center;padding:.7em .5em;">
<div class="paging"></div>

33
dashboard-ui/scripts/moviecollections.js
View file

@ -1,4 +1,4 @@
define(['events', 'libraryBrowser', 'imageLoader', 'alphaPicker', 'listView', 'emby-itemscontainer'], function (events, libraryBrowser, imageLoader, alphaPicker, listView) {
define(['events', 'libraryBrowser', 'imageLoader', 'alphaPicker', 'listView', 'cardBuilder', 'emby-itemscontainer'], function (events, libraryBrowser, imageLoader, alphaPicker, listView, cardBuilder) {
return function (view, params, tabContent) {
@ -45,6 +45,25 @@
return context.savedQueryKey;
}
function onViewStyleChange() {
var viewStyle = self.getCurrentViewStyle();
var itemsContainer = tabContent.querySelector('.itemsContainer');
if (viewStyle == "List") {
itemsContainer.classList.add('vertical-list');
itemsContainer.classList.remove('vertical-wrap');
}
else {
itemsContainer.classList.remove('vertical-list');
itemsContainer.classList.add('vertical-wrap');
}
itemsContainer.innerHTML = '';
}
function reloadItems(page) {
Dashboard.showLoadingMsg();
@ -74,7 +93,7 @@
if (viewStyle == "Thumb") {
html = libraryBrowser.getPosterViewHtml({
html = cardBuilder.getCardsHtml({
items: result.Items,
shape: "backdrop",
preferThumb: true,
@ -85,7 +104,7 @@
}
else if (viewStyle == "ThumbCard") {
html = libraryBrowser.getPosterViewHtml({
html = cardBuilder.getCardsHtml({
items: result.Items,
shape: "backdrop",
preferThumb: true,
@ -98,7 +117,7 @@
}
else if (viewStyle == "Banner") {
html = libraryBrowser.getPosterViewHtml({
html = cardBuilder.getCardsHtml({
items: result.Items,
shape: "banner",
preferBanner: true,
@ -116,7 +135,7 @@
}
else if (viewStyle == "PosterCard") {
html = libraryBrowser.getPosterViewHtml({
html = cardBuilder.getCardsHtml({
items: result.Items,
shape: "auto",
context: 'movies',
@ -130,7 +149,7 @@
else {
// Poster
html = libraryBrowser.getPosterViewHtml({
html = cardBuilder.getCardsHtml({
items: result.Items,
shape: "auto",
context: 'movies',
@ -246,6 +265,7 @@
getPageData(tabContent).view = viewStyle;
libraryBrowser.saveViewSetting(getSavedQueryKey(tabContent), viewStyle);
getQuery(tabContent).StartIndex = 0;
onViewStyleChange();
reloadItems(tabContent);
});
@ -269,6 +289,7 @@
};
initPage(tabContent);
onViewStyleChange();
self.renderTab = function () {

33
dashboard-ui/scripts/movies.js
View file

@ -1,4 +1,4 @@
define(['events', 'libraryBrowser', 'imageLoader', 'alphaPicker', 'listView', 'emby-itemscontainer'], function (events, libraryBrowser, imageLoader, alphaPicker, listView) {
define(['events', 'libraryBrowser', 'imageLoader', 'alphaPicker', 'listView', 'cardBuilder', 'emby-itemscontainer'], function (events, libraryBrowser, imageLoader, alphaPicker, listView, cardBuilder) {
return function (view, params, tabContent) {
@ -46,6 +46,25 @@
return context.savedQueryKey;
}
function onViewStyleChange() {
var viewStyle = self.getCurrentViewStyle();
var itemsContainer = tabContent.querySelector('.itemsContainer');
if (viewStyle == "List") {
itemsContainer.classList.add('vertical-list');
itemsContainer.classList.remove('vertical-wrap');
}
else {
itemsContainer.classList.remove('vertical-list');
itemsContainer.classList.add('vertical-wrap');
}
itemsContainer.innerHTML = '';
}
function reloadItems(page) {
Dashboard.showLoadingMsg();
@ -75,7 +94,7 @@
if (viewStyle == "Thumb") {
html = libraryBrowser.getPosterViewHtml({
html = cardBuilder.getCardsHtml({
items: result.Items,
shape: "backdrop",
preferThumb: true,
@ -86,7 +105,7 @@
}
else if (viewStyle == "ThumbCard") {
html = libraryBrowser.getPosterViewHtml({
html = cardBuilder.getCardsHtml({
items: result.Items,
shape: "backdrop",
preferThumb: true,
@ -99,7 +118,7 @@
}
else if (viewStyle == "Banner") {
html = libraryBrowser.getPosterViewHtml({
html = cardBuilder.getCardsHtml({
items: result.Items,
shape: "banner",
preferBanner: true,
@ -117,7 +136,7 @@
}
else if (viewStyle == "PosterCard") {
html = libraryBrowser.getPosterViewHtml({
html = cardBuilder.getCardsHtml({
items: result.Items,
shape: "portrait",
context: 'movies',
@ -130,7 +149,7 @@
else {
// Poster
html = libraryBrowser.getPosterViewHtml({
html = cardBuilder.getCardsHtml({
items: result.Items,
shape: "portrait",
context: 'movies',
@ -296,6 +315,7 @@
getPageData(tabContent).view = viewStyle;
libraryBrowser.saveViewSetting(getSavedQueryKey(tabContent), viewStyle);
getQuery(tabContent).StartIndex = 0;
onViewStyleChange();
reloadItems(tabContent);
});
}
@ -305,6 +325,7 @@
};
initPage(tabContent);
onViewStyleChange();
self.renderTab = function () {

12
dashboard-ui/scripts/movietrailers.js
View file

@ -1,4 +1,4 @@
define(['events', 'libraryBrowser', 'imageLoader', 'alphaPicker', 'listView', 'emby-itemscontainer'], function (events, libraryBrowser, imageLoader, alphaPicker, listView) {
define(['events', 'libraryBrowser', 'imageLoader', 'alphaPicker', 'listView', 'cardBuilder', 'emby-itemscontainer'], function (events, libraryBrowser, imageLoader, alphaPicker, listView, cardBuilder) {
return function (view, params, tabContent) {
@ -74,7 +74,7 @@
if (viewStyle == "Thumb") {
html = libraryBrowser.getPosterViewHtml({
html = cardBuilder.getCardsHtml({
items: result.Items,
shape: "backdrop",
preferThumb: true,
@ -85,7 +85,7 @@
}
else if (viewStyle == "ThumbCard") {
html = libraryBrowser.getPosterViewHtml({
html = cardBuilder.getCardsHtml({
items: result.Items,
shape: "backdrop",
preferThumb: true,
@ -98,7 +98,7 @@
}
else if (viewStyle == "Banner") {
html = libraryBrowser.getPosterViewHtml({
html = cardBuilder.getCardsHtml({
items: result.Items,
shape: "banner",
preferBanner: true,
@ -116,7 +116,7 @@
}
else if (viewStyle == "PosterCard") {
html = libraryBrowser.getPosterViewHtml({
html = cardBuilder.getCardsHtml({
items: result.Items,
shape: "portrait",
context: 'movies',
@ -129,7 +129,7 @@
else {
// Poster
html = libraryBrowser.getPosterViewHtml({
html = cardBuilder.getCardsHtml({
items: result.Items,
shape: "portrait",
context: 'movies',