Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@
<div class="mt-5" v-if="!isCurrentUserSavedAsAuthor">
<label class="checkContainer" for="currentUserAuthor">
I am the author or co-author
<input type="checkbox" id="currentUserAuthor" v-model="authorIsContributor" v-on:change="currentUserAuthorChange">
<input type="checkbox" id="currentUserAuthor" class="nhsuk-checkboxes__input" v-model="authorIsContributor" v-on:change="currentUserAuthorChange">
<span class="checkmark nhsuk-input"></span>
</label>
</div>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -15,14 +15,14 @@
<div class="row">
<label class="checkContainer ml-3">
<span class="my-auto">Make this resource available to everyone within the Learning Hub community.</span>
<input type="radio" name="resourceAccessibilityEnum" v-model="resourceDetails.resourceAccessibilityEnum" v-bind:value="2"/>
<input type="radio" class="nhsuk-radios__input" name="resourceAccessibilityEnum" v-model="resourceDetails.resourceAccessibilityEnum" v-bind:value="2"/>
<span class="radioButton"></span>
</label>
</div>
<div class="row">
<label class="checkContainer ml-3">
<span class="my-auto">Make this resource available only to the NHS and Social care workforce community.</span>
<input type="radio" name="resourceAccessibilityEnum" v-model="resourceDetails.resourceAccessibilityEnum" v-bind:value="3"/>
<input type="radio" class="nhsuk-radios__input" name="resourceAccessibilityEnum" v-model="resourceDetails.resourceAccessibilityEnum" v-bind:value="3"/>
<span class="radioButton"></span>
</label>
</div>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,12 +7,12 @@
<div class="mb-10">
<label class="checkContainer mr-0">
<span>Yes</span>
<input type="radio" name="resourceCertificateRadio" value="true" v-model="resourceDetails.certificateEnabled" @click="certificateEnabledChange($event.target.value)" />
<input type="radio" name="resourceCertificateRadio" class="nhsuk-radios__input" value="true" v-model="resourceDetails.certificateEnabled" @click="certificateEnabledChange($event.target.value)" />
<span class="radioButton"></span>
</label>
<label class="checkContainer mr-0">
<span>No</span>
<input type="radio" name="resourceCertificateRadio" value="false" v-model="resourceDetails.certificateEnabled" @click="certificateEnabledChange($event.target.value)" checked/>
<input type="radio" name="resourceCertificateRadio" class="nhsuk-radios__input" value="false" v-model="resourceDetails.certificateEnabled" @click="certificateEnabledChange($event.target.value)" checked/>
<span class="radioButton"></span>
</label>
</div>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
<span class="span-provider nhsuk-u-font-weight-normal">Not applicable</span>
<div v-for="provider in userProviders">
<label class="my-0 span-provider nhsuk-u-font-weight-normal">
<input class="radio-button" name="resourceProviderId" type="radio" :value="provider.id" v-model="resourceProviderId" @click="setResourceProvider($event.target.value)" />
<input class="radio-button" name="resourceProviderId" type="radio" :value="provider.id" v-model="resourceProviderId" @click="setResourceProvider($event.target.value)" />
{{provider.name}}
</label>
<br />
Expand All @@ -19,10 +19,14 @@
<div class="row my-2">
<div class="accordion col-12" id="provided-by-info-accordion">
<div class="pt-0 pb-4">

<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 'Developed with'</div>
<a href="#" class="collapsed text-decoration-skip" style="color:#005EB8;" data-toggle="collapse" data-target="#collapseProvidedByInfo" aria-expanded="false" aria-controls="collapseProvidedByInfo">
<div class="accordion-arrow"></div>
<span class="pl-3">
Why should I flag a resource as 'Developed with''
</span>
</a>
</div>
</div>
Expand Down Expand Up @@ -107,4 +111,19 @@
font-family: $font-stack !important;
font-size: 19px !important;
}
.radio-button {
appearance: none;
-webkit-appearance: none;
width: 24px;
height: 24px;
border: 2px solid black;
border-radius: 50%;
position: relative;
cursor: pointer;
transition: box-shadow 0.3s;
outline: none;
filter: grayscale(0) !important;
}
</style>
Original file line number Diff line number Diff line change
@@ -1,21 +1,35 @@
<template>
<details>
<summary class="mb-10">
More information on catalogues
</summary>
<div class="catalogue-selector-accordion-content">
<p>
A catalogue is a curated set of resources that has its own web page.
</p>
<p>
You can contribute a resource as an editor of a catalogue or in your own name.
To contribute a resource in your own name, select Community contributions from the drop down menu.
</p>
<p>
You can manage all resources that you have contributed in the My contributions area.
</p>
<div class="row my-2">
<div class="accordion col-12" id="cat-accordion">
<div class="pt-0 pb-4">

<div class="heading" id="accessibilityTypeInfo">
<div class="mb-0">
<a href="#" class="collapsed text-decoration-skip" style="color:#005EB8;" data-toggle="collapse" data-target="#collapseAccessibilityTypeInfo" aria-expanded="false" aria-controls="collapseAccessibilityTypeInfo">
<div class="accordion-arrow"></div>
<span class="pl-3">
More information on catalogues
</span>
</a>
</div>
</div>
<div id="collapseAccessibilityTypeInfo" class="collapse" aria-labelledby="accessibilityTypeInfo" data-parent="#cat-accordion">
<div class="content col-12">
<p>
A catalogue is a curated set of resources that has its own web page.
</p>
<p>
You can contribute a resource as an editor of a catalogue or in your own name.
To contribute a resource in your own name, select Community contributions from the drop down menu.
</p>
<p>
You can manage all resources that you have contributed in the My contributions area.
</p>
</div>
</div>
</div>
</div>
</details>
</div>
</template>

<script lang="ts">
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
<div class="mt-3">
<label class="checkContainer mb-0" for="sensitivecontent">
Yes
<input type="checkbox" id="sensitivecontent" v-model="resourceDetails.sensitiveContent">
<input type="checkbox" id="sensitivecontent" class="nhsuk-checkboxes__input" v-model="resourceDetails.sensitiveContent">
<span class="checkmark"></span>
</label>
</div>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -9,14 +9,18 @@
<div class="row my-2">
<div class="accordion col-12" id="cat-accordion">
<div class="pt-0 pb-4">
<div class="heading" id="headingCat">

<div class="heading" id="accessibilityTypeInfo">
<div class="mb-0">
<a href="#" class="collapsed" data-toggle="collapse" data-target="#collapseCat" aria-expanded="false" aria-controls="collapseCat">
<div class="accordion-arrow">More information on catalogues</div>
<a href="#" class="collapsed text-decoration-skip" style="color:#005EB8;" data-toggle="collapse" data-target="#collapseAccessibilityTypeInfo" aria-expanded="false" aria-controls="collapseAccessibilityTypeInfo">
<div class="accordion-arrow"></div>
<span class="pl-3">
More information on catalogues
</span>
</a>
</div>
</div>
<div id="collapseCat" class="collapse" aria-labelledby="headingCat" data-parent="#cat-accordion">
<div id="collapseAccessibilityTypeInfo" class="collapse" aria-labelledby="accessibilityTypeInfo" data-parent="#cat-accordion">
<div class="content col-12">
<p>
A catalogue is a curated set of resources that has its own web page.
Expand All @@ -33,7 +37,6 @@
</div>
</div>
</div>

<div class="row">
<div class="form-group col-12">
<select class="form-control nhsuk-input" aria-labelledby="type-label" id="catalogue" v-model="selectedCatalogue" @change="catalogueChange">
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -1168,7 +1168,6 @@
})
</script>

<style lang="scss" scoped>
.resource-area-body-file-upload {
min-height: auto !important;
Expand All @@ -1181,4 +1180,5 @@
.password-div-width{
max-width:70% !important;
}
</style>
Original file line number Diff line number Diff line change
Expand Up @@ -13,14 +13,14 @@
<div class="row">
<label class="checkContainer ml-3">
<span class="my-auto">Make this resource available to everyone within the Learning Hub community.</span>
<input type="radio" name="resourceAccessibilityEnum" v-model="localResourceDetail.resourceAccessibilityEnum" v-bind:value="2" @click="setProperty($event.target.name, $event.target.value)" />
<input type="radio" class="nhsuk-radios__input" name="resourceAccessibilityEnum" v-model="localResourceDetail.resourceAccessibilityEnum" v-bind:value="2" @click="setProperty($event.target.name, $event.target.value)" />
<span class="radioButton"></span>
</label>
</div>
<div class="row">
<label class="checkContainer ml-3">
<span class="my-auto">Make this resource available only to the NHS and Social care workforce community.</span>
<input type="radio" name="resourceAccessibilityEnum" v-model="localResourceDetail.resourceAccessibilityEnum" v-bind:value="3" @click="setProperty($event.target.name, $event.target.value)" checked />
<input type="radio" class="nhsuk-radios__input" name="resourceAccessibilityEnum" v-model="localResourceDetail.resourceAccessibilityEnum" v-bind:value="3" @click="setProperty($event.target.name, $event.target.value)" checked />
<span class="radioButton"></span>
</label>
</div>
Expand Down Expand Up @@ -148,5 +148,5 @@
left: 4px;
width: 12px;
height: 12px;
}
}
</style>
17 changes: 11 additions & 6 deletions LearningHub.Nhs.WebUI/Scripts/vuesrc/contribute/ContentCommon.vue
Original file line number Diff line number Diff line change
Expand Up @@ -25,11 +25,16 @@
<div class="pt-0 pb-4">
<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 'Developed with'</div>
<a href="#" class="collapsed text-decoration-skip" style="color:#005EB8;" data-toggle="collapse" data-target="#collapseProvidedByInfo" aria-expanded="false" aria-controls="collapseProvidedByInfo">
<div class="accordion-arrow"></div>
<span class="pl-3">
Why should I flag a resource as 'Developed with'
</span>
</a>
</div>
</div>


<div id="collapseProvidedByInfo" class="collapse" aria-labelledby="headingProvidedBy" data-parent="#provided-by-info-accordion">
<div class="content col-12">
<p>
Expand Down Expand Up @@ -68,7 +73,7 @@
<div class="mt-3">
<label class="checkContainer mb-0" for="sensitivecontent">
Yes
<input type="checkbox" id="sensitivecontent" v-model="sensitiveContent" @click="setSensitiveContent($event.target.checked)">
<input type="checkbox" id="sensitivecontent" class="nhsuk-checkboxes__input" v-model="sensitiveContent" @click="setSensitiveContent($event.target.checked)">
<span class="checkmark"></span>
</label>
</div>
Expand Down Expand Up @@ -153,7 +158,7 @@
<div>
<label class="checkContainer" for="currentUserAuthor">
I am the author or co-author
<input type="checkbox" id="currentUserAuthor" v-model="currentUserAuthor" @change="currentUserAuthorChange">
<input type="checkbox" class="nhsuk-checkboxes__input" id="currentUserAuthor" v-model="currentUserAuthor" @change="currentUserAuthorChange">
<span class="checkmark"></span>
</label>
</div>
Expand Down Expand Up @@ -223,12 +228,12 @@
<div class="mb-10">
<label class="checkContainer mr-0">
<span>Yes</span>
<input type="radio" name="resourceCertificateRadio" value="true" v-model="certificateEnabled" @click="certificateEnabledChange($event.target.value)" />
<input type="radio" name="resourceCertificateRadio" class="nhsuk-radios__input" value="true" v-model="certificateEnabled" @click="certificateEnabledChange($event.target.value)" />
<span class="radioButton"></span>
</label>
<label class="checkContainer mr-0">
<span>No</span>
<input type="radio" name="resourceCertificateRadio" value="false" v-model="certificateEnabled" @click="certificateEnabledChange($event.target.value)" />
<input type="radio" name="resourceCertificateRadio" class="nhsuk-radios__input" value="false" v-model="certificateEnabled" @click="certificateEnabledChange($event.target.value)" />
<span class="radioButton"></span>
</label>
</div>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -108,22 +108,22 @@
<div class="row">
<label class="checkContainer mr-0" style="margin-left:10px;">
<span>Don't display</span>
<input type="radio" name="esrLinkType" v-model="localGenericFileDetail.esrLinkType" value="1" data-toggle="modal" data-target="#esrLinkModal" @click="showWarningModal($event.target.name, $event.target.value)" checked>
<input type="radio" name="esrLinkType" class="nhsuk-radios__input" v-model="localGenericFileDetail.esrLinkType" value="1" data-toggle="modal" data-target="#esrLinkModal" @click="showWarningModal($event.target.name, $event.target.value)" checked>
<span class="radioButton"></span>
</label>
<label class="checkContainer ml-3" v-if="resourceCatalogueCount<=1">
<span>Display only to me</span>
<input type="radio" name="esrLinkType" v-model="localGenericFileDetail.esrLinkType" value="2" data-toggle="modal" data-target="#esrLinkModal" @click="showWarningModal($event.target.name, $event.target.value)">
<input type="radio" name="esrLinkType" class="nhsuk-radios__input" v-model="localGenericFileDetail.esrLinkType" value="2" data-toggle="modal" data-target="#esrLinkModal" @click="showWarningModal($event.target.name, $event.target.value)">
<span class="radioButton"></span>
</label>
<label class="checkContainer ml-3" v-if="resourceCatalogueCount>1">
<span>Display only to me and other catalogue editors</span>
<input type="radio" name="esrLinkType" v-model="localGenericFileDetail.esrLinkType" value="3" data-toggle="modal" data-target="#esrLinkModal" @click="showWarningModal($event.target.name, $event.target.value)">
<input type="radio" name="esrLinkType" class="nhsuk-radios__input" v-model="localGenericFileDetail.esrLinkType" value="3" data-toggle="modal" data-target="#esrLinkModal" @click="showWarningModal($event.target.name, $event.target.value)">
<span class="radioButton"></span>
</label>
<label class="checkContainer ml-3">
<span>Display to everyone</span>
<input type="radio" name="esrLinkType" v-model="localGenericFileDetail.esrLinkType" value="4" data-toggle="modal" data-target="#esrLinkModal" @click="showWarningModal($event.target.name, $event.target.value)">
<input type="radio" name="esrLinkType"class="nhsuk-radios__input" v-model="localGenericFileDetail.esrLinkType" value="4" data-toggle="modal" data-target="#esrLinkModal" @click="showWarningModal($event.target.name, $event.target.value)">
<span class="radioButton"></span>
</label>
</div>
Expand Down
Loading
Loading