From 7dc4b7b9b34f5378b6ce51c7319c13c959d6ff03 Mon Sep 17 00:00:00 2001 From: Luke Pulverenti Date: Mon, 16 Dec 2019 14:31:21 -0500 Subject: [PATCH] update strings --- cardbuilder/card.css | 78 ++++++++++++++++++++++++------------- listview/listview.css | 2 +- playback/playbackmanager.js | 5 ++- sections.css | 2 +- strings/cs.json | 10 ++--- strings/en-GB.json | 2 +- sync/sync.js | 17 ++++++-- tabbedview/tabbedview.js | 4 +- themes/black/theme.css | 2 +- themes/dark-red/theme.css | 2 +- themes/dark/theme.css | 2 +- themes/holiday/theme.css | 2 +- 12 files changed, 82 insertions(+), 46 deletions(-) diff --git a/cardbuilder/card.css b/cardbuilder/card.css index 3285f7f0..c424c097 100644 --- a/cardbuilder/card.css +++ b/cardbuilder/card.css @@ -104,6 +104,7 @@ button { .card-focuscontent-large { border: .5em solid transparent; + border-radius: .25em; } .cardBox-focustransform { @@ -473,7 +474,7 @@ button { } .backdropCard { - width: 100%; + width: 33.333333333333333333333333333333%; } .smallBackdropCard { @@ -500,20 +501,6 @@ button { width: 25%; } -@media (min-width: 25em) { - - .backdropCard { - width: 50%; - } -} - -@media (max-width: 35em) { - - .scrollX > .backdropCard { - width: 75%; - } -} - @media (min-width: 31.25em) { .fourThreeCard { @@ -545,12 +532,6 @@ button { } } -@media (min-width: 48.125em) { - .backdropCard { - width: 33.333333333333333333333333333333%; - } -} - @media (min-width: 50em) { .bannerCard { @@ -568,6 +549,10 @@ button { @media (min-width: 62.5em) { + .backdropCard { + width: 25%; + } + .smallBackdropCard { width: 20%; } @@ -577,7 +562,7 @@ button { } } -@media (min-width: 70em) { +@media (min-width: 66em) { .squareCard, .portraitCard { width: 16.666666666666666666666666666667%; @@ -586,10 +571,6 @@ button { @media (min-width: 75em) { - .backdropCard { - width: 25%; - } - .bannerCard { width: 33.333333333333333333333333333333%; } @@ -674,6 +655,17 @@ button { .portraitCard { width: 33.333333333333333333333333333333%; } + + .backdropCard { + width: 100%; + } +} + +@media all and (orientation: portrait) and (min-width: 25em) { + + .backdropCard { + width: 50%; + } } @media all and (orientation: portrait) and (min-width: 31.25em) { @@ -683,12 +675,25 @@ button { } } +@media all and (orientation: portrait) and (max-width: 35em) { + + .scrollX > .backdropCard { + width: 75%; + } +} + @media all and (orientation: portrait) and (min-width: 40em) { .squareCard, .portraitCard { width: 25%; } } +@media all and (orientation: portrait) and (min-width: 52em) { + .backdropCard { + width: 33.333333333333333333333333333333%; + } +} + @media all and (orientation: portrait) and (min-width: 55em) { .squareCard, .portraitCard { @@ -703,6 +708,13 @@ button { } } +@media all and (orientation: portrait) and (min-width: 75em) { + + .backdropCard { + width: 25%; + } +} + @media all and (orientation: portrait) and (min-width: 82.5em) { .squareCard, .portraitCard { @@ -731,6 +743,20 @@ button { } } +@media all and (orientation: portrait) and (min-width: 95em) { + + .backdropCard { + width: 20%; + } +} + +@media all and (orientation: portrait) and (min-width: 120em) { + + .backdropCard { + width: 16.666666666666666666666666666667%; + } +} + .itemsContainer-tv > .smallBackdropCard { width: 20%; } diff --git a/listview/listview.css b/listview/listview.css index a97215f6..c328273d 100644 --- a/listview/listview.css +++ b/listview/listview.css @@ -102,7 +102,7 @@ background-position: center center; position: relative; display: flex; - margin-left: .5em; + margin-left: .75em; border-radius: .3em; } diff --git a/playback/playbackmanager.js b/playback/playbackmanager.js index dc2511ec..7970f7b6 100644 --- a/playback/playbackmanager.js +++ b/playback/playbackmanager.js @@ -3260,7 +3260,10 @@ playerData.streamInfo = null; - var nextItem = self._playNextAfterEnded ? self._playQueueManager.getNextItemInfo() : null; + // e should never be null, but just being defensive to avoid any possible surprises + e = e || {}; + + var nextItem = self._playNextAfterEnded && e.playNext !== false ? self._playQueueManager.getNextItemInfo() : null; var nextMediaType = (nextItem ? nextItem.item.MediaType : null); diff --git a/sections.css b/sections.css index 895de781..4f2bdbb6 100644 --- a/sections.css +++ b/sections.css @@ -24,7 +24,7 @@ @media all and (min-width: 50em) { .sectionTitle-cards { - margin-left: .525em; + margin-left: .42em; } .sectionTitleContainer-cards { diff --git a/strings/cs.json b/strings/cs.json index 8e38e103..19c38e74 100644 --- a/strings/cs.json +++ b/strings/cs.json @@ -86,7 +86,7 @@ "HeaderFrequentlyPlayed": "Nej\u010dast\u011bji p\u0159ehr\u00e1v\u00e1no", "HeaderMoreLikeThis": "Podobn\u00e9 polo\u017eky", "HeaderMoreLikeThisOnLiveTV": "V\u00edce na Live TV", - "OriginalAirDateValue": "Datum vys\u00edl\u00e1n\u00ed origin\u00e1lu: {0}", + "OriginalAirDateValue": "P\u016fvodn\u00ed datum vys\u00edl\u00e1n\u00ed: {0}", "EndsAtValue": "Kon\u010d\u00ed v {0}", "HeaderSelectDate": "Vyber datum", "Watched": "Shl\u00e9dnuto", @@ -172,7 +172,7 @@ "InternalStorage": "Intern\u00ed \u00falo\u017ei\u0161t\u011b", "ExternalStorage": "Extern\u00ed \u00falo\u017ei\u0161t\u011b", "UploadToFollowingServers": "Nahr\u00e1t na servery", - "UploadingNumItems": "Uploading {0} of {1}", + "UploadingNumItems": "Nahr\u00e1v\u00e1n\u00ed {0} z {1}", "HeaderMyProfile": "M\u016fj profil", "HeaderOfflineDownloads": "Offline m\u00e9dia", "HeaderOfflineDownloadsDescription": "St\u00e1hnout m\u00e9dia do va\u0161eho za\u0159\u00edzen\u00ed pro snadn\u00e9 pou\u017eit\u00ed offline.", @@ -378,7 +378,7 @@ "Genres": "\u017d\u00e1nry", "Studios": "Studia", "Tags": "Tagy", - "Links": "Links", + "Links": "Odkazy", "HeaderMetadataSettings": "Nastaven\u00ed metadat", "People": "Lid\u00e9", "LabelMetadataDownloadLanguage": "Up\u0159ednost\u0148ovan\u00fd jazyk stahovan\u00fdch metadat:", @@ -657,7 +657,7 @@ "Mute": "Ztlumit", "Unmute": "Nahlas", "Folders": "Slo\u017eky", - "DisplayInOtherHomeScreenSections": "Zobrazit na domovsk\u00e9 obrazovce, podobn\u011b jako jsou nejnov\u011bj\u0161\u00ed m\u00e9dia, a pokra\u010dov\u00e1n\u00ed v p\u0159ehr\u00e1v\u00e1n\u00ed", + "DisplayInOtherHomeScreenSections": "Zobrazit v sekund\u00e1rn\u00edch sekc\u00edch domovsk\u00e9 obrazovky podobn\u011b, jako jsou nejnov\u011bj\u0161\u00ed m\u00e9dia a pokra\u010dovat v p\u0159ehr\u00e1v\u00e1n\u00ed.", "DisplayInMyMedia": "Zobrazit na domovsk\u00e9 obrazovce", "Shows": "Seri\u00e1ly", "HeaderMusicVideos": "Videoklipy", @@ -911,7 +911,7 @@ "PromptStillWatching": "Povolit ozn\u00e1men\u00ed 'St\u00e1le sledujete?'", "HeaderMissingMetadata": "Chyb\u011bj\u00edc\u00ed metadata", "HeaderIncludedIn": "Obsa\u017eeno v", - "EmbyConnectUserAlreadyLinked": "The Emby Connect user is already linked to another user on this server.", + "EmbyConnectUserAlreadyLinked": "U\u017eivatel Emby Connect je u\u017e propojen\u00fd s jin\u00fdm u\u017eivatelem tohoto serveru.", "VideoFilesWillBeConvertedTo": "P\u0159ek\u00f3dovan\u00e1 videa budou ulo\u017eena jako {0}.", "VideoWillBeConvertedTo": "Video streamy budou p\u0159ek\u00f3dov\u00e1ny do {0} nebo zkop\u00edrov\u00e1ny z p\u016fvodn\u00edho souboru pokud jsou u\u017e {0} a kvalitou odpov\u00eddaj\u00ed mo\u017enostem p\u0159ek\u00f3dov\u00e1n\u00ed.", "VideoWillBeConvertedToOrCopied": "Video streamy budou p\u0159ek\u00f3dov\u00e1ny do {0} nebo zkop\u00edrov\u00e1ny z p\u016fvodn\u00edho souboru pokud jsou n\u011bkter\u00e9 z {1} a kvalitou odpov\u00eddaj\u00ed mo\u017enostem p\u0159ek\u00f3dov\u00e1n\u00ed.", diff --git a/strings/en-GB.json b/strings/en-GB.json index a72b9dcf..08a97f11 100644 --- a/strings/en-GB.json +++ b/strings/en-GB.json @@ -657,7 +657,7 @@ "Mute": "Mute", "Unmute": "Unmute", "Folders": "Folders", - "DisplayInOtherHomeScreenSections": "Display in home screen sections such as latest media and continue watching", + "DisplayInOtherHomeScreenSections": "Display in secondary home screen sections such as latest media and continue watching", "DisplayInMyMedia": "Display on home screen", "Shows": "Shows", "HeaderMusicVideos": "Music Videos", diff --git a/sync/sync.js b/sync/sync.js index dfb03e5c..f4218f70 100644 --- a/sync/sync.js +++ b/sync/sync.js @@ -510,6 +510,9 @@ if (firstItem.Type === 'Audio') { return true; } + if (firstItem.Type === 'Photo') { + return true; + } if (firstItem.Type === 'MusicAlbum') { return true; } @@ -721,10 +724,6 @@ var profileOptions = options.ProfileOptions || []; - if (!profileOptions.length) { - return; - } - var option = profileOptions.filter(function (o) { return o.Id === profileId; })[0]; @@ -740,14 +739,24 @@ } var customProfileOptions = form.querySelector('.customProfileOptions'); + var customProfileSelects = customProfileOptions.querySelectorAll('select'); + var customProfileSelectsRequired = false; if (profileId === 'custom') { customProfileOptions.classList.remove('hide'); + customProfileSelectsRequired = true; } else { customProfileOptions.classList.add('hide'); + } + for (var i = 0, length = customProfileSelects.length; i < length; i++) { + if (customProfileSelectsRequired) { + customProfileSelects[i].setAttribute('required', 'required'); + } else { + customProfileSelects[i].removeAttribute('required'); + } } } diff --git a/tabbedview/tabbedview.js b/tabbedview/tabbedview.js index 78a2bbe5..bc4607b1 100644 --- a/tabbedview/tabbedview.js +++ b/tabbedview/tabbedview.js @@ -1,4 +1,4 @@ -define(['appHeader', 'backdrop', 'mainTabsManager', 'layoutManager', 'inputManager', 'connectionManager', 'emby-tabs'], function (appHeader, backdrop, mainTabsManager, layoutManager, inputManager, connectionManager) { +define(['appHeader', 'mainTabsManager', 'layoutManager', 'inputManager', 'connectionManager', 'emby-tabs'], function (appHeader, mainTabsManager, layoutManager, inputManager, connectionManager) { 'use strict'; function onViewDestroy(e) { @@ -142,8 +142,6 @@ define(['appHeader', 'backdrop', 'mainTabsManager', 'layoutManager', 'inputManag this.setTitle(); } - backdrop.clear(); - var currentTabController = this.currentTabController; if (!currentTabController) { diff --git a/themes/black/theme.css b/themes/black/theme.css index f2cdffe2..62257c02 100644 --- a/themes/black/theme.css +++ b/themes/black/theme.css @@ -26,7 +26,7 @@ html { @supports ( (backdrop-filter: blur(1em)) or (-webkit-backdrop-filter: blur(1em))) { .skinHeader-withBackground:not(.nobackdropfilter), .appfooter-withbackdropfilter { - background: rgba(18,18,18,0.72); + background: rgba(27,27,27,0.66); -webkit-backdrop-filter: saturate(1.8) blur(1.5em); backdrop-filter: saturate(1.8) blur(1.5em); } diff --git a/themes/dark-red/theme.css b/themes/dark-red/theme.css index 817b06c7..fc860f31 100644 --- a/themes/dark-red/theme.css +++ b/themes/dark-red/theme.css @@ -26,7 +26,7 @@ html { @supports ( (backdrop-filter: blur(1em)) or (-webkit-backdrop-filter: blur(1em))) { .skinHeader-withBackground:not(.nobackdropfilter), .appfooter-withbackdropfilter { - background: rgba(29,29,31,0.72); + background: rgba(29,29,31,0.66); -webkit-backdrop-filter: saturate(1.8) blur(1.5em); backdrop-filter: saturate(1.8) blur(1.5em); } diff --git a/themes/dark/theme.css b/themes/dark/theme.css index 2e460155..b62bee0d 100644 --- a/themes/dark/theme.css +++ b/themes/dark/theme.css @@ -26,7 +26,7 @@ html { @supports ( (backdrop-filter: blur(1em)) or (-webkit-backdrop-filter: blur(1em))) { .skinHeader-withBackground:not(.nobackdropfilter), .appfooter-withbackdropfilter { - background: rgba(29,29,31,0.72); + background: rgba(29,29,31,0.66); -webkit-backdrop-filter: saturate(1.8) blur(1.5em); backdrop-filter: saturate(1.8) blur(1.5em); } diff --git a/themes/holiday/theme.css b/themes/holiday/theme.css index dfb1a422..6e889361 100644 --- a/themes/holiday/theme.css +++ b/themes/holiday/theme.css @@ -26,7 +26,7 @@ html { @supports ( (backdrop-filter: blur(1em)) or (-webkit-backdrop-filter: blur(1em))) { .skinHeader-withBackground:not(.nobackdropfilter), .appfooter-withbackdropfilter { - background: rgba(29,29,31,0.72); + background: rgba(29,29,31,0.66); -webkit-backdrop-filter: saturate(1.8) blur(1.5em); backdrop-filter: saturate(1.8) blur(1.5em); }