diff --git a/dashboard-ui/bower_components/emby-webcomponents/.bower.json b/dashboard-ui/bower_components/emby-webcomponents/.bower.json index 9a98379bd3..25c77b436a 100644 --- a/dashboard-ui/bower_components/emby-webcomponents/.bower.json +++ b/dashboard-ui/bower_components/emby-webcomponents/.bower.json @@ -14,12 +14,12 @@ }, "devDependencies": {}, "ignore": [], - "version": "1.4.299", - "_release": "1.4.299", + "version": "1.4.301", + "_release": "1.4.301", "_resolution": { "type": "version", - "tag": "1.4.299", - "commit": "7e708cf27aa74f7f0d0aaa30d95d3e1f09b71ce3" + "tag": "1.4.301", + "commit": "641d27d968fc4dfd461f74b208f51905bab1926b" }, "_source": "https://github.com/MediaBrowser/emby-webcomponents.git", "_target": "^1.2.1", diff --git a/dashboard-ui/bower_components/emby-webcomponents/cardbuilder/card.css b/dashboard-ui/bower_components/emby-webcomponents/cardbuilder/card.css index e2356586b4..6c31322269 100644 --- a/dashboard-ui/bower_components/emby-webcomponents/cardbuilder/card.css +++ b/dashboard-ui/bower_components/emby-webcomponents/cardbuilder/card.css @@ -356,8 +356,9 @@ button { right: 0; margin: 0 .35em .5em 0; z-index: 1; + padding: 6px; /*opacity: 0; - transition: opacity 0.5s ease-in; /* vendorless fallback */ */; + transition: opacity 0.5s ease-in; */ } /*.card:hover .cardOverlayButton { diff --git a/dashboard-ui/bower_components/emby-webcomponents/emby-button/emby-button.css b/dashboard-ui/bower_components/emby-webcomponents/emby-button/emby-button.css index 8c19e9ba38..8f623792ef 100644 --- a/dashboard-ui/bower_components/emby-webcomponents/emby-button/emby-button.css +++ b/dashboard-ui/bower_components/emby-webcomponents/emby-button/emby-button.css @@ -38,7 +38,6 @@ background: transparent; box-shadow: none; text-transform: uppercase; - color: #52B54B; } .emby-button > i { @@ -151,8 +150,8 @@ } .paper-icon-button-light > i { - width: auto; - height: auto; + width: 1em; + height: 1em; font-size: 1.6em; /* Make sure its on top of the ripple */ position: relative; diff --git a/dashboard-ui/bower_components/emby-webcomponents/mediainfo/mediainfo.js b/dashboard-ui/bower_components/emby-webcomponents/mediainfo/mediainfo.js index 4df78e3828..3ed1f41608 100644 --- a/dashboard-ui/bower_components/emby-webcomponents/mediainfo/mediainfo.js +++ b/dashboard-ui/bower_components/emby-webcomponents/mediainfo/mediainfo.js @@ -157,7 +157,7 @@ define(['datetime', 'globalize', 'embyRouter', 'itemHelper', 'material-icons', ' if (options.year !== false && item.ProductionYear && item.Type == "Series") { if (item.Status == "Continuing") { - miscInfo.push(globalize.translate('sharedcomponents#ValueSeriesYearToPresent', item.ProductionYear)); + miscInfo.push(globalize.translate('sharedcomponents#SeriesYearToPresent', item.ProductionYear)); } else if (item.ProductionYear) { diff --git a/dashboard-ui/components/apphost.js b/dashboard-ui/components/apphost.js index 209353656d..428919ae32 100644 --- a/dashboard-ui/components/apphost.js +++ b/dashboard-ui/components/apphost.js @@ -148,7 +148,7 @@ define(['appStorage', 'browser'], function (appStorage, browser) { features.push('fullscreen'); } - if (browser.chrome || (browser.safari && !browser.mobile)) { + if (browser.chrome || (browser.safari && !browser.slow) || (browser.edge && !browser.slow)) { features.push('imageanalysis'); } @@ -160,7 +160,7 @@ define(['appStorage', 'browser'], function (appStorage, browser) { var version = window.dashboardVersion || '3.0'; return { - dvrFeatureCode: Dashboard.isConnectMode() ? 'dvr' : 'dvrl', + dvrFeatureCode: Dashboard.isConnectMode() ? 'dvr' : 'dvr-l', getWindowState: function () { return document.windowState || 'Normal'; }, diff --git a/dashboard-ui/components/favoriteitems.js b/dashboard-ui/components/favoriteitems.js index a5f41c36d8..c16f6d029d 100644 --- a/dashboard-ui/components/favoriteitems.js +++ b/dashboard-ui/components/favoriteitems.js @@ -100,7 +100,7 @@ showParentTitle: section.showParentTitle, scalable: true, overlayPlayButton: section.overlayPlayButton, - overlayMoreButton: section.overlayMoreButton, + overlayMoreButton: section.overlayMoreButton && !cardLayout, action: section.action, allowBottomPadding: !enableScrollX(), cardLayout: cardLayout, diff --git a/dashboard-ui/livetv.html b/dashboard-ui/livetv.html index 1cc9d8a02c..fa9abbc42c 100644 --- a/dashboard-ui/livetv.html +++ b/dashboard-ui/livetv.html @@ -144,7 +144,7 @@

${HeaderActiveRecordings}

-
+

diff --git a/dashboard-ui/scripts/livetvitems.js b/dashboard-ui/scripts/livetvitems.js index 06c2249ea1..de413844f1 100644 --- a/dashboard-ui/scripts/livetvitems.js +++ b/dashboard-ui/scripts/livetvitems.js @@ -64,7 +64,7 @@ preferThumb: !query.IsMovie && params.type != 'RecordingSeries', inheritThumb: params.type == 'Recordings', context: 'livetv', - centerText: true, + centerText: !supportsImageAnalysis, lazy: true, overlayText: false, showParentTitleOrTitle: true, diff --git a/dashboard-ui/scripts/livetvrecordings.js b/dashboard-ui/scripts/livetvrecordings.js index 2f0abb52e2..7ee5daf21d 100644 --- a/dashboard-ui/scripts/livetvrecordings.js +++ b/dashboard-ui/scripts/livetvrecordings.js @@ -90,7 +90,8 @@ centerText: !cardLayout, vibrant: supportsImageAnalysis, allowBottomPadding: !enableScrollX(), - preferThumb: 'auto' + preferThumb: 'auto', + overlayText: false }, cardOptions || {})); @@ -120,8 +121,7 @@ cardLayout: true, vibrant: true, preferThumb: true, - coverImage: true, - overlayText: false + coverImage: true }); }); } @@ -217,6 +217,7 @@ var moviesPromise; var seriesPromise; var latestPromise; + var lastFullRender = 0; categorysyncbuttons.init(tabContent); @@ -229,6 +230,10 @@ self.renderTab(); }); + function enableFullRender() { + return (new Date().getTime() - lastFullRender) > 300000; + } + self.preRender = function () { activeRecordingsPromise = ApiClient.getLiveTvRecordings({ @@ -240,6 +245,10 @@ EnableImageTypes: "Primary,Thumb,Backdrop" }); + if (!enableFullRender()) { + return; + } + latestPromise = ApiClient.getLiveTvRecordings({ UserId: Dashboard.getCurrentUserId(), @@ -291,23 +300,29 @@ }; self.renderTab = function () { - Dashboard.showLoadingMsg(); renderActiveRecordings(tabContent, activeRecordingsPromise); - renderLatestRecordings(tabContent, latestPromise); - renderMovieRecordings(tabContent, moviesPromise); - renderEpisodeRecordings(tabContent, seriesPromise); - renderSportsRecordings(tabContent, sportsPromise); - renderKidsRecordings(tabContent, kidsPromise); - ApiClient.getLiveTvRecordingGroups({ + if (enableFullRender()) { + Dashboard.showLoadingMsg(); - userId: Dashboard.getCurrentUserId() + renderLatestRecordings(tabContent, latestPromise); + renderMovieRecordings(tabContent, moviesPromise); + renderEpisodeRecordings(tabContent, seriesPromise); + renderSportsRecordings(tabContent, sportsPromise); + renderKidsRecordings(tabContent, kidsPromise); - }).then(function (result) { + ApiClient.getLiveTvRecordingGroups({ - renderRecordingGroups(tabContent, result.Items); - }); + userId: Dashboard.getCurrentUserId() + + }).then(function (result) { + + renderRecordingGroups(tabContent, result.Items); + }); + + lastFullRender = new Date().getTime(); + } }; }; diff --git a/dashboard-ui/scripts/livetvsuggested.js b/dashboard-ui/scripts/livetvsuggested.js index 96437f89f0..a319014ffe 100644 --- a/dashboard-ui/scripts/livetvsuggested.js +++ b/dashboard-ui/scripts/livetvsuggested.js @@ -103,9 +103,12 @@ }); } - function reload(page) { + var lastFullRender = 0; + function enableFullRender() { + return (new Date().getTime() - lastFullRender) > 300000; + } - loadRecommendedPrograms(page); + function reload(page) { renderActiveRecordings(page, ApiClient.getLiveTvRecordings({ UserId: Dashboard.getCurrentUserId(), @@ -115,6 +118,12 @@ EnableImageTypes: "Primary,Thumb,Backdrop" })); + if (!enableFullRender()) { + return; + } + + loadRecommendedPrograms(page); + ApiClient.getLiveTvRecommendedPrograms({ userId: Dashboard.getCurrentUserId(), @@ -181,6 +190,7 @@ renderItems(page, result.Items, 'upcomingKidsItems'); }); + lastFullRender = new Date().getTime(); } function renderItems(page, items, sectionClass, overlayButton, shape) { diff --git a/dashboard-ui/scripts/mediacontroller.js b/dashboard-ui/scripts/mediacontroller.js index 5a22b41e98..0dac7c1923 100644 --- a/dashboard-ui/scripts/mediacontroller.js +++ b/dashboard-ui/scripts/mediacontroller.js @@ -148,8 +148,8 @@ dlg.classList.add('promptDialog'); - html += '
'; - html += '

'; + html += '
'; + html += '

'; html += (playerInfo.deviceName || playerInfo.name); html += '

'; @@ -157,7 +157,7 @@ if (playerInfo.supportedCommands.indexOf('DisplayContent') != -1) { - html += '
'; - html += '
'; + html += '
'; - // On small layouts papepr dialog doesn't respond very well. this button isn't that important here anyway. - if (screen.availWidth >= 600) { - html += ''; - } - - html += ''; - html += ''; + html += ''; + html += ''; + html += ''; html += '
'; html += '
'; diff --git a/dashboard-ui/wizardlivetvguide.html b/dashboard-ui/wizardlivetvguide.html index 6b939b6b18..53f6f83ba0 100644 --- a/dashboard-ui/wizardlivetvguide.html +++ b/dashboard-ui/wizardlivetvguide.html @@ -1,4 +1,4 @@ -
+
@@ -12,15 +12,13 @@

-
- -
${AdditionalLiveTvProvidersCanBeInstalledLater}
-
diff --git a/dashboard-ui/wizardlivetvtuner.html b/dashboard-ui/wizardlivetvtuner.html index aa20c2bb0c..d3e01683a7 100644 --- a/dashboard-ui/wizardlivetvtuner.html +++ b/dashboard-ui/wizardlivetvtuner.html @@ -1,4 +1,4 @@ -
+
@@ -13,14 +13,12 @@

-
- -
${AdditionalLiveTvProvidersCanBeInstalledLater}
-
${HelpMoreTunersCanBeAdded}
diff --git a/dashboard-ui/wizardstart.html b/dashboard-ui/wizardstart.html index 52157edbea..d1495db36e 100644 --- a/dashboard-ui/wizardstart.html +++ b/dashboard-ui/wizardstart.html @@ -1,4 +1,4 @@ -
+
@@ -15,9 +15,8 @@

${ThisWizardWillGuideYou}


-
- - +
+

diff --git a/dashboard-ui/wizarduser.html b/dashboard-ui/wizarduser.html index 7651968ae4..812c06c08c 100644 --- a/dashboard-ui/wizarduser.html +++ b/dashboard-ui/wizarduser.html @@ -14,8 +14,12 @@
${MoreUsersCanBeAddedLater}
-

${HeaderOptionalLinkEmbyAccount}

-
+
+ +

${HeaderOptionalLinkEmbyAccount}

+
+ +
${LabelConnectUserNameHelp}