Skip to content

TD-5142: Issue with focussing to the fields on Contribute resource sc… #1098

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
Apr 25, 2025
Merged

TD-5142: Issue with focussing to the fields on Contribute resource sc… #1098

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
2 changes: 1 addition & 1 deletion AdminUI/LearningHub.Nhs.AdminUI/Scripts/vuesrc/ckeditorwithhint.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<template>
<div>
<ckeditor v-model="description" :config="editorConfig" @ready="onEditorReady" @blur="onBlur"></ckeditor>
<ckeditor class="nhsuk-textarea" v-model="description" :config="editorConfig" @ready="onEditorReady" @blur="onBlur"></ckeditor>
<div :class="[`pt-2 footer-text${this.valid ? '' : ' text-danger'}`]">{{ hint }}</div>
</div>
</template>
Expand Down
4 changes: 2 additions & 2 deletions AdminUI/LearningHub.Nhs.AdminUI/Views/Catalogue/CatalogueOwner.cshtml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,14 +47,14 @@
<div class="row mt-5">
<div class="col-12">
<label>Catalogue owner email address</label>
<input asp-for="OwnerEmailAddress" class="form-control" maxlength="250" />
<input asp-for="OwnerEmailAddress" class="form-control nhsuk-input" maxlength="250" />
<span asp-validation-for="OwnerEmailAddress"></span>
</div>
</div>
<div class="row mt-5">
<div class="col-12">
<label>Notes</label>
<textarea asp-for="Notes" class="form-control"></textarea>
<textarea asp-for="Notes" class="form-control nhsuk-input"></textarea>
<span asp-validation-for="Notes"></span>
</div>
</div>
Expand Down
2 changes: 1 addition & 1 deletion 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 @@ -137,7 +137,7 @@
<div class="row mt-5">
<div class="col-12">
<label for="Description">Description</label>
<textarea asp-for="Description" class="form-control"></textarea>
<textarea asp-for="Description" class="form-control nhsuk-input"></textarea>
<small id="with-hint-info" class="pt-2">Only the first 3,000 characters of the description will be used by search</small>
<span asp-validation-for="Description"></span>
</div>
Expand Down
2 changes: 1 addition & 1 deletion AdminUI/LearningHub.Nhs.AdminUI/Views/Notifications/CreateEdit.cshtml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -73,7 +73,7 @@
</div>
<div class="form-group col-12">
<label asp-for="Message" class="control-label"></label>
<textarea asp-for="Message" class="form-control" rows="10" required></textarea>
<textarea asp-for="Message" class="form-control nhsuk-input" rows="10" required></textarea>
<span asp-validation-for="Message" class="text-danger"></span>
</div>
<div class="form-group col-lg-3 col-md-6">
Expand Down
2 changes: 1 addition & 1 deletion LearningHub.Nhs.WebUI/Scripts/vuesrc/catalogue/catalogueaccessrequest.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -99,7 +99,7 @@
<div class="row mt-5">
<div class="col">
<label class="nhsuk-u-visually-hidden" for="rejectionMessage"></label>
<textarea v-model="rejectionMessage" id="rejectionMessage" class="form-control rejection-message-input" rows="6"></textarea>
<textarea v-model="rejectionMessage" id="rejectionMessage" class="form-control rejection-message-input nhsuk-textarea" rows="6"></textarea>
</div>
</div>
</div>
Expand Down
2 changes: 1 addition & 1 deletion LearningHub.Nhs.WebUI/Scripts/vuesrc/contribute-resource/ContributeAuthorsTab.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@
<label class="checkContainer" for="currentUserAuthor">
I am the author or co-author
<input type="checkbox" id="currentUserAuthor" v-model="authorIsContributor" v-on:change="currentUserAuthorChange">
<span class="checkmark"></span>
<span class="checkmark nhsuk-input"></span>
</label>
</div>
<CharacterCount v-model="authorName"
Expand Down
2 changes: 1 addition & 1 deletion LearningHub.Nhs.WebUI/Scripts/vuesrc/contribute-resource/ContributeLicenceTab.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
<a v-bind:href="moreInfoLink" class="mb-10 accessible-link" target="_blank">More information on licences</a>
</div>

<select class="form-control" aria-labelledby="licence-heading" id="licence" v-model="resourceDetails.resourceLicenceId">
<select class="form-control nhsuk-input" aria-labelledby="licence-heading" id="licence" v-model="resourceDetails.resourceLicenceId">
<option disabled v-bind:value="null" id="select">Please choose...</option>
<option v-for="licence in licences" :value="licence.id" :id="licence.id">
{{licence.title}}
Expand Down
2 changes: 1 addition & 1 deletion LearningHub.Nhs.WebUI/Scripts/vuesrc/contribute-resource/components/CatalogueSelector.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<CatalogueSelectorAccordion/>

<div class="form-group">
<select class="form-control" aria-labelledby="primary-catalogue-heading" id="catalogue" v-model="selectedCatalogue" @change="catalogueChange">
<select class="form-control nhsuk-input" aria-labelledby="primary-catalogue-heading" id="catalogue" v-model="selectedCatalogue" @change="catalogueChange">
<option disabled v-bind:value="{ nodeId: 0 }">Please choose...</option>
<option v-for="catalogue in userCatalogues" :value="catalogue">
{{getCatalogueName(catalogue)}}
Expand Down
2 changes: 1 addition & 1 deletion LearningHub.Nhs.WebUI/Scripts/vuesrc/contribute-resource/components/KeyWordsEditor.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
To help learners find this resource, type one or more relevant keywords separated by commas and click 'Add'.
</div>
<div class="col-12 input-with-button">
<input id="newKeyword" aria-labelledby="keyword-label" type="text" class="form-control" maxlength="260" v-model="newKeyword" v-bind:class="{ 'input-validation-error': keywordError }" @input="keywordError=false" @change="keywordChange" />
<input id="newKeyword" aria-labelledby="keyword-label" type="text" class="form-control nhsuk-input" maxlength="260" v-model="newKeyword" v-bind:class="{ 'input-validation-error': keywordError }" @input="keywordError=false" @change="keywordChange" />
<button type="button" class="nhsuk-button nhsuk-button--secondary ml-3 button_width nhsuk-u-margin-bottom-0" @click="addKeyword">&nbsp;Add</button>
</div>
<div class="col-12 footer-text" id="keyword-label">
Expand Down
2 changes: 1 addition & 1 deletion .../Scripts/vuesrc/contribute-resource/components/questions/QuestionBlockCollectionInput.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<div class="mr-20">
<ckeditorwithhint v-if="richText" :initialValue="message" :maxLength="textMaxLength" @change="updateByCkEditor" />
<div v-else>
<textarea class="form-control text-input"
<textarea class="form-control text-input nhsuk-textarea"
placeholder="Text input"
rows="4"
:maxlength="textMaxLength"
Expand Down
2 changes: 1 addition & 1 deletion LearningHub.Nhs.WebUI/Scripts/vuesrc/contribute/CatalogueSelect.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@

<div class="row">
<div class="form-group col-12">
<select class="form-control" aria-labelledby="type-label" id="catalogue" v-model="selectedCatalogue" @change="catalogueChange">
<select class="form-control nhsuk-input" aria-labelledby="type-label" id="catalogue" v-model="selectedCatalogue" @change="catalogueChange">
<option disabled v-bind:value="{ nodeId: 0 }">Please choose...</option>
<option v-for="catalogue in userCatalogues" :value="catalogue">
{{getCatalogueName(catalogue)}}
Expand Down
6 changes: 3 additions & 3 deletions LearningHub.Nhs.WebUI/Scripts/vuesrc/contribute/Content.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
<div class="form-group col-12 mt-5">
<h2 id="title-label" class="nhsuk-heading-l">Title<i v-if="$v.resourceDetailTitle.$invalid" class="warningTriangle fa-solid fa-triangle-exclamation"></i></h2>
<div class="mb-3"><label for="resourceDetail_title">Give your resource a concise, useful title that will make sense to learners.</label></div>
<input type="text" class="form-control" aria-labelledby="title-label" maxlength="255" id="resourceDetail_title" name="resourceDetail_title" v-model="resourceDetailTitle" @change="setTitle($event.target.value)" autocomplete="off" v-bind:disabled="resourceLoading">
<input type="text" class="form-control nhsuk-input" aria-labelledby="title-label" maxlength="255" id="resourceDetail_title" name="resourceDetail_title" v-model="resourceDetailTitle" @change="setTitle($event.target.value)" autocomplete="off" v-bind:disabled="resourceLoading">
</div>
</div>
<div class="row mt-4">
Expand Down Expand Up @@ -125,7 +125,7 @@
</div>
<div class="p-4 uploadInnerBox mt-4">
<div class="upload-btn-wrapper nhsuk-u-font-size-16">
<label for="fileUpload" class="nhsuk-button nhsuk-button--secondary">Choose file</label> No file chosen
<label for="fileUpload" class="nhsuk-button nhsuk-button--secondary" tabindex="0">Choose file</label> No file chosen
<input hidden type="file" id="fileUpload" aria-label="Choose file" ref="fileUpload" @change="onScormPackageFileChange($event)" />
</div>
</div>
Expand Down Expand Up @@ -359,7 +359,7 @@
<div>
<div class="modal-section-header"><label for="notes">Notes</label></div>
<p class="mt-1">Provide information to help learners understand why this new version has been created.</p>
<textarea class="form-control" id="notes" v-bind:class="{ 'input-validation-error': $v.publishNotes.$invalid && $v.publishNotes.$dirty }" rows="4" maxlength="4000" v-model="publishNotes"></textarea>
<textarea class="form-control nhsuk-textarea" id="notes" v-bind:class="{ 'input-validation-error': $v.publishNotes.$invalid && $v.publishNotes.$dirty }" rows="4" maxlength="4000" v-model="publishNotes"></textarea>
<div class="error-text pt-3" v-if="$v.publishNotes.$invalid && $v.publishNotes.$dirty">
<span class="text-danger">Enter notes.</span>
</div>
Expand Down
2 changes: 1 addition & 1 deletion LearningHub.Nhs.WebUI/Scripts/vuesrc/contribute/ContentArticle.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@
<div class="form-group col-12">
<div class="p-4 uploadInnerBox">
<div class="upload-btn-wrapper nhsuk-u-font-size-16">
<label for="articleFileUpload" class="nhsuk-button nhsuk-button--secondary">Choose file</label> No file chosen
<label for="articleFileUpload" class="nhsuk-button nhsuk-button--secondary" tabindex="0">Choose file</label> No file chosen
<input type="file" id="articleFileUpload" aria-label="Choose file" ref="articleFileUpload" @change="onArticleFileChange" hidden />
</div>
</div>
Expand Down
4 changes: 2 additions & 2 deletions LearningHub.Nhs.WebUI/Scripts/vuesrc/contribute/ContentAudio.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@
<div class="form-group col-12">
<div class="p-4 uploadInnerBox">
<div class="upload-btn-wrapper nhsuk-u-font-size-16">
<label for="transcriptFileUpload" class="nhsuk-button nhsuk-button--secondary">Choose file</label> No file chosen
<label for="transcriptFileUpload" class="nhsuk-button nhsuk-button--secondary" tabindex="0">Choose file</label> No file chosen
<input type="file" id="transcriptFileUpload" aria-label="Choose transcript file" ref="transcriptFileUpload" @change="onTranscriptFileChange" hidden />
</div>
</div>
Expand All @@ -43,7 +43,7 @@
for example, how it was developed or what is required for it to be used.
</div>
<div class="col-12 mt-3">
<textarea class="form-control" id="additionalinfo" aria-labelledby="additionalinfo-label" rows="4" maxlength="250" v-model="additionalInformation" @change="setAdditionalInformation($event.target.value)"></textarea>
<textarea class="form-control nhsuk-textarea" id="additionalinfo" aria-labelledby="additionalinfo-label" rows="4" maxlength="250" v-model="additionalInformation" @change="setAdditionalInformation($event.target.value)"></textarea>
</div>
<div class="col-12 footer-text">
You can enter a maximum of 250 characters
Expand Down
10 changes: 5 additions & 5 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 @@ -96,7 +96,7 @@
To help learners find this resource, type one or more relevant keywords separated by commas and click 'Add'.
</div>
<div class="col-12 mt-4 input-with-button">
<input id="newKeyword" aria-labelledby="keyword-label" aria-describedby="keyworddesc" type="text" class="form-control" maxlength="260" v-model="newKeyword" v-bind:class="{ 'input-validation-error': keywordError }" @input="keywordError=false" @change="keywordChange" />
<input id="newKeyword" aria-labelledby="keyword-label" aria-describedby="keyworddesc" type="text" class="form-control nhsuk-input" maxlength="260" v-model="newKeyword" v-bind:class="{ 'input-validation-error': keywordError }" @input="keywordError=false" @change="keywordChange" />
<button type="button" class="nhsuk-button nhsuk-button--secondary ml-3 nhsuk-u-margin-bottom-0" @click="addKeyword">&nbsp;Add</button>
</div>
<div class="col-12 footer-text" id="keyword-label">
Expand Down Expand Up @@ -126,7 +126,7 @@
</div>
<div class="row">
<div class="col-12 form-group">
<select id="licenceSelection" aria-labelledby="licence-label" class="form-control" v-model="resourceLicenceId" @change="licenceSelected">
<select id="licenceSelection" aria-labelledby="licence-label" class="form-control nhsuk-input" v-model="resourceLicenceId" @change="licenceSelected">
<option disabled v-bind:value="0">Please choose...</option>
<option v-for="licence in resourceLicences" :value="licence.id">
{{ licence.title }}
Expand Down Expand Up @@ -171,7 +171,7 @@
<label class="mb-0" for="authorName">Author name</label>
</div>
<div class="col-12">
<input type="text" id="authorName" name="authorName" class="form-control" aria-describedby="authorNamehint" v-bind:class="{ 'input-validation-error': authorError }" maxlength="100" v-model="authorName" v-bind:disabled="currentUserAuthor" @input="authorError=false" />
<input type="text" id="authorName" name="authorName" class="form-control nhsuk-input" aria-describedby="authorNamehint" v-bind:class="{ 'input-validation-error': authorError }" maxlength="100" v-model="authorName" v-bind:disabled="currentUserAuthor" @input="authorError=false" />
</div>
<div class="col-12 footer-text" id="authorNamehint">
You can enter a maximum of 100 characters
Expand All @@ -180,7 +180,7 @@
<label class="mb-0" for="authorOganisation">Organisation</label>
</div>
<div class="col-12">
<input type="text" id="authorOganisation" name="authorOganisation" aria-describedby="authorOganisationhint" class="form-control" v-bind:class="{ 'input-validation-error': authorError }" maxlength="100" v-model="authorOganisation" @input="authorError=false" />
<input type="text" id="authorOganisation" name="authorOganisation" aria-describedby="authorOganisationhint" class="form-control nhsuk-input" v-bind:class="{ 'input-validation-error': authorError }" maxlength="100" v-model="authorOganisation" @input="authorError=false" />
</div>
<div class="col-12 footer-text" id="authorOganisationhint">
You can enter a maximum of 100 characters
Expand All @@ -190,7 +190,7 @@
<label class="mb-0" for="authorRole">Role <span class="optional">(optional)</span></label>
</div>
<div class="col-12">
<input type="text" id="authorRole" name="authorRole" class="form-control" maxlength="100" v-model="authorRole" aria-describedby="authorRolehint" />
<input type="text" id="authorRole" name="authorRole" class="form-control nhsuk-input" maxlength="100" v-model="authorRole" aria-describedby="authorRolehint" />
</div>
<div class="col-12 footer-text" id="authorRolehint">
You can enter a maximum of 100 characters
Expand Down
2 changes: 1 addition & 1 deletion LearningHub.Nhs.WebUI/Scripts/vuesrc/contribute/ContentGenericFile.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -71,7 +71,7 @@
for example, how it was developed or what is required for it to be used.
</div>
<div class="col-12 mt-3">
<textarea class="form-control" id="additionalinfo" aria-labelledby="additionalinfo-label" rows="4" maxlength="250" v-model="additionalInformation" @change="setAdditionalInformation($event.target.value)"></textarea>
<textarea class="form-control nhsuk-textarea" id="additionalinfo" aria-labelledby="additionalinfo-label" rows="4" maxlength="250" v-model="additionalInformation" @change="setAdditionalInformation($event.target.value)"></textarea>
</div>
<div class="col-12 footer-text">
You can enter a maximum of 250 characters
Expand Down
2 changes: 1 addition & 1 deletion LearningHub.Nhs.WebUI/Scripts/vuesrc/contribute/ContentHtml.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
<div class="mb-4 uploadBox">
<div class="p-4 uploadInnerBox mt-4">
<div class="upload-btn-wrapper nhsuk-u-font-size-16">
<label for="fileUpload" class="nhsuk-button nhsuk-button--secondary">Choose file</label> No file chosen
<label for="fileUpload" class="nhsuk-button nhsuk-button--secondary" tabindex="0">Choose file</label> No file chosen
<input hidden type="file" id="fileUpload" accept=".zip,.rar,.7zip" aria-label="Choose file" ref="fileUpload" v-on:change="onResourceFileChange" />
</div>
</div>
Expand Down
4 changes: 2 additions & 2 deletions LearningHub.Nhs.WebUI/Scripts/vuesrc/contribute/ContentImage.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
This will not be shown on screen but it will help those using screen readers.
</div>
<div class="col-12 mt-3">
<textarea class="form-control" id="alttag" name="alttag" aria-labelledby="alttag-label" rows="4" maxlength="125" v-model="localImageDetail.altTag" @change="setProperty('altTag', $event.target.value)" @input="altTextKeyup"></textarea>
<textarea class="form-control nhsuk-textarea" id="alttag" name="alttag" aria-labelledby="alttag-label" rows="4" maxlength="125" v-model="localImageDetail.altTag" @change="setProperty('altTag', $event.target.value)" @input="altTextKeyup"></textarea>
</div>
<div class="col-12 footer-text">
You can enter a maximum of 125 characters
Expand All @@ -40,7 +40,7 @@
for example, how it was developed or what is required for it to be used.
</div>
<div class="col-12 mt-3">
<textarea class="form-control" id="additionalinfo" aria-labelledby="additionalinfo-label" rows="4" maxlength="250" v-model="additionalInformation" @change="setAdditionalInformation($event.target.value)"></textarea>
<textarea class="form-control nhsuk-textarea" id="additionalinfo" aria-labelledby="additionalinfo-label" rows="4" maxlength="250" v-model="additionalInformation" @change="setAdditionalInformation($event.target.value)"></textarea>
</div>
<div class="col-12 footer-text">
You can enter a maximum of 250 characters
Expand Down
Loading
Loading