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 photos page

Browse source
This commit is contained in:
Luke Pulverenti 2016-07-30 02:23:56 -04:00
parent 3f92a4d396
commit 7f2ed3fa52
7 changed files with 23 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

8
dashboard-ui/bower_components/emby-webcomponents/cardbuilder/card.css vendored
View file

@ -314,10 +314,14 @@ button.cardContent {
width: 14.285714285714285714285714285714%; width: 14.285714285714285714285714285714%;
} }
.scalableCard.backdropCard, .scalableCard.smallBackdropCard { .scalableCard.backdropCard {
width: 100%; width: 100%;
} }
.scalableCard.smallBackdropCard {
width: 50%;
}
.scalableCard.squareCard { .scalableCard.squareCard {
width: 50%; width: 50%;
} }
@ -342,7 +346,7 @@ button.cardContent {
@media all and (min-width: 420px) { @media all and (min-width: 420px) {
.scalableCard.backdropCard, .scalableCard.smallBackdropCard { .scalableCard.backdropCard {
width: 50%; width: 50%;
} }
} }

4
dashboard-ui/components/favoriteitems.js
View file

@ -25,7 +25,7 @@
{ name: 'HeaderFavoriteGames', types: "Game", id: "favoriteGames", shape: getSquareShape(), preferThumb: false, showTitle: true }, { name: 'HeaderFavoriteGames', types: "Game", id: "favoriteGames", shape: getSquareShape(), preferThumb: false, showTitle: true },
{ name: 'HeaderFavoriteArtists', types: "MusicArtist", id: "favoriteArtists", shape: getSquareShape(), preferThumb: false, showTitle: true, overlayText: false, showParentTitle: true, centerText: true, overlayPlayButton: true }, { name: 'HeaderFavoriteArtists', types: "MusicArtist", id: "favoriteArtists", shape: getSquareShape(), preferThumb: false, showTitle: true, overlayText: false, showParentTitle: true, centerText: true, overlayPlayButton: true },
{ name: 'HeaderFavoriteAlbums', types: "MusicAlbum", id: "favoriteAlbums", shape: getSquareShape(), preferThumb: false, showTitle: true, overlayText: false, showParentTitle: true, centerText: true, overlayPlayButton: true }, { name: 'HeaderFavoriteAlbums', types: "MusicAlbum", id: "favoriteAlbums", shape: getSquareShape(), preferThumb: false, showTitle: true, overlayText: false, showParentTitle: true, centerText: true, overlayPlayButton: true },
{ name: 'HeaderFavoriteSongs', types: "Audio", id: "favoriteSongs", shape: getSquareShape(), preferThumb: false, showTitle: true, overlayText: false, showParentTitle: true, centerText: true, overlayMoreButton: true, defaultAction: 'instantmix' } { name: 'HeaderFavoriteSongs', types: "Audio", id: "favoriteSongs", shape: getSquareShape(), preferThumb: false, showTitle: true, overlayText: false, showParentTitle: true, centerText: true, overlayMoreButton: true, action: 'instantmix' }
]; ];
} }
@ -98,7 +98,7 @@
scalable: true, scalable: true,
overlayPlayButton: section.overlayPlayButton, overlayPlayButton: section.overlayPlayButton,
overlayMoreButton: section.overlayMoreButton, overlayMoreButton: section.overlayMoreButton,
action: section.defaultAction action: section.action
}); });
html += '</div>'; html += '</div>';

2
dashboard-ui/movies.html
View file

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

2
dashboard-ui/photos.html
View file

@ -5,6 +5,6 @@
<div class="listTopPaging"> <div class="listTopPaging">
</div> </div>
</div> </div>
<div class="itemsContainer paddedItemsContainer" style="text-align:center;"></div> <div is="emby-itemscontainer" class="itemsContainer paddedItemsContainer vertical-wrap centered"></div>
</div> </div>
</div> </div>

10
dashboard-ui/scripts/itembynamedetailpage.js
View file

@ -1,4 +1,4 @@
define(['listView', 'emby-itemscontainer'], function (listView) { define(['listView', 'cardBuilder', 'emby-itemscontainer'], function (listView, cardBuilder) {
function renderItems(page, item) { function renderItems(page, item) {
@ -246,14 +246,18 @@
} }
listOptions.items = result.Items; listOptions.items = result.Items;
var itemsContainer = element.querySelector('.itemsContainer');
if (type == 'Audio') { if (type == 'Audio') {
html = listView.getListViewHtml(listOptions); html = listView.getListViewHtml(listOptions);
itemsContainer.classList.remove('vertical-wrap');
itemsContainer.classList.add('vertical-list');
} else { } else {
html = LibraryBrowser.getPosterViewHtml(listOptions); html = cardBuilder.getCardsHtml(listOptions);
itemsContainer.classList.add('vertical-wrap');
itemsContainer.classList.remove('vertical-list');
} }
var itemsContainer = element.querySelector('.itemsContainer');
itemsContainer.innerHTML = html; itemsContainer.innerHTML = html;
ImageLoader.lazyChildren(itemsContainer); ImageLoader.lazyChildren(itemsContainer);

6
dashboard-ui/scripts/livetvrecordings.js
View file

@ -1,4 +1,4 @@
define(['components/categorysyncbuttons', 'scripts/livetvcomponents', 'emby-button', 'listViewStyle', 'emby-itemscontainer'], function (categorysyncbuttons) { define(['components/categorysyncbuttons', 'cardBuilder', 'scripts/livetvcomponents', 'emby-button', 'listViewStyle', 'emby-itemscontainer'], function (categorysyncbuttons, cardBuilder) {
function getRecordingGroupHtml(group) { function getRecordingGroupHtml(group) {
@ -70,11 +70,13 @@
if (enableScrollX()) { if (enableScrollX()) {
recordingItems.classList.add('hiddenScrollX'); recordingItems.classList.add('hiddenScrollX');
recordingItems.classList.remove('vertical-wrap');
} else { } else {
recordingItems.classList.remove('hiddenScrollX'); recordingItems.classList.remove('hiddenScrollX');
recordingItems.classList.add('vertical-wrap');
} }
recordingItems.innerHTML = LibraryBrowser.getPosterViewHtml({ recordingItems.innerHTML = cardBuilder.getCardsHtml({
items: recordings, items: recordings,
shape: (enableScrollX() ? 'autooverflow' : 'auto'), shape: (enableScrollX() ? 'autooverflow' : 'auto'),
showTitle: true, showTitle: true,

4
dashboard-ui/scripts/photos.js
View file

@ -1,4 +1,4 @@
define(['jQuery'], function ($) { define(['jQuery', 'cardBuilder', 'emby-itemscontainer'], function ($, cardBuilder) {
var view = 'Poster'; var view = 'Poster';
@ -58,7 +58,7 @@
if (view == "Poster") { if (view == "Poster") {
// Poster // Poster
html = LibraryBrowser.getPosterViewHtml({ html = cardBuilder.getCardsHtml({
items: result.Items, items: result.Items,
shape: "square", shape: "square",
context: getParameterByName('context') || 'photos', context: getParameterByName('context') || 'photos',