diff --git a/dashboard-ui/bower_components/emby-webcomponents/.bower.json b/dashboard-ui/bower_components/emby-webcomponents/.bower.json index c175abbdf3..e15a31299f 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.295", - "_release": "1.4.295", + "version": "1.4.296", + "_release": "1.4.296", "_resolution": { "type": "version", - "tag": "1.4.295", - "commit": "1cfe41bab16e66d13ef8a613b251ee3edccde3a8" + "tag": "1.4.296", + "commit": "b1299a1ac50def9b8cdd03ec54b6170eb6c983f4" }, "_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 76333cd09a..e2356586b4 100644 --- a/dashboard-ui/bower_components/emby-webcomponents/cardbuilder/card.css +++ b/dashboard-ui/bower_components/emby-webcomponents/cardbuilder/card.css @@ -292,8 +292,9 @@ button { margin-right: 2em; } -.cardCenteredText { +.cardDefaultText { white-space: normal; + text-align: center; } .textActionButton { diff --git a/dashboard-ui/bower_components/emby-webcomponents/cardbuilder/cardbuilder.js b/dashboard-ui/bower_components/emby-webcomponents/cardbuilder/cardbuilder.js index 3465befe0e..88986eb210 100644 --- a/dashboard-ui/bower_components/emby-webcomponents/cardbuilder/cardbuilder.js +++ b/dashboard-ui/bower_components/emby-webcomponents/cardbuilder/cardbuilder.js @@ -804,7 +804,7 @@ define(['datetime', 'imageLoader', 'connectionManager', 'itemHelper', 'mediaInfo } var showMediaTitle = (showTitle && !titleAdded) || (options.showParentTitleOrTitle && !lines.length); - if (!showMediaTitle && showTitle && forceName && !titleAdded) { + if (!showMediaTitle && !titleAdded && (showTitle || forceName)) { showMediaTitle = true; } @@ -959,7 +959,12 @@ define(['datetime', 'imageLoader', 'connectionManager', 'itemHelper', 'mediaInfo lines.push(globalize.translate('sharedcomponents#SeriesYearToPresent', item.ProductionYear || '')); } else { - lines.push(item.ProductionYear || ''); + + if (item.EndDate && item.ProductionYear) { + lines.push(item.ProductionYear + ' - ' + datetime.parseISO8601Date(item.EndDate).getFullYear()); + } else { + lines.push(item.ProductionYear || ''); + } } } @@ -1160,7 +1165,7 @@ define(['datetime', 'imageLoader', 'connectionManager', 'itemHelper', 'mediaInfo var imgInfo = getCardImageUrl(item, apiClient, options); var imgUrl = imgInfo.imgUrl; - var forceName = imgInfo.forceName || !imgUrl; + var forceName = imgInfo.forceName; var showTitle = options.showTitle === 'auto' ? true : (options.showTitle || item.Type === 'PhotoAlbum' || item.Type === 'Folder'); var overlayText = options.overlayText; @@ -1336,7 +1341,7 @@ define(['datetime', 'imageLoader', 'connectionManager', 'itemHelper', 'mediaInfo if (!imgUrl) { var defaultName = item.Type === 'Program' || item.Type == 'Timer' || item.EpisodeTitle ? item.Name : itemHelper.getDisplayName(item); - cardImageContainerOpen += '
' + defaultName + '
'; + cardImageContainerOpen += '
' + defaultName + '
'; } var tagName = (layoutManager.tv || !scalable) && !overlayButtons ? 'button' : 'div'; diff --git a/dashboard-ui/bower_components/emby-webcomponents/strings/en-US.json b/dashboard-ui/bower_components/emby-webcomponents/strings/en-US.json index 4e33b201a5..98c4f80e99 100644 --- a/dashboard-ui/bower_components/emby-webcomponents/strings/en-US.json +++ b/dashboard-ui/bower_components/emby-webcomponents/strings/en-US.json @@ -10,7 +10,7 @@ "Repeat": "Repeat", "TrackCount": "{0} tracks", "ItemCount": "{0} items", - "ValueSeriesYearToPresent": "{0}-Present", + "ValueSeriesYearToPresent": "{0} - Present", "ReleaseYearValue": "Release year: {0}", "OriginalAirDateValue": "Original air date: {0}", "EndsAtValue": "Ends at {0}", @@ -223,7 +223,7 @@ "PackageInstallCompleted": "{0} installation completed.", "PackageInstallFailed": "{0} installation failed.", "PackageInstallCancelled": "{0} installation cancelled.", - "SeriesYearToPresent": "{0}-Present", + "SeriesYearToPresent": "{0} - Present", "ValueOneSong": "1 song", "ValueSongCount": "{0} songs", "ValueOneMovie": "1 movie", diff --git a/dashboard-ui/css/librarymenu.css b/dashboard-ui/css/librarymenu.css index 05c9290a1b..4f35057bfa 100644 --- a/dashboard-ui/css/librarymenu.css +++ b/dashboard-ui/css/librarymenu.css @@ -245,7 +245,7 @@ i.sidebarLinkIcon { } .darkDrawer i.sidebarLinkIcon { - margin-left: 1em; + margin-left: 1.7em; } .darkDrawer .sidebarLinkText, .darkDrawer .sidebarLink { diff --git a/dashboard-ui/dlnaprofile.html b/dashboard-ui/dlnaprofile.html index 46e2511cf7..95039cbeb4 100644 --- a/dashboard-ui/dlnaprofile.html +++ b/dashboard-ui/dlnaprofile.html @@ -17,91 +17,85 @@
-
- - +
+
-
-
- - +
+
${LabelUserLibraryHelp}
+ +
+

${LabelSupportedMediaTypes}

+
+ + + +
+

+
+ +
${LabelMaxStreamingBitrateHelp}
+
+
+ +
${LabelMusicStreamingTranscodingBitrateHelp}
+
+
+ + +
${OptionIgnoreTranscodeByteRangeRequestsHelp}
+
-
- ${LabelSupportedMediaTypes} - - - - - - - - -
- - -
-
-

${HeaderIdentificationCriteriaHelp}

-
-
- - +

${HeaderIdentificationCriteriaHelp}

+
+
${LabelIdentificationFieldHelp}
-
-
- - +
+
${LabelIdentificationFieldHelp}
-
-
- - +
+
${LabelIdentificationFieldHelp}
-
-
- - +
+
${LabelIdentificationFieldHelp}
-
-
- - +
+
${LabelIdentificationFieldHelp}
-
-
- - +
+
${LabelIdentificationFieldHelp}
-
-
- - +
+
${LabelIdentificationFieldHelp}
-
-
- - +
+
${LabelIdentificationFieldHelp}
-
-
- - +
+
${LabelIdentificationFieldHelp}
-

${HeaderHttpHeaders}

@@ -117,16 +111,20 @@

-
- - -
${OptionPlainStorageFoldersHelp}
+ +
+ +
${OptionPlainStorageFoldersHelp}
-
-
- - -
${OptionPlainVideoItemsHelp}
+
+ +
${OptionPlainVideoItemsHelp}
@@ -178,29 +176,6 @@
-
-
-
-
- - -
${LabelMaxStreamingBitrateHelp}
-
-
-
- - -
${LabelMusicStreamingTranscodingBitrateHelp}
-
-
-
- - -
${OptionIgnoreTranscodeByteRangeRequestsHelp}
-
-
-
-

${HeaderProfileServerSettingsHelp}

diff --git a/dashboard-ui/scripts/dlnaprofile.js b/dashboard-ui/scripts/dlnaprofile.js index 595899b3e1..14c00f282c 100644 --- a/dashboard-ui/scripts/dlnaprofile.js +++ b/dashboard-ui/scripts/dlnaprofile.js @@ -1,4 +1,4 @@ -define(['jQuery', 'fnchecked', 'jqmlistview'], function ($) { +define(['jQuery', 'fnchecked', 'jqmlistview', 'emby-select', 'emby-button', 'emby-input', 'emby-checkbox'], function ($) { var currentProfile; diff --git a/dashboard-ui/scripts/sections.js b/dashboard-ui/scripts/sections.js index 76a6303344..7185928d06 100644 --- a/dashboard-ui/scripts/sections.js +++ b/dashboard-ui/scripts/sections.js @@ -699,7 +699,7 @@ coverImage: true, lazy: true, showDetailsMenu: true, - centerText: true, + centerText: !supportsImageAnalysis, overlayText: false, overlayPlayButton: true, allowBottomPadding: !enableScrollX(), diff --git a/dashboard-ui/scripts/tvshows.js b/dashboard-ui/scripts/tvshows.js index bb676c05fa..a1d818f1fe 100644 --- a/dashboard-ui/scripts/tvshows.js +++ b/dashboard-ui/scripts/tvshows.js @@ -144,7 +144,7 @@ shape: "portrait", context: 'tv', showTitle: true, - showYear: true, + showSeriesYear: true, lazy: true, cardLayout: true, vibrant: supportsImageAnalysis diff --git a/dashboard-ui/strings/en-US.json b/dashboard-ui/strings/en-US.json index b7c0c2ab73..fdda74686d 100644 --- a/dashboard-ui/strings/en-US.json +++ b/dashboard-ui/strings/en-US.json @@ -1774,7 +1774,7 @@ "HeaderUnaired": "Unaired", "HeaderMissing": "Missing", "ButtonWebsite": "Website", - "ValueSeriesYearToPresent": "{0}-Present", + "ValueSeriesYearToPresent": "{0} - Present", "ValueAwards": "Awards: {0}", "ValueBudget": "Budget: {0}", "ValueRevenue": "Revenue: {0}",