diff --git a/app/views/guidance_groups/admin_edit.html.erb b/app/views/guidance_groups/admin_edit.html.erb index bc939f8..ca6bf47 100644 --- a/app/views/guidance_groups/admin_edit.html.erb +++ b/app/views/guidance_groups/admin_edit.html.erb @@ -12,7 +12,7 @@ <%= f.text_field :name, as: :string, class: 'input-medium required' %>
", aria-label="<%= _('More information: Guidance group names') %>"> + data-content="<%= _('Add an appropriate name for your guidance group. This name will be used to tell the end user where the guidance has come from. It will be appended to text identifying the theme e.g. "[guidance group name]: guidance on data sharing" so we suggest you just use the institution or department name.') %>" aria-label="<%= _('More information: Guidance group names') %>">
@@ -22,6 +22,12 @@
<%= f.label _('Published'), for: :published %> <%= f.check_box :published %> +
+ <% lbl = _("Check this box when you are ready for guidance associated with this group to appear on user's plans.") %> + + +
<% end %> @@ -30,7 +36,7 @@ <%= f.check_box :optional_subset %> <%= _('e.g. School/ Department') %>
", aria-label="<%= _('More information: Optional subsets for guidance groups') %>"> + data-content="<%= _("If the guidance is only meant for a subset of users e.g. those in a specific college or institute, check this box. Users will be able to select to display this subset guidance when answering questions in the 'create plan' wizard.") %>" aria-label="<%= _('More information: Optional subsets for guidance groups') %>">
diff --git a/app/views/guidance_groups/admin_new.html.erb b/app/views/guidance_groups/admin_new.html.erb index 0d48182..9639991 100644 --- a/app/views/guidance_groups/admin_new.html.erb +++ b/app/views/guidance_groups/admin_new.html.erb @@ -12,7 +12,7 @@ <%= f.text_field :name, as: :string, class: "input-medium required" %>
", aria-label="<%= _('More information: Guidance group names') %>"> + data-content="<%= _('Add an appropriate name for your guidance group. This name will be used to tell the end user where the guidance has come from. It will be appended to text identifying the theme e.g. "[guidance group name]: guidance on data sharing" so we suggest you just use the institution or department name.') %>" aria-label="<%= _('More information: Guidance group names') %>">
@@ -21,7 +21,7 @@ <%= f.check_box :optional_subset %> <%= _('e.g. School/ Department') %>
", aria-label="<%= _('More information: Optional subsets for guidance groups') %>"> + data-content="<%= _("If the guidance is only meant for a subset of users e.g. those in a specific college or institute, check this box. Users will be able to select to display this subset guidance when answering questions in the 'create plan' wizard.") %>" aria-label="<%= _('More information: Optional subsets for guidance groups') %>">
diff --git a/app/views/guidances/admin_edit.html.erb b/app/views/guidances/admin_edit.html.erb index b37599e..0f979ef 100644 --- a/app/views/guidances/admin_edit.html.erb +++ b/app/views/guidances/admin_edit.html.erb @@ -9,39 +9,28 @@
<%= f.label _('Text'), for: @guidance.text %> - <%= text_area_tag("guidance-text", @guidance.text, class: "tinymce", title: _('Enter your guidance here. You can include links where needed.')) %> + <%= text_area_tag("guidance-text", @guidance.text, class: "tinymce") %>
+ <% lbl = %> + data-content="<%= _('Enter your guidance here. You can include links where needed.') %>" + aria-label="<%= _('More information: Guidance') %>">
<%= f.label _('Themes'), for: :theme_ids %> <%= f.collection_select(:theme_ids, @themes, :id, :title, - {prompt: false, include_blank: 'None'}, {multiple: true, title: _('Select which theme(s) this guidance relates to.'), size: 30})%> -
- - -
+ {prompt: false, include_blank: 'None'}, {multiple: true, title: _('Select which theme(s) this guidance relates to.')})%>
<%= f.label _('Published'), for: :published %> - <%= f.check_box :published , as: :check_boxes%> + <%= f.check_box :published , as: :check_boxes, title: _("Check this box when you are ready for this guidance to appear on user's plans.") %>
<%= f.label _('Guidance group'), for: :guidance_group_id %> <%= f.collection_select(:guidance_group_id, @guidance_groups, :id, :name, {prompt: false, include_blank: 'None'}, {multiple: false, title: _('Select which group this guidance relates to.')})%> -
- - -

diff --git a/app/views/guidances/admin_new.html.erb b/app/views/guidances/admin_new.html.erb index 277c775..1589ebf 100644 --- a/app/views/guidances/admin_new.html.erb +++ b/app/views/guidances/admin_new.html.erb @@ -12,39 +12,26 @@ <%= f.label :text %> <%= text_area_tag("guidance-text", "", class: "tinymce") %>
+ <% lbl = _('Enter your guidance here. You can include links where needed.') %> - + data-content="<%= _('Enter your guidance here. You can include links where needed.') %>" + aria-label="<%= _('More information: Guidance') %>"> +
<%= f.label _('Themes'), for: :theme_ids %> <%= f.collection_select(:theme_ids, @themes, - :id, :title, {prompt: false, include_blank: 'None'}, {multiple: true}) %> -
- - -
+ :id, :title, {prompt: false, include_blank: 'None'}, {multiple: true, title: _('Select which theme(s) this guidance relates to.')}) %>
<%= f.label :published %> - <%= f.check_box :published , as: :check_boxes%> -
- "> - -
+ <%= f.check_box :published , as: :check_boxes, title: _("Check this box when you are ready for this guidance to appear on user's plans.") %>
<%= f.label _('Guidance group'), for: :guidance_group_id %> <%= f.collection_select(:guidance_group_id, @guidance_groups, - :id, :name, {prompt: false, include_blank: 'None'}, {multiple: false})%> -
- - -
+ :id, :name, {prompt: false, include_blank: 'None'}, {multiple: false, title: _('Select which group this guidance relates to.')})%>

diff --git a/app/views/layouts/application.html.erb b/app/views/layouts/application.html.erb index 3654077..e703526 100644 --- a/app/views/layouts/application.html.erb +++ b/app/views/layouts/application.html.erb @@ -68,13 +68,15 @@ <% if notice || flash[:notice] %>
- + + <%= _('Notice:') %> <%= raw notice %>
<% end %> <% if alert || flash[:alert] || flash[:error] %>
- + + <%= _('Alert:') %> <%= raw alert %>
<% end %> diff --git a/app/views/phases/_answer_form.html.erb b/app/views/phases/_answer_form.html.erb index 7272631..762340d 100644 --- a/app/views/phases/_answer_form.html.erb +++ b/app/views/phases/_answer_form.html.erb @@ -71,7 +71,7 @@

<%= annotation.org.abbreviation %> <%= _('Guidance') %> - +

@@ -89,7 +89,7 @@ <% group.each do |gobj| %>

<%= gobj[:org] %> guidance on <%= theme %> - +

diff --git a/app/views/phases/_edit_phase.html.erb b/app/views/phases/_edit_phase.html.erb index 7e34808..341fa1e 100644 --- a/app/views/phases/_edit_phase.html.erb +++ b/app/views/phases/_edit_phase.html.erb @@ -27,8 +27,8 @@
"> - + data-content="<%= _("Enter a basic description. This will be presented to users on the 'Admin Plan' tab, above the summary of the sections and questions which they will be asked to answer.") %>" aria-label="<%= _('More information: Phase descriptions') %>"> +
diff --git a/app/views/phases/admin_add.html.erb b/app/views/phases/admin_add.html.erb index 3b005e2..ba71058 100644 --- a/app/views/phases/admin_add.html.erb +++ b/app/views/phases/admin_add.html.erb @@ -42,8 +42,9 @@ <%= text_area_tag("phase-desc","" , class: "tinymce") %>
"> - + data-content="<%= _("Enter a basic description. This will be presented to users on the 'Admin Plan' tab, above the summary of the sections and questions which they will be asked to answer.") %>" + aria-label="<%= _('More information: Phase descriptions') %>"> +
diff --git a/app/views/phases/admin_show.html.erb b/app/views/phases/admin_show.html.erb index 11b95db..acdd174 100644 --- a/app/views/phases/admin_show.html.erb +++ b/app/views/phases/admin_show.html.erb @@ -15,7 +15,7 @@ aria-hidden="false" aria-labelledby="phase-<%= @phase.id %>-tab">
-

<%= _('Phase details')%>

+

<%= _('Phase details')%>

@@ -35,7 +35,7 @@ <% @sections.order("number ASC").each do |section| %> -

<%= section.title %>

+

<%= section.title %>

<% if @edit && section.modifiable %> <%= render partial: 'sections/edit_section', locals: {section: section, edit: @edit, phase: @phase} %> @@ -46,7 +46,7 @@ <% end %> <% if @edit || @phase.template.customization_of.present? %> -

<%= _('Add section') %>

+

<%= _('Add section') %>

- + data-content="<%= _('You can add an example answer to help users respond. These will be presented above the answer box and can be copied/ pasted.') %>" + aria-label="<%= _('More information: Example answers') %>"> +
@@ -137,8 +141,9 @@
"> - + data-content="<%= _("Enter specific guidance to accompany this question. If you have guidance by themes too, this will be pulled in based on your selections below so it's best not to duplicate too much text.") %>" + aria-label="<%= _('More information: Guidance') %>"> +
@@ -155,8 +160,8 @@
Select themes that are relevant to this question.

This allows your generic institution-level guidance to be drawn in, as well as that from other sources e.g. the %{organisation_abbreviation} or any Schools/Departments that you provide guidance for.

You can select multiple themes by using the CTRL button.

") %>"> - + data-content="<%= _("

Select themes that are relevant to this question.

This allows your generic institution-level guidance to be drawn in, as well as that from other sources e.g. the %{organisation_abbreviation} or any Schools/Departments that you provide guidance for.

You can select multiple themes by using the CTRL button.

") %>" aria-label="<%= _('More information: Themes') %>"> +
diff --git a/app/views/questions/_edit_question.html.erb b/app/views/questions/_edit_question.html.erb index f9f1ad6..4cda8a4 100644 --- a/app/views/questions/_edit_question.html.erb +++ b/app/views/questions/_edit_question.html.erb @@ -39,8 +39,9 @@
  • - text area (large box for paragraphs);
  • - text field (for a short answer);
  • - checkboxes where options are presented in a list and multiple values can be selected;
  • - radio buttons where options are presented in a list but only one can be selected;
  • - dropdown like this box - only one option can be selected;
  • - multiple select box allows users to select several options from a scrollable list, using the CTRL key;
    • ") %>"> -     + data-content="<%= _("You can choose from:") %>" + aria-label="<%= _('More information: Answer format') %>"> +
    @@ -55,8 +56,9 @@ <%= _('Default')%> - + data-content="<%= _('Enter any options that you wish to display. If you want to pre-set one option as selected, check the default box.') %>" + aria-label="<%= _('More information: Question options') %>"> + @@ -99,8 +101,9 @@
    - + data-content="<%= _('Anything you enter here will display in the answer box. If you want an answer in a certain format (e.g. tables), you can enter that style here.') %>" + aria-label="<%= _('More information: Default answer') %>"> +
    @@ -125,8 +128,9 @@
    - + data-content="<%= _('You can add an example or suggested answer to help users respond. These will be presented above the answer box and can be copied/ pasted.') %>" + aria-label="<%= _('More information: Example answers') %>"> +
    @@ -143,8 +147,9 @@
    "> - + data-content="<%= _("Enter specific guidance to accompany this question. If you have guidance by themes too, this will be pulled in based on your selections below so it's best not to duplicate too much text.") %>" + aria-label="<%= _('More information: Guidance') %>"> +
    @@ -160,8 +165,9 @@
    Select themes that are relevant to this question.

    This allows your generic institution-level guidance to be drawn in, as well as that from other sources e.g. the %{organisation_abbreviation} or any Schools/Departments that you provide guidance for.

    You can select multiple themes by using the CTRL button.

    ") %>"> -     + data-content="<%= _("

    Select themes that are relevant to this question.

    This allows your generic institution-level guidance to be drawn in, as well as that from other sources e.g. the %{organisation_abbreviation} or any Schools/Departments that you provide guidance for.

    You can select multiple themes by using the CTRL button.

    ") %>" + aria-label="<%= _('More information: Themes') %>"> +
    diff --git a/app/views/sections/_add_section.html.erb b/app/views/sections/_add_section.html.erb index 61dd490..5795ba4 100644 --- a/app/views/sections/_add_section.html.erb +++ b/app/views/sections/_add_section.html.erb @@ -37,8 +37,8 @@
    "> - + data-content="<%= _("Enter a basic description. This could be a summary of what is covered in the section or instructions on how to answer. This text will be displayed in the coloured banner once a section is opened to edit.") %>" aria-label="<%= _('More information: Section descriptions') %>"> +
    diff --git a/app/views/sections/_edit_section.html.erb b/app/views/sections/_edit_section.html.erb index 473c176..a177670 100644 --- a/app/views/sections/_edit_section.html.erb +++ b/app/views/sections/_edit_section.html.erb @@ -21,8 +21,8 @@ <%= text_area_tag("section-desc-#{section.id}", section.description , class: "tinymce") %>
    "> - + data-content="<%= _("Enter a basic description. This could be a summary of what is covered in the section or instructions on how to answer. This text will be displayed in the coloured banner once a section is opened to edit.") %>" aria-label="<%= _('More information: Section descriptions') %>"> +
    diff --git a/app/views/shared/_accessible_combobox.html.erb b/app/views/shared/_accessible_combobox.html.erb index 4fe65ca..94d4182 100644 --- a/app/views/shared/_accessible_combobox.html.erb +++ b/app/views/shared/_accessible_combobox.html.erb @@ -44,7 +44,7 @@ // Initialize the clear buttons on load // Replace the default js-combobox clear button [X] with a fontawesome icon - $(clear).html(''); + $(clear).html(''); $(clear).css("display", $(combo).val().trim().length <= 0 ? 'none' : 'inline'); // Function to hide/show the clear button when text changed in the dropdown diff --git a/app/views/shared/_table_filter.html.erb b/app/views/shared/_table_filter.html.erb index ebfd55b..d81a5e6 100644 --- a/app/views/shared/_table_filter.html.erb +++ b/app/views/shared/_table_filter.html.erb @@ -1,8 +1,8 @@
    <%= search_field_tag(:filter, params[:filter], placeholder: placeholder) %> - - + +
    diff --git a/app/views/templates/_edit_annotations.html.erb b/app/views/templates/_edit_annotations.html.erb index 94a7846..98d877a 100644 --- a/app/views/templates/_edit_annotations.html.erb +++ b/app/views/templates/_edit_annotations.html.erb @@ -60,8 +60,8 @@
    - + data-content="<%= _('You can add an example or suggested answer to help users respond. These will be presented above the answer box and can be copied/ pasted.') %>" aria-label="<%= _('More information: Example answers') %>"> +
    @@ -77,8 +77,8 @@
    "> - + data-content="<%= _("Enter specific guidance to accompany this question. If you have guidance by themes too, this will be pulled in based on your selections below so it's best not to duplicate too much text.") %>" aria-label="<%= _('More information: Guidance') %>"> +
    diff --git a/app/views/templates/_edit_template.html.erb b/app/views/templates/_edit_template.html.erb index 0481d27..d119010 100644 --- a/app/views/templates/_edit_template.html.erb +++ b/app/views/templates/_edit_template.html.erb @@ -13,8 +13,8 @@ <%= text_area_tag("template-desc", template.description, class: "input-large tinymce") %>
    - + data-content="<%= _('Enter a description that helps you to differentiate between templates e.g. if you have ones for different audiences') %>" aria-label="<% _('More information: Template descriptions') %>"> +
    diff --git a/app/views/templates/_show_phases_sections.html.erb b/app/views/templates/_show_phases_sections.html.erb index 62acdb8..47f20aa 100644 --- a/app/views/templates/_show_phases_sections.html.erb +++ b/app/views/templates/_show_phases_sections.html.erb @@ -1,6 +1,6 @@ -

    <%= phase.title %>

    +

    <%= phase.title %>

    <%= raw phase.description %>

    diff --git a/app/views/templates/admin_new.html.erb b/app/views/templates/admin_new.html.erb index a1e9bb2..fad342a 100644 --- a/app/views/templates/admin_new.html.erb +++ b/app/views/templates/admin_new.html.erb @@ -30,8 +30,8 @@
    - + data-content="<%= _('Enter a description that helps you to differentiate between templates e.g. if you have ones for different audiences') %>" aria-label="<%= _('More information: Template descriptions') %>"> +
    diff --git a/app/views/templates/admin_template.html.erb b/app/views/templates/admin_template.html.erb index 28ae3ad..9827fb2 100644 --- a/app/views/templates/admin_template.html.erb +++ b/app/views/templates/admin_template.html.erb @@ -17,7 +17,7 @@ aria-hidden="false" aria-labelledby="details-tab">
    -

    <%= _('Template details')%>

    +

    <%= _('Template details')%>

    <% if @template == @current && @template.customization_of.nil? %> @@ -41,7 +41,7 @@ <% else %> <% (1..@hash[:template][:phases].length).each do |phase_no| %> <% phase = @hash[:template][:phases][phase_no] %> -

    <%= phase[:data].title %>

    +

    <%= phase[:data].title %>

    diff --git a/app/views/templates/admin_template_history.html.erb b/app/views/templates/admin_template_history.html.erb index e228bb1..39dbcc1 100644 --- a/app/views/templates/admin_template_history.html.erb +++ b/app/views/templates/admin_template_history.html.erb @@ -8,53 +8,53 @@
    - - <% if @templates.length > 0 then %> - - - - - - - - - - - - <% @templates.each do |org_template| %> - - + + <% if @templates.length > 0 then %> +
    <%= _('Title') %><%= _('Version') %> <%= _('Published') %><%= _('Last updated') %><%= _('Actions') %>
    - <%= org_template.title%> - <% if org_template == @current && !org_template.published%> -     <%=_('Draft')%> - <% end %> -
    + + + + + + + + + + + <% @templates.each do |org_template| %> + + - - - - <%end%> - -
    <%= _('Title') %><%= _('Version') %> <%= _('Published') %><%= _('Last updated') %><%= _('Actions') %>
    + <%= org_template.title%> + <% if org_template == @current && !org_template.published%> +     <%=_('Draft')%> + <% end %> + <%= org_template.version %> <%= (org_template.published? ? _('Yes') : _('No')) %> - - <% last_temp_updated = org_template.updated_at %> - <% org_template.phases.each do |phase|%> - <% if org_template.updated_at.to_date < phase.updated_at.to_date %> - <% last_temp_updated = phase.updated_at %> - <% end %> - <% end %> - <%= l last_temp_updated.to_date, formats: :short %> - - <%= link_to (org_template == @current ? _('Edit') : _('View')), admin_template_template_path(id: org_template), class: "dmp_table_link"%> -
    - - <% else %> -

    <%= _('This template is new and does not yet have any publication history.') %>

    - <% end %> + + + <% last_temp_updated = org_template.updated_at %> + <% org_template.phases.each do |phase|%> + <% if org_template.updated_at.to_date < phase.updated_at.to_date %> + <% last_temp_updated = phase.updated_at %> + <% end %> + <% end %> + <%= l last_temp_updated.to_date, formats: :short %> + + + <%= link_to (org_template == @current ? _('Edit') : _('View')), admin_template_template_path(id: org_template), class: "dmp_table_link"%> + + + <%end%> + + + + <% else %> +

    <%= _('This template is new and does not yet have any publication history.') %>

    + <% end %>
    <%= _('View all templates') %> diff --git a/lib/assets/stylesheets/dmproadmap/accordions.scss b/lib/assets/stylesheets/dmproadmap/accordions.scss index 086be4b..eff63d1 100644 --- a/lib/assets/stylesheets/dmproadmap/accordions.scss +++ b/lib/assets/stylesheets/dmproadmap/accordions.scss @@ -20,6 +20,7 @@ .fa { position: absolute; font-size: 18px; + color: $white; right: 15px; top: 10px; }