diff --git a/dashboard-ui/scripts/homenextup.js b/dashboard-ui/scripts/homenextup.js
index 79a20d5305..75f07cace6 100644
--- a/dashboard-ui/scripts/homenextup.js
+++ b/dashboard-ui/scripts/homenextup.js
@@ -36,7 +36,7 @@
lazy: true,
preferThumb: true,
showDetailsMenu: true,
- centerText: true,
+ centerText: !supportsImageAnalysis,
overlayPlayButton: AppInfo.enableAppLayouts && !supportsImageAnalysis,
context: 'home-nextup',
cardLayout: supportsImageAnalysis,
diff --git a/dashboard-ui/scripts/homeupcoming.js b/dashboard-ui/scripts/homeupcoming.js
index 5ccd3a8e00..3f0786a7fe 100644
--- a/dashboard-ui/scripts/homeupcoming.js
+++ b/dashboard-ui/scripts/homeupcoming.js
@@ -118,7 +118,7 @@
preferThumb: true,
lazy: true,
showDetailsMenu: true,
- centerText: true,
+ centerText: !supportsImageAnalysis,
context: 'home-upcoming',
overlayMoreButton: !supportsImageAnalysis,
showParentTitle: true,
diff --git a/dashboard-ui/scripts/livetvschedule.js b/dashboard-ui/scripts/livetvschedule.js
index 909dfba8d6..718a7f0646 100644
--- a/dashboard-ui/scripts/livetvschedule.js
+++ b/dashboard-ui/scripts/livetvschedule.js
@@ -1,4 +1,47 @@
-define(['scripts/livetvcomponents', 'emby-button', 'emby-itemscontainer'], function () {
+define(['cardBuilder', 'scripts/livetvcomponents', 'emby-button', 'emby-itemscontainer'], function (cardBuilder) {
+
+ function enableScrollX() {
+ return browserInfo.mobile && AppInfo.enableAppLayouts;
+ }
+
+ function renderRecordings(elem, recordings, cardOptions) {
+
+ if (recordings.length) {
+ elem.classList.remove('hide');
+ } else {
+ elem.classList.add('hide');
+ }
+
+ var recordingItems = elem.querySelector('.recordingItems');
+
+ if (enableScrollX()) {
+ recordingItems.classList.add('hiddenScrollX');
+ recordingItems.classList.remove('vertical-wrap');
+ } else {
+ recordingItems.classList.remove('hiddenScrollX');
+ recordingItems.classList.add('vertical-wrap');
+ }
+
+ recordingItems.innerHTML = cardBuilder.getCardsHtml(Object.assign({
+ items: recordings,
+ shape: (enableScrollX() ? 'autooverflow' : 'auto'),
+ showTitle: true,
+ showParentTitle: true,
+ coverImage: true,
+ lazy: true,
+ cardLayout: true,
+ vibrant: true,
+ allowBottomPadding: !enableScrollX(),
+ preferThumb: 'auto'
+
+ }, cardOptions || {}));
+
+ ImageLoader.lazyChildren(recordingItems);
+ }
+
+ function getBackdropShape() {
+ return enableScrollX() ? 'overflowBackdrop' : 'backdrop';
+ }
function renderActiveRecordings(context, promise) {
@@ -9,8 +52,18 @@
result.Items = [];
}
- renderTimers(context.querySelector('#activeRecordings'), result.Items, {
- indexByDate: false
+ renderRecordings(context.querySelector('#activeRecordings'), result.Items, {
+ shape: getBackdropShape(),
+ showParentTitle: false,
+ showTitle: true,
+ showAirTime: true,
+ showAirEndTime: true,
+ showChannelName: true,
+ cardLayout: true,
+ vibrant: true,
+ preferThumb: true,
+ coverImage: true,
+ overlayText: false
});
});
}
@@ -54,8 +107,13 @@
});
self.preRender = function () {
- activeRecordingsPromise = ApiClient.getLiveTvTimers({
- IsActive: true
+ activeRecordingsPromise = ApiClient.getLiveTvRecordings({
+
+ UserId: Dashboard.getCurrentUserId(),
+ IsInProgress: true,
+ Fields: 'CanDelete,PrimaryImageAspectRatio,BasicSyncInfo',
+ EnableTotalRecordCount: false,
+ EnableImageTypes: "Primary,Thumb,Backdrop"
});
upcomingRecordingsPromise = ApiClient.getLiveTvTimers({
diff --git a/dashboard-ui/scripts/livetvsuggested.js b/dashboard-ui/scripts/livetvsuggested.js
index 27293ede0a..96437f89f0 100644
--- a/dashboard-ui/scripts/livetvsuggested.js
+++ b/dashboard-ui/scripts/livetvsuggested.js
@@ -4,6 +4,70 @@
return browserInfo.mobile && AppInfo.enableAppLayouts;
}
+ function renderRecordings(elem, recordings, cardOptions) {
+
+ if (recordings.length) {
+ elem.classList.remove('hide');
+ } else {
+ elem.classList.add('hide');
+ }
+
+ var recordingItems = elem.querySelector('.recordingItems');
+
+ if (enableScrollX()) {
+ recordingItems.classList.add('hiddenScrollX');
+ recordingItems.classList.remove('vertical-wrap');
+ } else {
+ recordingItems.classList.remove('hiddenScrollX');
+ recordingItems.classList.add('vertical-wrap');
+ }
+
+ recordingItems.innerHTML = cardBuilder.getCardsHtml(Object.assign({
+ items: recordings,
+ shape: (enableScrollX() ? 'autooverflow' : 'auto'),
+ showTitle: true,
+ showParentTitle: true,
+ coverImage: true,
+ lazy: true,
+ cardLayout: true,
+ vibrant: true,
+ allowBottomPadding: !enableScrollX(),
+ preferThumb: 'auto'
+
+ }, cardOptions || {}));
+
+ ImageLoader.lazyChildren(recordingItems);
+ }
+
+ function getBackdropShape() {
+ return enableScrollX() ? 'overflowBackdrop' : 'backdrop';
+ }
+
+ function renderActiveRecordings(context, promise) {
+
+ promise.then(function (result) {
+
+ // The IsActive param is new, so handle older servers that don't support it
+ if (result.Items.length && result.Items[0].Status != 'InProgress') {
+ result.Items = [];
+ }
+
+ renderRecordings(context.querySelector('#activeRecordings'), result.Items, {
+ shape: getBackdropShape(),
+ showParentTitle: false,
+ showTitle: true,
+ showAirTime: true,
+ showAirEndTime: true,
+ showChannelName: true,
+ cardLayout: true,
+ vibrant: true,
+ preferThumb: true,
+ coverImage: true,
+ overlayText: false
+ });
+ });
+ }
+
function getPortraitShape() {
return enableScrollX() ? 'overflowPortrait' : 'portrait';
}
@@ -43,6 +107,14 @@
loadRecommendedPrograms(page);
+ renderActiveRecordings(page, ApiClient.getLiveTvRecordings({
+ UserId: Dashboard.getCurrentUserId(),
+ IsInProgress: true,
+ Fields: 'CanDelete,PrimaryImageAspectRatio,BasicSyncInfo',
+ EnableTotalRecordCount: false,
+ EnableImageTypes: "Primary,Thumb,Backdrop"
+ }));
+
ApiClient.getLiveTvRecommendedPrograms({
userId: Dashboard.getCurrentUserId(),
@@ -122,7 +194,7 @@
shape: shape || (enableScrollX() ? 'overflowBackdrop' : 'backdrop'),
showParentTitleOrTitle: true,
showTitle: false,
- centerText: true,
+ centerText: !supportsImageAnalysis,
coverImage: true,
overlayText: false,
lazy: true,
@@ -134,7 +206,6 @@
showChannelName: true,
vibrant: true,
cardLayout: supportsImageAnalysis
- //cardFooterAside: 'logo'
});
var elem = page.querySelector('.' + sectionClass);
@@ -172,9 +243,6 @@
var tabControllers = [];
var renderedTabs = [];
- var tabControllers = [];
- var renderedTabs = [];
-
function getTabController(page, index, callback) {
var depends = [];
@@ -247,7 +315,7 @@
if (renderedTabs.indexOf(index) == -1) {
- if (index < 2) {
+ if (index === 1) {
renderedTabs.push(index);
}
controller.renderTab();
diff --git a/dashboard-ui/scripts/moviegenres.js b/dashboard-ui/scripts/moviegenres.js
index ab5d9f6470..586d2d5f49 100644
--- a/dashboard-ui/scripts/moviegenres.js
+++ b/dashboard-ui/scripts/moviegenres.js
@@ -78,7 +78,7 @@
showTitle: true,
scalable: true,
showItemCounts: true,
- centerText: true,
+ centerText: false,
cardLayout: true
});
}
@@ -89,7 +89,7 @@
showTitle: true,
scalable: true,
showItemCounts: true,
- centerText: true,
+ centerText: false,
cardLayout: true
});
}
diff --git a/dashboard-ui/scripts/musicrecommended.js b/dashboard-ui/scripts/musicrecommended.js
index bfefa05c57..4dccb875b9 100644
--- a/dashboard-ui/scripts/musicrecommended.js
+++ b/dashboard-ui/scripts/musicrecommended.js
@@ -45,7 +45,7 @@
showTitle: true,
showParentTitle: true,
lazy: true,
- centerText: true,
+ centerText: !supportsImageAnalysis,
overlayPlayButton: !supportsImageAnalysis,
allowBottomPadding: !enableScrollX(),
cardLayout: supportsImageAnalysis,
@@ -97,7 +97,7 @@
showParentTitle: true,
action: 'instantmix',
lazy: true,
- centerText: true,
+ centerText: !supportsImageAnalysis,
overlayMoreButton: !supportsImageAnalysis,
allowBottomPadding: !enableScrollX(),
cardLayout: supportsImageAnalysis,
@@ -149,7 +149,7 @@
showParentTitle: true,
action: 'instantmix',
lazy: true,
- centerText: true,
+ centerText: !supportsImageAnalysis,
overlayMoreButton: !supportsImageAnalysis,
allowBottomPadding: !enableScrollX(),
cardLayout: supportsImageAnalysis,
@@ -197,7 +197,7 @@
lazy: true,
coverImage: true,
showItemCounts: true,
- centerText: true,
+ centerText: !supportsImageAnalysis,
overlayPlayButton: !supportsImageAnalysis,
allowBottomPadding: !enableScrollX(),
cardLayout: supportsImageAnalysis,
diff --git a/dashboard-ui/scripts/sections.js b/dashboard-ui/scripts/sections.js
index 1b5776d9c4..76a6303344 100644
--- a/dashboard-ui/scripts/sections.js
+++ b/dashboard-ui/scripts/sections.js
@@ -572,8 +572,7 @@
centerText: true,
allowBottomPadding: !enableScrollX(),
cardLayout: supportsImageAnalysis,
- vibrant: supportsImageAnalysis,
- cardFooterAside: 'none'
+ vibrant: supportsImageAnalysis
});
html += '
';
}
@@ -662,7 +661,7 @@
});
}
- function loadLatestLiveTvRecordings(elem, userId, index) {
+ function loadLatestLiveTvRecordings(elem, userId) {
return ApiClient.getLiveTvRecordings({
@@ -678,10 +677,8 @@
if (result.Items.length) {
- var cssClass = index !== 0 ? 'listHeader' : 'listHeader';
-
html += '
';
}
@@ -708,8 +705,7 @@
allowBottomPadding: !enableScrollX(),
preferThumb: true,
cardLayout: supportsImageAnalysis,
- vibrant: supportsImageAnalysis,
- cardFooterAside: 'none'
+ vibrant: supportsImageAnalysis
});
html += '
';
diff --git a/dashboard-ui/scripts/tvgenres.js b/dashboard-ui/scripts/tvgenres.js
index 2f5d7a6c24..58151d19ac 100644
--- a/dashboard-ui/scripts/tvgenres.js
+++ b/dashboard-ui/scripts/tvgenres.js
@@ -78,7 +78,7 @@
showTitle: true,
scalable: true,
showItemCounts: true,
- centerText: true,
+ centerText: false,
cardLayout: true
});
}
@@ -89,7 +89,7 @@
showTitle: true,
scalable: true,
showItemCounts: true,
- centerText: true,
+ centerText: false,
cardLayout: true
});
}
diff --git a/dashboard-ui/scripts/tvrecommended.js b/dashboard-ui/scripts/tvrecommended.js
index 63d1e7050d..72021fd976 100644
--- a/dashboard-ui/scripts/tvrecommended.js
+++ b/dashboard-ui/scripts/tvrecommended.js
@@ -45,11 +45,10 @@
showTitle: true,
showParentTitle: true,
overlayText: false,
- centerText: true,
+ centerText: !supportsImageAnalysis,
overlayPlayButton: true,
cardLayout: supportsImageAnalysis,
- vibrant: supportsImageAnalysis,
- cardFooterAside: 'none'
+ vibrant: supportsImageAnalysis
});
Dashboard.hideLoadingMsg();
@@ -107,9 +106,10 @@
showTitle: true,
showParentTitle: true,
overlayText: false,
- centerText: true,
+ centerText: false,
overlayPlayButton: true,
- allowBottomPadding: allowBottomPadding
+ allowBottomPadding: allowBottomPadding,
+ cardLayout: true
});
});
}
diff --git a/dashboard-ui/scripts/tvupcoming.js b/dashboard-ui/scripts/tvupcoming.js
index 02f1829b50..2997c17dd4 100644
--- a/dashboard-ui/scripts/tvupcoming.js
+++ b/dashboard-ui/scripts/tvupcoming.js
@@ -120,7 +120,7 @@
preferThumb: true,
lazy: true,
showDetailsMenu: true,
- centerText: true,
+ centerText: !supportsImageAnalysis,
showParentTitle: true,
allowBottomPadding: allowBottomPadding,
cardLayout: supportsImageAnalysis,