diff --git a/dashboard-ui/index.html b/dashboard-ui/index.html
index 2df73c191f..839171523a 100644
--- a/dashboard-ui/index.html
+++ b/dashboard-ui/index.html
@@ -17,9 +17,9 @@
-
${HeaderWelcomeToMediaBrowserWebClient}
+
-
+
diff --git a/dashboard-ui/scripts/dashboardpage.js b/dashboard-ui/scripts/dashboardpage.js
index 21772182ef..6dea1b6422 100644
--- a/dashboard-ui/scripts/dashboardpage.js
+++ b/dashboard-ui/scripts/dashboardpage.js
@@ -1249,7 +1249,7 @@ $(document).on('pagebeforeshow', "#dashboardPage", DashboardPage.onPageShow)
(function ($, document, window) {
- var welcomeDismissValue = '8';
+ var welcomeDismissValue = '10';
var welcomeTourKey = 'welcomeTour';
function dismissWelcome(page, userId) {
@@ -1272,7 +1272,19 @@ $(document).on('pagebeforeshow', "#dashboardPage", DashboardPage.onPageShow)
if (result.CustomPrefs[welcomeTourKey] == welcomeDismissValue) {
$('.welcomeMessage', page).hide();
} else {
- $('.welcomeMessage', page).show();
+
+ var elem = $('.welcomeMessage', page).show();
+
+ if (result.CustomPrefs[welcomeTourKey]) {
+
+ $('.tourHeader', elem).html(Globalize.translate('HeaderWelcomeBack'));
+ $('.tourButtonText', elem).html(Globalize.translate('ButtonTakeTheTourToSeeWhatsNew'));
+
+ } else {
+
+ $('.tourHeader', elem).html(Globalize.translate('HeaderWelcomeToMediaBrowserServerDashboard'));
+ $('.tourButtonText', elem).html(Globalize.translate('ButtonTakeTheTour'));
+ }
}
});
}
diff --git a/dashboard-ui/scripts/indexpage.js b/dashboard-ui/scripts/indexpage.js
index fc95de879c..db87a69523 100644
--- a/dashboard-ui/scripts/indexpage.js
+++ b/dashboard-ui/scripts/indexpage.js
@@ -533,8 +533,25 @@
});
}
- function showWelcomeIfNeeded() {
-
+ function showWelcomeIfNeeded(page, displayPreferences) {
+
+ if (displayPreferences.CustomPrefs[homePageTourKey] == homePageDismissValue) {
+ $('.welcomeMessage', page).hide();
+ } else {
+
+ var elem = $('.welcomeMessage', page).show();
+
+ if (displayPreferences.CustomPrefs[homePageTourKey]) {
+
+ $('.tourHeader', elem).html(Globalize.translate('HeaderWelcomeBack'));
+ $('.tourButtonText', elem).html(Globalize.translate('ButtonTakeTheTourToSeeWhatsNew'));
+
+ } else {
+
+ $('.tourHeader', elem).html(Globalize.translate('HeaderWelcomeToMediaBrowserWebClient'));
+ $('.tourButtonText', elem).html(Globalize.translate('ButtonTakeTheTour'));
+ }
+ }
}
function takeTour(page, userId) {
@@ -581,12 +598,7 @@
ApiClient.getDisplayPreferences('home', userId, 'webclient').done(function (result) {
- if (result.CustomPrefs[homePageTourKey] == homePageDismissValue) {
- $('.welcomeMessage', page).hide();
- } else {
- $('.welcomeMessage', page).show();
- }
-
+ showWelcomeIfNeeded(page, result);
loadSections(page, userId, result);
});
diff --git a/dashboard-ui/scripts/supporterpage.js b/dashboard-ui/scripts/supporterpage.js
index 02965e7b12..c00d35984a 100644
--- a/dashboard-ui/scripts/supporterpage.js
+++ b/dashboard-ui/scripts/supporterpage.js
@@ -105,14 +105,14 @@
$('.planSummary', page)
.html(Globalize.translate('MessageYouHaveALifetimeMembership'))
- .css('color', 'blue');
+ .css('color', 'green');
}
else if (info.IsActiveSupporter) {
$('.planSummary', page)
.html(Globalize.translate('MessageYouHaveAnActiveRecurringMembership').replace('{0}', info.PlanType))
- .css('color', 'blue');
+ .css('color', 'green');
}
else if (info.IsExpiredSupporter) {
@@ -191,6 +191,8 @@
$('.radioDonationType', page).trigger('change');
+ $('.benefits', page).html(Globalize.translate('HeaderSupporterBenefit', '
', '')).trigger('create');
+
loadUserInfo(page);
});
diff --git a/dashboard-ui/supporter.html b/dashboard-ui/supporter.html
index 665a8c6640..e7b68e5883 100644
--- a/dashboard-ui/supporter.html
+++ b/dashboard-ui/supporter.html
@@ -21,7 +21,7 @@
${HeaderSupportTheTeam}
${HeaderSupportTheTeamHelp}
-
${HeaderSupporterBenefit}
+
diff --git a/dashboard-ui/wizardfinish.html b/dashboard-ui/wizardfinish.html
index 223b55c21c..a9cd8c2277 100644
--- a/dashboard-ui/wizardfinish.html
+++ b/dashboard-ui/wizardfinish.html
@@ -36,7 +36,7 @@
-
+