Skip to content

TD-3603-Content Provided By Changed to Content Developed With #166

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
Parent: Merge RC changes into CI
merged 1 commit into from
Feb 29, 2024
Merged

TD-3603-Content Provided By Changed to Content Developed With #166

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
4 changes: 2 additions & 2 deletions AdminUI/LearningHub.Nhs.AdminUI/Views/Catalogue/Edit.cshtml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -228,10 +228,10 @@

<div class="row">
<div class="col-12">
<label>Content provided by</label>
<label>Content developed with</label>
<p class="providertext">When applicable please select the provider of this content. This will allow a contributor to flag content from a specific provider. </p>
<p class="providertext">This will enable learners to search for content produced by organisations and help separate learning resources from community contributions. </p>
<p class="providertext">Provided by;</p>
<p class="providertext">Developed with;</p>
</div>
</div>

Expand Down
2 changes: 1 addition & 1 deletion AdminUI/LearningHub.Nhs.AdminUI/Views/Resource/Details.cshtml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -153,7 +153,7 @@
<dl>
@if (Model.Providers != null && Model.Providers.Count > 0)
{
<dt>Provided by</dt>
<dt>Developed with</dt>
@foreach (var provider in Model.Providers)
{
<dd>
Expand Down
2 changes: 1 addition & 1 deletion AdminUI/LearningHub.Nhs.AdminUI/Views/User/Details.cshtml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,7 @@
<a class="tab-link" id="contributions-tab" data-toggle="tab" href="#contributions" role="tab" aria-controls="contributions" aria-selected="false">Contributions</a>
</li>
<li class="tab-item large">
<a class="tab-link" id="providedBy-tab" data-toggle="tab" href="#providedByPermission" role="tab" aria-controls="providedby" aria-selected="false">Provided by permission</a>
<a class="tab-link" id="providedBy-tab" data-toggle="tab" href="#providedByPermission" role="tab" aria-controls="providedby" aria-selected="false">Developed with permission</a>
</li>
<li class="tab-item">
<a class="tab-link" id="history-tab" data-toggle="tab" href="#history" role="tab" aria-controls="history" aria-selected="false">History</a>
Expand Down
38 changes: 19 additions & 19 deletions AdminUI/LearningHub.Nhs.AdminUI/Views/User/_UserProviders.cshtml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,27 +3,27 @@
@model List<SelectListItem>

<div class="mt-5">
<div class="row">
<div class="col-12">
<h1>Provided by permission</h1>
<p class="providertext ">Give permission to allow a contributor to flag content from a specific provider. This helps to separate learning resources from community contributions. </p>
<p class="providertext">Select the relevant providers;</p>
<div class="row">
<div class="col-12">
<h1>Developed with permission</h1>
<p class="providertext ">Give permission to allow a contributor to flag content from a specific provider. This helps to separate learning resources from community contributions. </p>
<p class="providertext">Select the relevant providers;</p>
</div>
</div>
</div>

<div class="row mt-2">
<div class="col-12">
@if (Model != null && Model.Count > 0)
{
<div class="form-check form-check-vertical">
@foreach (var item in Model)
{
<input type="checkbox" class="form-check-input-provider" id=@($"provider_{item.Value}") name="providers" value="@item.Value" checked="@item.Selected" />
<span class="span-provider providertext">@item.Text</span>
<br />
}
<div class="row mt-2">
<div class="col-12">
@if (Model != null && Model.Count > 0)
{
<div class="form-check form-check-vertical">
@foreach (var item in Model)
{
<input type="checkbox" class="form-check-input-provider" id=@($"provider_{item.Value}") name="providers" value="@item.Value" checked="@item.Selected" />
<span class="span-provider providertext">@item.Text</span>
<br />
}
</div>
}
</div>
}
</div>
</div>
</div>
2 changes: 1 addition & 1 deletion LearningHub.Nhs.WebUI/Helpers/ProviderHelper.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ public static string GetProvidersString(List<string> providerNames)

if (providerNames != null && providerNames.Count > 0)
{
providerstring += "Provided by ";
providerstring += "Developed with ";
providerstring += string.Join(", ", providerNames.ToArray());
}

Expand Down
2 changes: 1 addition & 1 deletion LearningHub.Nhs.WebUI/Scripts/vuesrc/contribute-resource/Contribute.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -95,7 +95,7 @@
</template>
<template v-slot:tab_2>
<Tick :complete="providedbyPermissionTabComplete"></Tick>
Content provided by
Content developed with
</template>
<template v-slot:page_2>
<ContributeProvideByTab :resourceDetails="resourceDetails" :userProviders="userProviders" />
Expand Down
6 changes: 3 additions & 3 deletions LearningHub.Nhs.WebUI/Scripts/vuesrc/contribute-resource/ContributeProvideByTab.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
<div class="lh-padding-fluid">
<div class="lh-container-xl py-15">
<div class="contribute contribute-providedby-tab">
<h2 id="licence-heading" class="nhsuk-heading-l pt-15">Content provided by</h2>
<h2 id="licence-heading" class="nhsuk-heading-l pt-15">Content developed with</h2>
<p class="nhsuk-u-font-weight-normal">When applicable pease select the provider of this content. This will enable users to search for content produced by specific organisations.</p>
<div class="my-3">
<input class="radio-button" name="resourceProviderId" type="radio" :value="0" v-model="resourceProviderId" @click="setResourceProvider($event.target.value)" />
Expand All @@ -22,15 +22,15 @@
<div class="heading" id="headingProvidedBy">
<div class="mb-0">
<a href="#" class="collapsed" data-toggle="collapse" data-target="#collapseProvidedByInfo" aria-expanded="false" aria-controls="collapseProvidedByInfo">
<div class="accordion-arrow">Why should I flag a resource as 'Provided by'</div>
<div class="accordion-arrow">Why should I flag a resource as 'Developed with'</div>
</a>
</div>
</div>
<div id="collapseProvidedByInfo" class="collapse" aria-labelledby="headingProvidedBy" data-parent="#provided-by-info-accordion">
<div class="content col-12">
<p>
<b>
When publishing a resource it is important to mark a resource as 'Provided by' as it helps;
When publishing a resource it is important to mark a resource as 'Developed with' as it helps;
</b>
</p>
<ul>
Expand Down
6 changes: 3 additions & 3 deletions LearningHub.Nhs.WebUI/Scripts/vuesrc/contribute/ContentCommon.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
<div v-if="showProviders">
<div class="row">
<div class="form-group col-12">
<h2 class="nhsuk-heading-l">Content provided by<i v-if="resourceProviderId === null" class="warningTriangle fas fa-exclamation-triangle"></i></h2>
<h2 class="nhsuk-heading-l">Content developed with<i v-if="resourceProviderId === null" class="warningTriangle fas fa-exclamation-triangle"></i></h2>
</div>
</div>
<div class="row mt-3">
Expand All @@ -26,15 +26,15 @@
<div class="heading" id="headingProvidedBy">
<div class="mb-0">
<a href="#" class="collapsed" data-toggle="collapse" data-target="#collapseProvidedByInfo" aria-expanded="false" aria-controls="collapseProvidedByInfo">
<div class="accordion-arrow">Why should I flag a resource as 'Provided by'</div>
<div class="accordion-arrow">Why should I flag a resource as 'Developed with'</div>
</a>
</div>
</div>
<div id="collapseProvidedByInfo" class="collapse" aria-labelledby="headingProvidedBy" data-parent="#provided-by-info-accordion">
<div class="content col-12">
<p>
<b>
When publishing a resource it is important to mark a resource as 'Provided by' as it helps;
When publishing a resource it is important to mark a resource as 'Developed with' as it helps;
</b>
</p>
<ul>
Expand Down