diff --git a/app/views/annotations/_show.html.erb b/app/views/annotations/_show.html.erb new file mode 100644 index 0000000000..5cc67bbe36 --- /dev/null +++ b/app/views/annotations/_show.html.erb @@ -0,0 +1,13 @@ + +

+ <% if annotation.type == :example_answer %> + <%= _('Example Answer') %> + <% elsif annotation.type == :guidance %> + <%= _('Guidance') %> + <% else %> + <%= plan.template.org.abbreviation %> + <% end %> + +

+ +
<%= raw annotation.text %>
diff --git a/app/views/answers/_new_edit.html.erb b/app/views/answers/_new_edit.html.erb index 2434033380..862bc705d4 100644 --- a/app/views/answers/_new_edit.html.erb +++ b/app/views/answers/_new_edit.html.erb @@ -2,100 +2,109 @@ This partial creates a form for each type of question. The local variables are: plan, answer, question, readonly --> <% q_format = question.question_format %> -<%= semantic_form_for answer, :url => {controller: :answers, action: :update }, html: {method: "put", class: "roadmap-form", 'data-autosave': question.id }, remote: true do |f| %> -
- <% if !readonly %> - <%= f.input :id, as: :hidden, input_html: { value: answer.id } %> - <%= f.input :plan_id, as: :hidden, input_html: { value: answer.plan_id } %> - <%= f.input :user_id, as: :hidden, input_html: { value: answer.user_id } %> - <%= f.input :question_id, as: :hidden, input_html: { value: answer.question_id } %> - <%= f.input :lock_version, as: :hidden, input_html: { value: answer.lock_version } %> - <% end %> +<%= form_for answer, url: {controller: :answers, action: :update}, html: {method: :put, class: "roadmap-form", 'data-autosave': question.id}, remote: true do |f| %> +
+ <% if !readonly %> + <%= f.hidden_field :id %> + <%= f.hidden_field :plan_id %> + <%= f.hidden_field :user_id %> + <%= f.hidden_field :question_id %> + <%= f.hidden_field :lock_version %> + <% end %> + +
+ + <% if question.option_based? %> + <%= f.label raw(question.text), for: :question_option_ids, class: "no-colon" %> + <% else %> + <%= f.label raw(question.text), for: :text, class: "no-colon" %> + <% end %> + + <% if question.option_based? %> + <% options = question.question_options.by_number %> + <% if q_format.checkbox? %> +
    + <% options.each do |op| %> +
  1. + <%= f.check_box(:question_option_ids, { multiple: true, checked: answer.has_question_option(op.id), disabled: readonly }, op.id, nil) %> + <%= raw op.text %> +
    2. + <% end %> +
+ <% elsif q_format.radiobuttons? %> +
    + <% options.each do |op| %> +
  1. + <%= f.radio_button :question_option_ids, op.id, { checked: answer.has_question_option(op.id), id: "answer_option_ids_#{op.id}", disabled: readonly } %> + <%= raw op.text %> +
    2. + <% end %> +
+ <% elsif q_format.dropdown? || q_format.multiselectbox? %> + <% + options_html = "" + options.each do |op| + options_html += answer.has_question_option(op.id) ? + "" : + "" + end + %> + <%= select_tag('answer[question_option_ids]', raw(options_html), + {multiple: q_format.multiselectbox?, include_blank: q_format.dropdown?, disabled: readonly }) %> + <% end %> + + <% if question.option_comment_display == true %> + <%= label_tag('answer[text]', _('Comment')) %> + <% if readonly %> +

<%= raw(answer.text) %>

+ <% else %> + <%= text_area_tag('answer[text]', answer.text, id: "answer-text-#{question.id}") %> + <%= tinymce(selector: "#answer-text-#{question.id}", setup: "$.fn.tinymce_answer_events", content_css: asset_path('application.css')) %> + <% end %> + <%end%> - -

- <%= raw question.text %> -

+ + <% elsif q_format.textfield? %> + <% if readonly %> +

<%= strip_tags(answer.text) %>

+ <% else %> + <%= text_field_tag('answer[text]', strip_tags(answer.text)) %> + <% end %> + + <% elsif q_format.textarea? %> + <% if readonly %> +

<%= raw(answer.text) %>

+ <% else %> + <%= text_area_tag('answer[text]', answer.text, id: "answer-text-#{question.id}") %> + <%= tinymce(selector: "#answer-text-#{question.id}", setup: "$.fn.tinymce_answer_events", content_css: asset_path('application.css')) %> + <% end %> + <% end %> - - <% if !readonly && question.annotations.where(type: Annotation.types[:example_answer]).any? %> - <% annotation = question.annotations.where(type: Annotation.types[:example_answer]).order(:created_at).first %> - <% if annotation.text.present? %> -
- - <%="#{annotation.org.abbreviation} "%> <%=_('Example of answer')%> - + + <% if !readonly && question.annotations.where(type: Annotation.types[:example_answer]).any? %> + <% annotation = question.annotations.where(type: Annotation.types[:example_answer]).order(:created_at).first %> + <% if annotation.text.present? %> +
+ + <%="#{annotation.org.abbreviation} "%> <%=_('example answer')%> + -
-

- <%= raw annotation.text %> -

-
+
+

<%= raw annotation.text %>

- <% end %> +
<% end %> + <% end %> - <% if question.option_based? %> - <% options = question.question_options.by_number %> - <% if q_format.checkbox? %> -
    - <% options.each do |op| %> -
  1. - <%= f.check_box(:question_option_ids, { multiple: true, checked: answer.has_question_option(op.id), disabled: readonly }, op.id, nil) %> - <%= raw op.text %> -
    2. - <% end %> -
- <% elsif q_format.radiobuttons? %> -
    - <% options.each do |op| %> -
  1. - <%= f.radio_button :question_option_ids, op.id, { checked: answer.has_question_option(op.id), id: "answer_option_ids_#{op.id}", disabled: readonly } %> - <%= raw op.text %> -
    2. - <% end %> -
- <% elsif q_format.dropdown? || q_format.multiselectbox? %> - <% - options_html = "" - options.each do |op| - options_html += answer.has_question_option(op.id) ? - "" : - "" - end - %> - <%= select_tag('answer[question_option_ids]', raw(options_html), - {multiple: q_format.multiselectbox?, include_blank: q_format.dropdown?, disabled: readonly }) %> - <% end %> - - <% if question.option_comment_display == true %> - <%= label_tag('answer[text]', _('Comment')) %> - <% if readonly %> -

<%= raw(answer.text) %>

- <% else %> - <%= text_area_tag('answer[text]', answer.text, id: "answer-text-#{question.id}") %> - <%= tinymce(selector: "#answer-text-#{question.id}", setup: "$.fn.tinymce_answer_events", content_css: asset_path('application.css')) %> - <% end %> - <%end%> - <% end %> - - <% if q_format.textfield? %> - <% if readonly %> -

<%= strip_tags(answer.text) %>

- <% else %> - <%= text_field_tag('answer[text]', strip_tags(answer.text)) %> - <% end %> - <% elsif q_format.textarea? %> - <% if readonly %> -

<%= raw(answer.text) %>

- <% else %> - <%= text_area_tag('answer[text]', answer.text, id: "answer-text-#{question.id}") %> - <%= tinymce(selector: "#answer-text-#{question.id}", setup: "$.fn.tinymce_answer_events", content_css: asset_path('application.css')) %> - <% end %> - <% end %> +
- <% if !readonly %> - - <% end %> -
- <% end %> \ No newline at end of file +
+ <% if !readonly %> + + <% end %> +
" class="answer-status inline left-indent"> + <%= render(partial: 'answers/status', locals: { answer: answer }) %> +
+
+
+<% end %> \ No newline at end of file diff --git a/app/views/answers/update.js.erb b/app/views/answers/update.js.erb index 2290a67e5f..f63943d375 100644 --- a/app/views/answers/update.js.erb +++ b/app/views/answers/update.js.erb @@ -22,5 +22,5 @@ if($.fn.init_answer_status) $(".progress").html("<%= escape_javascript(render :partial => '/plans/progress', locals: { plan: @plan }) %>"); // partial /sections/progress -$("#section-progress-<%= @section.id %>") +$(".progress-bar-<%= @section.id %>") .html("<%= escape_javascript(render partial: '/sections/progress', locals: { section: @section, plan: @plan }) %>"); \ No newline at end of file diff --git a/app/views/contact_us/contacts/new.html.erb b/app/views/contact_us/contacts/new.html.erb index 7476dc43ab..141a4c5cce 100644 --- a/app/views/contact_us/contacts/new.html.erb +++ b/app/views/contact_us/contacts/new.html.erb @@ -3,13 +3,13 @@

<%= _("Contact Us") %>

-

+

<%= raw _('%{application_name} is provided by the %{organisation_name}.
You can find out more about us on our website. If you would like to contact us about %{application_name}, please fill out the form below.') % {organisation_name: Rails.configuration.branding[:organisation][:name], organisation_url: Rails.configuration.branding[:organisation][:url], application_name: Rails.configuration.branding[:application][:name]} %>

-
+
<%= form_for @contact, url: contacts_path, html: {class: "roadmap-form"} do |f| %> @@ -36,7 +36,7 @@
<%= f.label(:message, _('Message'), class: "align-top required") %> - <%= f.text_area(:message, class: "left-indent required input-large", rows: 10) %> + <%= f.text_area(:message, class: "required input-large", rows: 10, style: "height: 160px;") %>
<% if !user_signed_in? then %>
@@ -53,8 +53,7 @@ locals: {id: 'create_contact_submit', val: 'Submit', disabled_initially: true, - tooltip: _('Fill in the required fields'), - classes: 'left-indent'} %> + tooltip: _('Fill in the required fields')} %>
diff --git a/app/views/devise/passwords/new.html.erb b/app/views/devise/passwords/new.html.erb index 6be60ae8ef..0927721be4 100644 --- a/app/views/devise/passwords/new.html.erb +++ b/app/views/devise/passwords/new.html.erb @@ -6,7 +6,7 @@

<%= _('Forgot your password?') %>

-

<%= _('Please enter your email below and we will send you instructions on how to reset your password.') %>

+

<%= _('Please enter your email below and we will send you instructions on how to reset your password.') %>

<%= form_for resource, as: 'user', url: user_password_path, html: {class: "password-reset roadmap-form", method: :post} do |f| %> diff --git a/app/views/guidance_groups/_show.html.erb b/app/views/guidance_groups/_show.html.erb new file mode 100644 index 0000000000..263fdd02fc --- /dev/null +++ b/app/views/guidance_groups/_show.html.erb @@ -0,0 +1,8 @@ +

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

+ +
+ <%= raw group[:text] %> +
\ No newline at end of file diff --git a/app/views/guidances/admin_index.html.erb b/app/views/guidances/admin_index.html.erb index 1d4dc8006c..71b40823ef 100644 --- a/app/views/guidances/admin_index.html.erb +++ b/app/views/guidances/admin_index.html.erb @@ -4,7 +4,7 @@ <%= _('Guidance') %> -

+

<%= _("First create a guidance group. This could be institution wide or a subset e.g. a particular College / School, Institute or department. When you create guidance you'll be asked to assign it to a guidance group.") %>

diff --git a/app/views/guidances/untitled.txt b/app/views/guidances/untitled.txt new file mode 100644 index 0000000000..e69de29bb2 diff --git a/app/views/notes/_add.html.erb b/app/views/notes/_add.html.erb index 2817b90020..104525e799 100644 --- a/app/views/notes/_add.html.erb +++ b/app/views/notes/_add.html.erb @@ -16,9 +16,9 @@ <%= f.hidden_field :plan_id, value: plan_id %>
- <%= label_tag "#{questionid}new_note_text", _('Share note with collaborators') %> + <%= label_tag "#{questionid}new_note_text", _('Add comments to share with collaborators') %> <%= text_area_tag "#{questionid}new_note_text", nil, class: "tinymce" %> <%= tinymce :content_css => asset_path('application.css') %> - +
<% end %> diff --git a/app/views/notes/_list.html.erb b/app/views/notes/_list.html.erb index daf6a20a92..071dfb8ce7 100644 --- a/app/views/notes/_list.html.erb +++ b/app/views/notes/_list.html.erb @@ -1,14 +1,7 @@ - -<% if notes.count > 1 then%> - <% style_to_add = "height:150px; overflow-y:auto;" %> -<%else%> - <% style_to_add = "" %> -<%end%> -
-
+
<% notes.each do |note|%> @@ -23,10 +16,10 @@ <% if note.archived %> <% if note.archived_by == current_user.id %> - <%= _('Note removed by you')%> + <%= _('Comment removed by you')%> <% else %> <% archived_by_user = User.find(note.archived_by) %> - <%= _('Note removed by')%> <%= archived_by_user.name %> + <%= _('Comment removed by')%> <%= archived_by_user.name %> <%end%> <%else%> diff --git a/app/views/notes/_view.html.erb b/app/views/notes/_view.html.erb index 0610f0ce9d..efe24d25e7 100644 --- a/app/views/notes/_view.html.erb +++ b/app/views/notes/_view.html.erb @@ -4,7 +4,7 @@
    -

  • <%= _('Noted by:')%>

    • +

  • <%= _('Comment from:')%>

  • <%= user.name%> (<%= l note.updated_at, format: :custom %>)
  • <%= raw note.text %>
diff --git a/app/views/notes/create.js.erb b/app/views/notes/create.js.erb index 4cd1b85d56..532ce25b86 100644 --- a/app/views/notes/create.js.erb +++ b/app/views/notes/create.js.erb @@ -1,7 +1,7 @@ // rewrite the number of notes heading e.g. Notes(3) <% noteslabel = "#notes_number_#{@question.id}" %> -$("<%=noteslabel%>").html("Notes (<%= @num_notes %>)"); +$("<%=noteslabel%>").html("Comments (<%= @num_notes %>)"); // need to remove the existing tinymce editor otherwise tinymce.remove(".tinymce"); diff --git a/app/views/orgs/admin_edit.html.erb b/app/views/orgs/admin_edit.html.erb index 76d93fe583..770578b9ea 100644 --- a/app/views/orgs/admin_edit.html.erb +++ b/app/views/orgs/admin_edit.html.erb @@ -21,7 +21,7 @@