From a47214bbb92a243c635df30cbed64aa79d22f7a7 Mon Sep 17 00:00:00 2001 From: MrTimscampi Date: Sat, 15 Feb 2020 22:15:17 +0100 Subject: [PATCH 1/4] Add book and folder icons to cards --- src/components/cardbuilder/cardBuilder.js | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/src/components/cardbuilder/cardBuilder.js b/src/components/cardbuilder/cardBuilder.js index 23ac93676e..e2751b647d 100644 --- a/src/components/cardbuilder/cardBuilder.js +++ b/src/components/cardbuilder/cardBuilder.js @@ -1486,6 +1486,8 @@ define(['datetime', 'imageLoader', 'connectionManager', 'itemHelper', 'focusMana } function getDefaultText(item, options) { + console.debug("Getting icon for " + item.Type); + if (item.CollectionType) { return '' + imageHelper.getLibraryIcon(item.CollectionType) + '' } @@ -1500,6 +1502,10 @@ define(['datetime', 'imageLoader', 'connectionManager', 'itemHelper', 'focusMana return 'movie' case 'Series': return 'tv' + case 'Book': + return 'book' + case 'Folder': + return 'folder' } if (options && options.defaultCardImageIcon) { From 52ad0febe0eb665ff1ae5340810798c021d830eb Mon Sep 17 00:00:00 2001 From: MrTimscampi Date: Sat, 15 Feb 2020 22:23:40 +0100 Subject: [PATCH 2/4] Fix details page ribbon position in TV layout --- CONTRIBUTORS.md | 1 + src/assets/css/librarybrowser.css | 1 + src/components/cardbuilder/cardBuilder.js | 2 -- 3 files changed, 2 insertions(+), 2 deletions(-) diff --git a/CONTRIBUTORS.md b/CONTRIBUTORS.md index 5a43208068..aa3ec707e3 100644 --- a/CONTRIBUTORS.md +++ b/CONTRIBUTORS.md @@ -33,6 +33,7 @@ - [Daniel Hartung](https://github.com/dhartung) - [Ryan Hartzell](https://github.com/ryan-hartzell) - [Thibault Nocchi](https://github.com/ThibaultNocchi) + - [MrTimscampi](https://github.com/MrTimscampi) # Emby Contributors diff --git a/src/assets/css/librarybrowser.css b/src/assets/css/librarybrowser.css index 1b5b9ded6d..7a3e0ada68 100644 --- a/src/assets/css/librarybrowser.css +++ b/src/assets/css/librarybrowser.css @@ -522,6 +522,7 @@ .layout-tv .detailPagePrimaryContainer { position: relative; + top: 0; } .detailSticky { diff --git a/src/components/cardbuilder/cardBuilder.js b/src/components/cardbuilder/cardBuilder.js index e2751b647d..29d7455bc9 100644 --- a/src/components/cardbuilder/cardBuilder.js +++ b/src/components/cardbuilder/cardBuilder.js @@ -1486,8 +1486,6 @@ define(['datetime', 'imageLoader', 'connectionManager', 'itemHelper', 'focusMana } function getDefaultText(item, options) { - console.debug("Getting icon for " + item.Type); - if (item.CollectionType) { return '' + imageHelper.getLibraryIcon(item.CollectionType) + '' } From 32663bee2ec55d4ff82c2a0b5970ca24bec2d48c Mon Sep 17 00:00:00 2001 From: MrTimscampi Date: Sun, 16 Feb 2020 02:08:17 +0100 Subject: [PATCH 3/4] Fix details page poster placeholder icon size --- src/components/cardbuilder/card.css | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/components/cardbuilder/card.css b/src/components/cardbuilder/card.css index cb7cab3885..7e2855c85c 100644 --- a/src/components/cardbuilder/card.css +++ b/src/components/cardbuilder/card.css @@ -370,8 +370,8 @@ button::-moz-focus-inner { text-align: center; } -.cardImageIcon { - font-size: 5em !important; +.cardImageContainer .cardImageIcon { + font-size: 5em; color: inherit; } From ce959724aff8e960edfb9e54eda2e5df21719eb1 Mon Sep 17 00:00:00 2001 From: MrTimscampi Date: Sun, 16 Feb 2020 02:34:40 +0100 Subject: [PATCH 4/4] Add photo album type indicator --- src/components/indicators/indicators.js | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/src/components/indicators/indicators.js b/src/components/indicators/indicators.js index a8bd4c6200..c81ac6bf18 100644 --- a/src/components/indicators/indicators.js +++ b/src/components/indicators/indicators.js @@ -152,9 +152,12 @@ define(['datetime', 'itemHelper', 'css!./indicators.css', 'material-icons'], fun if (item.Type === 'Video') { return '
videocam
'; } - if (item.Type === 'Folder' || item.Type === 'PhotoAlbum') { + if (item.Type === 'Folder') { return '
folder
'; } + if (item.Type === 'PhotoAlbum') { + return '
'; + } if (item.Type === 'Photo') { return '
photo
'; }