diff --git a/dashboard-ui/cinemamodeconfiguration.html b/dashboard-ui/cinemamodeconfiguration.html index 3afabfe86a..bf879af509 100644 --- a/dashboard-ui/cinemamodeconfiguration.html +++ b/dashboard-ui/cinemamodeconfiguration.html @@ -53,10 +53,10 @@
  • -
    - +
    + +
    -
    ${LabelCustomIntrosPathHelp}
  • @@ -90,4 +90,4 @@ - + \ No newline at end of file diff --git a/dashboard-ui/scripts/dashboardpage.js b/dashboard-ui/scripts/dashboardpage.js index f1aee54f9f..dca3bba33e 100644 --- a/dashboard-ui/scripts/dashboardpage.js +++ b/dashboard-ui/scripts/dashboardpage.js @@ -39,7 +39,9 @@ $('.activityItems', page).activityLogList(); - $('.swaggerLink', page).attr('href', apiClient.getUrl('swagger-ui/index.html')); + $('.swaggerLink', page).attr('href', apiClient.getUrl('swagger-ui/index.html', { + api_key: ApiClient.accessToken() + })); }, onPageHide: function () { @@ -115,7 +117,7 @@ var query = { StartIndex: DashboardPage.newsStartIndex, - Limit: 5 + Limit: 7 }; ApiClient.getProductNews(query).done(function (result) { @@ -124,15 +126,31 @@ var itemHtml = ''; - itemHtml += '
    '; - itemHtml += '' + item.Title + ''; + itemHtml += ''; + itemHtml += ''; - var date = parseISO8601Date(item.Date, { toLocal: true }); - itemHtml += '
    ' + date.toLocaleDateString() + '
    '; + itemHtml += ''; - itemHtml += '
    ' + item.Description + '
    '; + itemHtml += ''; + + itemHtml += '
    '; + itemHtml += item.Title; itemHtml += '
    '; + itemHtml += '
    '; + var date = parseISO8601Date(item.Date, { toLocal: true }); + itemHtml += date.toLocaleDateString(); + itemHtml += '
    '; + + itemHtml += '
    '; + itemHtml += item.Description; + itemHtml += '
    '; + + itemHtml += '
    '; + + itemHtml += '
    '; + itemHtml += '
    '; + return itemHtml; }); @@ -751,7 +769,7 @@ html += "" + progress + "%"; - html += ''; + html += ''; } else if (task.State == "Cancelling") { html += '' + Globalize.translate('LabelStopping') + ''; @@ -985,7 +1003,7 @@ } }; -$(document).on('pageshowready', "#dashboardPage", DashboardPage.onPageShow).on('pagebeforehide', "#dashboardPage", DashboardPage.onPageHide); +$(document).on('pageshow', "#dashboardPage", DashboardPage.onPageShow).on('pagebeforehide', "#dashboardPage", DashboardPage.onPageHide); (function ($, document, window) { @@ -1066,61 +1084,43 @@ $(document).on('pageshowready', "#dashboardPage", DashboardPage.onPageShow).on(' var html = ''; - html += '
    '; + html += ''; - html += '
    '; + var color = entry.Severity == 'Error' || entry.Severity == 'Fatal' || entry.Severity == 'Warn' ? '#cc0000' : '#52B54B'; - 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: 20 + height: 40 }); - html += ''; + + html += ''; + } + else { + html += ''; } - html += date.toLocaleDateString() + ' ' + date.toLocaleTimeString().toLowerCase(); - html += '
    '; + html += ''; - html += '
    '; + html += '
    '; html += entry.Name; html += '
    '; - entry.ShortOverview = entry.ShortOverview || ' '; - - if (entry.ShortOverview) { - - html += '
    '; - - if (entry.Overview) { - html += ''; - } - html += entry.ShortOverview; - if (entry.Overview) { - html += ''; - } - - html += '
    '; - - if (entry.Overview) { - html += ''; - } - } - - //if (notification.Url) { - // html += '

    ' + Globalize.translate('ButtonMoreInformation') + '

    '; - //} - + html += '
    '; + var date = parseISO8601Date(entry.Date, { toLocal: true }); + html += date.toLocaleDateString() + ' ' + date.toLocaleTimeString().toLowerCase(); html += '
    '; + html += '
    '; + html += entry.ShortOverview || ''; html += '
    '; + html += ''; + + html += ''; + return html; } @@ -1287,7 +1287,7 @@ $(document).on('pageshowready', "#dashboardPage", DashboardPage.onPageShow).on(' result.CustomPrefs[welcomeTourKey] = welcomeDismissValue; ApiClient.updateDisplayPreferences('dashboard', result, userId, 'dashboard'); - $(page).off('pageshowready', onPageShowReadyCheckTour); + $(page).off('pageshow', onPageShowCheckTour); }); } @@ -1344,7 +1344,7 @@ $(document).on('pageshowready', "#dashboardPage", DashboardPage.onPageShow).on(' }); } - function onPageShowReadyCheckTour() { + function onPageShowCheckTour() { var page = this; var apiClient = ApiClient; @@ -1362,13 +1362,13 @@ $(document).on('pageshowready', "#dashboardPage", DashboardPage.onPageShow).on(' takeTour(page, Dashboard.getCurrentUserId()); }); - }).on('pageshowready', "#dashboardPage", onPageShowReadyCheckTour); + }).on('pageshow', "#dashboardPage", onPageShowCheckTour); })(jQuery, document, window); (function () { - $(document).on('pageshowready', ".type-interior", function () { + $(document).on('pageshow', ".type-interior", function () { var page = this; diff --git a/dashboard-ui/scripts/supporterpage.js b/dashboard-ui/scripts/supporterpage.js index 73cd1e37f3..d9814a14c9 100644 --- a/dashboard-ui/scripts/supporterpage.js +++ b/dashboard-ui/scripts/supporterpage.js @@ -188,7 +188,7 @@ $('.supporterForm').off('submit', onSubmit).on('submit', onSubmit); - }).on('pageshowready', "#supporterPage", function () { + }).on('pageshow', "#supporterPage", function () { var page = this;