diff --git a/dashboard-ui/css/librarybrowser.css b/dashboard-ui/css/librarybrowser.css index 054d4b7f58..39982bac4d 100644 --- a/dashboard-ui/css/librarybrowser.css +++ b/dashboard-ui/css/librarybrowser.css @@ -551,7 +551,7 @@ span.itemCommunityRating:not(:empty) + .userDataIcons { } .ui-page-theme-a .detailSectionHeader { - background-color: #fff; + background-color: #ddd; border: 1px solid #ddd; border-radius: 2px; } diff --git a/dashboard-ui/myprofile.html b/dashboard-ui/myprofile.html index ac36da4359..6283468199 100644 --- a/dashboard-ui/myprofile.html +++ b/dashboard-ui/myprofile.html @@ -4,7 +4,7 @@ ${TitleMediaBrowser} -
+
${TabDisplay} diff --git a/dashboard-ui/scripts/myprofile.js b/dashboard-ui/scripts/myprofile.js index 22174f9823..06570fc753 100644 --- a/dashboard-ui/scripts/myprofile.js +++ b/dashboard-ui/scripts/myprofile.js @@ -181,20 +181,7 @@ window.MyProfilePage = new myProfilePage(); - $(document).on('pagebeforeshow', "#userImagePage", function () { - - var page = this; - - Dashboard.getCurrentUser().done(function (loggedInUser) { - - if (loggedInUser.Policy.IsAdministrator) { - $('#lnkParentalControl', page).show(); - } else { - $('#lnkParentalControl', page).hide(); - } - }); - - }).on('pageinit', "#userImagePage", function () { + $(document).on('pageinit', "#userImagePage", function () { var page = this; @@ -416,20 +403,7 @@ window.UpdatePasswordPage = new updatePasswordPage(); - $(document).on('pagebeforeshow', "#userImagePage", function () { - - var page = this; - - Dashboard.getCurrentUser().done(function (loggedInUser) { - - if (loggedInUser.Policy.IsAdministrator) { - $('#lnkParentalControl', page).show(); - } else { - $('#lnkParentalControl', page).hide(); - } - }); - - }).on('pageshow', "#userImagePage", function () { + $(document).on('pageshow', ".userPasswordPage", function () { var page = this; diff --git a/dashboard-ui/scripts/userpassword.js b/dashboard-ui/scripts/userpassword.js index 764f764ff9..d0bde186cd 100644 --- a/dashboard-ui/scripts/userpassword.js +++ b/dashboard-ui/scripts/userpassword.js @@ -4,7 +4,13 @@ Dashboard.setPageTitle(user.Name); - $('.lnkEditUserPreferences', page).attr('href', 'myprofile.html?userId=' + user.Id); + if (user.ConnectLinkType == 'Guest') { + + $('.connectMessage', page).show(); + } + else { + $('.connectMessage', page).hide(); + } Dashboard.hideLoadingMsg(); } diff --git a/dashboard-ui/userpassword.html b/dashboard-ui/userpassword.html index 93c42ef383..03ca4107ff 100644 --- a/dashboard-ui/userpassword.html +++ b/dashboard-ui/userpassword.html @@ -4,7 +4,7 @@ -
+
@@ -16,10 +16,81 @@
-

${HeaderDashboardUserPassword}

-

- ${ButtonConfigurePassword} -

+ + + + +
+
+
+
+ ${HeaderEasyPinCode} +
+
+
+
${EasyPasswordHelp}
+
+
+ + +
+
+
+ + +
${LabelInNetworkSignInWithEasyPasswordHelp}
+
+
+
+ + +
+
+
+
+ +