diff --git a/app/views/branded/plans/_form_v1.html.erb b/app/views/branded/plans/_form_v1.html.erb index de38152..ce9b5de 100644 --- a/app/views/branded/plans/_form_v1.html.erb +++ b/app/views/branded/plans/_form_v1.html.erb @@ -2,7 +2,10 @@
<%= form_for Plan.new, url: plans_path do |f| %> -

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

+

+ * + <%= _('Project title') %> +

<%= f.text_field(:title, class: 'form-control', 'aria-describedby': 'project-title', 'aria-required': 'true', diff --git a/app/views/branded/plans/_form_v2.html.erb b/app/views/branded/plans/_form_v2.html.erb index 247af6d..c6f49fc 100644 --- a/app/views/branded/plans/_form_v2.html.erb +++ b/app/views/branded/plans/_form_v2.html.erb @@ -1,143 +1,153 @@ - -<%= form_for Plan.new, url: plans_path do |f| %>
-

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

-
-
- <%= f.text_field(:title, class: 'form-control', 'aria-describedby': 'project-title', 'aria-required': 'true', - 'data-toggle': 'tooltip', - title: _('If applying for funding, state the project title exactly as in the proposal.')) %> + <%= form_for Plan.new, url: plans_path do |f| %> + +

+ * + <%= _('Project title') %> +

+
+
+ <%= f.text_field(:title, class: 'form-control', 'aria-describedby': 'project-title', 'aria-required': 'true', 'aria-label': 'project-title', + 'data-toggle': 'tooltip', + 'data-placement': 'bottom', + title: _('If applying for funding, state the project title exactly as in the proposal.')) %> +
+
 
+
+
+ <%= label_tag(:is_test) do %> + <%= check_box_tag(:is_test, "1", false) %> + <%= _('mock project for testing, practice, or educational purposes') %> + <% end %> +
-
 
-
- <%= label_tag(:is_test, raw("#{check_box_tag(:is_test, "1", false)} #{ d_('dmpopidor', 'Plan for testing, practice, or educational purposes')}")) %> -
+
+ +
+
+

<%= d_('dmpopidor', 'Choose a template') %>

+

+ <%= d_('dmpopidor', 'You can either choose a template provided by your organisation, another organisation or a funder template. The default template is ') %> + <%= @default_template.title + "." %> +
+ <%= link_to d_('dmpopidor', 'Find the list of the available templates'), public_templates_path, :target => "_blank" %> +

-
-
-
-
-

<%= d_('dmpopidor', 'Choose a template') %>

-

- <%= d_('dmpopidor', 'You can either choose a template provided by your organisation, another organisation or a funder template. The default template is ') %> - <%= @default_template.title + "." %> -
- <%= link_to d_('dmpopidor', 'Find the list of the available templates'), public_templates_path, :target => "_blank" %> -

-
-
+
-
-
+
+
- - + + - -
- -
- <% if @default_org %> - <%= hidden_field_tag('own_org_name', @default_org.name) %> - <%= hidden_field_tag('own_org_id', @default_org.id) %> - <% end %> -
+ +
+ +
+ <% if @default_org %> + <%= hidden_field_tag('own_org_name', @default_org.name) %> + <%= hidden_field_tag('own_org_id', @default_org.id) %> + <% end %> +
- -
-

- <%= d_('dmpopidor', 'Would you like to choose the template of another organisation?') %> -

- - <%= render partial: "shared/accessible_combobox", - locals: {name: 'plan[org_name]', - id: 'plan_org_name', - default_selection: @default_org, - models: @orgs, - attribute: 'name', - required: true, - error: _('You must select a research organisation from the list.'), - tooltip: _('Please select a valid research organisation from the list.')} %> -
+ +
+

+ <%= d_('dmpopidor', 'Would you like to choose the template of another organisation?') %> +

+ + <%= render partial: "shared/accessible_combobox", + locals: {name: 'plan[org_name]', + id: 'plan_org_name', + default_selection: @default_org, + models: @orgs, + attribute: 'name', + required: true, + error: _('You must select a research organisation from the list.'), + tooltip: _('Please select a valid research organisation from the list.')} %> +
- -
-

- <%= d_('dmpopidor', 'Would you like to choose the template of a funder?') %> -

- - <%= render partial: "shared/accessible_combobox", - locals: {name: 'plan[funder_name]', - id: 'plan_funder_name', - default_selection: nil, - models: @funders, - attribute: 'name', - required: true, - error: _('You must select a funding organisation from the list.'), - tooltip: _('Please select a valid funding organisation from the list.')} %> -
+ +
+

+ <%= d_('dmpopidor', 'Would you like to choose the template of a funder?') %> +

+ + <%= render partial: "shared/accessible_combobox", + locals: {name: 'plan[funder_name]', + id: 'plan_funder_name', + default_selection: nil, + models: @funders, + attribute: 'name', + required: true, + error: _('You must select a funding organisation from the list.'), + tooltip: _('Please select a valid funding organisation from the list.')} %> +
- - <%= check_box_tag(:plan_no_org, '', false, style: 'display: none;') %> - <%= check_box_tag(:plan_no_funder, '', true, style: 'display: none;') %> - + + <%= check_box_tag(:plan_no_org, '', false, style: 'display: none;') %> + <%= check_box_tag(:plan_no_funder, '', true, style: 'display: none;') %> + - - + <% end %>
-
-<% end %> \ No newline at end of file +
\ No newline at end of file