Skip to content

task/#1055 - UI Standardisation #1056

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
StuartFerguson merged 5 commits into from
Mar 17, 2026
Merged

task/#1055 - UI Standardisation #1056

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
49ad262
task/#1055 - Standardise UI styling to match EstateManagementUI
StuartFerguson Mar 16, 2026
bef02f6
task/#1055 - Centre login and forgot password page controls
StuartFerguson Mar 16, 2026
1b22bb4
task/#1055 - Fix centering on login and forgot password pages using m…
StuartFerguson Mar 16, 2026
44fdd7d
task/#1055 - Centre reset password page using mx-auto
StuartFerguson Mar 17, 2026
2819fdb
Delete .github/workflows/prlinked.yml
StuartFerguson Mar 17, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
47 changes: 0 additions & 47 deletions .github/workflows/prlinked.yml
View file
Open in desktop

This file was deleted.

9 changes: 5 additions & 4 deletions SecurityService.UserInterface/Pages/Account/AccessDenied.cshtml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,10 @@
@model IdentityServerHost.Pages.Account.AccessDeniedModel
@{
}
<div class="row">
<div class="col">
<h1>Access Denied</h1>
<p>You do not have permission to access that resource.</p>

<div class="max-w-lg">
<div class="p-4 rounded-lg bg-red-100 border border-red-200 text-red-800">
<h1 class="text-lg font-semibold">Access Denied</h1>
<p class="mt-1 text-sm">You do not have permission to access that resource.</p>
</div>
</div>
68 changes: 35 additions & 33 deletions SecurityService.UserInterface/Pages/Account/ChangePassword/Index.cshtml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,45 +2,47 @@
@using Microsoft.AspNetCore.Mvc.TagHelpers
@model IdentityServerHost.Pages.ChangePassword.Index

<div class="login-page">
<div class="mb-6">
<h1 class="text-2xl font-bold text-gray-900">Change Password</h1>
</div>

<partial name="_ValidationSummary"/>

<div class="row">
<div class="col-sm-6">
<div class="card">
<div class="card-header">
<h2>Change Password</h2>
</div>

<div class="card-body">
<form asp-page="/Account/ChangePassword/Index">
<input type="hidden" asp-for="Input.ReturnUrl"/>
<input type="hidden" asp-for="Input.ClientId"/>

<div class="form-group">
<label asp-for="Input.Username"></label>
<input class="form-control" placeholder="Username" asp-for="Input.Username" autofocus readonly="true">
</div>
<div class="form-group">
<label asp-for="Input.CurrentPassword"></label>
<input class="form-control" type="password" placeholder="Current Password" asp-for="Input.CurrentPassword" autocomplete="off">
</div>

<div class="form-group">
<label asp-for="Input.NewPassword"></label>
<input class="form-control" type="password" placeholder="New Password" asp-for="Input.NewPassword" autocomplete="off">
</div>

<div class="form-group">
<label asp-for="Input.ConfirmPassword"></label>
<input class="form-control" type="password" placeholder="Confirm Password" asp-for="Input.ConfirmPassword" autocomplete="off">
</div>
<div class="max-w-lg">
<div class="card">
<div class="card-header">
<h2 class="card-title">Change Password</h2>
</div>

<div class="card-body">
<form asp-page="/Account/ChangePassword/Index">
<input type="hidden" asp-for="Input.ReturnUrl"/>
<input type="hidden" asp-for="Input.ClientId"/>

<div class="form-group">
<label class="form-label" asp-for="Input.Username"></label>
<input class="form-control" placeholder="Username" asp-for="Input.Username" autofocus readonly="true">
</div>
<div class="form-group">
<label class="form-label" asp-for="Input.CurrentPassword"></label>
<input class="form-control" type="password" placeholder="Current Password" asp-for="Input.CurrentPassword" autocomplete="off">
</div>

<div class="form-group">
<label class="form-label" asp-for="Input.NewPassword"></label>
<input class="form-control" type="password" placeholder="New Password" asp-for="Input.NewPassword" autocomplete="off">
</div>

<div class="form-group">
<label class="form-label" asp-for="Input.ConfirmPassword"></label>
<input class="form-control" type="password" placeholder="Confirm Password" asp-for="Input.ConfirmPassword" autocomplete="off">
</div>

<div class="flex gap-2 mt-4">
<button class="btn btn-primary" name="Input.Button" value="login">Change Password</button>
<button class="btn btn-secondary" name="Input.Button" value="cancel">Cancel</button>
</form>
</div>
</div>
</form>
</div>
</div>
</div>
11 changes: 6 additions & 5 deletions SecurityService.UserInterface/Pages/Account/EmailConfirmation/Confirm.cshtml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,19 +2,20 @@
@using Microsoft.AspNetCore.Mvc.TagHelpers
@model IdentityServerHost.Pages.EmailConfirmation.Confirm

<div class="login-page">
<div class="mb-6">
<h1 class="text-2xl font-bold text-gray-900">Email Confirmation</h1>
</div>

<partial name="_ValidationSummary"/>

<div class="row">
<div class="col-sm-6">
<div class="max-w-lg">
<div class="card">
<div class="card-header">
<h2>Confirm Email Address</h2>
<h2 class="card-title">Confirm Email Address</h2>
</div>

<div class="card-body">
<p id="userMessage">@Model.View.UserMessage</p>
<p id="userMessage" class="text-gray-700">@Model.View.UserMessage</p>
</div>
</div>
</div>
61 changes: 33 additions & 28 deletions SecurityService.UserInterface/Pages/Account/ForgotPassword/Confirm.cshtml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,39 +2,44 @@
@using Microsoft.AspNetCore.Mvc.TagHelpers
@model IdentityServerHost.Pages.ForgotPassword.Confirm

<div class="login-page">
<div class="max-w-md mx-auto">

<div class="mb-6 text-center">
<h1 class="text-2xl font-bold text-gray-900">Reset Password</h1>
</div>

<partial name="_ValidationSummary"/>

<div class="row">
<div class="col-sm-6">
<div class="card">
<div class="card-header">
<h2>Forgot Password</h2>
</div>

<div class="card-body">
<form asp-page="/Account/ForgotPassword/Confirm">
<input type="hidden" asp-for="@Model.Input.Token"/>
<input type="hidden" asp-for="@Model.Input.Username"/>
<input type="hidden" asp-for="@Model.Input.ClientId"/>
<div class="form-group">
<label asp-for="@Model.View.Username">@Model.View.Username</label>
</div>

<div class="form-group">
<label asp-for="Input.Password"></label>
<input type="password" class="form-control" placeholder="New Password" asp-for="Input.Password" autocomplete="off">
</div>

<div class="form-group">
<label asp-for="Input.ConfirmPassword"></label>
<input type="password" class="form-control" placeholder="Confirm New Password" asp-for="Input.ConfirmPassword" autocomplete="off">
</div>
<div class="card">
<div class="card-header">
<h2 class="card-title">Reset Password</h2>
</div>

<div class="card-body">
<form asp-page="/Account/ForgotPassword/Confirm">
<input type="hidden" asp-for="@Model.Input.Token"/>
<input type="hidden" asp-for="@Model.Input.Username"/>
<input type="hidden" asp-for="@Model.Input.ClientId"/>
<div class="form-group">
<label class="form-label" asp-for="@Model.View.Username">@Model.View.Username</label>
</div>

<div class="form-group">
<label class="form-label" asp-for="Input.Password"></label>
<input type="password" class="form-control" placeholder="New Password" asp-for="Input.Password" autocomplete="off">
</div>

<div class="form-group">
<label class="form-label" asp-for="Input.ConfirmPassword"></label>
<input type="password" class="form-control" placeholder="Confirm New Password" asp-for="Input.ConfirmPassword" autocomplete="off">
</div>

<div class="flex gap-2 mt-4">
<button class="btn btn-primary" name="Input.Button" value="login">Confirm Reset Password</button>
<button class="btn btn-secondary" name="Input.Button" value="cancel">Cancel</button>
</form>
</div>
</div>
</form>
</div>
</div>

</div>
68 changes: 37 additions & 31 deletions SecurityService.UserInterface/Pages/Account/ForgotPassword/Index.cshtml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,40 +2,46 @@
@using Microsoft.AspNetCore.Mvc.TagHelpers
@model IdentityServerHost.Pages.ForgotPassword.Index

<div class="login-page">
<div class="max-w-md mx-auto">

<div class="mb-6 text-center">
<h1 class="text-2xl font-bold text-gray-900">Forgot Password</h1>
</div>

<partial name="_ValidationSummary"/>

<div class="row">
<div class="col-sm-6">
<div class="card">
<div class="card-header">
<h2>Forgot Password</h2>
</div>

@if (String.IsNullOrEmpty(Model.View.UserMessage)) {
<div class="card-body">
<form asp-page="/Account/ForgotPassword/Index">
<input type="hidden" asp-for="Input.ReturnUrl"/>
<input type="hidden" asp-for="Input.ClientId"/>

<div class="form-group">
<label asp-for="Input.Username"></label>
<input class="form-control" placeholder="Username" asp-for="Input.Username" autofocus>
</div>
<div class="form-group">
<label asp-for="Input.EmailAddress"></label>
<input class="form-control" placeholder="Email Address" asp-for="Input.EmailAddress" autocomplete="off">
</div>

<button class="btn btn-primary" name="Input.Button" value="login">Reset Password</button>
<button class="btn btn-secondary" name="Input.Button" value="cancel">Cancel</button>
</form>
<div class="card">
<div class="card-header">
<h2 class="card-title">Forgot Password</h2>
</div>

@if (String.IsNullOrEmpty(Model.View.UserMessage)) {
<div class="card-body">
<form asp-page="/Account/ForgotPassword/Index">
<input type="hidden" asp-for="Input.ReturnUrl"/>
<input type="hidden" asp-for="Input.ClientId"/>

<div class="form-group">
<label class="form-label" asp-for="Input.Username"></label>
<input class="form-control" placeholder="Username" asp-for="Input.Username" autofocus>
</div>
<div class="form-group">
<label class="form-label" asp-for="Input.EmailAddress"></label>
<input class="form-control" placeholder="Email Address" asp-for="Input.EmailAddress" autocomplete="off">
</div>

<div class="flex gap-2 mt-4">
<button class="btn btn-primary" name="Input.Button" value="login">Reset Password</button>
<button class="btn btn-secondary" name="Input.Button" value="cancel">Cancel</button>
</div>
}
else {
<p id="forgotPasswordMessage">@Model.View.UserMessage</p>
}
</form>
</div>
</div>
}
else {
<div class="card-body">
<p id="forgotPasswordMessage" class="text-gray-700">@Model.View.UserMessage</p>
</div>
}
</div>

</div>
Loading
Loading