diff --git a/app/views/plans/_edit_details.html.erb b/app/views/plans/_edit_details.html.erb index 9d9d86a..2c08a8b 100644 --- a/app/views/plans/_edit_details.html.erb +++ b/app/views/plans/_edit_details.html.erb @@ -10,14 +10,9 @@ title: _('If applying for funding, state the name exactly as in the grant proposal.')) %> -
+
<%= f.hidden_field :visibility %> -
- <%= f.label(:is_test, _('mock project for testing, practice, or educational purposes'), class: 'control-label') %> -
-
- <%= check_box_tag(:is_test,1, @plan.is_test?) %> -
+ <%= f.label(:is_test, raw("#{check_box_tag(:is_test,1, @plan.is_test?)} #{_('mock project for testing, practice, or educational purposes')}"), class: 'control-label') %>
@@ -43,9 +38,9 @@
<%= f.label(:description, _('Project Abstract'), class: 'control-label') %>
-
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.

").html_safe %>"> +
"> <%= f.text_area( - :description, + :description, rows: 6, class: 'form-control tinymce', "aria-required": false) %>
@@ -59,7 +54,7 @@ title: _('A pertinent ID as determined by the funder and/or institution.')) %>
-
+

<%= _('Principal Investigator') %>

@@ -95,9 +90,24 @@ "data-validation": "email") %>
-
+
+
+ <%= f.label(:principal_investigator_phone, _('Phone'), class: 'control-label') %> +
+
+ <%= f.phone_field( + :principal_investigator_phone, + class: 'form-control', + "aria-required": false) %> +
+
+

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

-
+
+ <% checked = ((@plan.data_contact.present? || @plan.data_contact_phone.present? || @plan.data_contact_email.present?) ? 1 : 0) %> + <%= label_tag(:show_data_contact, raw("#{check_box_tag(:show_data_contact, checked, checked == 0)} #{_('Same as Principal Investigator')}"), class: 'control-label') %> +
+
<%= f.label(:data_contact, _('Name'), class: 'control-label') %>
@@ -108,18 +118,7 @@ "aria-required": false) %>
-
-
- <%= f.label(:data_contact_phone, _('Phone'), class: 'control-label') %> -
-
- <%= f.text_field( - :data_contact_phone, - class: 'form-control', - "aria-required": false) %> -
-
-
+
<%= f.label(:data_contact_email, _('Email'), class: 'control-label') %>
@@ -131,6 +130,17 @@ "data-validation": "email") %>
+
+
+ <%= f.label(:data_contact_phone, _('Phone'), class: 'control-label') %> +
+
+ <%= f.phone_field( + :data_contact_phone, + class: 'form-control', + "aria-required": false) %> +
+
<%= f.button(_('Submit'), class: "btn btn-default", type: "submit") %> <% end %>
diff --git a/app/views/plans/_share_form.html.erb b/app/views/plans/_share_form.html.erb index a62fb16..e9defec 100644 --- a/app/views/plans/_share_form.html.erb +++ b/app/views/plans/_share_form.html.erb @@ -1,16 +1,18 @@

<%= _('Set plan visibility') %>

-

<%= _('Public or organisational visibility is intended for finished plans. You must answer at least one question to enable these options.') %>

+

<%= _('Public or organisational visibility is intended for finished plans. You must answer at least one question to enable these options.') %>

<%= form_for @plan, html: {method: :put} do |f| %> > -
- <%= f.label :visibility, raw("#{f.radio_button :visibility, :privately_visible} #{_('Private: restricted to me and my collaborators')}") %> -
-
- <%= f.label :visibility, raw("#{f.radio_button :visibility, :organisationally_visible} #{_('Organisation: anyone at my organisation can view')}") %> -
-
- <%= f.label :visibility, raw("#{f.radio_button :visibility, :publicly_visible} #{_('Public: anyone can view')}") %> +
+
+ <%= f.label :visibility, raw("#{f.radio_button :visibility, :privately_visible} #{_('Private: restricted to me and my collaborators')}") %> +
+
+ <%= f.label :visibility, raw("#{f.radio_button :visibility, :organisationally_visible} #{_('Organisation: anyone at my organisation can view')}") %> +
+
+ <%= f.label :visibility, raw("#{f.radio_button :visibility, :publicly_visible} #{_('Public: anyone can view')}") %> +
<% end %> @@ -19,12 +21,12 @@

<%= _('Invite specific people to read, edit, or administer your plan. Invitees will receive an email notification that they have access to this plan.') %>

<% if @plan.roles.any? then %> - +
- + @@ -39,7 +41,7 @@ <%= 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.hidden_field :id %> <%= 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.') } %>
@@ -61,7 +63,7 @@ <% new_role = Role.new %> <% new_role.plan = @plan %> <%= form_for new_role, url: {controller: :roles, action: :create }, html: {method: :post} do |f| %> -
+
<%= f.hidden_field :plan_id %> <%= f.fields_for :user do |user| %> <%= user.label :email, _('Email'), class: 'control-label' %> @@ -69,16 +71,19 @@ <% end %>
-

<%= _('Permissions') %>

-
- <%= f.label :access_level, raw("#{f.radio_button :access_level, 1} #{_('Read only: can view but not make changes')}") %> -
-
- <%= f.label :access_level, raw("#{f.radio_button :access_level, 2} #{_('Editor: can comment and make changes')}") %> -
-
- <%= f.label :access_level, raw("#{f.radio_button :access_level, 3, "aria-required": true} #{_('Co-owner: can edit project details, change visibility, and add collaborators')}") %> +
+

<%= _('Permissions') %>

+
+ <%= f.label :access_level, raw("#{f.radio_button :access_level, 1} #{_('Read only: can view but not make changes')}") %> +
+
+ <%= f.label :access_level, raw("#{f.radio_button :access_level, 2} #{_('Editor: can comment and make changes')}") %> +
+
+ <%= f.label :access_level, raw("#{f.radio_button :access_level, 3, "aria-required": true} #{_('Co-owner: can edit project details, change visibility, and add collaborators')}") %> +
+ + <%= f.button(_('Submit'), class: "btn btn-primary", type: "submit") %>
- <%= f.button(_('Submit'), class: "btn btn-primary", type: "submit") %> <% end %> \ No newline at end of file diff --git a/app/views/static_pages/about_us.html.erb b/app/views/static_pages/about_us.html.erb index 0fa1053..7a119dd 100644 --- a/app/views/static_pages/about_us.html.erb +++ b/app/views/static_pages/about_us.html.erb @@ -12,12 +12,13 @@

<%= _('DMP Background') %>

<%= _("The Digital Curation Centre and UC3 team at the California Digital Library have developed and delivered tools for data management planning since the advent of open data policies in 2011. ")%> - <%= link_to "DMPOnline", "https://dmponline.dcc.ac.uk/" %><%=_(" (DCC-UK) and ") %><%= link_to "DMPTool", "https://dmptool.org/" %> + <%= link_to "DMPonline", "https://DMPonline.dcc.ac.uk/" %><%=_(" (DCC-UK) and ") %><%= link_to "DMPTool", "https://dmptool.org/" %> <%= _("(CDL-US) are now established in our national contexts as the resource for researchers seeking guidance in creating DMPs. We have worked together from the outset to share experiences, but with the explosion of interest in both of our tools across the globe we formalized our partnership to co-develop and maintain a single open-source platform for DMPs. By working together we can extend our reach, keep costs down, and move best practices forward, allowing us to participate in a truly global open science ecosystem.") %>

<%= _("The new platform will be separate from the services each of our teams runs on top of it. Our shared goal: provide a combined DMPRoadmap platform as a core infrastructure for DMPs. Future enhancements will focus on making DMPs machine actionable so please continue sharing your use cases.") %>

-

<%= _("We invite you to peruse the DMPRoadmap GitHub wiki to learn how to ")%><%= link_to( "get involved", "https://github.com/DMPRoadmap/roadmap/wiki/get-involved", id: "get involved" ) %><%= _(" in the project. You can also report bugs and request new features via ") %><%= _('GitHub Issues') %>

+

<%= _("We invite you to peruse the DMPRoadmap GitHub wiki to learn how to ")%><%= link_to( "get involved", "https://github.com/DMPRoadmap/roadmap/wiki/get-involved", target: '_blank', id: "get involved" ) %><%= _(" in the project. You can also report bugs and request new features via ") %> + <%= _('GitHub Issues') %>

<%= _('Getting Started') %>

diff --git a/app/views/static_pages/help.html.erb b/app/views/static_pages/help.html.erb index e696f0e..3dbc495 100644 --- a/app/views/static_pages/help.html.erb +++ b/app/views/static_pages/help.html.erb @@ -7,7 +7,7 @@
- <%= raw _("

When you login to %{application_name} you will be directed to the 'My Dashboard' page. From here you can edit, share, download, copy or remove any of your plans. You will also see plans that have been shared with you by others.

+ <%= raw _("

When you log in to DMPRoadmap you will be directed to the 'My Dashboard' page. From here you can edit, share, download, copy or remove any of your plans. You will also see plans that have been shared with you by others.

Create a plan

diff --git a/app/views/static_pages/termsuse.html.erb b/app/views/static_pages/termsuse.html.erb index 0eac1dd..3d4ae16 100644 --- a/app/views/static_pages/termsuse.html.erb +++ b/app/views/static_pages/termsuse.html.erb @@ -18,7 +18,7 @@ <%= raw _("

Your personal details and consent notice

-

In order to help identify and administer your account with DMPRoadmap, we need to store your name and email address. We may also use it to contact you to obtain feedback on your use of the tool, or to inform you of the latest developments or releases. The information may be transferred between the DCC and CDL partner institutions but only for the following legitimate DCC and CDL purposes: marketing, improving our services and informing you of relevant content and events. We will not sell, rent, or trade any personal information you provide to us. +

In order to help identify and administer your account with DMPRoadmap, we need to store your name and email address. We may also use it to contact you to obtain feedback on your use of the tool, or to inform you of the latest developments or releases. The information may be transferred between the DCC and CDL but only for the following legitimate DCC and CDL purposes: marketing, improving our services and informing you of relevant content and events. We will not sell, rent, or trade any personal information you provide to us. By using this system, you consent to the collection, retention, and use of your personal information in accordance with the above. You have the right to ask us not to process your personal details for marketing purposes.

<%= _('Email address')%> <%= _('Permissions')%><%= _('Actions') %><%= _('Actions') %>