diff --git a/app/controllers/plans_controller.rb b/app/controllers/plans_controller.rb index 9f5d37f..77c5256 100644 --- a/app/controllers/plans_controller.rb +++ b/app/controllers/plans_controller.rb @@ -115,6 +115,8 @@ @plan = Plan.eager_load(params[:id]) authorize @plan + @visibility = @plan.visibility.blank? ? @plan.visibility.to_s : Rails.application.config.default_plan_visibility + @editing = (!params[:editing].nil? && @plan.administerable_by?(current_user.id)) # Get all Guidance Groups applicable for the plan and group them by org @@ -153,9 +155,14 @@ def edit @plan = Plan.find(params[:id]) authorize @plan + + @visibility = @plan.visibility.blank? ? @plan.visibility.to_s : Rails.application.config.default_plan_visibility + # If there was no phase specified use the template's 1st phase @phase = (params[:phase].nil? ? @plan.template.phases.first : Phase.find(params[:phase])) - + @show_phase_tab = params[:phase] + @readonly = !@plan.editable_by?(current_user.id) + # Get all Guidance Groups applicable for the plan and group them by org @all_guidance_groups = @plan.get_guidance_group_options @all_ggs_grouped_by_org = @all_guidance_groups.sort.group_by(&:org) diff --git a/app/controllers/registrations_controller.rb b/app/controllers/registrations_controller.rb index 134ce0d..fc3447b 100644 --- a/app/controllers/registrations_controller.rb +++ b/app/controllers/registrations_controller.rb @@ -77,7 +77,7 @@ @other_organisations = Org.where(parent_id: nil, is_other: true).pluck(:id) @identifier_schemes = IdentifierScheme.where(active: true).order(:name) @languages = Language.sorted_by_abbreviation - if params[:skip_personal_details] == true + if params[:skip_personal_details] == "true" do_update_password(current_user, params) else do_update(require_password=needs_password?(current_user, params)) @@ -163,29 +163,41 @@ message = _('Please enter your current password') elsif params[:user][:password_confirmation].blank? message = _('Please enter a password confirmation') - elsif params[:user][:new_password] != params[:user][:password_confirmation] + elsif params[:user][:password] != params[:user][:password_confirmation] message = _('Password and comfirmation must match') else successfully_updated = current_user.update_with_password(password_update) end + #render the correct page + if successfully_updated + session[:locale] = current_user.get_locale unless current_user.get_locale.nil? + set_gettext_locale #Method defined at controllers/application_controller.rb + set_flash_message :notice, _('Details successfully updated.') + sign_in current_user, bypass: true # Sign in the user bypassing validation in case his password changed + redirect_to edit_user_registration_path, notice: _('Details successfully updated.') + + else + flash[:notice] = message.blank? ? failed_update_error(current_user, _('profile')) : message + render "edit" + end end def sign_up_params params.require(:user).permit(:email, :password, :password_confirmation, :firstname, :surname, :recovery_email, - :accept_terms, :other_organisation, :prefs) + :accept_terms, :other_organisation) end def update_params params.require(:user).permit(:firstname, :org_id, :other_organisation, - :language_id, :surname, :prefs) + :language_id, :surname) end def password_update params.require(:user).permit(:email, :firstname, :current_password, :org_id, :language_id, :password, :password_confirmation, :surname, - :other_organisation, :prefs) + :other_organisation) end end diff --git a/app/views/devise/registrations/_external_identifier_shibboleth.html.erb b/app/views/devise/registrations/_external_identifier_shibboleth.html.erb index 39078c1..0fa1626 100644 --- a/app/views/devise/registrations/_external_identifier_shibboleth.html.erb +++ b/app/views/devise/registrations/_external_identifier_shibboleth.html.erb @@ -16,6 +16,7 @@ <%= link_to ''.html_safe, destroy_user_identifier_path(id), method: :delete, title: _("Unlink your account from #{scheme.description}. You can link again at any time."), + 'data-toggle': "modal", 'dialog-width': "450px", data: {confirm: _("Are you sure you want to unlink #{scheme.description} ID?")} %> <% end %> \ No newline at end of file diff --git a/app/views/devise/registrations/_password_details.html.erb b/app/views/devise/registrations/_password_details.html.erb index d953505..6fd93fc 100644 --- a/app/views/devise/registrations/_password_details.html.erb +++ b/app/views/devise/registrations/_password_details.html.erb @@ -7,16 +7,16 @@
+ class="left-indent required input-medium" value="" />
- - - <%= _('New Password') %> + +
@@ -24,29 +24,25 @@ + class="left-indent required input-medium" value="" />
-
- - -
+ + +
+ +
+
+ + <%= render partial: 'shared/accessible_submit_button', + locals: {id: 'update', + val: 'Save', + disabled_initially: false, + classes: 'small-input-button left-indent', + tooltip: _('Enter all of the required information above')} %>
- -
- - <%= render partial: 'shared/accessible_submit_button', - locals: {id: 'update', - val: 'Save', - disabled_initially: false, - classes: 'small-input-button', - tooltip: _('Enter all of the required information above')} %> - <%= link_to 'Cancel', '#', style: 'text-decoration:none;' %> -
<% end %> \ No newline at end of file diff --git a/app/views/devise/registrations/_personal_details.html.erb b/app/views/devise/registrations/_personal_details.html.erb index 7899829..be39742 100644 --- a/app/views/devise/registrations/_personal_details.html.erb +++ b/app/views/devise/registrations/_personal_details.html.erb @@ -1,137 +1,131 @@ <%= form_for(resource, as: resource_name, url: registration_path(resource_name), html: {method: :put, class: "roadmap-form white_background"}) do |f| %> -
-

- <%= _("Please note that your email address is used as your username. - If you change this, remember to use your new email address on sign in.") %> -

-
- -
- -
- <%= _('You can edit any of the details below.') %> - - <%= hidden_field_tag :unlink_flag, "false", id: "unlink_flag" %> - <%= hidden_field_tag :skip_personal_details, "false" %> - -
- - - -
- -
- - -
-
- - -
- -
- - - -
- -
- - - -
- -
- - <%= render partial: "shared/accessible_combobox", - locals: {name: "#{resource_name}[org_name]", - id: "#{resource_name}_org_name", - default_selection: @default_org, - models: @orgs, - attribute: 'name', - classes: 'fixed-width-large left-indent'} %> -
- - <% if MANY_LANGUAGES %> -
- <% lang = current_user.language.nil? ? FastGettext.default_locale : current_user.language.abbreviation %> - - -
- <% end %> - - <% @identifier_schemes.each do |scheme| %> -
- <% if scheme.name == 'shibboleth' %> - - <% else %> - - <% end %> -
- <%= render partial: "external_identifier_#{scheme.name}", - locals: { scheme: scheme, - id: current_user.identifier_for(scheme)} %> -
-
- <% end %> - - <% unless @user.api_token.blank? %> -
- <%= f.label :api_token, _('API token') %> -
<%= @user.api_token %>
- - -
<%= link_to( _('How to use the API'), controller: "token_permission_types", action: "index")%>
-
- <% end %> - -
-
- - <%= render partial: 'shared/accessible_submit_button', - locals: {id: 'update', - val: 'Save', - disabled_initially: true, - classes: 'small-input-button', - tooltip: _('Enter all of the required information above')} %> - <%= link_to 'Cancel', '#', style: 'text-decoration:none;' %> +
+

+ <%= _("Please note that your email address is used as your username. + If you change this, remember to use your new email address on sign in.") %> +

-
+ +
+ +
+ <%= _('You can edit any of the details below.') %> + + <%= hidden_field_tag :unlink_flag, "false", id: "unlink_flag" %> + <%= hidden_field_tag :skip_personal_details, "false" %> + +
+ + + +
+ +
+ + +
+
+ + +
+ +
+ + + +
+ +
+ + + +
+ +
+ + <%= render partial: "shared/accessible_combobox", + locals: {name: "#{resource_name}[org_name]", + id: "#{resource_name}_org_name", + default_selection: @default_org, + models: @orgs, + attribute: 'name', + classes: 'left-indent'} %> +
+ + <% if MANY_LANGUAGES %> +
+ <% lang = current_user.language.nil? ? FastGettext.default_locale : current_user.language.abbreviation %> + + +
+ <% end %> + + <% @identifier_schemes.each do |scheme| %> +
+ <% if scheme.name == 'shibboleth' %> + + <% else %> + + <% end %> +
+ <%= render partial: "external_identifier_#{scheme.name}", + locals: { scheme: scheme, + id: current_user.identifier_for(scheme)} %> +
+
+ <% end %> + + <% unless @user.api_token.blank? %> +
+ <%= f.label :api_token, _('API token') %> +
<%= @user.api_token %>
+ + +
<%= link_to( _('How to use the API'), controller: "token_permission_types", action: "index")%>
+
+ <% end %> + +
+
+ + <%= render partial: 'shared/accessible_submit_button', + locals: {id: 'update', + val: 'Save', + disabled_initially: true, + classes: 'small-input-button left-indent', + tooltip: _('Enter all of the required information above')} %> +
+ +
+
<% end %> - \ No newline at end of file + diff --git a/app/views/devise/registrations/edit.html.erb b/app/views/devise/registrations/edit.html.erb index ca84c15..5fa5a66 100644 --- a/app/views/devise/registrations/edit.html.erb +++ b/app/views/devise/registrations/edit.html.erb @@ -1,6 +1,8 @@ <% javascript "views/devise/registrations/edit.js" %>

<%= _('Edit profile') %>

+ +
  • <%= link_to _("Admin area"), admin_show_org_path(current_user.org_id), class: "signIn_dropdown_link" %>
    • +
  • <%= link_to _("Admin area"), admin_edit_org_path(current_user.org_id), class: "signIn_dropdown_link" %>
    • <% elsif current_user.can_modify_templates?%>
  • <%= link_to _("Admin area"), admin_index_template_path(current_user.org_id), class: "signIn_dropdown_link" %>
    • <% elsif current_user.can_modify_guidance? %>
  • <%= link_to _("Admin area"), admin_index_guidance_path(current_user.org_id), class: "signIn_dropdown_link" %>
    • <% elsif current_user.can_modify_org_details? %> -
  • <%= link_to _("Admin area"), admin_show_org_path(current_user.org_id), class: "signIn_dropdown_link" %>
    • +
  • <%= link_to _("Admin area"), admin_edit_org_path(current_user.org_id), class: "signIn_dropdown_link" %>
    • <% elsif current_user.can_grant_permissions? %>
  • <%= link_to _("Admin area"), admin_index_users_path, class: "signIn_dropdown_link" %>
    • <% end %> diff --git a/app/views/phases/_answer_form.html.erb b/app/views/phases/_answer_form.html.erb index c95732b..8c151f3 100644 --- a/app/views/phases/_answer_form.html.erb +++ b/app/views/phases/_answer_form.html.erb @@ -5,7 +5,7 @@ **Copyright: Digital Curation Centre and California Digital Library --> -
    +
    <% answers = question.plan_answers(plan.id) if answers.present? @@ -29,61 +29,57 @@
    -
    +
    -
    - <% comments = answer.notes.all %> - <%= hidden_field_tag :question_id, question.id, class: "question_id" %> - <% active_tab = nil %> -
      - <% annotations = question.annotations.where(type: Annotation.types[:guidance]) %> - <% if annotations.present? || question_guidances.present? %> - <% active_tab = 'guidance_tab' %> -
    • - <%= link_to _('Guidance'), "#", class: "right_column_tab_link" %> -
      • - <% else %> - <% active_tab = 'note_tab' %> - <% end %> -
    • "> - <% if comments.count > 0 %> - <%= link_to "#{_('Notes')} (#{comments.count})" , "#", id: "notes_number_#{question.id}", class: "right_column_tab_link" %> - <% else %> - <%= link_to _('Share note'), "#", id: "notes_number_#{question.id}", class: "right_column_tab_link" %> - <% end %> +
      + <% comments = answer.notes.all %> + <%= hidden_field_tag :question_id, question.id, class: "question_id" %> + <% active_tab = nil %> + + +
        + <% annotations = question.annotations.where(type: Annotation.types[:guidance]) %> + <% if annotations.present? || question_guidances.present? %> + <% active_tab = 'guidance_tab' %> + -
      -
      + <% else %> + <% active_tab = 'note_tab' %> + <% end %> +
    • " role="tab" aria-controls="comment-question-area-<%= question.id %>"> + <% if comments.count > 0 %> + <%= _('Notes') %> + <% else %> + <%= _(' Share note') %> + <% end %> +
      • +
    + +
    +
    -
    <% num_annotations = 0 %> + <% i = 0 %> <% if annotations.present? %> <% annotations.each do |annotation| %> -
    - - -
    - -
    - <%= annotation.org.abbreviation %> <%= _('Guidance') %> -
    -     -
    +

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

    <%= raw annotation.text %>
    <% num_annotations += 1%> -
    + <% i += 1 %> <% end %> <% end %> @@ -91,33 +87,36 @@ <% guidance_accordion_id = num_annotations %> <% question_guidances.each_pair do |theme, group| %> <% group.each do |gobj| %> -
    -
    - -
    - <%= gobj[:org] %> guidance on <%= theme %> -
    -     -
    +

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

    +
    <%= raw gobj[:text] %>
    <% guidance_accordion_id += 1 %> -
    + <% i += 1 %> <% end %> <% end %>
    -
    + +
    + +
    + -
    <%= render partial: "note", locals: {question: question, answer: answer, plan: plan, suffix: "" }%> -
    -
    + +
    +
    +
    +
    <% if last_question_id == question.id then %>
    <% else %> -
    +
    <% end %> diff --git a/app/views/phases/edit.html.erb b/app/views/phases/edit.html.erb index 5e33227..ed69430 100644 --- a/app/views/phases/edit.html.erb +++ b/app/views/phases/edit.html.erb @@ -11,52 +11,60 @@ <%= render :partial => "/plans/plan_title", locals: {plan: @plan} %> -
    +
    <%= render :partial => "/plans/progress", locals: { plan: @plan } %>
    - -<%= render :partial => "/plans/plan_nav_tabs", locals: {plan: @plan, active: @phase.title} %> +
    +
    + + - -
    + +
    +
    + <% i = 0 %> <% @phase.sections.order(:number).each do |section| %> <% sectionid = section.id %> - +

    + <%= render :partial => "/sections/progress", locals: { section: section, plan: @plan } %> + +

    - -
    - -
    - <%= render :partial => "/sections/progress", locals: { section: section, plan: @plan } %> -
    - - - -     -
    - -
    -
    - <%= raw section.description %> -
    +

    <%= raw section.description %>

    -
    - +
    @@ -79,40 +87,47 @@
    <% end %>
    -
    -
    -
    - - - + + <% i += 1 %> +
    + <% end %>
    -
    -
    +
    +
    +
    +
    + + +
    <%= render :partial => "plans/export", locals: {plan: @plan, plan_data: @plan_data, phase: @phase } %> +
    \ No newline at end of file diff --git a/app/views/plans/_available_templates.html.erb b/app/views/plans/_available_templates.html.erb index 5d9f710..d826258 100644 --- a/app/views/plans/_available_templates.html.erb +++ b/app/views/plans/_available_templates.html.erb @@ -1,6 +1,6 @@ <%= _('Which DMP template would you like to use?') %> -
    +
    diff --git a/app/views/plans/_details.html.erb b/app/views/plans/_details.html.erb deleted file mode 100644 index 68f11cb..0000000 --- a/app/views/plans/_details.html.erb +++ /dev/null @@ -1,67 +0,0 @@ -

    <%= _('Project Details') %>

    - -<%= form_for resource, as: 'user', url: user_session_path, - html: {class: "login-form roadmap-form content-two-column"} do |f| %> - -
    -
    - -
    - - - -
    -
    - - -
    -
    - - -
    -
    - -
    - - <%= tinymce(selector: "#plan_description", content_css: asset_path('application.css')) %> -
    -
    - - -
    -

    <%= _('Data Contact Person') %>

    -
    - - - -
    -
    - - - -
    -
    - - - - -
    - -
    - <%= render partial: 'shared/accessible_submit_button', - locals: {id: 'details-button', - val: _('Save'), - disabled_initially: true, - classes: 'small-input-button', - tooltip: _('Project title is required.')} %> -
    -
    -
    -<% end %> \ No newline at end of file diff --git a/app/views/plans/_edit_details.html.erb b/app/views/plans/_edit_details.html.erb new file mode 100644 index 0000000..d6c92f9 --- /dev/null +++ b/app/views/plans/_edit_details.html.erb @@ -0,0 +1,81 @@ +<% javascript('views/plans/edit.js') %> + +<%= form_for plan, html: {method: :put, class: "roadmap-form"} do |f| %> +
    +
    +
    + <%= f.label "#{_('Project Title')} #{_('(required)')}", for: :title %> + <%= f.text_field :title, class: "input-large has-tooltip", 'data-toggle': "tooltip", + 'title': _('If applying for funding, state the name exactly as in the grant proposal.') %> +
    + +
    + <%= f.label :grant_number %> + <%= f.text_field :grant_number, class: 'input-small has-tooltip', 'data-toggle': "tooltip", + 'title': _('Grant reference number if applicable [POST-AWARD DMPs ONLY]') %> +
    + +
    + <%= f.label :principal_investigator %> + <%= f.text_field :principal_investigator, class: 'input-medium has-tooltip', 'data-toggle': "tooltip", + 'title': _('Name of Principal Investigator(s) or main researcher(s) on the project.') %> +
    + +
    + <%= f.label _('Project Abstract'), for: :description %> + <%= f.text_area :description, { rows: 7, class: 'input-large has-tooltip', + 'data-toggle': "tooltip", 'data-html': "true", + 'title': _("

    Questions to consider:

    • - What is the nature of your research project?
    • - What research questions are you addressing?
    • - For what purpose are the data being collected or created?

    Guidance:

    Briefly summarise the type of study (or studies) to help others understand the purposes for which the data are being collected or created.

    ")} %> +
    + +
    + +
    + <%= f.label _('Plan ID'), for: :identifier %> + <%= f.text_field :identifier, class: 'input-medium has-tooltip', 'data-toggle': "tooltip", + 'title': _('A pertinent ID as determined by the funder and/or institution.') %> +
    + +
    +
    + +
    +
    + <%= f.label _('Name'), for: :data_contact %> + <%= f.text_field :data_contact, class: 'input-medium has-tooltip', 'data-toggle': "tooltip", + 'title': _('Name (if different to above), telephone and email contact details') %> +
    + +
    +
    +
    + + +
    +
    +
    + +
    +
    + + +
    + +
    (<%= _('Limited to finished plans') %>)
    +
    +
    /><%= raw display_visibility('privately_visible') %>
    +
    /><%= raw display_visibility('organisationally_visible') %>
    +
    /><%= raw display_visibility('publicly_visible') %>
    +
    +
    + +
    +
    <%= _('Plan Guidance Configuration') %>
    +

    <%= _('To help you write your plan, %{application_name} can show you guidance from a variety of organisations.') % {application_name: Rails.configuration.branding[:application][:name]} %>

    +
    +

    <% _('Select up to 3 organisations to see their guidance.') %>

    + +<%= @important_ggs.inspect %> +
    +
    +<% end %> \ No newline at end of file diff --git a/app/views/plans/_phase.html.erb b/app/views/plans/_phase.html.erb deleted file mode 100644 index c83c46a..0000000 --- a/app/views/plans/_phase.html.erb +++ /dev/null @@ -1,113 +0,0 @@ -
    -
    - <% sections = @phase.sections %> - <% sections.each do |section| %> - - - <% if session[:question_id_comments].to_i != 0 then %> - <% question_from_comment = Question.find(session[:question_id_comments])%> - <% if section.id == question_from_comment.section_id then %> - <%= hidden_field_tag :comment_section_id, question_from_comment.section_id, :class => "comment_section_id" %> - <%end%> - <% end%> - - - -
    - - <% num_section_questions = @plan.status["sections"][section.id]["num_questions"] %> - <% num_section_answers = @plan.status["sections"][section.id]["num_answers"] %> - <% question_word = "questions" %> - <% if num_section_questions == 1 then %> - <% question_word = "question" %> - <% end %> - <% section_status = "#{num_section_questions} #{question_word}, #{num_section_answers} answered" %> - - -
    - -
    - <%= section.title %> - <% if num_section_questions.to_i > num_section_answers.to_i then %> - (<%= section_status %>) - <% else %> - (<%= section_status %>) - <% end %> -
    - - - -     -
    - - -
    -
    - <%= raw section.description %> -
    -
    - - -
    -

    <%= t ('helpers.loading')%>

    -
    - - - - -
    - <% section.questions.order("number").each do |question| %> - <% if question.id == session[:question_id_comments].to_i then id_css = "current_question" end %> -
    - <% partialname = "answer_form" - if @readonly - partialname += "_ro" - end - %> - - <%= #render partial: partialname, - # locals: { - # plan: @plan, - # question: question, - # last_question_id: section.questions.order("number DESC").first.id - # } - %> -
    - <% end %> -
    - -
    -
    -
    - - - - <% end %> -
    - <%= tinymce %> -
    -
    - <%= _('Export') %> -
    \ No newline at end of file diff --git a/app/views/plans/_plan_details.html.erb b/app/views/plans/_plan_details.html.erb deleted file mode 100644 index a8db978..0000000 --- a/app/views/plans/_plan_details.html.erb +++ /dev/null @@ -1,80 +0,0 @@ -<% javascript('views/plans/edit.js') %> - -<%= form_for plan, html: {method: :put, class: "roadmap-form"} do |f| %> -
    -
    -
    - <%= f.label "#{_('Project Title')} #{_('(required)')}", for: :title %> - <%= f.text_field :title, class: "input-large has-tooltip", 'data-toggle': "tooltip", - 'title': _('If applying for funding, state the name exactly as in the grant proposal.') %> -
    - -
    - <%= f.label :grant_number %> - <%= f.text_field :grant_number, class: 'input-small has-tooltip', 'data-toggle': "tooltip", - 'title': _('Grant reference number if applicable [POST-AWARD DMPs ONLY]') %> -
    - -
    - <%= f.label :principal_investigator %> - <%= f.text_field :principal_investigator, class: 'input-medium has-tooltip', 'data-toggle': "tooltip", - 'title': _('Name of Principal Investigator(s) or main researcher(s) on the project.') %> -
    - -
    - <%= f.label _('Project Abstract'), for: :description %> - <%= f.text_area :description, { rows: 7, class: 'input-large has-tooltip', - 'data-toggle': "tooltip", 'data-html': "true", - 'title': _("

    Questions to consider:

    • - What is the nature of your research project?
    • - What research questions are you addressing?
    • - For what purpose are the data being collected or created?

    Guidance:

    Briefly summarise the type of study (or studies) to help others understand the purposes for which the data are being collected or created.

    ")} %> -
    - -
    - -
    - <%= f.label _('Plan ID'), for: :identifier %> - <%= f.text_field :identifier, class: 'input-medium has-tooltip', 'data-toggle': "tooltip", - 'title': _('A pertinent ID as determined by the funder and/or institution.') %> -
    - -
    -
    - -
    -
    - <%= f.label _('Name'), for: :data_contact %> - <%= f.text_field :data_contact, class: 'input-medium has-tooltip', 'data-toggle': "tooltip", - 'title': _('Name (if different to above), telephone and email contact details') %> -
    - -
    -
    -
    - - -
    -
    -
    - -
    -
    - -
    - -
    (<%= _('Limited to finished plans') %>)
    -
    -
    /><%= raw display_visibility('privately_visible') %>
    -
    /><%= raw display_visibility('organisationally_visible') %>
    -
    /><%= raw display_visibility('publicly_visible') %>
    -
    -
    - -
    -
    <%= _('Plan Guidance Configuration') %>
    -

    <%= _('To help you write your plan, %{application_name} can show you guidance from a variety of organisations.') % {application_name: Rails.configuration.branding[:application][:name]} %>

    -
    -

    <% _('Select up to 3 organisations to see their guidance.') %>

    - -<%= @important_ggs.inspect %> -
    -
    -<% end %> \ No newline at end of file diff --git a/app/views/plans/edit.html.erb b/app/views/plans/edit.html.erb deleted file mode 100644 index 38de2ac..0000000 --- a/app/views/plans/edit.html.erb +++ /dev/null @@ -1,59 +0,0 @@ -

    <%= @plan.title %>

    - -<% if @plan.visibility == 'is_test' %> -
    - - <%= _('This is a') %> <%= _('test plan') %>. -
    -<% end %> - -
    -
    - - - - -
    -
    - <%= render partial: 'plan_details', locals: {plan: @plan} %> -
    - - <% i = 0 %> - <% @plan.template.phases.each do |phase| %> -
    - <%= render partial: 'phase', locals: {plan: @plan, phase: phase} %> -
    - <% end %> - -
    - <%= render partial: 'share', locals: {plan: @plan} %> -
    -
    -
    - <%= _('Export') %> -
    - <%= render partial: "download", locals: {plan: @plan, phase: @phase} %> -
    -
    -
    \ No newline at end of file diff --git a/app/views/plans/index.html.erb b/app/views/plans/index.html.erb index 180c925..a4ba9b4 100644 --- a/app/views/plans/index.html.erb +++ b/app/views/plans/index.html.erb @@ -25,7 +25,7 @@ <%= render(partial: "shared/table_filter", - locals: {path: plan_path, placeholder: _('Filter plans')}) %> + locals: {path: plans_path, placeholder: _('Filter plans')}) %> <% end %> @@ -46,7 +46,7 @@ <%= link_to "#{plan.title.length > 60 ? "#{plan.title[0..59]} ..." : plan.title}", - edit_plan_path(plan) %> + plan_path(plan) %> <%= plan.template.title %> <%= l(plan.latest_update.to_date, formats: :short) %> @@ -59,21 +59,21 @@ <%= _('Actions') %> -
    diff --git a/app/views/plans/new.html.erb b/app/views/plans/new.html.erb index ffdf8f0..d10fff2 100644 --- a/app/views/plans/new.html.erb +++ b/app/views/plans/new.html.erb @@ -14,15 +14,14 @@
    <%= _('What research project are you planning?') %> -
    +
    - -
    - <%= _('If applying for funding, state the title exactly as in the proposal.') %> -
    +
    @@ -30,7 +29,7 @@
    <%= _('Primary research organisation') %> -
    +
    @@ -59,7 +58,7 @@
    <%= _('Funding organisation') %> -
    +
    diff --git a/app/views/plans/public_index.html.erb b/app/views/plans/public_index.html.erb index 21f099b..5f0fdae 100644 --- a/app/views/plans/public_index.html.erb +++ b/app/views/plans/public_index.html.erb @@ -28,9 +28,9 @@ <% end %> - <%= _('Plan Title') %> + <%= _('Project Title') %> <%= _('Template') %> - <%= _('Organisation') %> + <%= _('Institution') %> <%= _('Owner') %> <%= _('Download') %> diff --git a/app/views/plans/share.html.erb b/app/views/plans/share.html.erb index c74e8c4..338e387 100644 --- a/app/views/plans/share.html.erb +++ b/app/views/plans/share.html.erb @@ -8,97 +8,96 @@
    -
    +
    +

    <%= _('Collaborators')%>

    - <%= raw _('

    You can give other people access to your plan here. There are three permission levels.

    • Users with "read only" access can only read the plan.
    • Editors can contribute to the plan.
    • Co-owners can also contribute to the plan, but additionally can edit the plan details and control access to the plan.

    Add each collaborator in turn by entering their email address below, choosing a permission level and clicking "Add collaborator".

    Those you invite will receive an email notification that they have access to this plan, inviting them to register with %{application_name} if they don\'t already have an account. A notification is also issued when a user\'s permission level is changed.

    ') % { application_name: Rails.configuration.branding[:application][:name] } %> +

    <%= _('You can give other people access to your plan here. There are three permission levels.') %> +

      +
    • <%= _('Users with "read only" access can only read the plan.') %>
      • +
    • <%= _('Editors can contribute to the plan.') %>
      • +
    • <%= _('Co-owners can also contribute to the plan, but additionally can edit the plan details and control access to the plan.') %>
      • +
    +

    +

    <%= _('Add each collaborator in turn by entering their email address below, choosing a permission level and clicking "Add collaborator".') %>

    +

    <%= _('Those you invite will receive an email notification that they have access to this plan, inviting them to register with %{application_name} if they don\'t already have an account. A notification is also issued when a user\'s permission level is changed.') % { application_name: Rails.configuration.branding[:application][:name] } %>

    -
    -

    <%= _('Collaborators')%>

    -
    - <% if @plan.roles.any? then %> - - - - - - - - - - <% plan_roles = @plan.roles.all %> - <% plan_roles.each do |role| %> - - - - - - <% end %> - -
    <%= _('Email address')%><%= _('Permissions')%>
    <%= role.user.name %> - <% if role.creator? %> - <%= 'Owner' %> - <% elsif !role.creator? && role.user == current_user %> - <%= display_role(role) %> - <% elsif !role.creator? && role.user != current_user %> - <%= form_for role, url: {controller: :roles, action: :update, id: role.id }, html: {method: :put} do |f| %> -
    - <%= f.select :access_level, {"#{_('Co-owner')}": 3, "#{_('Editor')}": 2, "#{_('Read only')}": 1}, {}, {id: "#{role.id}-can-edit", class: "toggle-existing-user-access has-tooltip", 'data-toggle': "tooltip", 'title': _('Editors can contribute to plans. Co-owners have additional rights to edit plan details and control access.') } %> -
    - <% end %> - <% end %> -     		- <% unless role.creator? || role.user == current_user then %> - <%= link_to _('Remove user access'), role, method: :delete, data: { confirm: _('Are you sure?') }, :class => "a-orange" %> - <% end %> -
    + <% if @plan.roles.any? then %> + + + + + + + + + + <% plan_roles = @plan.roles.all %> + <% plan_roles.each do |role| %> + + + + + + <% end %> + +
    <%= _('Email address')%><%= _('Permissions')%>
    <%= role.user.name %> + <% if role.creator? %> + <%= 'Owner' %> + <% elsif !role.creator? && role.user == current_user %> + <%= display_role(role) %> + <% elsif !role.creator? && role.user != current_user %> + <%= form_for role, url: {controller: :roles, action: :update, id: role.id }, html: {method: :put} do |f| %> +
    + <%= f.select :access_level, {"#{_('Co-owner')}": 3, "#{_('Editor')}": 2, "#{_('Read only')}": 1}, {}, {id: "#{role.id}-can-edit", class: "toggle-existing-user-access has-tooltip", 'data-toggle': "tooltip", 'title': _('Editors can contribute to plans. Co-owners have additional rights to edit plan details and control access.') } %> +
    + <% end %> + <% end %> +     		+ <% unless role.creator? || role.user == current_user then %> + <%= link_to _('Remove user access'), role, method: :delete, data: { confirm: _('Are you sure?') }, :class => "a-orange" %> + <% end %> +
    + <% end %> + +

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

    + <% new_role = Role.new %> + <% new_role.plan = @plan %> + <%= form_for new_role, url: {controller: :roles, action: :create }, + html: {method: :post, class: 'roadmap-form'} do |f| %>

    +
    + <%= f.hidden_field :plan_id %> + + <%= f.fields_for :user do |user| %> + <%= user.label :email, _('Email') %> + <%= user.email_field :email, for: :user, name: "user", class: "left-indent" %> <% end %> -

    -
    - -
    - <% new_role = Role.new %> - <% new_role.plan = @plan %> - <%= form_for new_role, url: {controller: :roles, action: :create }, - html: {method: :post, class: 'roadmap-form'} do |f| %> -
    - <%= _('Add collaborator') %> - - <%= f.hidden_field :plan_id %> - - <%= f.fields_for :user do |user| %> - <%= user.label :email, _('Email') %> - <%= user.email_field :email, for: :user, name: "user", class: "left-indent" %> - <% end %> - - <%= f.label :access_level, _('Permissions') %> - <%= f.select :access_level, [[_('Co-owner'), 3], [ _('Editor') , 2], [ _('Read only'), 1]], {}, {class: 'has-tooltip left-indent', 'data-toggle': "tooltip", 'title': _('Editors can contribute to plans. Co-owners have additional rights to edit plan details and control access.') } %> - -
    - <% end %> -
    -
    + <%= f.label :access_level, _('Permissions') %> + <%= f.select :access_level, [[_('Co-owner'), 3], [ _('Editor') , 2], [ _('Read only'), 1]], {}, {class: 'has-tooltip left-indent', 'data-toggle': "tooltip", 'title': _('Editors can contribute to plans. Co-owners have additional rights to edit plan details and control access.') } %> + +
    + <% end %>
    diff --git a/app/views/plans/show.html.erb b/app/views/plans/show.html.erb index 2ddcc79..af86338 100644 --- a/app/views/plans/show.html.erb +++ b/app/views/plans/show.html.erb @@ -11,43 +11,26 @@ <% @plan.template.phases.each do |phase| %> <% end %>
-
- <%= render partial: 'show_details', locals: {plan: @plan} %> -
- - <% i = 0 %> - <% @plan.template.phases.each do |phase| %> -
- <%= render partial: 'show_phase', locals: {plan: @plan, phase: phase} %> -
- <% end %> - -
- <%= render partial: 'share', locals: {plan: @plan} %> -
-
-
- <%= _('Export') %> -
- <%= render partial: "download", locals: {plan: @plan, phase: @phase} %> +
+ <% if @plan.editable_by?(current_user) %> + <%= render partial: 'edit_details', locals: {plan: @plan, visibility: @visibility} %> + <% else %> + <%= render partial: 'show_details', locals: {plan: @plan, visibility: @visibility} %> + <% end %>
\ No newline at end of file diff --git a/app/views/plans/show_export.html.erb b/app/views/plans/show_export.html.erb index 3096205..3270041 100644 --- a/app/views/plans/show_export.html.erb +++ b/app/views/plans/show_export.html.erb @@ -3,56 +3,48 @@ <%= render :partial => "plan_title", locals: {plan: @plan} %> -
-
+
- <%= raw _("

From here you can download your plan in various formats. This may be useful if you need to submit your plan as part of a grant application.
Select what format you wish to use and click to 'Export'.

")%> +

<%= _("From here you can download your plan in various formats. This may be useful if you need to submit your plan as part of a grant application.") %>

+

<%= _(" Select what format you wish to use and click to 'Export'.") %>

<% if @plan.template.phases.count == 1 %> <%= render :partial => "/shared/export_links", locals: {plan: @plan, phase: @plan.template.phases.first} %> <%else%> - <% @plan.template.phases.each do |phase| %> -
-
-
- -

<%= phase.title %>

- -
-
-
- <%= render :partial => "/shared/export_links", locals: {plan: @plan, phase: phase} %> -
-
+
+ <% @plan.template.phases.each do |phase| %> +

<%= phase.title %>

+
+ <%= render :partial => "/shared/export_links", locals: {plan: @plan, phase: phase} %>
-
- <%end%> + <%end%> +
<%end%>
diff --git a/app/views/users/_notification_preferences.html.erb b/app/views/users/_notification_preferences.html.erb index 9b79290..cdcb003 100644 --- a/app/views/users/_notification_preferences.html.erb +++ b/app/views/users/_notification_preferences.html.erb @@ -1,67 +1,66 @@

- <%= link_to 'Select all', '#', id: 'select_all' %> | - <%= link_to 'Deselect all', '#', id: 'deselect_all' %> + <%= link_to 'Select all', '#', id: 'select_all' %> | + <%= link_to 'Deselect all', '#', id: 'deselect_all' %>

- <%= form_tag(user_update_preferences_path, html: {method: :put, class: "roadmap-form"}) do |f| %> + <%= form_tag(user_update_preferences_path, html: {method: :put, class: "roadmap-form"}) do |f| %> - <%= hidden_field_tag :user_id, @user.id %> + <%= hidden_field_tag :user_id, @user.id %> -

All Users

-
- <%= check_box_tag 'prefs[users][new_comment]', true, @user.prefs[:users][:new_comment] %> - <%= label_tag 'prefs[users][new_comment]', 'A new comment has been added to my DMP', :class => 'checkbox-label' %> -
-
- <%= check_box_tag 'prefs[users][added_as_coowner]', true, @user.prefs[:users][:added_as_coowner] %> - <%= label_tag 'prefs[users][added_as_coowner]', 'A plan has been shared with me', :class => 'checkbox-label' %> -
-
- <%= check_box_tag 'prefs[users][admin_privileges]', true, @user.prefs[:users][:admin_privileges] %> - <%= label_tag 'prefs[users][admin_privileges]', 'Admin privileges granted to me', :class => 'checkbox-label' %> -
+

All Users

+
+ <%= check_box_tag 'prefs[users][new_comment]', true, @user.prefs[:users][:new_comment] %> + <%= label_tag 'prefs[users][new_comment]', 'A new comment has been added to my DMP', :class => 'checkbox-label' %> +
+
+ <%= check_box_tag 'prefs[users][added_as_coowner]', true, @user.prefs[:users][:added_as_coowner] %> + <%= label_tag 'prefs[users][added_as_coowner]', 'A plan has been shared with me', :class => 'checkbox-label' %> +
+
+ <%= check_box_tag 'prefs[users][admin_privileges]', true, @user.prefs[:users][:admin_privileges] %> + <%= label_tag 'prefs[users][admin_privileges]', 'Admin privileges granted to me', :class => 'checkbox-label' %> +
-
-

DMP owners and co-owners

-
- <%= check_box_tag 'prefs[owners_and_coowners][visibility_changed]', true, @user.prefs[:owners_and_coowners][:visibility_changed] %> - <%= label_tag 'prefs[owners_and_coowners][visibility_changed]', "My DMP's visibility has changed", :class => 'checkbox-label' %> -
+
+

DMP owners and co-owners

+
+ <%= check_box_tag 'prefs[owners_and_coowners][visibility_changed]', true, @user.prefs[:owners_and_coowners][:visibility_changed] %> + <%= label_tag 'prefs[owners_and_coowners][visibility_changed]', "My DMP's visibility has changed", :class => 'checkbox-label' %> +
-
-

DMP administrators

-
- <%= check_box_tag 'prefs[admins][template_published]', true, @user.prefs[:admins][:template_published] %> - <%= label_tag 'prefs[admins][template_published]', 'An organisational template is published', :class => 'checkbox-label' %> -
-
- <%= check_box_tag 'prefs[admins][template_unpublished]', true, @user.prefs[:admins][:template_unpublished] %> - <%= label_tag 'prefs[admins][template_unpublished]', 'An organisational template is unpublished', :class => 'checkbox-label' %> -
-
- <%= check_box_tag 'prefs[admins][feedback_requested]', true, @user.prefs[:admins][:feedback_requested] %> - <%= label_tag 'prefs[admins][feedback_requested]', 'A user has requested feedback on a DMP', :class => 'checkbox-label' %> -
+
+

DMP administrators

+
+ <%= check_box_tag 'prefs[admins][template_published]', true, @user.prefs[:admins][:template_published] %> + <%= label_tag 'prefs[admins][template_published]', 'An organisational template is published', :class => 'checkbox-label' %> +
+
+ <%= check_box_tag 'prefs[admins][template_unpublished]', true, @user.prefs[:admins][:template_unpublished] %> + <%= label_tag 'prefs[admins][template_unpublished]', 'An organisational template is unpublished', :class => 'checkbox-label' %> +
+
+ <%= check_box_tag 'prefs[admins][feedback_requested]', true, @user.prefs[:admins][:feedback_requested] %> + <%= label_tag 'prefs[admins][feedback_requested]', 'A user has requested feedback on a DMP', :class => 'checkbox-label' %> +
-
-
- - <%= submit_tag 'Save', class: 'btn btn-primary' %> - <%= link_to 'Cancel', '#', style: 'text-decoration:none;' %> -
- <% end %> +
+
+ + <%= submit_tag 'Save', class: 'btn btn-primary' %> +
+ <% end %>
\ No newline at end of file diff --git a/lib/assets/javascripts/dmproadmap/utils.js b/lib/assets/javascripts/dmproadmap/utils.js index 6c7e170..240510d 100644 --- a/lib/assets/javascripts/dmproadmap/utils.js +++ b/lib/assets/javascripts/dmproadmap/utils.js @@ -13,16 +13,19 @@ var visible = $("#" + id + "-dropdown").css('visibility') == 'visible'; $("#" + id + "-dropdown").css('visibility', (visible ? 'hidden' : 'visible')); - // Set an auto timeout so that the dropdown disappears after a second - var dropdownTimer = setTimeout(function(){ - $("#" + id + "-dropdown").css('visibility', 'hidden'); - }, 1080); - // If the user mouses over the dropdown clear the timeout timer. hide the dropdown when the mouse out - $("#" + id + "-dropdown").mouseenter(function(){ - clearTimeout(dropdownTimer); - }).mouseleave(function(){ + $("#" + id + "-dropdown").mouseleave(function(){ $(this).css('visibility', 'hidden'); }); }); + + // Display tooltips when the item has focus or hover + $("[data-toggle='tooltip']").on('focus', function(e){ + if($(this).attr('data-content') != undefined){ + var y = $(this).width() + 35; + $(this).parent().append('
' + $(this).attr('data-content') + '