diff --git a/dashboard-ui/bower_components/emby-webcomponents/.bower.json b/dashboard-ui/bower_components/emby-webcomponents/.bower.json index f24a52ad1b..64a53a8524 100644 --- a/dashboard-ui/bower_components/emby-webcomponents/.bower.json +++ b/dashboard-ui/bower_components/emby-webcomponents/.bower.json @@ -16,12 +16,12 @@ }, "devDependencies": {}, "ignore": [], - "version": "1.3.49", - "_release": "1.3.49", + "version": "1.3.50", + "_release": "1.3.50", "_resolution": { "type": "version", - "tag": "1.3.49", - "commit": "9838b499815bcaf95d4d50c4476c3b95173ffc30" + "tag": "1.3.50", + "commit": "2c09d5bf9a8f9698095956faca9a8fa55886cb42" }, "_source": "https://github.com/MediaBrowser/emby-webcomponents.git", "_target": "^1.2.0", diff --git a/dashboard-ui/bower_components/emby-webcomponents/actionsheet/actionsheet.css b/dashboard-ui/bower_components/emby-webcomponents/actionsheet/actionsheet.css index 288c65caac..82ef017a31 100644 --- a/dashboard-ui/bower_components/emby-webcomponents/actionsheet/actionsheet.css +++ b/dashboard-ui/bower_components/emby-webcomponents/actionsheet/actionsheet.css @@ -22,7 +22,9 @@ flex-direction: column; display: flex; justify-content: center; - height: 100%; + flex-grow: 1; + align-items: center; + text-align: center; } .actionSheetMenuItem { @@ -40,8 +42,8 @@ } .layout-tv .actionSheetMenuItem { - padding-top: .2em; - padding-bottom: .2em; + padding-top: .16em; + padding-bottom: .16em; } .actionSheetItemIcon { @@ -49,27 +51,25 @@ } .actionSheetScroller { - max-height: 60%; - overflow-x: hidden; - overflow-y: auto; /* Override default style being applied by polymer */ margin-bottom: 0 !important; - scroll-behavior: smooth; + flex-grow: 1; } - .actionSheetScroller::-webkit-scrollbar, .actionSheetScroller::-webkit-scrollbar { - width: 0 !important; - display: none; - } +.layout-tv .actionSheetScroller { + max-height: 60%; +} h1.actionSheetTitle { margin: .5em 0 1em !important; padding: 0 1em; + flex-grow: 0; } h2.actionSheetTitle { margin: .25em 0 .55em !important; padding: 0 1em; + flex-grow: 0; } .actionSheet.extraSpacing { diff --git a/dashboard-ui/bower_components/emby-webcomponents/actionsheet/actionsheet.js b/dashboard-ui/bower_components/emby-webcomponents/actionsheet/actionsheet.js index 77d6d49830..b7da0a093e 100644 --- a/dashboard-ui/bower_components/emby-webcomponents/actionsheet/actionsheet.js +++ b/dashboard-ui/bower_components/emby-webcomponents/actionsheet/actionsheet.js @@ -1,4 +1,4 @@ -define(['dialogHelper', 'layoutManager', 'globalize', 'paper-button', 'css!./actionsheet', 'html!./../icons/nav.html'], function (dialogHelper, layoutManager, globalize) { +define(['dialogHelper', 'layoutManager', 'globalize', 'paper-button', 'css!./actionsheet', 'html!./../icons/nav.html', 'scrollStyles'], function (dialogHelper, layoutManager, globalize) { function parentWithClass(elem, className) { @@ -130,7 +130,7 @@ } } - html += '
'; + html += '
'; options.items.forEach(function (o) { o.ironIcon = o.selected ? 'nav:check' : null; diff --git a/dashboard-ui/bower_components/emby-webcomponents/viewmanager/viewcontainer-lite.js b/dashboard-ui/bower_components/emby-webcomponents/viewmanager/viewcontainer-lite.js index cc1647d053..2023ef00f3 100644 --- a/dashboard-ui/bower_components/emby-webcomponents/viewmanager/viewcontainer-lite.js +++ b/dashboard-ui/bower_components/emby-webcomponents/viewmanager/viewcontainer-lite.js @@ -93,7 +93,7 @@ define(['browser'], function (browser) { function animate(newAnimatedPage, oldAnimatedPage, transition, isBack) { - if (enableAnimation() && newAnimatedPage.animate) { + if (enableAnimation() && oldAnimatedPage && newAnimatedPage.animate) { if (transition == 'slide') { return slide(newAnimatedPage, oldAnimatedPage, transition, isBack); } else if (transition == 'fade') { diff --git a/dashboard-ui/components/viewcontainer-lite.js b/dashboard-ui/components/viewcontainer-lite.js index dfa19d0067..34d45fdcbf 100644 --- a/dashboard-ui/components/viewcontainer-lite.js +++ b/dashboard-ui/components/viewcontainer-lite.js @@ -195,7 +195,7 @@ define(['browser'], function (browser) { function animate(newAnimatedPage, oldAnimatedPage, transition, isBack) { - if (enableAnimation() && newAnimatedPage.animate) { + if (enableAnimation() && oldAnimatedPage && newAnimatedPage.animate) { if (transition == 'slide') { return slide(newAnimatedPage, oldAnimatedPage, transition, isBack); } else if (transition == 'fade') { diff --git a/dashboard-ui/dashboard.html b/dashboard-ui/dashboard.html index de388a8433..de6251d523 100644 --- a/dashboard-ui/dashboard.html +++ b/dashboard-ui/dashboard.html @@ -62,6 +62,15 @@
+
+

+
${HeaderHealthMonitor}
+ +

+
+
+
+

${HeaderActiveDevices}

diff --git a/dashboard-ui/scripts/dashboardpage.js b/dashboard-ui/scripts/dashboardpage.js index bcd1585ce2..f331f6b8b6 100644 --- a/dashboard-ui/scripts/dashboardpage.js +++ b/dashboard-ui/scripts/dashboardpage.js @@ -1,5 +1,21 @@ define(['datetime'], function (datetime) { + function renderNoHealthAlertsMessage(page) { + + var html = '

'; + + html += ''; + + html += Globalize.translate('HealthMonitorNoAlerts') + '

'; + + page.querySelector('.healthMonitor').innerHTML = html; + } + + function refreshHealthMonitor(page) { + + renderNoHealthAlertsMessage(page); + } + window.DashboardPage = { newsStartIndex: 0, @@ -44,6 +60,8 @@ $('.swaggerLink', page).attr('href', apiClient.getUrl('swagger-ui/index.html', { api_key: ApiClient.accessToken() })); + + refreshHealthMonitor(page); }, onPageHide: function () { diff --git a/dashboard-ui/scripts/sections.js b/dashboard-ui/scripts/sections.js index ffbabf340c..c9e47af4f9 100644 --- a/dashboard-ui/scripts/sections.js +++ b/dashboard-ui/scripts/sections.js @@ -699,7 +699,7 @@ } html += LibraryBrowser.getPosterViewHtml({ items: result.Items, - shape: enableScrollX() ? 'autoOverflow' : 'auto', + shape: enableScrollX() ? 'autooverflow' : 'auto', showTitle: true, showParentTitle: true, coverImage: true, diff --git a/dashboard-ui/strings/en-US.json b/dashboard-ui/strings/en-US.json index 308f7dbd00..d6b33c7354 100644 --- a/dashboard-ui/strings/en-US.json +++ b/dashboard-ui/strings/en-US.json @@ -562,7 +562,7 @@ "LabelEnableAutomaticPortMap": "Enable automatic port mapping", "LabelEnableAutomaticPortMapHelp": "Attempt to automatically map the public port to the local port via UPnP. This may not work with some router models.", "LabelExternalDDNS": "External domain:", - "LabelExternalDDNSHelp": "If you have a dynamic DNS enter it here. Emby apps will use it when connecting remotely. This field is required when used with a custom https certificate.", + "LabelExternalDDNSHelp": "If you have a dynamic DNS enter it here. Emby apps will use it when connecting remotely. This field is required when used with a custom ssl certificate.", "TabResume": "Resume", "TabWeather": "Weather", "TitleAppSettings": "App Settings", @@ -2353,5 +2353,7 @@ "OptionConvertRecordingPreserveAudio": "Preserve original audio when converting recordings", "OptionConvertRecordingPreserveAudioHelp": "This will provide better audio but may require transcoding during playback on some devices.", "CreateCollectionHelp": "Collections allow you to create personalized groupings of movies and other library content.", - "AddItemToCollectionHelp": "Add items to collections by searching for them and using their right-click or tap menus to add them to a collection." + "AddItemToCollectionHelp": "Add items to collections by searching for them and using their right-click or tap menus to add them to a collection.", + "HeaderHealthMonitor": "Health Monitor", + "HealthMonitorNoAlerts": "There are no active alerts." }