Skip to content

Commit

Permalink
Merge pull request #93 from SkillsFundingAgency/CV-517-BugFix-Cv-607
Browse files Browse the repository at this point in the history 
CV-517 - CV-607 Layout Bug Fix
  • Loading branch information
@Najamuddin-Muhammad
Najamuddin-Muhammad authored Jan 23, 2020
2 parents 8925f31 + 71ebd58 commit 742033d
Show file tree
Hide file tree
Showing 2 changed files with 38 additions and 37 deletions.
19 changes: 9 additions & 10 deletions src/SFA.DAS.EmployerCommitmentsV2.Web/Views/Cohort/Cohorts.cshtml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,21 +4,20 @@
ViewData["Title"] = "Your cohort requests";
}

<div class="govuk-grid-row">

<div class="govuk-grid-row">
<div class="govuk-width-container">
<h1 class="govuk-heading-xl">Your cohort requests</h1>
<div class="govuk-grid-column-two-thirds">
<div class="govuk-width-container">
<h1 class="govuk-heading-xl">Your cohort requests</h1>

<div class="das-cards das-cards--bingo">
@await Html.PartialAsync("_CardLink", Model.CohortsInReview)
@await Html.PartialAsync("_CardLink", Model.CohortsWithTrainingProvider)
@await Html.PartialAsync("_CardLink", Model.CohortsInDraft)
@await Html.PartialAsync("_CardLink", Model.CohortsWithTransferSender)
<div class="das-cards das-cards--bingo">
@await Html.PartialAsync("_CardLink", Model.CohortsInReview)
@await Html.PartialAsync("_CardLink", Model.CohortsWithTrainingProvider)
@await Html.PartialAsync("_CardLink", Model.CohortsInDraft)
@await Html.PartialAsync("_CardLink", Model.CohortsWithTransferSender)
</div>
</div>
</div>
</div>
</div>

@section Back
{
Expand Down
56 changes: 29 additions & 27 deletions src/SFA.DAS.EmployerCommitmentsV2.Web/Views/Home/Index.cshtml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,40 +6,42 @@
@{
ViewData["Title"] = "Apprentices";
}

<h1 class="govuk-heading-xl">Apprentices</h1>

<hr class="das-section-break das-section-break--l das-section-break--heavy-grey">
<div class="das-cards">
<div class="das-card das-card--underline">
<h2 class="govuk-heading-m das-card__heading"><a id="AddApprentice" href="@Url.CommitmentsLink($"/accounts/{Model.AccountHashedId}/apprentices/inform")" class="govuk-link">Add an apprentice</a></h2>
<p>Add apprentices to a new cohort or ask your training provider to add them.</p>
</div>
<div class="das-card das-card--underline">
<h2 class="govuk-heading-m das-card__heading"><a id="YourCohorts" href="@Url.CommitmentsLink($"/accounts/{Model.AccountHashedId}/apprentices/cohorts")" class="govuk-link">Your cohorts</a></h2>
<p>Review, edit, approve and add more apprentices to cohorts you've already started.</p>
</div>
<div class="das-card">
<h2 class="govuk-heading-m das-card__heading"><a id="ManageApprentices" href="@Url.CommitmentsLink($"accounts/{Model.AccountHashedId}/apprentices/manage/all")" class="govuk-link" >Manage your apprentices</a></h2>
<p>View approved apprentices, update details of existing apprentices or stop and pause payments to training providers.</p>
</div>
@if (Model.ShowSetPaymentOrderLink)
{
<div class="das-card">
<h2 class="govuk-heading-m"><a id="SetPaymentOrder" href="@Url.CommitmentsLink($"/accounts/{Model.AccountHashedId}/apprentices/manage/paymentorder")" class="govuk-link">Set payment order</a></h2>
<p>View and change the order in which your providers are paid from your available funds.</p>
<div class="govuk-grid-row">
<div class="govuk-grid-column-two-thirds">
<div class="das-cards">
<div class="das-card das-card--underline">
<h2 class="govuk-heading-m das-card__heading"><a id="AddApprentice" href="@Url.CommitmentsLink($"/accounts/{Model.AccountHashedId}/apprentices/inform")" class="govuk-link">Add an apprentice</a></h2>
<p>Add apprentices to a new cohort or ask your training provider to add them.</p>
</div>
<div class="das-card das-card--underline">
<h2 class="govuk-heading-m das-card__heading"><a id="YourCohorts" href="@Url.CommitmentsLink($"/accounts/{Model.AccountHashedId}/apprentices/cohorts")" class="govuk-link">Your cohorts</a></h2>
<p>Review, edit, approve and add more apprentices to cohorts you've already started.</p>
</div>
<div class="das-card">
<h2 class="govuk-heading-m das-card__heading"><a id="ManageApprentices" href="@Url.CommitmentsLink($"accounts/{Model.AccountHashedId}/apprentices/manage/all")" class="govuk-link">Manage your apprentices</a></h2>
<p>View approved apprentices, update details of existing apprentices or stop and pause payments to training providers.</p>
</div>
@if (Model.ShowSetPaymentOrderLink)
{
<div class="das-card">
<h2 class="govuk-heading-m"><a id="SetPaymentOrder" href="@Url.CommitmentsLink($"/accounts/{Model.AccountHashedId}/apprentices/manage/paymentorder")" class="govuk-link">Set payment order</a></h2>
<p>View and change the order in which your providers are paid from your available funds.</p>
</div>
}
</div>
<hr class="das-section-break das-section-break--l das-section-break--heavy-grey">
<div class="das-cards">
<div class="das-card">
<h2 class="govuk-heading-m das-card__heading"><a id="ReportPublicSectorTarget" href="@Url.PublicSectorReportingLink($"/accounts/{Model.AccountHashedId}/home")" class="govuk-link">Report public sector apprenticeship target</a></h2>
<p>Submit data on your progress towards the public sector apprenticeship target</p>
</div>
</div>
}
</div>
<hr class="das-section-break das-section-break--l das-section-break--heavy-grey">
<div class="das-cards">
<div class="das-card">
<h2 class="govuk-heading-m das-card__heading"><a id="ReportPublicSectorTarget" href="@Url.PublicSectorReportingLink($"/accounts/{Model.AccountHashedId}/home")" class="govuk-link">Report public sector apprenticeship target</a></h2>
<p>Submit data on your progress towards the public sector apprenticeship target</p>
</div>
</div>


@section Back
{
<div class="govuk-breadcrumbs">
Expand Down

0 comments on commit 742033d

Please sign in to comment.