From 0ab8e15f0592c0529a2f9fe37edd5aab2d8c474f Mon Sep 17 00:00:00 2001
From: Anthony Stivers <tony.stivers@gmail.com>
Date: Tue, 10 Jul 2018 15:56:47 -0400
Subject: [PATCH] [Fixes #1866] Fix ActivePage declarations

* Fix missing activepage declarations
* Change activepage declarations to correct values
* Add missing ActivePage
---
 .../Areas/Identity/Pages/Account/Manage/ChangePassword.cshtml   | 1 +
 .../Identity/Pages/Account/Manage/DeletePersonalData.cshtml     | 2 +-
 .../Identity/Pages/Account/Manage/DownloadPersonalData.cshtml   | 2 +-
 .../Areas/Identity/Pages/Account/Manage/ExternalLogins.cshtml   | 1 +
 src/UI/Areas/Identity/Pages/Account/Manage/Index.cshtml         | 1 +
 .../Pages/Account/Manage/TwoFactorAuthentication.cshtml         | 1 +
 6 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/src/UI/Areas/Identity/Pages/Account/Manage/ChangePassword.cshtml b/src/UI/Areas/Identity/Pages/Account/Manage/ChangePassword.cshtml
index 878f3afdde..21cfadb73d 100644
--- a/src/UI/Areas/Identity/Pages/Account/Manage/ChangePassword.cshtml
+++ b/src/UI/Areas/Identity/Pages/Account/Manage/ChangePassword.cshtml
@@ -2,6 +2,7 @@
 @model ChangePasswordModel
 @{
     ViewData["Title"] = "Change password";
+    ViewData["ActivePage"] = ManageNavPages.ChangePassword;
 }
 
 <h4>@ViewData["Title"]</h4>
diff --git a/src/UI/Areas/Identity/Pages/Account/Manage/DeletePersonalData.cshtml b/src/UI/Areas/Identity/Pages/Account/Manage/DeletePersonalData.cshtml
index e76617d469..eb1bc438ec 100644
--- a/src/UI/Areas/Identity/Pages/Account/Manage/DeletePersonalData.cshtml
+++ b/src/UI/Areas/Identity/Pages/Account/Manage/DeletePersonalData.cshtml
@@ -2,7 +2,7 @@
 @model DeletePersonalDataModel
 @{
     ViewData["Title"] = "Delete Personal Data";
-    ViewData["ActivePage"] = ManageNavPages.DeletePersonalData;
+    ViewData["ActivePage"] = ManageNavPages.PersonalData;
 }
 
 <h4>@ViewData["Title"]</h4>
diff --git a/src/UI/Areas/Identity/Pages/Account/Manage/DownloadPersonalData.cshtml b/src/UI/Areas/Identity/Pages/Account/Manage/DownloadPersonalData.cshtml
index a4f5ca4814..fa300e7b38 100644
--- a/src/UI/Areas/Identity/Pages/Account/Manage/DownloadPersonalData.cshtml
+++ b/src/UI/Areas/Identity/Pages/Account/Manage/DownloadPersonalData.cshtml
@@ -2,7 +2,7 @@
 @model DownloadPersonalDataModel
 @{
     ViewData["Title"] = "Download Your Data";
-    ViewData["ActivePage"] = ManageNavPages.DownloadPersonalData;
+    ViewData["ActivePage"] = ManageNavPages.PersonalData;
 }
 
 <h4>@ViewData["Title"]</h4>
diff --git a/src/UI/Areas/Identity/Pages/Account/Manage/ExternalLogins.cshtml b/src/UI/Areas/Identity/Pages/Account/Manage/ExternalLogins.cshtml
index b5592871e6..f1992da2d4 100644
--- a/src/UI/Areas/Identity/Pages/Account/Manage/ExternalLogins.cshtml
+++ b/src/UI/Areas/Identity/Pages/Account/Manage/ExternalLogins.cshtml
@@ -2,6 +2,7 @@
 @model ExternalLoginsModel
 @{
     ViewData["Title"] = "Manage your external logins";
+    ViewData["ActivePage"] = ManageNavPages.ExternalLogins;
 }
 
 @Html.Partial("_StatusMessage", Model.StatusMessage)
diff --git a/src/UI/Areas/Identity/Pages/Account/Manage/Index.cshtml b/src/UI/Areas/Identity/Pages/Account/Manage/Index.cshtml
index c7d3da0bd6..cf71af3425 100644
--- a/src/UI/Areas/Identity/Pages/Account/Manage/Index.cshtml
+++ b/src/UI/Areas/Identity/Pages/Account/Manage/Index.cshtml
@@ -2,6 +2,7 @@
 @model IndexModel
 @{
     ViewData["Title"] = "Profile";
+    ViewData["ActivePage"] = ManageNavPages.Index;
 }
 
 <h4>@ViewData["Title"]</h4>
diff --git a/src/UI/Areas/Identity/Pages/Account/Manage/TwoFactorAuthentication.cshtml b/src/UI/Areas/Identity/Pages/Account/Manage/TwoFactorAuthentication.cshtml
index d03b52f0d0..bfd2791584 100644
--- a/src/UI/Areas/Identity/Pages/Account/Manage/TwoFactorAuthentication.cshtml
+++ b/src/UI/Areas/Identity/Pages/Account/Manage/TwoFactorAuthentication.cshtml
@@ -2,6 +2,7 @@
 @model TwoFactorAuthenticationModel
 @{
     ViewData["Title"] = "Two-factor authentication (2FA)";
+    ViewData["ActivePage"] = ManageNavPages.TwoFactorAuthentication;
 }
 
 @Html.Partial("_StatusMessage", Model.StatusMessage)