diff --git a/ProjectLighthouse/Pages/Layouts/BaseLayout.cshtml b/ProjectLighthouse/Pages/Layouts/BaseLayout.cshtml index 85b4ec24..b2c9cd9a 100644 --- a/ProjectLighthouse/Pages/Layouts/BaseLayout.cshtml +++ b/ProjectLighthouse/Pages/Layouts/BaseLayout.cshtml @@ -7,11 +7,7 @@ @{ if (Model!.User == null) { - Model.NavigationItemsRight.Add(new PageNavigationItem("Log in", "/login", "user alternate")); - if (ServerSettings.Instance.RegistrationEnabled) - { - Model.NavigationItemsRight.Add(new PageNavigationItem("Register", "/register", "user alternate edit")); - } + Model.NavigationItemsRight.Add(new PageNavigationItem("Login / Register", "/login", "sign in")); } else { diff --git a/ProjectLighthouse/Pages/LoginForm.cshtml b/ProjectLighthouse/Pages/LoginForm.cshtml index f89075af..ede86b66 100644 --- a/ProjectLighthouse/Pages/LoginForm.cshtml +++ b/ProjectLighthouse/Pages/LoginForm.cshtml @@ -1,4 +1,5 @@ @page "/login" +@using LBPUnion.ProjectLighthouse.Types.Settings @model LBPUnion.ProjectLighthouse.Pages.LoginForm @{ @@ -28,18 +29,33 @@ } -
+ @Html.AntiForgeryToken() -
- - -


+
+ +
+ + +
+
-
- - -



+
+ +
+ + +
+
-
+ + @if (ServerSettings.Instance.RegistrationEnabled) + { + +
+ + Register +
+
+ }
\ No newline at end of file diff --git a/ProjectLighthouse/Pages/RegisterForm.cshtml b/ProjectLighthouse/Pages/RegisterForm.cshtml index e7c670ae..2b0d05ba 100644 --- a/ProjectLighthouse/Pages/RegisterForm.cshtml +++ b/ProjectLighthouse/Pages/RegisterForm.cshtml @@ -30,23 +30,32 @@ } -
-
- @Html.AntiForgeryToken() + + @Html.AntiForgeryToken() - - -


+
+ +
+ + +
+
-
- - -


+
+ +
+ + +
+
-
- - -



+
+ +
+ + +
+
-
+
\ No newline at end of file