diff --git a/app/views/guidance_groups/admin_edit.html.erb b/app/views/guidance_groups/admin_edit.html.erb index a239fe3..40b75cc 100644 --- a/app/views/guidance_groups/admin_edit.html.erb +++ b/app/views/guidance_groups/admin_edit.html.erb @@ -11,7 +11,9 @@ <%= f.label :name %> <%= f.text_field :name, as: :string, class: 'input-medium required' %>
- <%= link_to(image_tag('help_button.png'), '#', "data-toggle": "popover", rel: "popover", 'data-html' => "true", '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.')) %> + "> +
@@ -20,9 +22,6 @@
<%= f.label :published %> <%= f.check_box :published %> -
- -
<% end %> @@ -30,7 +29,9 @@ <%= f.label :optional_subset %> <%= f.check_box :optional_subset %> <%= _('e.g. School/ Department') %>
- <%= link_to(image_tag('help_button.png'), '#', "data-toggle": "popover", rel: "popover", 'data-html' => "true", '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.")) %> + "> +
diff --git a/app/views/guidance_groups/admin_new.html.erb b/app/views/guidance_groups/admin_new.html.erb index de8cf5d..bcef054 100644 --- a/app/views/guidance_groups/admin_new.html.erb +++ b/app/views/guidance_groups/admin_new.html.erb @@ -11,14 +11,18 @@ <%= f.label :name %> <%= f.text_field :name, as: :string, class: "input-medium required" %>
- <%= link_to( image_tag("help_button.png"), "#", "data-toggle": "popover", rel: "popover", 'data-html' => "true", '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.'))%> + "> +
<%= f.label :optional_subset %> <%= f.check_box :optional_subset %> <%= _('e.g. School/ Department') %>
- <%= link_to( image_tag('help_button.png'), '#', "data-toggle": "popover", rel: "popover", 'data-html' => "true", '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."))%> + "> +
diff --git a/app/views/guidances/_add_guidance.html.erb b/app/views/guidances/_add_guidance.html.erb index ca49a90..54f475f 100644 --- a/app/views/guidances/_add_guidance.html.erb +++ b/app/views/guidances/_add_guidance.html.erb @@ -9,7 +9,9 @@ <%= text_area_tag("guidance-text", "", class: "tinymce") %>
- <%= link_to( image_tag("help_button.png"), "#", "data-toggle": "popover", rel: "popover", "data-html" => "true", "data-content" => _('Enter your guidance here. You can include links where needed.'))%> + +
@@ -23,8 +25,10 @@ Theme.all.order("title"), :id, :title, {prompt: false, include_blank: _('None')}, {multiple: true})%> -
- <%= link_to( image_tag("help_button.png"), "#", "data-toggle": "popover", rel: "popover", "data-html" => "true", "data-content" => _('Select which theme(s) this guidance relates to.'))%> +
+ +
@@ -47,7 +51,9 @@ :id, :name, {prompt: false, include_blank: _('None')}, {multiple: false})%>
- <%= link_to( image_tag("help_button.png"), "#", "data-toggle": "popover", rel: "popover", "data-html" => "true", "data-content" => _('Select which group this guidance relates to.'))%> + +
diff --git a/app/views/guidances/admin_edit.html.erb b/app/views/guidances/admin_edit.html.erb index 4701487..31e1702 100644 --- a/app/views/guidances/admin_edit.html.erb +++ b/app/views/guidances/admin_edit.html.erb @@ -11,7 +11,9 @@ <%= f.label _('Text'), for: @guidance.text %> <%= text_area_tag("guidance-text", @guidance.text, class: "tinymce") %>
- <%= link_to( image_tag('help_button.png'), '#', "data-toggle": "popover", rel: "popover", 'data-html' => "true", 'data-content' => _('Enter your guidance here. You can include links where needed.'))%> + +
@@ -19,7 +21,9 @@ <%= f.collection_select(:theme_ids, @themes, :id, :title, {prompt: false, include_blank: 'None'}, {multiple: true})%>
- <%= link_to( image_tag('help_button.png'), '#', class: 'input-medium', "data-toggle": "popover", rel: "popover", 'data-html' => "true", 'data-content' => _('Select which theme(s) this guidance relates to.'))%> + +
@@ -31,7 +35,9 @@ <%= f.collection_select(:guidance_group_id, @guidance_groups, :id, :name, {prompt: false, include_blank: 'None'}, {multiple: false})%>
- <%= link_to( image_tag('help_button.png'), '#', class: 'input-medium', "data-toggle": "popover", rel: "popover", 'data-html' => "true", 'data-content' => _('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 51be5f8..277c775 100644 --- a/app/views/guidances/admin_new.html.erb +++ b/app/views/guidances/admin_new.html.erb @@ -12,7 +12,9 @@ <%= f.label :text %> <%= text_area_tag("guidance-text", "", class: "tinymce") %>
- <%= link_to( image_tag('help_button.png'), '#', "data-toggle": "popover", rel: "popover", 'data-html' => "true", 'data-content' => _('Enter your guidance here. You can include links where needed.'))%> + +
@@ -20,14 +22,18 @@ <%= f.collection_select(:theme_ids, @themes, :id, :title, {prompt: false, include_blank: 'None'}, {multiple: true}) %>
- <%= link_to( image_tag('help_button.png'), '#', "data-toggle": "popover", rel: "popover", 'data-html' => "true", 'data-content' => _('Select which theme(s) this guidance relates to.'))%> + +
<%= f.label :published %> <%= f.check_box :published , as: :check_boxes%>
- <%= link_to( image_tag('help_button.png'), '#', "data-toggle": "popover", rel: "popover", 'data-html' => "true", 'data-content' => _("Check this box when you are ready for this guidance to appear on user's plans."))%> + "> +
@@ -35,7 +41,9 @@ <%= f.collection_select(:guidance_group_id, @guidance_groups, :id, :name, {prompt: false, include_blank: 'None'}, {multiple: false})%>
- <%= link_to( image_tag('help_button.png'), '#', "data-toggle": "popover", rel: "popover", 'data-html' => "true", 'data-content' => _('Select which group this guidance relates to.'))%> + +
diff --git a/app/views/phases/_edit_phase.html.erb b/app/views/phases/_edit_phase.html.erb index 6aa8fbb..7e34808 100644 --- a/app/views/phases/_edit_phase.html.erb +++ b/app/views/phases/_edit_phase.html.erb @@ -25,8 +25,10 @@
<%= text_area_tag("phase-desc", phase.description, class: "tinymce") %>
-
- <%= link_to( image_tag('help_button.png'), '#', "data-toggle": "popover", rel: "popover", 'data-html' => "true", '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."))%> +
+ "> +
diff --git a/app/views/phases/admin_add.html.erb b/app/views/phases/admin_add.html.erb index 2007449..3b005e2 100644 --- a/app/views/phases/admin_add.html.erb +++ b/app/views/phases/admin_add.html.erb @@ -41,7 +41,9 @@ <%= f.label :description %> <%= text_area_tag("phase-desc","" , class: "tinymce") %>
- <%= link_to( image_tag("help_button.png"), "#", 'data-toggle': 'popover', rel: "popover", "data-html" => "true", "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."))%> + "> +
diff --git a/app/views/phases/admin_show.html.erb b/app/views/phases/admin_show.html.erb index d6239fb..11b95db 100644 --- a/app/views/phases/admin_show.html.erb +++ b/app/views/phases/admin_show.html.erb @@ -43,18 +43,18 @@ <%= render partial: 'sections/show_section', locals: {section: section}%> <% end %> - <% end %> - - <% if @edit || @phase.template.customization_of.present? %> -

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

- - - <% end %> + <% end %> + + <% if @edit || @phase.template.customization_of.present? %> +

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

+ + + <% end %> - - + + diff --git a/app/views/questions/_add_question.html.erb b/app/views/questions/_add_question.html.erb index 6675827..25f2202 100644 --- a/app/views/questions/_add_question.html.erb +++ b/app/views/questions/_add_question.html.erb @@ -43,7 +43,9 @@ {}, class: "question_format" %>
- <%= link_to( image_tag("help_button.png"), "#", "data-toggle": "popover", rel: "popover", "data-html" => "true", "data-content" => _("You can choose from:"))%> +
  • - 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;
    • ") %>"> +
    @@ -55,7 +57,10 @@ <%= _('Order')%> <%= _('Text')%> <%= _('Default')%> - <%= link_to( image_tag("help_button.png"), "#", class: "question_options_popover", "data-toggle": "popover",rel: "popover", "data-html" => "true", "data-content" => _('Enter any options that you wish to display. If you want to pre-set one option as selected, check the default box.'))%> + + + @@ -97,7 +102,9 @@
    - <%= link_to( image_tag("help_button.png"), "#", "data-toggle": "popover", rel: "popover", "data-html" => "true", "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.'))%> + +
    @@ -113,7 +120,9 @@ <%= text_area_tag(:example_answer, "", class: "tinymce") %>
    - <%= link_to( image_tag("help_button.png"), "#", "data-toggle": "popover", rel: "popover", "data-html" => "true", "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.'))%> + +
    @@ -127,7 +136,9 @@ <%= text_area_tag(:guidance, "", class: "tinymce") %>
    - <%= link_to( image_tag("help_button.png"), "#", "data-toggle": "popover", rel: "popover", "data-html" => "true", "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."))%> + "> +
    @@ -143,7 +154,9 @@ :id, :title, {prompt: false, include_blank: _('None')}, {multiple: true})%>
    - <%= link_to( image_tag("help_button.png"), "#", "data-toggle": "popover", rel: "popover", "data-html" => "true", "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.

    "))%> + 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.

    ") %>"> +
    diff --git a/app/views/questions/_edit_question.html.erb b/app/views/questions/_edit_question.html.erb index 0d721d4..f9f1ad6 100644 --- a/app/views/questions/_edit_question.html.erb +++ b/app/views/questions/_edit_question.html.erb @@ -38,7 +38,9 @@ {}, class: "question_format", id: "#{question.id}-select-format"%>
    - <%= link_to( image_tag("help_button.png"), "#", "data-toggle": "popover", rel: "popover", "data-html" => "true", "data-content" => _("You can choose from:"))%> +
  • - 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;
    • ") %>"> +
    @@ -51,7 +53,11 @@ <%= _('Order')%> <%= _('Text')%> <%= _('Default')%> - <%= link_to( image_tag("help_button.png"), "#", class: "question_options_popover", "data-toggle": "popover",rel: "popover", "data-html" => "true", "data-content" => _('Enter any options that you wish to display. If you want to pre-set one option as selected, check the default box.'))%> + + + + @@ -92,7 +98,9 @@
    - <%= link_to( image_tag("help_button.png"), "#", "data-toggle": "popover", rel: "popover", "data-html" => "true", "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.'))%> + +
    @@ -116,7 +124,9 @@ <% end %>
    - <%= link_to( image_tag("help_button.png"), "#", "data-toggle": "popover", rel: "popover", "data-html" => "true", "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.'))%> + +
    @@ -132,7 +142,9 @@ <%= text_area_tag("question-guidance-#{question.id}", guidance_text , class: "tinymce") %>
    - <%= link_to( image_tag("help_button.png"), "#", "data-toggle": "popover", rel: "popover", "data-html" => "true", "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."))%> + "> +
    @@ -147,7 +159,9 @@ :id, :title, {prompt: false, include_blank: "None"}, {multiple: true})%>
    - <%= link_to( image_tag("help_button.png"), "#", "data-toggle": "popover", rel: "popover", "data-html" => "true", "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.

    "))%> + 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.

    ") %>"> +
    diff --git a/app/views/sections/_add_section.html.erb b/app/views/sections/_add_section.html.erb index 93564b8..61dd490 100644 --- a/app/views/sections/_add_section.html.erb +++ b/app/views/sections/_add_section.html.erb @@ -36,7 +36,9 @@ <%= text_area_tag("section-desc", "" , class: "tinymce") %>
    - <%= link_to( image_tag("help_button.png"), "#", "data-toggle": "popover", rel: "popover", "data-html" => "true", "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.
    "))%> + "> +
    diff --git a/app/views/sections/_edit_section.html.erb b/app/views/sections/_edit_section.html.erb index 3419af2..473c176 100644 --- a/app/views/sections/_edit_section.html.erb +++ b/app/views/sections/_edit_section.html.erb @@ -7,23 +7,25 @@

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

    - <%= form_for(section, url: admin_update_section_path(section, phase: phase, edit: edit), html: { method: :put, class: 'roadmap-form bordered'}) do |s| %> -
    -
    - <%= s.label :title %> - <%= s.text_field :title, as: :string, class: 'input-large', placeholder: _('New section title') %> -
    -
    - <%= s.label _('Order of display'), for: :number %> + <%= form_for(section, url: admin_update_section_path(section, phase: phase, edit: edit), html: { method: :put, class: 'roadmap-form bordered'}) do |s| %> +
    +
    + <%= s.label :title %> + <%= s.text_field :title, as: :string, class: 'input-large', placeholder: _('New section title') %> +
    +
    + <%= s.label _('Order of display'), for: :number %> <%= s.number_field :number, in: 1..15, class: "input-small has-tooltip", 'data-toggle' => "tooltip", 'title' => _('This allows you to order sections.') %>
    - <%= s.label :description %> + <%= s.label :description %> <%= text_area_tag("section-desc-#{section.id}", section.description , class: "tinymce") %>
    - <%= link_to( image_tag('help_button.png'), '#', "data-toggle": "popover", rel: "popover", 'data-html' => "true", '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.
    "))%> + "> +
    -
    - +
    +
     
    @@ -34,16 +36,16 @@ <% end %> <%= link_to _('Cancel'), :back, class: 'btn cancel' %>
    -
    - <% end %> +
    + <% end %>
    - +

    <%= _('Questions') %>

    <% @questions = section.questions.order("number")%> <% if @questions.length > 0 %> - <% @questions.each do |question| %> -
    -
    "> + <% @questions.each do |question| %> +
    +
    "> <%= render partial: 'questions/show_question', locals: {question: question} %>
    @@ -52,19 +54,19 @@ <%= render partial: 'questions/edit_question', locals: {question: question} %>
    -
    +
    <% end %> <% end %> <% if section.modifiable %> - - + + -
    +
    <%= hidden_field_tag :section_id, section.id, class: "section_id" %> <%= link_to _('Add question'), '#', class: "btn btn-primary add_question_button" %> diff --git a/app/views/templates/_edit_annotations.html.erb b/app/views/templates/_edit_annotations.html.erb index e69961f..94a7846 100644 --- a/app/views/templates/_edit_annotations.html.erb +++ b/app/views/templates/_edit_annotations.html.erb @@ -59,7 +59,9 @@ <% end %>
    - <%= link_to( image_tag("help_button.png"), "#", "data-toggle": "popover", rel: "popover", "data-html" => "true", "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.'))%> + +
    @@ -74,7 +76,9 @@ <%= text_area_tag("question-guidance-#{question.id}", question.guidance , class: "tinymce") %>
    - <%= link_to( image_tag("help_button.png"), "#", "data-toggle": "popover", rel: "popover", "data-html" => "true", "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."))%> + "> +
    diff --git a/app/views/templates/_edit_template.html.erb b/app/views/templates/_edit_template.html.erb index 8eb53e8..0481d27 100644 --- a/app/views/templates/_edit_template.html.erb +++ b/app/views/templates/_edit_template.html.erb @@ -12,9 +12,9 @@ <%= f.label _('Description'), for: template.description %> <%= text_area_tag("template-desc", template.description, class: "input-large tinymce") %>
    - - + +
    diff --git a/app/views/templates/admin_new.html.erb b/app/views/templates/admin_new.html.erb index 0acf208..a1e9bb2 100644 --- a/app/views/templates/admin_new.html.erb +++ b/app/views/templates/admin_new.html.erb @@ -29,7 +29,9 @@ <%= text_area_tag("template-desc", "", class: "tinymce") %>
    - <%= link_to( image_tag("help_button.png"), "#", "data-toggle": "popover", rel: "popover", "data-html" => "true", "data-content" => _("
    Enter a description that helps you to differentiate between templates e.g. if you have ones for different audiences.
    "))%> + +