diff --git a/LearningHub.Nhs.WebUI/Views/Catalogue/RequestAccess.cshtml b/LearningHub.Nhs.WebUI/Views/Catalogue/RequestAccess.cshtml index dc7a202e3..b67917e35 100644 --- a/LearningHub.Nhs.WebUI/Views/Catalogue/RequestAccess.cshtml +++ b/LearningHub.Nhs.WebUI/Views/Catalogue/RequestAccess.cshtml @@ -2,68 +2,82 @@ @using LearningHub.Nhs.WebUI.Models.Catalogue @using LearningHub.Nhs.Models.Enums @{ - ViewData["Title"] = "Request Access"; + ViewData["Title"] = "Request Access"; } -@section styles{ - +@section styles { + }
-
- -

Catalogue access request

+
+ +

Catalogue access request

-
- @using (Html.BeginForm("RequestAccessPost", "Catalogue", FormMethod.Post)) - { - @if (Model.CatalogueAccessRequest != null && Model.CatalogueAccessRequest.Status == CatalogueAccessRequestStatus.Rejected) - { -

Your last request to access this catalogue was denied on @Model.CatalogueAccessRequest.DateRejected.Value.ToString("dd MMM yyyy") for the following reason:

-

@Model.CatalogueAccessRequest.ResponseMessage

- } +
+ @using (Html.BeginForm("RequestAccessPost", "Catalogue", FormMethod.Post)) + { + @if (Model.CatalogueAccessRequest != null && Model.CatalogueAccessRequest.Status == CatalogueAccessRequestStatus.Rejected) + { +

Your last request to access this catalogue was denied on @Model.CatalogueAccessRequest.DateRejected.Value.ToString("dd MMM yyyy") for the following reason:

+

@Model.CatalogueAccessRequest.ResponseMessage

+ } + else if (Model.CatalogueAccessRequest != null && Model.CatalogueAccessRequest.Status == CatalogueAccessRequestStatus.Pending) + { +

Your access request which was sent on @Model.CatalogueAccessRequest.DateRequested.ToString("dd MMM yyyy") is pending a decision.

+

If you need further information contact support

+ } -

You are requesting access to the @Model.CatalogueName catalogue. Enter the information below which will be sent to the catalogue administrator. You will be notified of their decision by email.

+

You are requesting access to the @Model.CatalogueName catalogue. Enter the information below which will be sent to the catalogue administrator. You will be notified of their decision by email.

- - - - - - - - - -
Name:@Model.CurrentUser.FirstName @Model.CurrentUser.LastName
Email:@Model.CurrentUser.EmailAddress
+ + + + + + + + + +
Name:@Model.CurrentUser.FirstName @Model.CurrentUser.LastName
Email:@Model.CurrentUser.EmailAddress
-
-
- Enter your role, place of work, professional body number (if applicable) and information on why you are requesting access to this catalogue. -
+
+
+ Enter your role, place of work, professional body number (if applicable) and information on why you are requesting access to this catalogue. +
- -
-
+ +
+
- - - - - - - - @if (Model.CatalogueAccessRequest != null) - { - - - - } + + + + + + + + @if (Model.CatalogueAccessRequest != null) + { + + + + } -
- Cancel - -
- } +
+ + @if (Model.CatalogueAccessRequest != null && Model.CatalogueAccessRequest.Status == CatalogueAccessRequestStatus.Pending) + { + Cancel + + } + else + { + Cancel + + }
+ }
+
\ No newline at end of file diff --git a/LearningHub.Nhs.WebUI/Views/Shared/_RestrictedAccessBanner.cshtml b/LearningHub.Nhs.WebUI/Views/Shared/_RestrictedAccessBanner.cshtml index 110a49be8..982e1492d 100644 --- a/LearningHub.Nhs.WebUI/Views/Shared/_RestrictedAccessBanner.cshtml +++ b/LearningHub.Nhs.WebUI/Views/Shared/_RestrictedAccessBanner.cshtml @@ -4,26 +4,26 @@ @if (ViewBag.UserAuthenticated && Model.RestrictedAccess && !Model.HasCatalogueAccess) { -
-
- @if (Model.CatalogueAccessRequest == null || Model.UserGroups.Count == 0) - { -

@Model.TitleText

-

@Model.BodyText

- Request access - } - else if (Model.CatalogueAccessRequest != null && Model.CatalogueAccessRequest.Status == CatalogueAccessRequestStatus.Pending) - { -

@Model.TitleText

-

Your access request which was sent on @Model.CatalogueAccessRequest.DateRequested.ToString("dd MMM yyyy") is pending a decision.

-

If you need further information contact support

- } - else if (Model.CatalogueAccessRequest != null && Model.CatalogueAccessRequest.Status == CatalogueAccessRequestStatus.Rejected) - { -

@Model.TitleText

-

The catalogue administrator did not approve your request to access this catalogue on @Model.CatalogueAccessRequest.DateRejected.Value.ToString("dd MMM yyyy"). If anything has changed in relation to your original request, you can request access again.

- Request access - } -
+
+
+ @if (Model.CatalogueAccessRequest != null && Model.CatalogueAccessRequest.Status == CatalogueAccessRequestStatus.Pending) + { +

@Model.TitleText

+

Your access request which was sent on @Model.CatalogueAccessRequest.DateRequested.ToString("dd MMM yyyy") is pending a decision.

+

If you need further information contact support

+ } + else if (Model.CatalogueAccessRequest != null && Model.CatalogueAccessRequest.Status == CatalogueAccessRequestStatus.Rejected) + { +

@Model.TitleText

+

The catalogue administrator did not approve your request to access this catalogue on @Model.CatalogueAccessRequest.DateRejected.Value.ToString("dd MMM yyyy"). If anything has changed in relation to your original request, you can request access again.

+ Request access + } + else if (Model.CatalogueAccessRequest == null || Model.UserGroups.Count == 0) + { +

@Model.TitleText

+

@Model.BodyText

+ Request access + }
+
}