diff --git a/app/components/collections/edit_license_component.html.erb b/app/components/collections/edit_license_component.html.erb index 439a89209..480a3c59a 100644 --- a/app/components/collections/edit_license_component.html.erb +++ b/app/components/collections/edit_license_component.html.erb @@ -1,4 +1,4 @@ -
+
Terms of use and license * <%= render PopoverComponent.new key: "collection.terms" %>

diff --git a/app/components/collections/settings_component.html.erb b/app/components/collections/settings_component.html.erb index a952e9ca7..7a4c02ebb 100644 --- a/app/components/collections/settings_component.html.erb +++ b/app/components/collections/settings_component.html.erb @@ -3,7 +3,7 @@

Manage release of deposits for discovery and download *
- When will files on deposits to this collection be downloadable? * <%= render PopoverComponent.new key: "collection.release" %> + When will files on deposits to this collection be downloadable? * <%= render PopoverComponent.new key: "collection.release" %>
" data-complex-radio-target="selection"> <%= form.radio_button :release_option, "immediate", class: "form-check-input", data: {action: "complex-radio#disableUnselectedInputs"} %> <%= form.label "release_option_immediate", t("options.collection.release.immediate"), class: "form-check-label" %> @@ -35,7 +35,7 @@
- Who will have permission to download files for deposits to this collection? * <%= render PopoverComponent.new key: "collection.access" %> + Who will have permission to download files for deposits to this collection? * <%= render PopoverComponent.new key: "collection.access" %>
<%= form.radio_button :access, "world", class: "form-check-input" %> <%= form.label "access_world", t("options.collection.access.world"), class: "form-check-label" %> @@ -51,7 +51,7 @@
- Will a DOI be assigned to the deposits in this collection?* <%= render PopoverComponent.new key: "collection.doi" %> + Will a DOI be assigned to the deposits in this collection?* <%= render PopoverComponent.new key: "collection.doi" %> <%= link_to "What is a DOI?", Settings.external_links.what_is_a_doi, target: "_blank" %>
diff --git a/app/components/collections/update/depositors_component.html.erb b/app/components/collections/update/depositors_component.html.erb index 5b2483fef..1bd6a9759 100644 --- a/app/components/collections/update/depositors_component.html.erb +++ b/app/components/collections/update/depositors_component.html.erb @@ -1,5 +1,5 @@
- Depositors + Depositors
<%= render PopoverComponent.new key: "collection.depositors" %>
diff --git a/app/components/collections/update/managers_component.html.erb b/app/components/collections/update/managers_component.html.erb index dac92ea09..08eb3d62b 100644 --- a/app/components/collections/update/managers_component.html.erb +++ b/app/components/collections/update/managers_component.html.erb @@ -1,5 +1,5 @@
- Managers * + Managers *
<%= render PopoverComponent.new key: "collection.managers" %>
diff --git a/app/components/collections/update/reviewers_component.html.erb b/app/components/collections/update/reviewers_component.html.erb index e7c8940f9..ed5bc0ef7 100644 --- a/app/components/collections/update/reviewers_component.html.erb +++ b/app/components/collections/update/reviewers_component.html.erb @@ -1,7 +1,7 @@

Enter one reviewer SUNet ID per box and then click "Add" to save the entry.

- Additional Reviewers + Additional Reviewers
<%= render PopoverComponent.new key: "collection.reviewers" %>
diff --git a/app/components/first_draft_collections/create/details_component.html.erb b/app/components/first_draft_collections/create/details_component.html.erb index 74d9683de..adc913e01 100644 --- a/app/components/first_draft_collections/create/details_component.html.erb +++ b/app/components/first_draft_collections/create/details_component.html.erb @@ -2,7 +2,7 @@
Details *
- <%= form.label :name, "Collection name *", class: "col-form-label" %> + <%= form.label :name, "Collection name *", class: "col-form-label", "aria-describedby": "popover-collection.name" %> <%= render PopoverComponent.new key: "collection.name" %>
@@ -12,7 +12,7 @@
- <%= form.label :description, "Description *", class: "col-form-label" %> + <%= form.label :description, "Description *", class: "col-form-label", "aria-describedby": "popover-collection.description" %> <%= render PopoverComponent.new key: "collection.description" %>
diff --git a/app/components/works/authors_component.html.erb b/app/components/works/authors_component.html.erb index fbb215d44..6fe451ead 100644 --- a/app/components/works/authors_component.html.erb +++ b/app/components/works/authors_component.html.erb @@ -1,5 +1,5 @@
-
+
Authors to include in citation <%= render PopoverComponent.new key: "work.author" %>
diff --git a/app/components/works/contributor_row_component.html.erb b/app/components/works/contributor_row_component.html.erb index 288e9ef20..e24ba8fef 100644 --- a/app/components/works/contributor_row_component.html.erb +++ b/app/components/works/contributor_row_component.html.erb @@ -3,7 +3,7 @@
- <%= form.label :role_term, role_term_label, class: "form-label" %> + <%= form.label :role_term, role_term_label, class: "form-label", "aria-describedby": "popover-work.role_term" %> <%= render PopoverComponent.new key: "work.role_term" %> <%= select_role %>
@@ -18,7 +18,7 @@
- <%= form.label :first_name, first_name_label, class: "form-label" %> + <%= form.label :first_name, first_name_label, class: "form-label", "aria-describedby": "popover-work.first_name" %> <%= render PopoverComponent.new key: "work.first_name" %> <%= form.text_field :first_name, html_options("contributorFirst", disabled: orcid?) %>
You must provide a first name
@@ -42,7 +42,7 @@
<% text_field_id_prefix = "work_#{namespace}_orcid_#{form.options[:child_index]}_" %>
- <%= form.label :orcid, orcid_label, for: "#{text_field_id_prefix}id", class: "form-label" %> + <%= form.label :orcid, orcid_label, for: "#{text_field_id_prefix}id", class: "form-label", "aria-describedby": "popover-work.orcid" %> <%= render PopoverComponent.new key: "work.orcid" %> <%= form.text_field :orcid, class: "form-control", required: author?, id: "#{text_field_id_prefix}id", data: {contributors_target: "orcid", action: "contributors#lookupOrcid"} %>
You must provide an ORCID iD
@@ -50,7 +50,7 @@
- <%= form.label :first_name, first_name_label, for: "#{text_field_id_prefix}first_name", class: "form-label" %> + <%= form.label :first_name, first_name_label, for: "#{text_field_id_prefix}first_name", class: "form-label", "aria-describedby": "popover-work.orcid_name" %> <%= render PopoverComponent.new key: "work.orcid_name" %> <%= form.text_field :first_name, html_options("contributorFirst", contributors_target: "orcidFirstName", disabled: !orcid?).merge(id: "#{text_field_id_prefix}first_name") %>
You must provide a first name
@@ -67,7 +67,7 @@
- <%= form.label :full_name, organization_label, class: "form-label" %> + <%= form.label :full_name, organization_label, class: "form-label", "aria-describedby": "popover-work.organization" %> <%= render PopoverComponent.new key: "work.organization" %> <%= form.text_field :full_name, html_options("contributorOrg") %>
You must provide a name
diff --git a/app/components/works/contributors_component.html.erb b/app/components/works/contributors_component.html.erb index 3fb7d8ae2..311ffece6 100644 --- a/app/components/works/contributors_component.html.erb +++ b/app/components/works/contributors_component.html.erb @@ -1,5 +1,5 @@
-
Additional contributors +
Additional contributors <%= render PopoverComponent.new key: "work.contributor" %>

Names will be listed in the order shown below.

diff --git a/app/components/works/dates_component.html.erb b/app/components/works/dates_component.html.erb index 36460dd9d..c047cac9f 100644 --- a/app/components/works/dates_component.html.erb +++ b/app/components/works/dates_component.html.erb @@ -1,5 +1,5 @@
-
Enter dates related to your deposit +
Enter dates related to your deposit <%= render PopoverComponent.new key: "work.date" %>
<%= render Works::PublicationDateComponent.new(form: form, @@ -11,7 +11,7 @@
-
+
Creation date <%= render PopoverComponent.new key: "work.creation_date" %>
diff --git a/app/components/works/description_component.html.erb b/app/components/works/description_component.html.erb index d3d7f4fd0..ca17f12cd 100644 --- a/app/components/works/description_component.html.erb +++ b/app/components/works/description_component.html.erb @@ -6,7 +6,7 @@
- <%= form.label :abstract, "Abstract *", class: "col-form-label" %> + <%= form.label :abstract, "Abstract *", class: "col-form-label", "aria-describedby": "popover-work.abstract" %> <%= render PopoverComponent.new key: "work.abstract" %>
@@ -17,7 +17,7 @@
- <%= form.label :keywords, "Keywords *", class: "col-form-label" %> + <%= form.label :keywords, "Keywords *", class: "col-form-label", "aria-describedby": "popover-work.keywords" %> <%= render PopoverComponent.new key: "work.keywords" %>
(one per box)
@@ -29,7 +29,7 @@ <%= render Works::SubtypesComponent.new(form: form) %>
- + Citation for this deposit <%= render PopoverComponent.new key: "work.citation" %> diff --git a/app/components/works/edit/file_row_component.html.erb b/app/components/works/edit/file_row_component.html.erb index 5e16c9a24..7a8e1a4a2 100644 --- a/app/components/works/edit/file_row_component.html.erb +++ b/app/components/works/edit/file_row_component.html.erb @@ -18,7 +18,7 @@
<% unless zip_template? %>
- <%= form.label :label, "Description (optional)" %> + <%= form.label :label, "Description (optional)", "aria-describedby": "popover-work.description" %> <%= render PopoverComponent.new key: "work.description" %>
<%= form.text_field :label, class: "form-control" %> @@ -32,7 +32,7 @@ <%= form.hidden_field :path %> <% unless zip_template? %> <%= form.check_box :hide, class: "form-check-input" %> - <%= form.label :hide, "Hide file", class: "form-check-label col-form-label " %> + <%= form.label :hide, "Hide file", class: "form-check-label col-form-label", "aria-describedby": "popover-work.hide_file" %> <%= render PopoverComponent.new key: "work.hide_file" %> <% end %>
diff --git a/app/components/works/edit/files_component.html.erb b/app/components/works/edit/files_component.html.erb index fbb23f68a..df3c5bf79 100644 --- a/app/components/works/edit/files_component.html.erb +++ b/app/components/works/edit/files_component.html.erb @@ -3,7 +3,7 @@ Filename Description - Hide <%= render PopoverComponent.new key: "work.hide_file" %> + Hide <%= render PopoverComponent.new key: "work.hide_file" %> Actions diff --git a/app/components/works/license_component.html.erb b/app/components/works/license_component.html.erb index 294f248ce..ec57f4829 100644 --- a/app/components/works/license_component.html.erb +++ b/app/components/works/license_component.html.erb @@ -3,7 +3,7 @@ <% if user_can_set_license? %>
- <%= form.label :license, "License *", class: "col-form-label" %> + <%= form.label :license, "License *", class: "col-form-label", "aria-describedby": "popover-work.license" %> <%= render PopoverComponent.new key: "work.license" %>
diff --git a/app/components/works/publication_date_component.html.erb b/app/components/works/publication_date_component.html.erb index 72f61deb0..38c943257 100644 --- a/app/components/works/publication_date_component.html.erb +++ b/app/components/works/publication_date_component.html.erb @@ -1,5 +1,5 @@
-
+
Publication date <%= render PopoverComponent.new key: "work.publication_date" %>
diff --git a/app/components/works/related_work_component.html.erb b/app/components/works/related_work_component.html.erb index a41771e4a..04683c5f9 100644 --- a/app/components/works/related_work_component.html.erb +++ b/app/components/works/related_work_component.html.erb @@ -1,5 +1,5 @@
- + Related works <%= render PopoverComponent.new key: "work.related_work" %> diff --git a/app/components/works/subtypes_component.html.erb b/app/components/works/subtypes_component.html.erb index 6b5c1fa33..d051fd6e2 100644 --- a/app/components/works/subtypes_component.html.erb +++ b/app/components/works/subtypes_component.html.erb @@ -11,7 +11,7 @@
- <%= form.label :subtype, 'Specify "Other" type' %> <%= render PopoverComponent.new key: "work.subtypes.other" %> + <%= form.label :subtype, 'Specify "Other" type', "aria-describedby": "popover-work.subtypes.other" %> <%= render PopoverComponent.new key: "work.subtypes.other" %>
diff --git a/app/components/works/title_component.html.erb b/app/components/works/title_component.html.erb index d43f1f1a9..1da94ba1f 100644 --- a/app/components/works/title_component.html.erb +++ b/app/components/works/title_component.html.erb @@ -2,7 +2,7 @@
Title of deposit and contact information *
- <%= form.label :title, "Title of deposit *", class: "col-form-label" %> + <%= form.label :title, "Title of deposit *", class: "col-form-label", "aria-describedby": "popover-work.title" %> <%= render PopoverComponent.new key: "work.title" %>
diff --git a/app/components/works/work_type_modal_component.html.erb b/app/components/works/work_type_modal_component.html.erb index 7fa917032..c7f58b143 100644 --- a/app/components/works/work_type_modal_component.html.erb +++ b/app/components/works/work_type_modal_component.html.erb @@ -7,7 +7,7 @@
-
What type of content will you deposit? +
What type of content will you deposit? <%= render PopoverComponent.new key: :what_type %>
@@ -32,7 +32,7 @@