Skip to content

Commit

Permalink
Merge pull request #309 from DFE-Digital/fix/confirm-qualification-st…
Browse files Browse the repository at this point in the history 
…yling

Styling changes to the additional reqs page and the qualification list page
  • Loading branch information
@DanielClarkeEducation
DanielClarkeEducation authored Aug 14, 2024
2 parents 19cc31e + e27ee92 commit 282566d
Show file tree
Hide file tree
Showing 2 changed files with 49 additions and 45 deletions.
4 changes: 2 additions & 2 deletions src/Dfe.EarlyYearsQualification.Web/Views/CheckAdditionalRequirements/Index.cshtml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -69,7 +69,7 @@
<form id="check-additional-requirements" asp-controller="CheckAdditionalRequirements" asp-action="Post" method="post">
<input type="hidden" name="qualificationId" value="@Model.QualificationId">
<div id="additional-requirements-form-group" class="govuk-form-group">
<h3 id="radio-heading" class="govuk-heading-l govuk-!-static-margin-top-8">@Model.QuestionSectionHeading</h3>
<h2 id="radio-heading" class="govuk-heading-l govuk-!-static-margin-top-8">@Model.QuestionSectionHeading</h2>
<input type="hidden" name="QuestionCount" value="@Model.QuestionCount"/>
@for (var qi = 0; qi < Model.AdditionalRequirementQuestions.Count; qi++)
{
Expand All @@ -79,7 +79,7 @@
<div class="govuk-form-group @(Model.AdditionalRequirementQuestions[qi].HasError ? "govuk-form-group--error" : "")">
<fieldset class="govuk-fieldset" name="@fieldsetName">
<legend class="govuk-fieldset__legend govuk-fieldset__legend--l">
<h3 class="govuk-heading-s mb-0" id="@questionId">@question.Question</h3>
<p class="govuk-heading-s mb-0" id="@questionId">@question.Question</p>
</legend>
@if (!string.IsNullOrEmpty(question.HintText))
{
Expand Down
90 changes: 47 additions & 43 deletions src/Dfe.EarlyYearsQualification.Web/Views/QualificationDetails/Get.cshtml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -25,51 +25,52 @@
<div id="post-filter-content">@Html.Raw(Model.PostSearchCriteriaContent)</div>
</div>
<div class="govuk-grid-column-three-quarters">
<h1 id="heading" class="govuk-heading-xl mb-8">@Model.Header</h1>
<h3 id="found-heading" class="govuk-heading-m govuk-!-static-margin-bottom-8">
<strong>
@if (Model.Qualifications.Count > 0)
{
@Model.Qualifications.Count
}
else
{
@Model.NoQualificationsFoundText
} @(Model.Qualifications.Count == 1 ? Model.SingleQualificationFoundText : Model.MultipleQualificationsFoundText)
</strong>
</h3>
<div id="pre-search-content">@Html.Raw(Model.PreSearchBoxContent)</div>
<div class="govuk-grid-row">
<div class="govuk-grid-column-three-quarters">
@using (Html.BeginForm("Refine", "QualificationDetails", FormMethod.Post))
{
<div class="display-flex">
<input class="govuk-input" id="refineSearch" name="refineSearch" aria-label="refine search box" type="text" value="@Model.SearchCriteria">
<button id="refineSearchButton" type="submit" class="govuk-button govuk-button--secondary govuk-!-static-margin-left-1" data-module="govuk-button">
@Model.SearchButtonText
</button>
</div>

}
</div>
<div class="govuk-grid-column-one-quarter">
@using (Html.BeginForm("Refine", "QualificationDetails", FormMethod.Post))
{
<input name="refineSearch" type="hidden" value="">
<button id="clear-search" type="submit" class="govuk-link button-as-link float-left govuk-!-static-margin-left-3 govuk-!-static-margin-top-1 govuk-!-font-size-19">@Model.ClearSearchText</button>
}
</div>
<h1 id="heading" class="govuk-heading-xl mb-8">@Model.Header</h1>
</div>
<div class="govuk-grid-row">
<h3 id="found-heading" class="govuk-heading-m govuk-!-static-margin-bottom-8">
<strong>
@if (Model.Qualifications.Count > 0)
{
@(Model.Qualifications.Count + " " + (Model.Qualifications.Count == 1 ? Model.SingleQualificationFoundText : Model.MultipleQualificationsFoundText))
}
else
{
@(Model.NoQualificationsFoundText + " " + Model.MultipleQualificationsFoundText)
}
</strong>
</h3>
</div>
<div class="govuk-grid-row">
<div id="pre-search-content">@Html.Raw(Model.PreSearchBoxContent)</div>
</div>
<div class="govuk-grid-row">
@using (Html.BeginForm("Refine", "QualificationDetails", FormMethod.Post, new { @class = "float-left", style = "width:80%" }))
{
<input class="govuk-input" style="width: 85%" id="refineSearch" name="refineSearch" aria-label="refine search box" type="text" value="@Model.SearchCriteria">
<button id="refineSearchButton" type="submit" class="govuk-button govuk-button--secondary govuk-!-static-margin-left-1" data-module="govuk-button">
@Model.SearchButtonText
</button>
}
@using (Html.BeginForm("Refine", "QualificationDetails", FormMethod.Post, new { @class = "float-left", style = "width:20%" }))
{
<input name="refineSearch" type="hidden" value="">
<button id="clear-search" type="submit" class="govuk-link button-as-link float-left govuk-!-static-margin-left-3 govuk-!-static-margin-top-1 govuk-!-font-size-19">@Model.ClearSearchText</button>
}
</div>
<div class="govuk-grid-row">
@if (Model.Qualifications.Count == 0)
{
<div id="no-result-content">
@Html.Raw(Model.NoResultText)
</div>
}
</div>

@if (Model.Qualifications.Count == 0)
{
<div id="no-result-content">
@Html.Raw(Model.NoResultText)
</div>
}

@foreach (var qualification in Model.Qualifications)
{
{
<div class="govuk-grid-row">
<div class="chevron-card__wrapper">
<a href="@Url.Action("Index", "ConfirmQualification", new { qualificationId = qualification.QualificationId })" class="govuk-link govuk-heading-m chevron-card__link">
@qualification.QualificationName
Expand All @@ -94,7 +95,10 @@
</dl>
<hr class="govuk-section-break govuk-section-break--m govuk-section-break--visible">
</div>
}
<div id="post-list-content">@Html.Raw(Model.PostQualificationListContent)</div>
</div>
}
<div class="govuk-grid-row">
<div id="post-list-content">@Html.Raw(Model.PostQualificationListContent)</div>
</div>
</div>
</div>

0 comments on commit 282566d

Please sign in to comment.