diff --git a/dashboard-ui/bower_components/emby-webcomponents/recordingcreator/recordingcreator.css b/dashboard-ui/bower_components/emby-webcomponents/recordingcreator/recordingcreator.css index 81e137b19b..d1ac2da22b 100644 --- a/dashboard-ui/bower_components/emby-webcomponents/recordingcreator/recordingcreator.css +++ b/dashboard-ui/bower_components/emby-webcomponents/recordingcreator/recordingcreator.css @@ -6,9 +6,23 @@ display: none; } +.recordingDialog-imageContainer { + flex-shrink: 0; + padding: 1em 1em 1em 0; + max-width: 30%; +} + +.recordingDialog-img { + max-width: 100%; +} + +.recordingDialog-itemName { + margin-top: .5em; +} + @media all and (max-height: 1400px) { .layout-tv .recordingDialog .itemOverview { display: none; } -} \ No newline at end of file +} diff --git a/dashboard-ui/bower_components/emby-webcomponents/recordingcreator/recordingcreator.js b/dashboard-ui/bower_components/emby-webcomponents/recordingcreator/recordingcreator.js index eaa9716418..c9814e3000 100644 --- a/dashboard-ui/bower_components/emby-webcomponents/recordingcreator/recordingcreator.js +++ b/dashboard-ui/bower_components/emby-webcomponents/recordingcreator/recordingcreator.js @@ -126,7 +126,7 @@ } function showSeriesDays(context) { - + if (context.querySelector('#chkAnyTime').checked) { slideUpToHide(context.querySelector('.seriesDays')); } else { @@ -276,9 +276,49 @@ } } + function getImageUrl(item, apiClient, imageHeight) { + + var imageTags = item.ImageTags || {}; + + if (item.PrimaryImageTag) { + imageTags.Primary = item.PrimaryImageTag; + } + + if (imageTags.Primary) { + + return apiClient.getScaledImageUrl(item.Id, { + type: "Primary", + maxHeight: imageHeight, + tag: item.ImageTags.Primary + }); + } + else if (imageTags.Thumb) { + + return apiClient.getScaledImageUrl(item.Id, { + type: "Thumb", + maxHeight: imageHeight, + tag: item.ImageTags.Thumb + }); + } + + return null; + } + function renderRecording(context, defaultTimer, program, apiClient) { - context.querySelector('.itemName').innerHTML = program.Name; + var imgUrl = getImageUrl(program, apiClient, 200); + var imageContainer = context.querySelector('.recordingDialog-imageContainer'); + + if (imgUrl) { + imageContainer.innerHTML = ''; + imageContainer.classList.remove('hide'); + } else { + imageContainer.innerHTML = ''; + imageContainer.classList.add('hide'); + } + + context.querySelector('.recordingDialog-itemName').innerHTML = program.Name; + context.querySelector('.itemGenres').innerHTML = (program.Genres || []).join(' / '); context.querySelector('.itemMiscInfoPrimary').innerHTML = mediaInfo.getPrimaryMediaInfoHtml(program); context.querySelector('.itemMiscInfoSecondary').innerHTML = mediaInfo.getSecondaryMediaInfoHtml(program); diff --git a/dashboard-ui/bower_components/emby-webcomponents/recordingcreator/recordingcreator.template.html b/dashboard-ui/bower_components/emby-webcomponents/recordingcreator/recordingcreator.template.html index 16be87c4cd..0af5666cbc 100644 --- a/dashboard-ui/bower_components/emby-webcomponents/recordingcreator/recordingcreator.template.html +++ b/dashboard-ui/bower_components/emby-webcomponents/recordingcreator/recordingcreator.template.html @@ -7,9 +7,17 @@
-

-

-

+
+
+ +
+
+

+

+

+

+
+

@@ -100,7 +108,7 @@
-
+
diff --git a/dashboard-ui/bower_components/emby-webcomponents/recordingcreator/recordingeditor.js b/dashboard-ui/bower_components/emby-webcomponents/recordingcreator/recordingeditor.js index 98d0e1c1a5..3e1f46123a 100644 --- a/dashboard-ui/bower_components/emby-webcomponents/recordingcreator/recordingeditor.js +++ b/dashboard-ui/bower_components/emby-webcomponents/recordingcreator/recordingeditor.js @@ -30,19 +30,56 @@ }); } - function renderTimer(context, item) { + function getImageUrl(item, apiClient, imageHeight) { - var programInfo = item.ProgramInfo || {}; + var imageTags = item.ImageTags || {}; - context.querySelector('.itemName').innerHTML = item.Name; + if (item.PrimaryImageTag) { + imageTags.Primary = item.PrimaryImageTag; + } - context.querySelector('.itemGenres').innerHTML = (programInfo.Genres || []).join(' / '); - context.querySelector('.itemOverview').innerHTML = programInfo.Overview || ''; + if (imageTags.Primary) { - //var timerPageImageContainer = context.querySelector('.timerPageImageContainer'); + return apiClient.getScaledImageUrl(item.Id, { + type: "Primary", + maxHeight: imageHeight, + tag: item.ImageTags.Primary + }); + } + else if (imageTags.Thumb) { - context.querySelector('.itemMiscInfoPrimary').innerHTML = mediaInfo.getPrimaryMediaInfoHtml(programInfo); - context.querySelector('.itemMiscInfoSecondary').innerHTML = mediaInfo.getSecondaryMediaInfoHtml(programInfo); + return apiClient.getScaledImageUrl(item.Id, { + type: "Thumb", + maxHeight: imageHeight, + tag: item.ImageTags.Thumb + }); + } + + return null; + } + + function renderTimer(context, item, apiClient) { + + var program = item.ProgramInfo || {}; + + var imgUrl = getImageUrl(program, apiClient, 200); + var imageContainer = context.querySelector('.recordingDialog-imageContainer'); + + if (imgUrl) { + imageContainer.innerHTML = ''; + imageContainer.classList.remove('hide'); + } else { + imageContainer.innerHTML = ''; + imageContainer.classList.add('hide'); + } + + context.querySelector('.recordingDialog-itemName').innerHTML = item.Name; + + context.querySelector('.itemGenres').innerHTML = (program.Genres || []).join(' / '); + context.querySelector('.itemOverview').innerHTML = program.Overview || ''; + + context.querySelector('.itemMiscInfoPrimary').innerHTML = mediaInfo.getPrimaryMediaInfoHtml(program); + context.querySelector('.itemMiscInfoSecondary').innerHTML = mediaInfo.getSecondaryMediaInfoHtml(program); context.querySelector('#txtPrePaddingMinutes').value = item.PrePaddingSeconds / 60; context.querySelector('#txtPostPaddingMinutes').value = item.PostPaddingSeconds / 60; @@ -119,7 +156,7 @@ var apiClient = connectionManager.getApiClient(currentServerId); apiClient.getLiveTvTimer(id).then(function (result) { - renderTimer(context, result); + renderTimer(context, result, apiClient); loading.hide(); }); } diff --git a/dashboard-ui/bower_components/emby-webcomponents/recordingcreator/recordingeditor.template.html b/dashboard-ui/bower_components/emby-webcomponents/recordingcreator/recordingeditor.template.html index 75f1b2fcd6..866803cd3e 100644 --- a/dashboard-ui/bower_components/emby-webcomponents/recordingcreator/recordingeditor.template.html +++ b/dashboard-ui/bower_components/emby-webcomponents/recordingcreator/recordingeditor.template.html @@ -7,10 +7,19 @@
-

-

-

-

+ +
+
+ +
+
+

+

+

+

+
+
+