From e37cc027eef4ed6f00815a0409ff54aa05345ef6 Mon Sep 17 00:00:00 2001
From: Dara Keon <lc.sales.duarte@gmail.com>
Date: Thu, 8 Aug 2024 23:44:05 +0100
Subject: [PATCH] site: adapt wizard to new menus

---
 core/Language/Language/Site/wizard.json       |  8 +++----
 .../Areas/Account/Views/Reports/Month.cshtml  |  4 ++++
 site/MVC/Views/Accounts/Index.cshtml          |  2 ++
 site/MVC/Views/Categories/Index.cshtml        |  2 ++
 site/MVC/Views/Settings/Index.cshtml          |  4 +++-
 site/MVC/Views/Settings/Wipe.cshtml           |  2 ++
 .../Shared/Skeleton/Menus/AccountArea.cshtml  | 22 ++++++++++++-------
 .../Shared/Skeleton/Menus/DefaultArea.cshtml  | 19 +++++++++-------
 8 files changed, 42 insertions(+), 21 deletions(-)

diff --git a/core/Language/Language/Site/wizard.json b/core/Language/Language/Site/wizard.json
index d9121fccf..14e975737 100644
--- a/core/Language/Language/Site/wizard.json
+++ b/core/Language/Language/Site/wizard.json
@@ -73,7 +73,7 @@
 			"This is a month report.",
 			"If you want to change the month, use the navigation below.",
 			"Here you can see the account balance too.",
-			"Let's check 'Year Summary' clicking at top menu.",
+			"Let's check 'Reports' clicking at top menu then click 'Year Summary'.",
 			null
 		],
 		"Wizard_MovesEdit": [
@@ -117,7 +117,7 @@
 			null
 		],
 		"Wizard_AccountsIndexSchedule": [
-			"...now click into Schedules menu...",
+			"...now click into Administration then Schedules menu...",
 			null
 		],
 		"Wizard_SchedulesIndexFilled": [
@@ -513,7 +513,7 @@
 			"Este é um relatório mensal.",
 			"Quando quiser mudar o mês, use a navegação abaixo.",
 			"Nesta tela também é visível o Saldo atual da conta.",
-			"Vamos ver agora o 'Resumo Anual', clicando no menu to topo.",
+			"Vamos ver agora em 'Relatórios', clicando no menu to topo e clicando em 'Resumo Anual'.",
 			null
 		],
 		"Wizard_MovesEdit": [
@@ -557,7 +557,7 @@
 			null
 		],
 		"Wizard_AccountsIndexSchedule": [
-			"...clique no menu de Agendamentos...",
+			"...clique no menu de Administração e então em Agendamentos...",
 			null
 		],
 		"Wizard_SchedulesIndexFilled": [
diff --git a/site/MVC/Areas/Account/Views/Reports/Month.cshtml b/site/MVC/Areas/Account/Views/Reports/Month.cshtml
index 2dcedeac8..6a24b8d72 100644
--- a/site/MVC/Areas/Account/Views/Reports/Month.cshtml
+++ b/site/MVC/Areas/Account/Views/Reports/Month.cshtml
@@ -23,6 +23,8 @@
 		hasForeseenMoves, hasMoves
 	)
 		.AddBox("MoveMenuClass", 0, null, 1, null, null, null, null, null, 2)
+		.AddBox("ReportsMenuClass", null, null, null, 1, null, null, null, 5, null)
+		.AddBox("ExtractMenuClass", null, null, null, null, null, null, null, null, null)
 		.AddBox("SummaryMenuClass", null, null, null, null, null, null, null, 5, null)
 		.AddBox("HomeMenuClass", null, null, null, null, null, null, 4, null, null)
 		.AddBox("TitleClass", null, null, null, null, null, null, null, 2, null)
@@ -64,6 +66,8 @@
 		.AddBox("MoveCheck", null, null, null, null, null, null, null, null);
 
 	ViewBag.MoveMenuClass = hl["MoveMenuClass"];
+	ViewBag.ReportsMenuClass = hl["ReportsMenuClass"];
+	ViewBag.ExtractMenuClass = hl["ExtractMenuClass"];
 	ViewBag.SummaryMenuClass = hl["SummaryMenuClass"];
 	ViewBag.HomeMenuClass = hl["HomeMenuClass"];
 	ViewBag.CategoriesMenuClass = hl["CategoriesMenuClass"];
diff --git a/site/MVC/Views/Accounts/Index.cshtml b/site/MVC/Views/Accounts/Index.cshtml
index bbe961ac4..0b2b349af 100644
--- a/site/MVC/Views/Accounts/Index.cshtml
+++ b/site/MVC/Views/Accounts/Index.cshtml
@@ -26,6 +26,7 @@
 		.AddBox("CloseButton", null, null, null, null, null, null, null, null, 3, null)
 		.AddBox("Name", null, null, null, 0, null, null, 0, null, 4, null)
 		.AddBox("Reports", null, null, null, 0, null, null, 0, null, 4, null)
+		.AddBox("AdminMenu", null, null, null, null, null, null, null, 0, null, null)
 		.AddBox("SchedulesMenu", null, null, null, null, null, null, null, 0, null, null)
 		.AddBox("Sign", null, null, null, null, null, 0, null, null, null, null)
 		.AddBox("SignSome", null, null, null, null, 0, null, null, null, null, null)
@@ -70,6 +71,7 @@
 	}
 
 	ViewBag.TitleClass = hl["TitleClass"];
+	ViewBag.AdminMenuClass = hl["AdminMenu"];
 	ViewBag.SchedulesMenuClass = hl["SchedulesMenu"];
 
 	var createAccountLabel = anyAccount
diff --git a/site/MVC/Views/Categories/Index.cshtml b/site/MVC/Views/Categories/Index.cshtml
index e2b3c07ba..77f35a189 100644
--- a/site/MVC/Views/Categories/Index.cshtml
+++ b/site/MVC/Views/Categories/Index.cshtml
@@ -18,6 +18,7 @@
 		.AddBox("Edit", 1, null)
 		.AddBox("Disable", 2, null)
 		.AddBox("Unify", 3, null)
+		.AddBox("Admin", 4, null)
 		.AddBox("Accounts", 4, null);
 
 	ViewBag.Buttons = new List<Button>
@@ -25,6 +26,7 @@
 		new(createCategoryLabel, "Create", hl["New"])
 	};
 
+	ViewBag.AdminMenuClass = hl["Admin"];
 	ViewBag.AccountsMenuClass = hl["Accounts"];
 }
 
diff --git a/site/MVC/Views/Settings/Index.cshtml b/site/MVC/Views/Settings/Index.cshtml
index 2e9c03edc..7c6bae012 100644
--- a/site/MVC/Views/Settings/Index.cshtml
+++ b/site/MVC/Views/Settings/Index.cshtml
@@ -47,12 +47,14 @@
 		.AddBox("EnableCategories", null, null, null, null, null, null, null, 9)
 		.AddBox("EnableAccountSigns", null, null, null, null, null, 0, null, null)
 		.AddBox("EnableMoveCheck", null, null, null, 5, null, null, null, null)
-		.AddBox("EnableCurrency", null, 2, null, 5, null, null, null, null)
+		.AddBox("EnableCurrency", null, 2, null, null, null, null, null, null)
+		.AddBox("AdminMenu", 0, null, 0, null, 0, null, 0, null)
 		.AddBox("CategoriesMenu", null, null, null, null, null, null, 0, null)
 		.AddBox("AccountsMenu", 0, null, 0, null, 0, null, null, null)
 		.AddBox("Save", null, null, null, null, null, 1, null, 10)
 		;
 
+	ViewBag.AdminMenuClass = hl["AdminMenu"];
 	ViewBag.CategoriesMenuClass = hl["CategoriesMenu"];
 	ViewBag.AccountsMenuClass = hl["AccountsMenu"];
 
diff --git a/site/MVC/Views/Settings/Wipe.cshtml b/site/MVC/Views/Settings/Wipe.cshtml
index b39243ccd..1f4d934e3 100644
--- a/site/MVC/Views/Settings/Wipe.cshtml
+++ b/site/MVC/Views/Settings/Wipe.cshtml
@@ -8,9 +8,11 @@
 
 	var hl = new WizardHL()
 		.AddBox("Explanation", 5)
+		.AddBox("AdminMenu", 6)
 		.AddBox("LoginsMenu", 6)
 		;
 
+	ViewBag.AdminMenuClass = hl["AdminMenu"];
 	ViewBag.LoginsMenuClass = hl["LoginsMenu"];
 }
 
diff --git a/site/MVC/Views/Shared/Skeleton/Menus/AccountArea.cshtml b/site/MVC/Views/Shared/Skeleton/Menus/AccountArea.cshtml
index 39afee154..908e72b0d 100644
--- a/site/MVC/Views/Shared/Skeleton/Menus/AccountArea.cshtml
+++ b/site/MVC/Views/Shared/Skeleton/Menus/AccountArea.cshtml
@@ -12,13 +12,19 @@
 		}
 	);
 
-	const String menuHL = " wl-other-color";
-	var moveClass = ViewBag.MoveMenuClass + menuHL;
-	var scheduleClass = ViewBag.ScheduleMenuClass + menuHL;
-	var categoriesClass = ViewBag.CategoriesMenuClass + menuHL;
-	var extractClass = ViewBag.ExtractMenuClass + menuHL;
-	var summaryClass = ViewBag.SummaryMenuClass + menuHL;
-	var homeClass = ViewBag.HomeMenuClass + menuHL;
+	String hlClass(dynamic viewBag)
+	{
+		if (viewBag == null) return null;
+		return viewBag + " wl-other-color";
+	}
+
+	var moveClass = hlClass(ViewBag.MoveMenuClass);
+	var scheduleClass = hlClass(ViewBag.ScheduleMenuClass);
+	var categoriesClass = hlClass(ViewBag.CategoriesMenuClass);
+	var reportsClass = hlClass(ViewBag.ReportsMenuClass);
+	var extractClass = hlClass(ViewBag.ExtractMenuClass);
+	var summaryClass = hlClass(ViewBag.SummaryMenuClass);
+	var homeClass = hlClass(ViewBag.HomeMenuClass);
 }
 
 @if (Model.Account.IsOpen)
@@ -40,7 +46,7 @@
 }
 
 <li class="dropdown">
-	<a class="dropdown-toggle @moveClass hide-whl-after-click" data-toggle="dropdown" role="button">
+	<a class="dropdown-toggle @reportsClass hide-whl-after-click" data-toggle="dropdown" role="button">
 		@Context.Translate("Reports")
 	</a>
 
diff --git a/site/MVC/Views/Shared/Skeleton/Menus/DefaultArea.cshtml b/site/MVC/Views/Shared/Skeleton/Menus/DefaultArea.cshtml
index cbdf6840b..781686568 100644
--- a/site/MVC/Views/Shared/Skeleton/Menus/DefaultArea.cshtml
+++ b/site/MVC/Views/Shared/Skeleton/Menus/DefaultArea.cshtml
@@ -1,14 +1,17 @@
 @model BaseSiteModel
 
 @{
-	const String menuHL = " wl-other-color";
-
-	var adminClass = ViewBag.AdminMenuClass + menuHL;
-
-	var schedulesClass = ViewBag.SchedulesMenuClass + menuHL;
-	var accountsClass = ViewBag.AccountsMenuClass + menuHL;
-	var categoriesClass = ViewBag.CategoriesMenuClass + menuHL;
-	var loginsClass = ViewBag.LoginsMenuClass + menuHL;
+	String hlClass(dynamic viewBag)
+	{
+		if (viewBag == null) return null;
+		return viewBag + " wl-other-color";
+	}
+
+	var adminClass = hlClass(ViewBag.AdminMenuClass);
+	var schedulesClass = hlClass(ViewBag.SchedulesMenuClass);
+	var accountsClass = hlClass(ViewBag.AccountsMenuClass);
+	var categoriesClass = hlClass(ViewBag.CategoriesMenuClass);
+	var loginsClass = hlClass(ViewBag.LoginsMenuClass);
 }
 
 <li class="dropdown">