diff --git a/app/assets/javascripts/views/devise/registrations/edit.js b/app/assets/javascripts/views/devise/registrations/edit.js index 9d1eabb..8a2115f 100644 --- a/app/assets/javascripts/views/devise/registrations/edit.js +++ b/app/assets/javascripts/views/devise/registrations/edit.js @@ -53,6 +53,7 @@ }); toggleSubmit(); + selectActiveTab(); function validateEmailsDoNotMatch(){ var email = $("form.register-form #user_email").val().trim(); diff --git a/app/views/contact_us/contacts/new.html.erb b/app/views/contact_us/contacts/new.html.erb index bff54e4..c8883dd 100644 --- a/app/views/contact_us/contacts/new.html.erb +++ b/app/views/contact_us/contacts/new.html.erb @@ -1,19 +1,15 @@ <% javascript "views/contacts/new_contact.js" %> -
-
-

<%= _("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]} %> -

-
-
+

<%= _("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| %>
<% if ContactUs.require_name %> @@ -59,11 +55,11 @@
<% 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 9b1139d..15c6fe9 100644 --- a/app/views/devise/registrations/edit.html.erb +++ b/app/views/devise/registrations/edit.html.erb @@ -1,40 +1,37 @@ <% javascript "views/devise/registrations/edit.js" %> -

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

-
-
- +
+
+
+ -
-
- <%= render partial: 'devise/registrations/personal_details' %> -
+
+
+ <%= render partial: 'devise/registrations/personal_details' %> +
- + -
-
- - \ No newline at end of file +
\ No newline at end of file diff --git a/app/views/guidance_groups/admin_edit.html.erb b/app/views/guidance_groups/admin_edit.html.erb index cfd27cc..f89dc20 100644 --- a/app/views/guidance_groups/admin_edit.html.erb +++ b/app/views/guidance_groups/admin_edit.html.erb @@ -1,55 +1,56 @@ <% javascript 'admin.js' %> -

- <%= _('Guidance group') %> -

+

<%= _('Guidance group') %>

-
- <%= form_for(@guidance_group, url: admin_update_guidance_group_path(@guidance_group), html: {method: :put, class: 'roadmap-form bordered'}) do |f| %> -
-
- <%= f.label _('Name'), for: :name %> - <%= f.text_field :name, as: :string, class: 'input-medium required' %> -
- " aria-label="<%= _('More information: Guidance group names') %>"> - -
-
- - - <% if @guidance_group.published == true then %> +
+
+ <%= form_for(@guidance_group, url: admin_update_guidance_group_path(@guidance_group), html: {method: :put, class: 'roadmap-form bordered'}) do |f| %> +
- <%= f.label _('Published'), for: :published %> - <%= f.check_box :published %> + <%= f.label _('Name'), for: :name %> + <%= f.text_field :name, as: :string, class: 'input-medium required' %>
- <% lbl = _("Check this box when you are ready for guidance associated with this group to appear on user's plans.") %> - + " aria-label="<%= _('More information: Guidance group names') %>">
- <% end %> - -
- <%= f.label _('Optional Subset'), for: :optional_subset %> - <%= f.check_box :optional_subset %> <%= _('e.g. School/ Department') %> -
- " aria-label="<%= _('More information: Optional subsets for guidance groups') %>"> - -
-
- - -
-
-
 
- <%= f.submit _('Save'), class: 'btn btn-primary', role:"button" %> - <% if @guidance_group.published == false then %> - <%= f.submit _('Publish'), name: "save_publish", class: "btn btn-primary", role:"button" %> + + + <% if @guidance_group.published == true then %> +
+ <%= f.label _('Published'), for: :published %> + <%= f.check_box :published %> +
+ <% lbl = _("Check this box when you are ready for guidance associated with this group to appear on user's plans.") %> + + +
+
<% end %> -
-
- <% end %> + +
+ <%= f.label _('Optional Subset'), for: :optional_subset %> + <%= f.check_box :optional_subset %> <%= _('e.g. School/ Department') %> +
+ " aria-label="<%= _('More information: Optional subsets for guidance groups') %>"> + +
+
+ + +
+
+
 
+ <%= f.submit _('Save'), class: 'btn btn-primary', role:"button" %> + <% if @guidance_group.published == false then %> + <%= f.submit _('Publish'), name: "save_publish", class: "btn btn-primary", role:"button" %> + <% end %> +
+
+ <% end %> +
+ diff --git a/app/views/guidance_groups/admin_new.html.erb b/app/views/guidance_groups/admin_new.html.erb index a22ae2b..a34bf17 100644 --- a/app/views/guidance_groups/admin_new.html.erb +++ b/app/views/guidance_groups/admin_new.html.erb @@ -1,37 +1,37 @@ <% javascript 'admin.js' %> -

- <%= _('Guidance group') %> -

+

<%= _('Guidance group') %>

-
- <%= form_for :guidance_group, url: {action: "admin_create"}, html: {class: 'roadmap-form bordered'} do |f| %> -
-
- <%= f.label _('Name'), for: :name %> - <%= f.text_field :name, as: :string, class: "input-medium required" %> -
- " aria-label="<%= _('More information: Guidance group names') %>"> - -
-
-
- <%= f.label _('Optional Subset'), for: :optional_subset %> - <%= f.check_box :optional_subset %> <%= _('e.g. School/ Department') %> -
- " aria-label="<%= _('More information: Optional subsets for guidance groups') %>"> +
+
+ <%= form_for :guidance_group, url: {action: "admin_create"}, html: {class: 'roadmap-form bordered'} do |f| %> +
+
+ <%= f.label _('Name'), for: :name %> + <%= f.text_field :name, as: :string, class: "input-medium required" %> +
+ " aria-label="<%= _('More information: Guidance group names') %>"> +
-
+
+ <%= f.label _('Optional Subset'), for: :optional_subset %> + <%= f.check_box :optional_subset %> <%= _('e.g. School/ Department') %> +
+ " aria-label="<%= _('More information: Optional subsets for guidance groups') %>"> + +
+
- -
-
-
 
- <%= f.submit _('Save'), name: "draft", class: "btn btn-primary", role:"button"%> -
-
- <% end %> + +
+
+
 
+ <%= f.submit _('Save'), name: "draft", class: "btn btn-primary", role:"button"%> +
+ + <% end %> +
diff --git a/app/views/guidances/admin_edit.html.erb b/app/views/guidances/admin_edit.html.erb index 8f617f8..8398dfc 100644 --- a/app/views/guidances/admin_edit.html.erb +++ b/app/views/guidances/admin_edit.html.erb @@ -1,46 +1,46 @@ <% javascript 'views/guidances/admin_edit.js' %> -

- <%= _('Guidance') %> -

+

<%= _('Guidance') %>

-
- <%= form_for(@guidance, url: admin_update_guidance_path(@guidance), html: { method: :put , id: 'edit_guidance_form', class: 'roadmap-form bordered'}) do |f| %> -
-
- <%= f.label _('Text'), for: @guidance.text %> - <%= text_area_tag("guidance-text", @guidance.text, class: "tinymce") %> -
- <% lbl = %> - - -
-
-
- <%= f.label _('Themes'), for: :theme_ids %> - <%= f.collection_select(:theme_ids, @themes, :id, :title, - {prompt: false, include_blank: 'None'}, {multiple: true, title: _('Select which theme(s) this guidance relates to.')})%> -
-
- <%= f.label _('Published'), for: :published %> - <%= f.check_box :published , as: :check_boxes, title: _("Check this box when you are ready for this guidance to appear on user's plans.") %> -
-
- <%= f.label _('Guidance group'), for: :guidance_group_id %> - <%= f.collection_select(:guidance_group_id, @guidance_groups, - :id, :name, {prompt: false, include_blank: 'None'}, {multiple: false, title: _('Select which group this guidance relates to.')})%> -
+
+
+ <%= form_for(@guidance, url: admin_update_guidance_path(@guidance), html: { method: :put , id: 'edit_guidance_form', class: 'roadmap-form bordered'}) do |f| %> +
+
+ <%= f.label _('Text'), for: @guidance.text %> + <%= text_area_tag("guidance-text", @guidance.text, class: "tinymce") %> +
+ <% lbl = %> + + +
+
+
+ <%= f.label _('Themes'), for: :theme_ids %> + <%= f.collection_select(:theme_ids, @themes, :id, :title, + {prompt: false, include_blank: 'None'}, {multiple: true, title: _('Select which theme(s) this guidance relates to.')})%> +
+
+ <%= f.label _('Published'), for: :published %> + <%= f.check_box :published , as: :check_boxes, title: _("Check this box when you are ready for this guidance to appear on user's plans.") %> +
+
+ <%= f.label _('Guidance group'), for: :guidance_group_id %> + <%= f.collection_select(:guidance_group_id, @guidance_groups, + :id, :name, {prompt: false, include_blank: 'None'}, {multiple: false, title: _('Select which group this guidance relates to.')})%> +
-
-
-
 
- -
-
-<%end%> - +
+
+
 
+ +
+
+ <%end%> +
+
<%= tinymce :content_css => asset_path('application.css') %> diff --git a/app/views/guidances/admin_index.html.erb b/app/views/guidances/admin_index.html.erb index 71b4082..27b2b8a 100644 --- a/app/views/guidances/admin_index.html.erb +++ b/app/views/guidances/admin_index.html.erb @@ -1,141 +1,141 @@ <% javascript "admin.js" %> -

- <%= _('Guidance') %> -

+

<%= _('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.") %>

-
-

<%= _('Guidance group list') %>

+
+
+

<%= _('Guidance group list') %>

- - <% if @guidance_groups.length > 0 then%> - - - - - - - - - - - <% !@guidance_groups.each do |guidance_gr| %> - - - - - - - - - <% end %> - -
<%= _('Name') %><%= _('Published') %><%= _('Optional subset') %><%= _('Last updated') %><%= _('Actions') %> -
- <%= guidance_gr.name %> - - <% if guidance_gr.published.nil? || guidance_gr.published == false then%> - <%= _('No')%> - <% else %> - <%= _('Yes')%> - <% end %> - - <% if guidance_gr.optional_subset.nil? || guidance_gr.optional_subset == false then%> - <%= _('No')%> - <% else %> - <%= _('Yes')%> - <% end %> - - <%= l guidance_gr.updated_at.to_date, formats: :short %> - - <%= link_to _('Edit'), admin_edit_guidance_group_path(guidance_gr), class: "dmp_table_link"%>
- <%= link_to _('Delete'), admin_destroy_guidance_group_path(guidance_gr), data: {confirm: _("You are about to delete '%{guidance_group_name}'. This will affect guidance. Are you sure?") % { :guidance_group_name => guidance_gr.name }}, method: :delete, class: "dmp_table_link"%> -
- <%end%> - -
- <%= _('Create a guidance group') %> -
-
- -

<%= _('Guidance list') %>

- -

- <%= _('You can write pieces of guidance to be displayed by theme (e.g. generic guidance on storage and backup that should present across the board). Writing generic guidance by theme saves you time and effort as your advice will be automatically displayed across all templates rather than having to write guidance to accompany each.') %> -

-

- <%= _('If you do have a need to provide guidance for specific funders that would not be useful to a wider audience (e.g. if you have specific instructions for applicants to BBSRC for example), you can do so by adding guidance to a specific question when you edit your template.') %> -

- - - <% if @guidances.length > 0 then%> - - - <% if @guidances.length > 10 %> + + <% if @guidance_groups.length > 0 then%> +
+ - - - <% end %> - - - - + + + - - - <% @guidances.each do |guidance| %> - <% if guidance.in_group_belonging_to?(current_user.org_id) then %> + + + + <% !@guidance_groups.each do |guidance_gr| %> - <% if guidance.themes.present? then %> - - <% else %> - - <% end %> - <% if guidance.guidance_group.present? then %> - - <% else %> - - <% end %> - + + + + <% end %> - <% end %> - -
- <%= render(partial: "shared/table_filter", - locals: {path: admin_index_guidance_path, - placeholder: _('Filter guidance')}) %> -
<%= _('Text') %><%= _('Themes') %><%= _('Guidance group') %><%= _('Name') %><%= _('Published') %><%= _('Optional subset') %> <%= _('Last updated') %> <%= _('Actions') %> -
- <%= guidance.text.html_safe%> - - <% guidance.themes.each do |th| %> - <%= th.title %> - <% end %> - - - - - <%= guidance.guidance_group.name %> - - - - - <%= l guidance.updated_at.to_date, formats: :short %> + <%= guidance_gr.name %> - <%= link_to _('Edit'), admin_edit_guidance_path(guidance), class: "dmp_table_link"%>
- <%= link_to _('Delete'), admin_destroy_guidance_path(guidance), - data: {confirm: _("You are about to delete '%{guidance_summary}'. Are you sure?") % { :guidance_summary => truncate(sanitize(guidance.text,tags: %w(br a)), length: 20 , omission: _('... (continued)'))} }, method: :delete, class: "dmp_table_link"%> + <% if guidance_gr.published.nil? || guidance_gr.published == false then%> + <%= _('No')%> + <% else %> + <%= _('Yes')%> + <% end %> + 		+ <% if guidance_gr.optional_subset.nil? || guidance_gr.optional_subset == false then%> + <%= _('No')%> + <% else %> + <%= _('Yes')%> + <% end %> + + <%= l guidance_gr.updated_at.to_date, formats: :short %> + + <%= link_to _('Edit'), admin_edit_guidance_group_path(guidance_gr), class: "dmp_table_link"%>
+ <%= link_to _('Delete'), admin_destroy_guidance_group_path(guidance_gr), data: {confirm: _("You are about to delete '%{guidance_group_name}'. This will affect guidance. Are you sure?") % { :guidance_group_name => guidance_gr.name }}, method: :delete, class: "dmp_table_link"%>
- <% end %> + + + <%end%> -
- <%= _('Create guidance') %> +
+ <%= _('Create a guidance group') %> +
+
+ +

<%= _('Guidance list') %>

+ +

+ <%= _('You can write pieces of guidance to be displayed by theme (e.g. generic guidance on storage and backup that should present across the board). Writing generic guidance by theme saves you time and effort as your advice will be automatically displayed across all templates rather than having to write guidance to accompany each.') %> +

+

+ <%= _('If you do have a need to provide guidance for specific funders that would not be useful to a wider audience (e.g. if you have specific instructions for applicants to BBSRC for example), you can do so by adding guidance to a specific question when you edit your template.') %> +

+ + + <% if @guidances.length > 0 then%> + + + <% if @guidances.length > 10 %> + + + + <% end %> + + + + + + + + + <% @guidances.each do |guidance| %> + <% if guidance.in_group_belonging_to?(current_user.org_id) then %> + + + <% if guidance.themes.present? then %> + + <% else %> + + <% end %> + <% if guidance.guidance_group.present? then %> + + <% else %> + + <% end %> + + + + <% end %> + <% end %> + +
+ <%= render(partial: "shared/table_filter", + locals: {path: admin_index_guidance_path, + placeholder: _('Filter guidance')}) %> +
<%= _('Text') %><%= _('Themes') %><%= _('Guidance group') %><%= _('Last updated') %><%= _('Actions') %> +
+ <%= guidance.text.html_safe%> + + <% guidance.themes.each do |th| %> + <%= th.title %> + <% end %> + + - + + <%= guidance.guidance_group.name %> + + - + + <%= l guidance.updated_at.to_date, formats: :short %> + + <%= link_to _('Edit'), admin_edit_guidance_path(guidance), class: "dmp_table_link"%>
+ <%= link_to _('Delete'), admin_destroy_guidance_path(guidance), + data: {confirm: _("You are about to delete '%{guidance_summary}'. Are you sure?") % { :guidance_summary => truncate(sanitize(guidance.text,tags: %w(br a)), length: 20 , omission: _('... (continued)'))} }, method: :delete, class: "dmp_table_link"%> +
+ <% end %> + +
+ <%= _('Create guidance') %> +
diff --git a/app/views/guidances/admin_new.html.erb b/app/views/guidances/admin_new.html.erb index a487cb5..ee25eae 100644 --- a/app/views/guidances/admin_new.html.erb +++ b/app/views/guidances/admin_new.html.erb @@ -1,46 +1,46 @@ <% javascript 'views/guidances/admin_edit.js' %> -

- <%= _('New guidance') %> -

+

<%= _('New guidance') %>

-
- <%= form_for :guidance, url: {action: 'admin_create'}, html: {id: 'edit_guidance_form', class: 'roadmap-form bordered'} do |f| %> -
-
- <%= f.label :text %> - <%= text_area_tag("guidance-text", "", class: "tinymce") %> -
- <% lbl = _('Enter your guidance here. You can include links where needed.') %> - - +
+
+ <%= form_for :guidance, url: {action: 'admin_create'}, html: {id: 'edit_guidance_form', class: 'roadmap-form bordered'} do |f| %> +
+
+ <%= f.label :text %> + <%= text_area_tag("guidance-text", "", class: "tinymce") %> +
+ <% lbl = _('Enter your guidance here. You can include links where needed.') %> + + +
-
-
- <%= f.label _('Themes'), for: :theme_ids %> - <%= f.collection_select(:theme_ids, @themes, - :id, :title, {prompt: false, include_blank: 'None'}, {multiple: true, title: _('Select which theme(s) this guidance relates to.')}) %> -
-
- <%= f.label :published %> - <%= f.check_box :published , as: :check_boxes, title: _("Check this box when you are ready for this guidance to appear on user's plans.") %> -
-
- <%= f.label _('Guidance group'), for: :guidance_group_id %> - <%= f.collection_select(:guidance_group_id, @guidance_groups, - :id, :name, {prompt: false, include_blank: 'None'}, {multiple: false, title: _('Select which group this guidance relates to.')})%> -
+
+ <%= f.label _('Themes'), for: :theme_ids %> + <%= f.collection_select(:theme_ids, @themes, + :id, :title, {prompt: false, include_blank: 'None'}, {multiple: true, title: _('Select which theme(s) this guidance relates to.')}) %> +
+
+ <%= f.label :published %> + <%= f.check_box :published , as: :check_boxes, title: _("Check this box when you are ready for this guidance to appear on user's plans.") %> +
+
+ <%= f.label _('Guidance group'), for: :guidance_group_id %> + <%= f.collection_select(:guidance_group_id, @guidance_groups, + :id, :name, {prompt: false, include_blank: 'None'}, {multiple: false, title: _('Select which group this guidance relates to.')})%> +
-
-
-
 
- -
-
- <% end %> +
+
+
 
+ +
+ + <% end %> +
<%= tinymce :content_css => asset_path('application.css') %> diff --git a/app/views/guidances/untitled.txt b/app/views/guidances/untitled.txt deleted file mode 100644 index e69de29..0000000 --- a/app/views/guidances/untitled.txt +++ /dev/null diff --git a/app/views/orgs/admin_edit.html.erb b/app/views/orgs/admin_edit.html.erb index 770578b..759e193 100644 --- a/app/views/orgs/admin_edit.html.erb +++ b/app/views/orgs/admin_edit.html.erb @@ -1,72 +1,72 @@ <% javascript 'views/orgs/admin_edit.js' %> -

- <%= _('Organisation details') %> -

+

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

-
- <%= form_for(@org, url: admin_update_org_path(@org), html: { class: "roadmap-form bordered", multipart: true, id: "edit_org_details", method: :put}) do |f| %> +
+
+ <%= form_for(@org, url: admin_update_org_path(@org), html: { class: "roadmap-form bordered", multipart: true, id: "edit_org_details", method: :put}) do |f| %> -
-
- <%= f.label :name, class: 'required' %> - <%= f.text_field :name, class: "left-indent required input-large" %> -
-
- <%= f.label :abbreviation, class: 'required' %> - <%= f.text_field :abbreviation, class: "left-indent required input-small" %> -
+
+
+ <%= f.label :name, class: 'required' %> + <%= f.text_field :name, class: "left-indent required input-large" %> +
+
+ <%= f.label :abbreviation, class: 'required' %> + <%= f.text_field :abbreviation, class: "left-indent required input-small" %> +
- <% if @org.logo.present? %> -
- <% end %> +
+
 
+ <%= render partial: 'shared/accessible_submit_button', + locals: {id: 'save_org_submit', + val: 'Save', + disabled_initially: true, + tooltip: _('Name and abbreviation are required'), + classes: 'left-indent'} %> +
+
+ <% end %> +
<%= tinymce :content_css => asset_path('application.css') %> diff --git a/app/views/orgs/shibboleth_ds.html.erb b/app/views/orgs/shibboleth_ds.html.erb index 5a7a77e..763fc4c 100644 --- a/app/views/orgs/shibboleth_ds.html.erb +++ b/app/views/orgs/shibboleth_ds.html.erb @@ -2,81 +2,83 @@

Find your institution to sign in

-
- <%= form_for 'shibboleth_ds', url: shibboleth_ds_path, html: {class: "shibboleth-ds-form roadmap-form"} do |f| %> -
-
- <%= f.label(:org_name, _('Look up your institution here')) %> +
+
+ <%= form_for 'shibboleth_ds', url: shibboleth_ds_path, html: {class: "shibboleth-ds-form roadmap-form"} do |f| %> +
+
+ <%= f.label(:org_name, _('Look up your institution here')) %> - <% if @orgs.length <= 10 %> - + <% if @orgs.length <= 10 %> + - <% else %> - <%= render partial: "shared/accessible_combobox", - locals: {name: 'org_name', - id: 'org_name', - default_selection: nil, - models: @orgs, - attribute: 'name', - classes: 'fixed-width-large'} %> - <% end %> - - <%= render partial: 'shared/accessible_submit_button', - locals: {id: 'submit-button', - val: _('Go'), - disabled_initially: true, - classes: 'small-input-button', - tooltip: _('Select an institution.'), - classes: 'inline left-indent'} %> - - <% if @orgs.length > 10 %> -

- - <%= _('or') %> - -
- <%= _('See the full list of participating institutions') %> -

- <% end %> - -
-
- <% end %> - -
+ <% end %> + + + +
+ +

+ <%= _('Institution not in the list?') %> <%= _('Create an account with any email address')%> +

- -
- -

- <%= _('Institution not in the list?') %> <%= _('Create an account with any email address')%> -

diff --git a/app/views/phases/admin_add.html.erb b/app/views/phases/admin_add.html.erb index 61ff15e..46d8d40 100644 --- a/app/views/phases/admin_add.html.erb +++ b/app/views/phases/admin_add.html.erb @@ -1,69 +1,69 @@ <%- model_class = Phase -%> <% javascript "admin.js" %> -

- <%= @template.title %> -

+

<%= @template.title %>

-
-
- - <%= render partial: "templates/admin_nav_tabs", locals: {template: @template, active: "add_plan"} %> +
+
+
+ + <%= render partial: "templates/admin_nav_tabs", locals: {template: @template, active: "add_plan"} %> -
- -
+
+ +
-
-

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

+
+

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

- -
-
- -

- <%= _('When you create a new phase for your template, a version will automatically be created. Once you complete the form below you will be provided with options to create sections and questions.') %>

- <%= form_for :phase, {url: admin_create_phase_path, html: {class: "roadmap-form"}} do |f| %> - <%= f.hidden_field :template_id, value: @template.id%> + +
+
+ +

+ <%= _('When you create a new phase for your template, a version will automatically be created. Once you complete the form below you will be provided with options to create sections and questions.') %>

+ <%= form_for :phase, {url: admin_create_phase_path, html: {class: "roadmap-form"}} do |f| %> + <%= f.hidden_field :template_id, value: @template.id%> -
-
- <%= f.label :title %> - <%= f.text_field :title, as: :string, - class: "text_field has-tooltip", "data-toggle" => "tooltip", "title" => _('Enter a title for the phase e.g. intial DMP, full DMP... This is what users will see in the tabs when completing a plan. If you only have one phase, call it something generic e.g. Glasgow DMP') %> -
-
- <%= f.label _('Order of display'), for: :number %> - <%= f.number_field :number, in: 1..5, class: "number_field has-tooltip", "data-toggle" => "tooltip", title: _('This allows you to order the phases of your template.') %> -
-
- <%= f.label :description %> - <%= text_area_tag("phase-desc","" , class: "tinymce") %> -
- " - aria-label="<%= _('More information: Phase descriptions') %>"> - +
+
+ <%= f.label :title %> + <%= f.text_field :title, as: :string, + class: "text_field has-tooltip", "data-toggle" => "tooltip", "title" => _('Enter a title for the phase e.g. intial DMP, full DMP... This is what users will see in the tabs when completing a plan. If you only have one phase, call it something generic e.g. Glasgow DMP') %>
-
+
+ <%= f.label _('Order of display'), for: :number %> + <%= f.number_field :number, in: 1..5, class: "number_field has-tooltip", "data-toggle" => "tooltip", title: _('This allows you to order the phases of your template.') %> +
+
+ <%= f.label :description %> + <%= text_area_tag("phase-desc","" , class: "tinymce") %> +
+ " + aria-label="<%= _('More information: Phase descriptions') %>"> + +
+
-
-
-
 
- <%= f.submit _('Save'), class: "btn btn-primary" %> - <%= link_to _('Cancel'), admin_template_template_path(@template), class: "btn cancel" %> -
-
- <% end %> +
+
+
 
+ <%= f.submit _('Save'), class: "btn btn-primary" %> + <%= link_to _('Cancel'), admin_template_template_path(@template), class: "btn cancel" %> +
+ + <% end %> +
-
-
-
+
+
-
-
+
+
+
<%= tinymce :content_css => asset_path('application.css') %> \ No newline at end of file diff --git a/app/views/phases/admin_preview.html.erb b/app/views/phases/admin_preview.html.erb index 95b1b6a..0b7f689 100644 --- a/app/views/phases/admin_preview.html.erb +++ b/app/views/phases/admin_preview.html.erb @@ -13,46 +13,48 @@
-
+
+
+ + <%= render partial: "templates/admin_nav_tabs", locals: {template: @template, active: @phase.id} %> - -<%= render partial: "templates/admin_nav_tabs", locals: {template: @template, active: @phase.id} %> + +
+
+ <% sections = @phase.sections %> + <% sections.order(:number).each do |section| %> +
+
+ +
+ <%= section.title %> +
+ + + +
+
+
+ <%= raw section.description %> +
+
+ <% last_question_id = section.questions.order("number DESC").first.id%> - -
-
- <% sections = @phase.sections %> - <% sections.order(:number).each do |section| %> -
-
- -
- <%= section.title %> -
- - - -
-
-
- <%= raw section.description %> -
-
- <% last_question_id = section.questions.order("number DESC").first.id%> + <% section.questions.order("number").each do |question| %> + + <%= render partial: 'questions/preview_question', locals: {question: question}%> + <% if last_question_id == question.id then %> +
+ <% else %> +
+ <% end %> - <% section.questions.order("number").each do |question| %> - - <%= render partial: 'questions/preview_question', locals: {question: question}%> - <% if last_question_id == question.id then %> -
- <% else %> -
- <% end %> - - <% end %> -
-
-
- <% end %> -
+ <% end %> +
+
+
+ <% end %> +
+
+
\ No newline at end of file diff --git a/app/views/phases/admin_show.html.erb b/app/views/phases/admin_show.html.erb index acdd174..34c8309 100644 --- a/app/views/phases/admin_show.html.erb +++ b/app/views/phases/admin_show.html.erb @@ -1,57 +1,57 @@ <% javascript 'admin.js' %> -

- <%= @phase.template.title %> -

+

<%= @phase.template.title %>

-
-
- - <%= render partial: "templates/admin_nav_tabs", locals: {template: @phase.template, active: @phase.id, edit: @edit, current: @current} %> +
+
+
+ + <%= render partial: "templates/admin_nav_tabs", locals: {template: @phase.template, active: @phase.id, edit: @edit, current: @current} %> -
- -
+
+ +
-
-

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

+
+

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

- -
-
+ +
+
- -
- <%= render partial: "phases/show_phase", locals: {phase: @phase}%> -
- <% if @phase.modifiable && @edit %> -
+ + + <% @sections.order("number ASC").each do |section| %> +

<%= section.title %>

+
+ <% if @edit && section.modifiable %> + <%= render partial: 'sections/edit_section', locals: {section: section, edit: @edit, phase: @phase} %> + <% else %> + <%= render partial: 'sections/show_section', locals: {section: section}%> + <% end %> +
+ <% end %> + + <% if @edit || @phase.template.customization_of.present? %> +

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

+ + + <% end %>
- - - <% @sections.order("number ASC").each do |section| %> -

<%= section.title %>

-
- <% if @edit && section.modifiable %> - <%= render partial: 'sections/edit_section', locals: {section: section, edit: @edit, phase: @phase} %> - <% else %> - <%= render partial: 'sections/show_section', locals: {section: section}%> - <% end %> -
- <% end %> - - <% if @edit || @phase.template.customization_of.present? %> -

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

- - - <% end %>
diff --git a/app/views/phases/edit.html.erb b/app/views/phases/edit.html.erb index e6c5e3c..448e01d 100644 --- a/app/views/phases/edit.html.erb +++ b/app/views/phases/edit.html.erb @@ -1,5 +1,3 @@ -<%- model_class = Plan -%> - <% javascript('views/answers/status.js') %> <% javascript('views/notes/index.js') %>

<%= @plan.title %>

-
-
- - - -
-
+ +
+
-
-
- expand all - | - collapse all +
+
+ expand all + | + collapse all +
+
+ <%= render :partial => "/plans/progress", locals: { plan: @plan } %> +
-
- <%= render :partial => "/plans/progress", locals: { plan: @plan } %> -
-
-
- <% @phase.sections.order(:number).each do |section| %> - <% sectionid = section.id %> +
+ <% @phase.sections.order(:number).each do |section| %> + <% sectionid = section.id %> -

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

- -
- -
<%= raw section.description %>
- - - - - -
- <% section.questions.each do |question| %> - <% if question.id == session[:question_id_comments].to_i then id_css = "current_question" end %> -
- - <% - # Load the answer or create a new one - answers = question.plan_answers(@plan.id) - if answers.present? - answer = answers.first - else - answer = Answer.new({plan_id: @plan.id, - question_id: question.id, - user_id: current_user.id }) - if question.default_value.present? - answer.text = question.default_value - end - end - %> - - -
-
-
" class="answer-locking">
-
"> - <%= render(partial: 'answers/new_edit', - locals: { question: question, answer: answer, readonly: @readonly }) %> -
-
-
- - - -
- <%= render partial: 'guidance_section', - locals: {plan: @plan, question: question, answer: answer, - question_guidances: @question_guidances} %> -
-
- <% end %> - -
- - -
-
-
+
+
+
+
diff --git a/app/views/plans/new.html.erb b/app/views/plans/new.html.erb index 0147e38..9453750 100644 --- a/app/views/plans/new.html.erb +++ b/app/views/plans/new.html.erb @@ -1,95 +1,95 @@ <% javascript "views/plans/new.js" %> -

<%= _('Create a new plan') %>

<%= _("Before you get started, we need some information about your research project to set you up with the best DMP template for your needs.") %>

-
- <%= form_for @plan, html: {method: :post, class: "roadmap-form padded bordered"}, remote: true do |f| %> -
+
+
+ <%= form_for @plan, html: {method: :post, class: "roadmap-form padded bordered"}, remote: true do |f| %> +
- -
- <%= _('What research project are you planning?') %> - -
- <%= f.text_field(:title, class: 'left-indent input-large', - 'data-toggle': 'tooltip', - 'data-content': _('If applying for funding, state the project title exactly as in the proposal.')) %> - <%= check_box_tag(:is_test, "1", false, class: 'left-indent') %> - <%= label_tag(:is_test, _('mock project for testing, practice, or educational purposes'), class: 'inline checkbox-label') %> -
-
- - -
- <%= _('Select the primary research organisation') %> + +
+ <%= _('What research project are you planning?') %> -
- <%= render partial: "shared/accessible_combobox", - locals: {name: 'plan[org_name]', - id: 'plan_org_name', - default_selection: @default_org, - models: @orgs, - attribute: 'name', - tooltip: _('Please select a valid research organisation from the list.'), - error: _('You must select a research organisation from the list.'), - classes: 'input-large'} %> -
- -
-

- <%= _('or') %> -

- <%= check_box_tag(:plan_no_org) %> - <%= label_tag(:plan_no_org, raw(" - #{_('My research organisation is not on the list')} - #{_(' or ')} - #{_('no research organisation is associated with this plan')} - "), class: 'checkbox-label') %> -
-
- - -
- <%= _('Select the primary funding organisation') %> - -
- <%= render partial: "shared/accessible_combobox", - locals: {name: 'plan[funder_name]', - id: 'plan_funder_name', - default_selection: nil, - models: @funders, - attribute: 'name', - tooltip: _('Please select a valid funding organisation from the list.'), - error: _('You must select a funding organisation from the list.'), - classes: 'input-large'} %> -
-
-

- <%= _('or') %> -

- <%= check_box_tag(:plan_no_funder) %> - <%= label_tag(:plan_no_funder, _('No funder associated with this plan'), class: 'checkbox-label') %> -
-
+
+ <%= f.text_field(:title, class: 'left-indent input-large', + 'data-toggle': 'tooltip', + 'data-content': _('If applying for funding, state the project title exactly as in the proposal.')) %> + <%= check_box_tag(:is_test, "1", false, class: 'left-indent') %> + <%= label_tag(:is_test, _('mock project for testing, practice, or educational purposes'), class: 'inline checkbox-label') %> +
+
- -
-
+ +
+ <%= _('Select the primary research organisation') %> -
+
+ <%= render partial: "shared/accessible_combobox", + locals: {name: 'plan[org_name]', + id: 'plan_org_name', + default_selection: @default_org, + models: @orgs, + attribute: 'name', + tooltip: _('Please select a valid research organisation from the list.'), + error: _('You must select a research organisation from the list.'), + classes: 'input-large'} %> +
+ +
+

- <%= _('or') %> -

+ <%= check_box_tag(:plan_no_org) %> + <%= label_tag(:plan_no_org, raw(" + #{_('My research organisation is not on the list')} + #{_(' or ')} + #{_('no research organisation is associated with this plan')} + "), class: 'checkbox-label') %> +
+ + + +
+ <%= _('Select the primary funding organisation') %> -
-
- <%= f.hidden_field(:template_id) %> - <%= f.hidden_field(:visibility, value: @is_test ? 'is_test' : Rails.application.config.default_plan_visibility) %> - <%= render partial: 'shared/accessible_submit_button', - locals: {id: 'create_plan_submit', - val: 'Create Plan', - disabled_initially: true, - classes: "left-indent", - tooltip: _('You can not continue until you have filled in all of the required information.')} %> +
+ <%= render partial: "shared/accessible_combobox", + locals: {name: 'plan[funder_name]', + id: 'plan_funder_name', + default_selection: nil, + models: @funders, + attribute: 'name', + tooltip: _('Please select a valid funding organisation from the list.'), + error: _('You must select a funding organisation from the list.'), + classes: 'input-large'} %> +
+
+

- <%= _('or') %> -

+ <%= check_box_tag(:plan_no_funder) %> + <%= label_tag(:plan_no_funder, _('No funder associated with this plan'), class: 'checkbox-label') %> +
+
+ + +
+
+
- - <% end %> + +
+
+ <%= f.hidden_field(:template_id) %> + <%= f.hidden_field(:visibility, value: @is_test ? 'is_test' : Rails.application.config.default_plan_visibility) %> + <%= render partial: 'shared/accessible_submit_button', + locals: {id: 'create_plan_submit', + val: 'Create Plan', + disabled_initially: true, + classes: "left-indent", + tooltip: _('You can not continue until you have filled in all of the required information.')} %> +
+
+ <% end %> +
- diff --git a/app/views/plans/share.html.erb b/app/views/plans/share.html.erb index 213d397..ff17499 100644 --- a/app/views/plans/share.html.erb +++ b/app/views/plans/share.html.erb @@ -1,141 +1,142 @@ <% javascript('views/plans/share.js') %> -

<%= @plan.title %>

- -
-
- - - -

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

+ +
+
diff --git a/app/views/plans/show.html.erb b/app/views/plans/show.html.erb index d9d3809..b96c8c9 100644 --- a/app/views/plans/show.html.erb +++ b/app/views/plans/show.html.erb @@ -1,38 +1,41 @@ -

<%= @plan.title %>

+

<%= @plan.title %>

-
-
- - + + +
+
+ <% 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 6bf37d2..4d23e85 100644 --- a/app/views/plans/show_export.html.erb +++ b/app/views/plans/show_export.html.erb @@ -1,118 +1,119 @@ <%- model_class = Plan -%> <% javascript('views/plans/export_configure.js') %> -

<%= @plan.title %>

-
-
- - - + + +
+ +
+ +

<%= _("Download Settings") %>

+
+ <%= form_tag( export_plan_path(@plan), method: :get, html: {class: "roadmap-form"}) do |f| %> + <% if @phase_options.length > 1 %> +
+ <%= label_tag(:phase_id, _("Select phase to download")) %> + <%= select_tag(:phase_id, options_for_select(@phase_options, @phase_options[0])) %> +
+ <% else %> + <%= hidden_field_tag(:phase_id, @phase_options[0][1]) %> + <% end %> +

<%= _("Optional plan components") %>

- <%= label_tag(:phase_id, _("Select phase to download")) %> - <%= select_tag(:phase_id, options_for_select(@phase_options, @phase_options[0])) %> + <%= check_box_tag 'export[project_details]', true, false %> + <%= label_tag 'export[project_details]', _('project details coversheet'), class: 'checkbox-label' %>
- <% else %> - <%= hidden_field_tag(:phase_id, @phase_options[0][1]) %> +
+ <%= check_box_tag 'export[question_headings]', true, true, class: 'question-headings'%> + <%= label_tag 'export[question_headings]', _('question text and section headings'), class: 'checkbox-label' %> +
+
+ <%= check_box_tag 'export[unanswered_questions]', true, true, class: 'unanswered-questions' %> + <%= label_tag 'export[unanswered_questions]', _('unanswered questions'), class: 'checkbox-label' %> +
+ <% if @plan.template.customization_of.present? %> +
+ <%= check_box_tag 'export[custom_sections]', true, false %> + <%= label_tag 'export[custom_sections]', _('supplementary section(s) not requested by funding organisation'), class: 'checkbox-label' %> +
+ <% end %> + + +
+
+ <%= label_tag(:format, _('Format')) %> + <%= select_tag(:format, options_for_select(ExportedPlan::VALID_FORMATS, :pdf), class: 'export-format-selection') %> +
+ + +
+
+

<%= _('PDF Formatting') %>

+
+ <%= _('Font') -%> +
+ <%= label_tag("export[formatting][font_face]", _('Face')) %> + <%= select_tag("export[formatting][font_face]", options_for_select(Settings::Template::VALID_FONT_FACES, @export_settings.formatting[:font_face]), { "data-default" => @plan.template.settings(:export).formatting[:font_face] }) %> +
+
+ <%= label_tag("export[formatting][font_size]", _('Size') + " (pt)") %> + <%= select_tag("export[formatting][font_size]", options_for_select(Settings::Template::VALID_FONT_SIZE_RANGE.to_a, @export_settings.formatting[:font_size]), { "data-default" => @plan.template.settings(:export).formatting[:font_size] }) %> +
+
+
+ <%= _('Margin') -%> (mm) +
+ <%= label_tag("export[formatting][margin][top]", _('Top')) %> + <%= select_tag("export[formatting][margin][top]", options_for_select(Settings::Template::VALID_MARGIN_RANGE.to_a, @export_settings.formatting[:margin][:top]), { "data-default" => @plan.template.settings(:export).formatting[:margin][:top] }) %> +
+
+ <%= label_tag("export[formatting][margin][bottom]", _('Bottom')) %> + <%= select_tag("export[formatting][margin][bottom]", options_for_select(Settings::Template::VALID_MARGIN_RANGE.to_a, @export_settings.formatting[:margin][:bottom]), { "data-default" => @plan.template.settings(:export).formatting[:margin][:bottom] }) %> +
+
+ <%= label_tag("export[formatting][margin][left]", _('Left')) %> + <%= select_tag("export[formatting][margin][left]", options_for_select(Settings::Template::VALID_MARGIN_RANGE.to_a, @export_settings.formatting[:margin][:left]), { "data-default" => @plan.template.settings(:export).formatting[:margin][:left] }) %> +
+
+ <%= label_tag("export[formatting][margin][right]", _('Right')) %> + <%= select_tag("export[formatting][margin][right]", options_for_select(Settings::Template::VALID_MARGIN_RANGE.to_a, @export_settings.formatting[:margin][:right]), { "data-default" => @plan.template.settings(:export).formatting[:margin][:rigth] }) %> +
+
+
+ +
+
 
+ <%= submit_tag _('Download Plan'), class: 'btn btn-primary', role: 'button' %> +
+ <% end %> -

<%= _("Optional plan components") %>

-
- <%= check_box_tag 'export[project_details]', true, false %> - <%= label_tag 'export[project_details]', _('project details coversheet'), class: 'checkbox-label' %> -
-
- <%= check_box_tag 'export[question_headings]', true, true, class: 'question-headings'%> - <%= label_tag 'export[question_headings]', _('question text and section headings'), class: 'checkbox-label' %> -
-
- <%= check_box_tag 'export[unanswered_questions]', true, true, class: 'unanswered-questions' %> - <%= label_tag 'export[unanswered_questions]', _('unanswered questions'), class: 'checkbox-label' %> -
- <% if @plan.template.customization_of.present? %> -
- <%= check_box_tag 'export[custom_sections]', true, false %> - <%= label_tag 'export[custom_sections]', _('supplementary section(s) not requested by funding organisation'), class: 'checkbox-label' %> -
- <% end %> - - -
-
- <%= label_tag(:format, _('Format')) %> - <%= select_tag(:format, options_for_select(ExportedPlan::VALID_FORMATS, :pdf), class: 'export-format-selection') %> -
- - -
-
-

<%= _('PDF Formatting') %>

-
- <%= _('Font') -%> -
- <%= label_tag("export[formatting][font_face]", _('Face')) %> - <%= select_tag("export[formatting][font_face]", options_for_select(Settings::Template::VALID_FONT_FACES, @export_settings.formatting[:font_face]), { "data-default" => @plan.template.settings(:export).formatting[:font_face] }) %> -
-
- <%= label_tag("export[formatting][font_size]", _('Size') + " (pt)") %> - <%= select_tag("export[formatting][font_size]", options_for_select(Settings::Template::VALID_FONT_SIZE_RANGE.to_a, @export_settings.formatting[:font_size]), { "data-default" => @plan.template.settings(:export).formatting[:font_size] }) %> -
-
-
- <%= _('Margin') -%> (mm) -
- <%= label_tag("export[formatting][margin][top]", _('Top')) %> - <%= select_tag("export[formatting][margin][top]", options_for_select(Settings::Template::VALID_MARGIN_RANGE.to_a, @export_settings.formatting[:margin][:top]), { "data-default" => @plan.template.settings(:export).formatting[:margin][:top] }) %> -
-
- <%= label_tag("export[formatting][margin][bottom]", _('Bottom')) %> - <%= select_tag("export[formatting][margin][bottom]", options_for_select(Settings::Template::VALID_MARGIN_RANGE.to_a, @export_settings.formatting[:margin][:bottom]), { "data-default" => @plan.template.settings(:export).formatting[:margin][:bottom] }) %> -
-
- <%= label_tag("export[formatting][margin][left]", _('Left')) %> - <%= select_tag("export[formatting][margin][left]", options_for_select(Settings::Template::VALID_MARGIN_RANGE.to_a, @export_settings.formatting[:margin][:left]), { "data-default" => @plan.template.settings(:export).formatting[:margin][:left] }) %> -
-
- <%= label_tag("export[formatting][margin][right]", _('Right')) %> - <%= select_tag("export[formatting][margin][right]", options_for_select(Settings::Template::VALID_MARGIN_RANGE.to_a, @export_settings.formatting[:margin][:right]), { "data-default" => @plan.template.settings(:export).formatting[:margin][:rigth] }) %> -
-
-
- -
-
 
- <%= submit_tag _('Download Plan'), class: 'btn btn-primary', role: 'button' %> -
- - <% end %> -
+ +
diff --git a/app/views/public_pages/plan_index.html.erb b/app/views/public_pages/plan_index.html.erb index 501abad..420972e 100644 --- a/app/views/public_pages/plan_index.html.erb +++ b/app/views/public_pages/plan_index.html.erb @@ -1,55 +1,56 @@ <%- model_class = Plan -%> +

<%= raw _('Public DMPs') %>

-

- <%= raw _('Public DMPs') %> -

+
+
+ + <% if @plans.count > 0 %> +

+ <%= _('Public DMPs are plans created using the %{application_name} and shared publicly by their owners. They are not vetted for quality, completeness, or adherence to funder guidelines.') % {application_name: Rails.application.config.branding[:application][:name]} %> +

+ <% else %> +

+ <%= _("There are currently no public DMPs.")%> +

+ <% end %> - -<% if @plans.count > 0 %> -

- <%= _('Public DMPs are plans created using the %{application_name} and shared publicly by their owners. They are not vetted for quality, completeness, or adherence to funder guidelines.') % {application_name: Rails.application.config.branding[:application][:name]} %> -

-<% else %> -

- <%= _("There are currently no public DMPs.")%> -

-<% end %> - -<% if @plans.count > 0 %> -
- - - <% if @plans.count > 10 %> - - - - <% end %> - - - - - - - - - - <% @plans.each do |plan| %> - - - - - - - - <% end %> - -
- <%= render(partial: "shared/table_filter", - locals: {path: public_plans_path, placeholder: _('Filter plans')}) %> -
<%= _('Project Title') %><%= _('Template') %><%= _('Institution') %><%= _('Owner') %><%= _('Download') %>
<%= plan.title %><%= plan.template.title %><%= (plan.owner.nil? || plan.owner.org.nil? ? _('Not Applicable') : plan.owner.org.name) %><%= (plan.owner.nil? ? _('Unknown') : plan.owner.name(false)) %> - <%= link_to _('PDF'), - plan_export_path(plan, format: :pdf), - class: "dmp_table_link" %> -
-
-<% end %> + <% if @plans.count > 0 %> +
+ + + <% if @plans.count > 10 %> + + + + <% end %> + + + + + + + + + + <% @plans.each do |plan| %> + + + + + + + + <% end %> + +
+ <%= render(partial: "shared/table_filter", + locals: {path: public_plans_path, placeholder: _('Filter plans')}) %> +
<%= _('Project Title') %><%= _('Template') %><%= _('Institution') %><%= _('Owner') %><%= _('Download') %>
<%= plan.title %><%= plan.template.title %><%= (plan.owner.nil? || plan.owner.org.nil? ? _('Not Applicable') : plan.owner.org.name) %><%= (plan.owner.nil? ? _('Unknown') : plan.owner.name(false)) %> + <%= link_to _('PDF'), + plan_export_path(plan, format: :pdf), + class: "dmp_table_link" %> +
+
+ <% end %> +
+
\ No newline at end of file diff --git a/app/views/public_pages/template_index.html.erb b/app/views/public_pages/template_index.html.erb index a6097db..b6316af 100644 --- a/app/views/public_pages/template_index.html.erb +++ b/app/views/public_pages/template_index.html.erb @@ -1,45 +1,44 @@ -<%- model_class = Template -%> +

<%= raw _('DMP Templates') %>

-

- <%= raw _('DMP Templates') %> -

+
+
+ <% if @templates.count > 0 %> +

<%= _('Templates are provided by a funder, an institution, or a trusted party.') %>

+ <% else %> +

<%= _('There are currently no public Templates.')%>

+ <% end %> - -<% if @templates.count > 0 %> -

<%= _('Templates are provided by a funder, an institution, or a trusted party.') %>

-<% else %> -

<%= _('There are currently no public Templates.')%>

-<% end %> - -<% if @templates.count > 0 %> -
- - - <% if @templates.count > 10 %> - - - - <% end %> - - - - - - - - <% @templates.each do |template| %> - - - - - - <% end %> -
- <%= render(partial: "shared/table_filter", - locals: {path: public_templates_path, placeholder: _('Filter templates')}) %> -
<%= _('Template Name') %><%= _('Organisation Name') %><%= _('Download') %>
<%= template.title %><%= template.org.name %> - <%= link_to _('DOCX'), template_export_path(template.dmptemplate_id, format: :docx) %> - <%= link_to _('PDF'), template_export_path(template.dmptemplate_id, format: :pdf) %> -
+ <% if @templates.count > 0 %> +
+ + + <% if @templates.count > 10 %> + + + + <% end %> + + + + + + + + <% @templates.each do |template| %> + + + + + + <% end %> +
+ <%= render(partial: "shared/table_filter", + locals: {path: public_templates_path, placeholder: _('Filter templates')}) %> +
<%= _('Template Name') %><%= _('Organisation Name') %><%= _('Download') %>
<%= template.title %><%= template.org.name %> + <%= link_to _('DOCX'), template_export_path(template.dmptemplate_id, format: :docx) %> + <%= link_to _('PDF'), template_export_path(template.dmptemplate_id, format: :pdf) %> +
+
+ <% end %>
-<% 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 35a0331..4c50c50 100644 --- a/app/views/static_pages/about_us.html.erb +++ b/app/views/static_pages/about_us.html.erb @@ -1,9 +1,7 @@ +

<%= _('About %{application_name}') % { :application_name => Rails.configuration.branding[:application][:name] } %>

+
-

- <%= _('About %{application_name}') % { :application_name => Rails.configuration.branding[:application][:name] } %> -

-