diff --git a/dashboard-ui/mysync.html b/dashboard-ui/mysync.html
index 735df60085..0a31d1907c 100644
--- a/dashboard-ui/mysync.html
+++ b/dashboard-ui/mysync.html
@@ -10,13 +10,13 @@
diff --git a/dashboard-ui/scripts/movies.js b/dashboard-ui/scripts/movies.js
index 3de460e2ca..9a2a7977b1 100644
--- a/dashboard-ui/scripts/movies.js
+++ b/dashboard-ui/scripts/movies.js
@@ -165,6 +165,12 @@
});
$('.btnChangeLayout', page).on('layoutchange', function (e, layout) {
+
+ if (layout == 'Timeline') {
+ getQuery().SortBy = 'PremiereDate,SortName';
+ getQuery().SortOrder = 'Descending';
+ }
+
getPageData().view = layout;
LibraryBrowser.saveViewSetting(getSavedQueryKey(), layout);
reloadItems(page, viewPanel);
diff --git a/dashboard-ui/scripts/musicalbums.js b/dashboard-ui/scripts/musicalbums.js
index a01e044f67..26ae9160f9 100644
--- a/dashboard-ui/scripts/musicalbums.js
+++ b/dashboard-ui/scripts/musicalbums.js
@@ -61,7 +61,8 @@
addLayoutButton: true,
currentLayout: view,
updatePageSizeSetting: false,
- viewIcon: 'filter-list'
+ viewIcon: 'filter-list',
+ layouts: 'List,Poster,PosterCard,Timeline'
});
page.querySelector('.listTopPaging').innerHTML = pagingHtml;
@@ -128,6 +129,12 @@
});
$('.btnChangeLayout', page).on('layoutchange', function (e, layout) {
+
+ if (layout == 'Timeline') {
+ getQuery().SortBy = 'PremiereDate,SortName';
+ getQuery().SortOrder = 'Descending';
+ }
+
getPageData().view = layout;
LibraryBrowser.saveViewSetting(getSavedQueryKey(), layout);
reloadItems(page, viewPanel);
diff --git a/dashboard-ui/scripts/syncactivity.js b/dashboard-ui/scripts/syncactivity.js
index ec47738ae9..4d2b9c27ef 100644
--- a/dashboard-ui/scripts/syncactivity.js
+++ b/dashboard-ui/scripts/syncactivity.js
@@ -392,7 +392,20 @@
}
- $(document).on('pageshow', ".syncActivityPage", function () {
+ $(document).on('pageinit', ".syncActivityPage", function () {
+
+ var page = this;
+
+ $('.btnSyncSupporter', page).on('click', function () {
+
+ requirejs(["scripts/registrationservices"], function () {
+ RegistrationServices.validateFeature('sync').done(function () {
+ });
+ });
+ });
+ $('.supporterPromotion .mainText', page).html(Globalize.translate('HeaderSyncRequiresSupporterMembership'));
+
+ }).on('pageshow', ".syncActivityPage", function () {
var page = this;
@@ -402,16 +415,6 @@
$('.supporterPromotionContainer', page).hide();
} else {
$('.supporterPromotionContainer', page).show();
-
- if (AppInfo.enableSupporterMembership) {
- $('.supporterPromotion a', page).attr('href', 'http://emby.media/premiere');
- $('.supporterPromotion .btnLearnMore', page).show();
- $('.supporterPromotion .mainText', page).html(Globalize.translate('HeaderSyncRequiresSupporterMembership'));
- } else {
- $('.supporterPromotion a', page).attr('href', '#');
- $('.supporterPromotion .btnLearnMore', page).hide();
- $('.supporterPromotion .mainText', page).html(Globalize.translate('HeaderSyncRequiresSupporterMembershipAppVersion'));
- }
}
});