diff --git a/dashboard-ui/cinemamodeconfiguration.html b/dashboard-ui/cinemamodeconfiguration.html index 28ec4ffec9..3afabfe86a 100644 --- a/dashboard-ui/cinemamodeconfiguration.html +++ b/dashboard-ui/cinemamodeconfiguration.html @@ -43,7 +43,7 @@
${LabelTheseFeaturesRequireSupporterHelpAndTrailers}
-
+
-
-
diff --git a/dashboard-ui/scripts/dashboardpage.js b/dashboard-ui/scripts/dashboardpage.js
index 99bf99bfed..f1aee54f9f 100644
--- a/dashboard-ui/scripts/dashboardpage.js
+++ b/dashboard-ui/scripts/dashboardpage.js
@@ -39,9 +39,7 @@
$('.activityItems', page).activityLogList();
- $('.swaggerLink', page).attr('href', apiClient.getUrl('swagger-ui/index.html', {
- api_key: ApiClient.accessToken()
- }));
+ $('.swaggerLink', page).attr('href', apiClient.getUrl('swagger-ui/index.html'));
},
onPageHide: function () {
@@ -117,7 +115,7 @@
var query = {
StartIndex: DashboardPage.newsStartIndex,
- Limit: 7
+ Limit: 5
};
ApiClient.getProductNews(query).done(function (result) {
@@ -126,31 +124,15 @@
var itemHtml = '';
- itemHtml += '';
- itemHtml += '';
+ itemHtml += '
+
+
${LabelCustomIntrosPathHelp}
';
+ itemHtml += '' + item.Title + '';
- itemHtml += '';
-
- itemHtml += ' ';
-
- itemHtml += '';
- itemHtml += '';
-
return itemHtml;
});
@@ -769,7 +751,7 @@
html += "" + progress + "%";
- html += '
' + text + '');
+ $('.supporterIconContainer', page).html('' + text + '');
} else {
imgUrl = "css/images/supporter/nonsupporterbadge.png";
text = Globalize.translate('MessagePleaseSupportProject');
- $('.supporterIconContainer', page).html('' + text + '');
+ $('.supporterIconContainer', page).html('' + text + '');
}
},
@@ -1003,7 +985,7 @@
}
};
-$(document).on('pageshow', "#dashboardPage", DashboardPage.onPageShow).on('pagebeforehide', "#dashboardPage", DashboardPage.onPageHide);
+$(document).on('pageshowready', "#dashboardPage", DashboardPage.onPageShow).on('pagebeforehide', "#dashboardPage", DashboardPage.onPageHide);
(function ($, document, window) {
@@ -1084,42 +1066,60 @@ $(document).on('pageshow', "#dashboardPage", DashboardPage.onPageShow).on('pageb
var html = '';
- html += '';
+ html += '
';
- itemHtml += item.Title;
- itemHtml += '
';
-
- itemHtml += '';
var date = parseISO8601Date(item.Date, { toLocal: true });
- itemHtml += date.toLocaleDateString();
+ itemHtml += '
';
- itemHtml += '' + date.toLocaleDateString() + '
';
+
+ itemHtml += '' + item.Description + '
';
itemHtml += '';
- itemHtml += item.Description;
- itemHtml += '
';
-
- itemHtml += '' + text + '');
+ $('.supporterIconContainer', page).html('' + text + '');
} else {
imgUrl = "css/images/supporter/nonsupporterbadge.png";
text = Globalize.translate('MessagePleaseSupportProject');
- $('.supporterIconContainer', page).html('' + text + '');
+ $('.supporterIconContainer', page).html('' + text + '');
}
},
@@ -1003,7 +985,7 @@
}
};
-$(document).on('pageshow', "#dashboardPage", DashboardPage.onPageShow).on('pagebeforehide', "#dashboardPage", DashboardPage.onPageHide);
+$(document).on('pageshowready', "#dashboardPage", DashboardPage.onPageShow).on('pagebeforehide', "#dashboardPage", DashboardPage.onPageHide);
(function ($, document, window) {
@@ -1084,42 +1066,60 @@ $(document).on('pageshow', "#dashboardPage", DashboardPage.onPageShow).on('pageb
var html = '';
- html += '';
- var color = entry.Severity == 'Error' || entry.Severity == 'Fatal' || entry.Severity == 'Warn' ? '#cc0000' : '#52B54B';
+ html += '
';
+ var date = parseISO8601Date(entry.Date, { toLocal: true });
+
+ var color = entry.Severity == 'Error' || entry.Severity == 'Fatal' || entry.Severity == 'Warn' ? '#cc0000' : 'green';
+
+ html += '
- ';
if (entry.UserId && entry.UserPrimaryImageTag) {
var userImgUrl = ApiClient.getUserImageUrl(entry.UserId, {
type: 'Primary',
tag: entry.UserPrimaryImageTag,
- height: 40
+ height: 20
});
-
- html += '
';
}
- html += '';
-
- html += '
';
return html;
}
@@ -1287,7 +1287,7 @@ $(document).on('pageshow', "#dashboardPage", DashboardPage.onPageShow).on('pageb
result.CustomPrefs[welcomeTourKey] = welcomeDismissValue;
ApiClient.updateDisplayPreferences('dashboard', result, userId, 'dashboard');
- $(page).off('pageshow', onPageShowCheckTour);
+ $(page).off('pageshowready', onPageShowReadyCheckTour);
});
}
@@ -1344,7 +1344,7 @@ $(document).on('pageshow', "#dashboardPage", DashboardPage.onPageShow).on('pageb
});
}
- function onPageShowCheckTour() {
+ function onPageShowReadyCheckTour() {
var page = this;
var apiClient = ApiClient;
@@ -1362,13 +1362,13 @@ $(document).on('pageshow', "#dashboardPage", DashboardPage.onPageShow).on('pageb
takeTour(page, Dashboard.getCurrentUserId());
});
- }).on('pageshow', "#dashboardPage", onPageShowCheckTour);
+ }).on('pageshowready', "#dashboardPage", onPageShowReadyCheckTour);
})(jQuery, document, window);
(function () {
- $(document).on('pageshow', ".type-interior", function () {
+ $(document).on('pageshowready', ".type-interior", function () {
var page = this;
@@ -1378,7 +1378,7 @@ $(document).on('pageshow', "#dashboardPage", DashboardPage.onPageShow).on('pageb
$('.supporterPromotion', page).remove();
if (!pluginSecurityInfo.IsMBSupporter && AppInfo.enableSupporterMembership) {
- $('.content-primary', page).append('');
+ $('.content-primary', page).append('');
}
}
diff --git a/dashboard-ui/scripts/supporterpage.js b/dashboard-ui/scripts/supporterpage.js
index b0b3a0ae11..73cd1e37f3 100644
--- a/dashboard-ui/scripts/supporterpage.js
+++ b/dashboard-ui/scripts/supporterpage.js
@@ -83,6 +83,12 @@
$('.currentPlanInfo', page).hide();
}
+ if (info.IsActiveSupporter) {
+ $('.supporterContainer', page).addClass('hide');
+ } else {
+ $('.supporterContainer', page).removeClass('hide');
+ }
+
if (info.IsActiveSupporter && info.PlanType == 'Lifetime') {
$('.planSummary', page)
@@ -182,7 +188,7 @@
$('.supporterForm').off('submit', onSubmit).on('submit', onSubmit);
- }).on('pageshow', "#supporterPage", function () {
+ }).on('pageshowready', "#supporterPage", function () {
var page = this;
diff --git a/dashboard-ui/supporter.html b/dashboard-ui/supporter.html
index bedb5e381f..210b81ee4c 100644
--- a/dashboard-ui/supporter.html
+++ b/dashboard-ui/supporter.html
@@ -27,7 +27,13 @@
';
}
- html += '';
- html += entry.Name;
- html += '
';
-
- html += '';
- var date = parseISO8601Date(entry.Date, { toLocal: true });
html += date.toLocaleDateString() + ' ' + date.toLocaleTimeString().toLowerCase();
html += '
';
- html += '';
- html += entry.ShortOverview || '';
+ html += '
';
+
+ html += '';
+ html += entry.Name;
html += '
';
- html += '';
+ entry.ShortOverview = entry.ShortOverview || ' ';
- html += '';
+ if (entry.ShortOverview) {
+
+ html += '';
+
+ if (entry.Overview) {
+ html += '';
+ }
+ html += entry.ShortOverview;
+ if (entry.Overview) {
+ html += '';
+ }
+
+ html += '
';
+
+ if (entry.Overview) {
+ html += '';
+ }
+ }
+
+ //if (notification.Url) {
+ // html += '';
+ //}
+
+ html += '