diff --git a/dashboard-ui/css/card.css b/dashboard-ui/css/card.css index 266ed1f7f9..92ad29b820 100644 --- a/dashboard-ui/css/card.css +++ b/dashboard-ui/css/card.css @@ -176,7 +176,7 @@ padding: 5px 4px 2px; text-shadow: none; font-weight: 400; - line-height: initial; + line-height: 1.4; } .cardOverlayInner { diff --git a/dashboard-ui/scripts/indexpage.js b/dashboard-ui/scripts/indexpage.js index 11f4acca82..eae87f1208 100644 --- a/dashboard-ui/scripts/indexpage.js +++ b/dashboard-ui/scripts/indexpage.js @@ -524,7 +524,7 @@ return $.when(promises); } - var homePageDismissValue = '12'; + var homePageDismissValue = '14'; var homePageTourKey = 'homePageTour'; function dismissWelcome(page, userId) { @@ -588,14 +588,19 @@ function loadConfigureViewsWelcomeMessage(page, userId) { - $('.btnMyPreferences', page).attr('href', 'mypreferencesdisplay.html?userId=' + userId); + Dashboard.getCurrentUser().done(function (user) { - // Need the timeout because previous methods in the chain have popups that will be in the act of closing - setTimeout(function () { + if (user.Policy.EnableUserPreferenceAccess) { + $('.btnMyPreferences', page).attr('href', 'mypreferencesdisplay.html?userId=' + userId); - $('.popupConfigureViews', page).popup('open'); + // Need the timeout because previous methods in the chain have popups that will be in the act of closing + setTimeout(function () { - }, 500); + $('.popupConfigureViews', page).popup('open'); + + }, 500); + } + }); } $(document).on('pageinit', "#indexPage", function () { diff --git a/dashboard-ui/scripts/mediaplayer-video.js b/dashboard-ui/scripts/mediaplayer-video.js index 76efb72b20..7528f47a66 100644 --- a/dashboard-ui/scripts/mediaplayer-video.js +++ b/dashboard-ui/scripts/mediaplayer-video.js @@ -1039,13 +1039,16 @@ volumeSlider.val(initialVolume).slider('refresh'); updateVolumeButtons(initialVolume); - video.one("loadedmetadata.mediaplayerevent", function (e) { + video.one("playing.mediaplayerevent", function (e) { // TODO: This is not working in chrome. Is it too early? // Appending #t=xxx to the query string doesn't seem to work with HLS if (startPositionInSeekParam && this.currentSrc && this.currentSrc.toLowerCase().indexOf('.m3u8') != -1) { - this.currentTime = startPositionInSeekParam; + var element = this; + setTimeout(function () { + element.currentTime = startPositionInSeekParam; + }, 3000); } }).on("volumechange.mediaplayerevent", function (e) {