diff --git a/app/views/devise/confirmations/new.html.erb b/app/views/devise/confirmations/new.html.erb index f5fadfb..27db57a 100644 --- a/app/views/devise/confirmations/new.html.erb +++ b/app/views/devise/confirmations/new.html.erb @@ -1,12 +1,20 @@ -

<%= t('custom_devise.resend_confirmation') %>

+
+
+

<%= t('custom_devise.resend_confirmation') %>

+
+
-<%= form_for(resource, :as => resource_name, :url => confirmation_path(resource_name), :html => { :method => :post }) do |f| %> - <%= devise_error_messages! %> +
+
+ <%= form_for(resource, :as => resource_name, :url => confirmation_path(resource_name), :html => { :method => :post }) do |f| %> + <%= devise_error_messages! %> -
<%= f.label :email %>
- <%= f.email_field :email, :autofocus => true %>
+
<%= f.label :email %>
+ <%= f.email_field :email, :autofocus => true %>
-
<%= f.submit t('custom_devise.resend_confirmation') %>
-<% end %> +
<%= f.submit t('custom_devise.resend_confirmation') %>
+ <% end %> -<%= render "devise/shared/links" %> + <%= render "devise/shared/links" %> +
+
\ No newline at end of file diff --git a/app/views/devise/invitations/edit.html.erb b/app/views/devise/invitations/edit.html.erb index 4a4b73e..7720b7f 100644 --- a/app/views/devise/invitations/edit.html.erb +++ b/app/views/devise/invitations/edit.html.erb @@ -1,15 +1,23 @@ -

<%= t "devise.invitations.edit.header" %>

-
- <%= form_for resource, :as => resource_name, :url => invitation_path(resource_name), :html => { :method => :put } do |f| %> - <%= devise_error_messages! %> - <%= f.hidden_field :invitation_token %> - -

<%= f.label :password %>
- <%= f.password_field :password %>

- -

<%= f.label :password_confirmation %>
- <%= f.password_field :password_confirmation %>

- -

<%= f.submit t("devise.invitations.edit.submit_button") %>

- <% end %> -
+
+
+

<%= t "devise.invitations.edit.header" %>

+
+
+ +
+
+ <%= form_for resource, :as => resource_name, :url => invitation_path(resource_name), :html => { :method => :put } do |f| %> + <%= devise_error_messages! %> + <%= f.hidden_field :invitation_token %> + +

<%= f.label :password %>
+ <%= f.password_field :password %>

+ +

<%= f.label :password_confirmation %>
+ <%= f.password_field :password_confirmation %>

+ +

<%= f.submit t("devise.invitations.edit.submit_button") %>

+ <% end %> +
+
+ diff --git a/app/views/devise/invitations/new.html.erb b/app/views/devise/invitations/new.html.erb index 3567356..5aee6f2 100644 --- a/app/views/devise/invitations/new.html.erb +++ b/app/views/devise/invitations/new.html.erb @@ -1,14 +1,20 @@ -

<%= t "devise.invitations.new.header" %>

-
- <%= form_for resource, :as => resource_name, :url => invitation_path(resource_name), :html => {:method => :post} do |f| %> - <%= devise_error_messages! %> - - <% resource.class.invite_key_fields.each do |field| -%> -

<%= f.label field %>
- <%= f.text_field field %>

- <% end -%> - -

<%= f.submit t("devise.invitations.new.submit_button") %>

- <% end %> +
+
+

<%= t "devise.invitations.new.header" %>

+
+
+
+
+ <%= form_for resource, :as => resource_name, :url => invitation_path(resource_name), :html => {:method => :post} do |f| %> + <%= devise_error_messages! %> + + <% resource.class.invite_key_fields.each do |field| -%> +

<%= f.label field %>
+ <%= f.text_field field %>

+ <% end -%> + +

<%= f.submit t("devise.invitations.new.submit_button") %>

+ <% end %> +
\ No newline at end of file diff --git a/app/views/devise/passwords/edit.html.erb b/app/views/devise/passwords/edit.html.erb index 93dbcfc..27cc107 100644 --- a/app/views/devise/passwords/edit.html.erb +++ b/app/views/devise/passwords/edit.html.erb @@ -1,26 +1,31 @@ -

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

-
+
+
+

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

+
+
- <%= form_for(resource, :as => resource_name, :url => password_path(resource_name), :html => { :method => :put }) do |f| %> - <%= devise_error_messages! %> - <%= f.hidden_field :reset_password_token %> -
- - - - - - - - - -
<%= t('helpers.new_password') %><%= f.password_field :password, :autofocus => true %>
<%= t('helpers.password') %><%= f.password_field :password_confirmation %>
-
- <%= f.submit t('helpers.save'), :class => 'btn btn-primary', role: 'button'%> -
-
- <% end %> +
+
+ <%= form_for(resource, :as => resource_name, :url => password_path(resource_name), :html => { :method => :put }) do |f| %> + <%= devise_error_messages! %> + <%= f.hidden_field :reset_password_token %> +
+ + + + + + + + + +
<%= t('helpers.new_password') %><%= f.password_field :password, :autofocus => true %>
<%= t('helpers.password') %><%= f.password_field :password_confirmation %>
+
+ <%= f.submit t('helpers.save'), :class => 'btn btn-primary', role: 'button'%> +
+
+ <% end %> - <%= render "devise/shared/links" %> - -
+ <%= render "devise/shared/links" %> +
+
diff --git a/app/views/devise/passwords/new.html.erb b/app/views/devise/passwords/new.html.erb index 0927721..b6718cc 100644 --- a/app/views/devise/passwords/new.html.erb +++ b/app/views/devise/passwords/new.html.erb @@ -1,31 +1,37 @@ <% javascript "views/devise/passwords/new.js" %> -<% unless @user.errors[:email].empty? %> -

<%= _('The email address you entered is not registered.') %>

-<% end %> +
+
+ <% unless @user.errors[:email].empty? %> +

<%= _('The email address you entered is not registered.') %>

+ <% end %> + +

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

-

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

+

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

+
+
-

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

+
+
+ <%= form_for resource, as: 'user', url: user_password_path, html: {class: "password-reset roadmap-form", method: :post} do |f| %> -
- <%= form_for resource, as: 'user', url: user_password_path, html: {class: "password-reset roadmap-form", method: :post} do |f| %> +
+
+ <%= f.label(:email, _('Email'), class: 'required') %> + <%= f.email_field(:email, class: 'left-indent required input-small') %> + +
-
-
- <%= f.label(:email, _('Email'), class: 'required') %> - <%= f.email_field(:email, class: 'left-indent required input-small') %> - -
- -
- <%= render partial: 'shared/accessible_submit_button', - locals: {id: 'password-reset-button', - val: _('Send'), - disabled_initially: true, - classes: 'left-indent', - tooltip: _('Enter a valid email.')} %> -
-
- <% end %> +
+ <%= render partial: 'shared/accessible_submit_button', + locals: {id: 'password-reset-button', + val: _('Send'), + disabled_initially: true, + classes: 'left-indent', + tooltip: _('Enter a valid email.')} %> +
+
+ <% 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 15c6fe9..8d301df 100644 --- a/app/views/devise/registrations/edit.html.erb +++ b/app/views/devise/registrations/edit.html.erb @@ -1,5 +1,9 @@ <% javascript "views/devise/registrations/edit.js" %> -

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

+
+
+

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

+
+
diff --git a/app/views/devise/registrations/new.html.erb b/app/views/devise/registrations/new.html.erb index 0c689be..d9242fa 100644 --- a/app/views/devise/registrations/new.html.erb +++ b/app/views/devise/registrations/new.html.erb @@ -1,13 +1,19 @@ -

<%= _('Create account') %>

-<% unless session["devise.shibboleth_data"].nil? %> -

- <%= (_("%{application_name} doesn't recognise your institutional credentials - either you haven't created an account with us or you haven't linked these details to your existing account.
* If you do not have an account with %{application_name}, please complete the form below.
* If you have an account with %{application_name}, please Sign in so we can link your account to your institutional credentials.
Once you have created and/or linked your account, you'll be able to sign in with your institutional credentials directly.") % { :application_name => Rails.configuration.branding[:application][:name] }).html_safe %> -

- <% cookies[:show_shib_link] = { value: 'show_shib_link', expires: 3.hours.from_now } %> -<% end %> - -
-
- - <%= render :partial => 'shared/register_form', locals: {extended: true} %> -
+
+
+

<%= _('Create account') %>

+ + <% unless session["devise.shibboleth_data"].nil? %> +

+ <%= (_("%{application_name} doesn't recognise your institutional credentials - either you haven't created an account with us or you haven't linked these details to your existing account.
* If you do not have an account with %{application_name}, please complete the form below.
* If you have an account with %{application_name}, please Sign in so we can link your account to your institutional credentials.
Once you have created and/or linked your account, you'll be able to sign in with your institutional credentials directly.") % { :application_name => Rails.configuration.branding[:application][:name] }).html_safe %> +

+ <% cookies[:show_shib_link] = { value: 'show_shib_link', expires: 3.hours.from_now } %> + <% end %> +
+
+ +
+
+ + <%= render :partial => 'shared/register_form', locals: {extended: true} %> +
+
diff --git a/app/views/devise/sessions/new.html.erb b/app/views/devise/sessions/new.html.erb index 90556a7..34c952a 100644 --- a/app/views/devise/sessions/new.html.erb +++ b/app/views/devise/sessions/new.html.erb @@ -1,33 +1,39 @@ -

<%= _('Sign in') %>

-
+
+
+

<%= _('Sign in') %>

+
+
- <%= form_for(resource, :as => resource_name, :url => session_path(resource_name)) do |f| %> -
- - - - - - - - - - - - - -
<%= _('Email') %><%= f.email_field :email, :autofocus => true %>
<%= _('Password') %><%= f.password_field :password %>
<% if devise_mapping.rememberable? -%> -
- <%= f.check_box :remember_me %> - <%= f.label :remember_me %> -
- <% end -%> -
-
- <%= f.submit _('Sign in'), :class => "btn btn-primary" %> -
-
- <% end %> - - <%= render "devise/shared/links" %> +
+
+ <%= form_for(resource, :as => resource_name, :url => session_path(resource_name)) do |f| %> +
+ + + + + + + + + + + + + +
<%= _('Email') %><%= f.email_field :email, :autofocus => true %>
<%= _('Password') %><%= f.password_field :password %>
<% if devise_mapping.rememberable? -%> +
+ <%= f.check_box :remember_me %> + <%= f.label :remember_me %> +
+ <% end -%> +
+
+ <%= f.submit _('Sign in'), :class => "btn btn-primary" %> +
+
+ <% end %> + + <%= render "devise/shared/links" %> +
diff --git a/app/views/devise/unlocks/new.html.erb b/app/views/devise/unlocks/new.html.erb index 40792b2..08db6da 100644 --- a/app/views/devise/unlocks/new.html.erb +++ b/app/views/devise/unlocks/new.html.erb @@ -1,12 +1,20 @@ -

<%= t('custom_devise.resend_unlock') %>

+
+
+

<%= t('custom_devise.resend_unlock') %>

+
+
-<%= form_for(resource, :as => resource_name, :url => unlock_path(resource_name), :html => { :method => :post }) do |f| %> - <%= devise_error_messages! %> +
+
+ <%= form_for(resource, :as => resource_name, :url => unlock_path(resource_name), :html => { :method => :post }) do |f| %> + <%= devise_error_messages! %> -
<%= f.label :email %>
- <%= f.email_field :email, :autofocus => true %>
+
<%= f.label :email %>
+ <%= f.email_field :email, :autofocus => true %>
-
<%= f.submit "Resend unlock instructions" %>
-<% end %> +
<%= f.submit "Resend unlock instructions" %>
+ <% end %> -<%= render "devise/shared/links" %> + <%= render "devise/shared/links" %> +
+
\ 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 f89dc20..bd1d437 100644 --- a/app/views/guidance_groups/admin_edit.html.erb +++ b/app/views/guidance_groups/admin_edit.html.erb @@ -1,6 +1,10 @@ <% javascript 'admin.js' %> -

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

+
+
+

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

+
+
diff --git a/app/views/guidance_groups/admin_new.html.erb b/app/views/guidance_groups/admin_new.html.erb index a34bf17..721ed63 100644 --- a/app/views/guidance_groups/admin_new.html.erb +++ b/app/views/guidance_groups/admin_new.html.erb @@ -1,6 +1,10 @@ <% javascript 'admin.js' %> -

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

+
+
+

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

+
+
diff --git a/app/views/guidances/admin_edit.html.erb b/app/views/guidances/admin_edit.html.erb index c260533..57097a1 100644 --- a/app/views/guidances/admin_edit.html.erb +++ b/app/views/guidances/admin_edit.html.erb @@ -1,6 +1,10 @@ <% javascript 'views/guidances/admin_edit.js' %> -

<%= _('Guidance') %>

+
+
+

<%= _('Guidance') %>

+
+
diff --git a/app/views/guidances/admin_index.html.erb b/app/views/guidances/admin_index.html.erb index 27b2b8a..e7298fa 100644 --- a/app/views/guidances/admin_index.html.erb +++ b/app/views/guidances/admin_index.html.erb @@ -1,10 +1,14 @@ <% 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.") %> -

+

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

+
+
diff --git a/app/views/guidances/admin_new.html.erb b/app/views/guidances/admin_new.html.erb index d86038c..b2d68de 100644 --- a/app/views/guidances/admin_new.html.erb +++ b/app/views/guidances/admin_new.html.erb @@ -1,7 +1,11 @@ <% javascript 'views/guidances/admin_edit.js' %> -

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

+
+
+

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

+
+
diff --git a/app/views/home/index.html.erb b/app/views/home/index.html.erb index ac6511e..d66a5a5 100644 --- a/app/views/home/index.html.erb +++ b/app/views/home/index.html.erb @@ -2,7 +2,11 @@

<%= _('Welcome.')%>

+
+
+
+
<%= raw _('

%{application_name} has been jointly developed by the %{organisation_name} to help you write data management plans.

') % {:application_name => Rails.configuration.branding[:application][:name], :organisation_name => Rails.configuration.branding[:organisation][:name]} %>

<%= _('Screencast on how to use %{application_name}') % {:application_name => Rails.configuration.branding[:application][:name]} %>

diff --git a/app/views/orgs/admin_edit.html.erb b/app/views/orgs/admin_edit.html.erb index f823dee..a1c18f5 100644 --- a/app/views/orgs/admin_edit.html.erb +++ b/app/views/orgs/admin_edit.html.erb @@ -1,6 +1,10 @@ <% javascript 'views/orgs/admin_edit.js' %> -

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

+
+
+

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

+
+
diff --git a/app/views/orgs/shibboleth_ds.html.erb b/app/views/orgs/shibboleth_ds.html.erb index 763fc4c..638d43f 100644 --- a/app/views/orgs/shibboleth_ds.html.erb +++ b/app/views/orgs/shibboleth_ds.html.erb @@ -1,6 +1,10 @@ <% javascript 'views/orgs/shibboleth_ds.js'%> -

Find your institution to sign in

+
+
+

Find your institution to sign in

+
+
diff --git a/app/views/phases/admin_add.html.erb b/app/views/phases/admin_add.html.erb index 9326e00..6dabbe7 100644 --- a/app/views/phases/admin_add.html.erb +++ b/app/views/phases/admin_add.html.erb @@ -1,7 +1,11 @@ <%- model_class = Phase -%> <% javascript "admin.js" %> -

<%= @template.title %>

+
+
+

<%= @template.title %>

+
+
diff --git a/app/views/phases/admin_preview.html.erb b/app/views/phases/admin_preview.html.erb index 0b7f689..0e7466a 100644 --- a/app/views/phases/admin_preview.html.erb +++ b/app/views/phases/admin_preview.html.erb @@ -1,60 +1,64 @@ <%- model_class = Phase -%> -

- <%= @template.title %> - -
- <%= link_to _('Back to edit view'), - admin_show_phase_path(id: @phase.id, edit: "true"), - class: 'btn btn-primary' %> - <%= link_to _('View all templates'), - admin_index_template_path, - class: 'btn btn-primary' %> +
+
+

+ <%= @template.title %> + +
+ <%= link_to _('Back to edit view'), + admin_show_phase_path(id: @phase.id, edit: "true"), + class: 'btn btn-primary' %> + <%= link_to _('View all templates'), + admin_index_template_path, + class: 'btn btn-primary' %> +
+

-

+
- - <%= 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 96f2aba..e7a6854 100644 --- a/app/views/phases/admin_show.html.erb +++ b/app/views/phases/admin_show.html.erb @@ -1,6 +1,10 @@ <% javascript 'admin.js' %> -

<%= @phase.template.title %>

+
+
+

<%= @phase.template.title %>

+
+
diff --git a/app/views/phases/edit.html.erb b/app/views/phases/edit.html.erb index 18c914c..22f8293 100644 --- a/app/views/phases/edit.html.erb +++ b/app/views/phases/edit.html.erb @@ -4,9 +4,12 @@ so if we come this way then we are editing a phase --> - -

<%= @plan.title %>

- +
+
+ +

<%= @plan.title %>

+
+
diff --git a/app/views/plans/new.html.erb b/app/views/plans/new.html.erb index 9453750..13297ab 100644 --- a/app/views/plans/new.html.erb +++ b/app/views/plans/new.html.erb @@ -1,9 +1,14 @@ <% 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.") %> -

+
+
+

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

+
+
diff --git a/app/views/plans/share.html.erb b/app/views/plans/share.html.erb index ff17499..6bcbb6d 100644 --- a/app/views/plans/share.html.erb +++ b/app/views/plans/share.html.erb @@ -1,6 +1,11 @@ <% javascript('views/plans/share.js') %> - -

<%= @plan.title %>

+ +
+
+ +

<%= @plan.title %>

+
+
diff --git a/app/views/plans/show.html.erb b/app/views/plans/show.html.erb index b96c8c9..85c18ec 100644 --- a/app/views/plans/show.html.erb +++ b/app/views/plans/show.html.erb @@ -1,5 +1,9 @@ - -

<%= @plan.title %>

+
+
+ +

<%= @plan.title %>

+
+
diff --git a/app/views/plans/show_export.html.erb b/app/views/plans/show_export.html.erb index 4d23e85..9cd7704 100644 --- a/app/views/plans/show_export.html.erb +++ b/app/views/plans/show_export.html.erb @@ -1,7 +1,12 @@ <%- model_class = Plan -%> <% javascript('views/plans/export_configure.js') %> - -

<%= @plan.title %>

+ +
+
+ +

<%= @plan.title %>

+
+
diff --git a/app/views/public_pages/plan_index.html.erb b/app/views/public_pages/plan_index.html.erb index 420972e..d3ba7bf 100644 --- a/app/views/public_pages/plan_index.html.erb +++ b/app/views/public_pages/plan_index.html.erb @@ -1,5 +1,10 @@ <%- model_class = Plan -%> -

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

+ +
+
+

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

+
+
diff --git a/app/views/public_pages/template_index.html.erb b/app/views/public_pages/template_index.html.erb index b6316af..4c9eb36 100644 --- a/app/views/public_pages/template_index.html.erb +++ b/app/views/public_pages/template_index.html.erb @@ -1,4 +1,8 @@ -

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

+
+
+

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

+
+
diff --git a/app/views/settings/phases/show.html.erb b/app/views/settings/phases/show.html.erb index c719d53..796bd51 100644 --- a/app/views/settings/phases/show.html.erb +++ b/app/views/settings/phases/show.html.erb @@ -1,6 +1,13 @@ +
+
+

<%= _('File Name') -%> - <%= @plan.title -%>

+

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

+
+
-

<%= _('File Name') -%> - <%= @plan.title -%>

-

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

- -<%= render "export_formatting_form" %> +
+
+ <%= render "export_formatting_form" %> +
+
diff --git a/app/views/static_pages/help.html.erb b/app/views/static_pages/help.html.erb index f863ce3..3ca4fe5 100644 --- a/app/views/static_pages/help.html.erb +++ b/app/views/static_pages/help.html.erb @@ -1,4 +1,8 @@ -

<%= _('Help')%>

+
+
+

<%= _('Help')%>

+
+
diff --git a/app/views/static_pages/roadmap.html.erb b/app/views/static_pages/roadmap.html.erb index 3804ac7..2e72ac9 100644 --- a/app/views/static_pages/roadmap.html.erb +++ b/app/views/static_pages/roadmap.html.erb @@ -1,4 +1,8 @@ -

<%= _('Future plans')%>

+
+
+

<%= _('Future plans')%>

+
+
diff --git a/app/views/static_pages/termsuse.html.erb b/app/views/static_pages/termsuse.html.erb index 866af80..37f0aa7 100644 --- a/app/views/static_pages/termsuse.html.erb +++ b/app/views/static_pages/termsuse.html.erb @@ -1,4 +1,8 @@ -

<%= _('Terms of use')%>

+
+
+

<%= _('Terms of use')%>

+
+
diff --git a/app/views/templates/admin_index.html.erb b/app/views/templates/admin_index.html.erb index 30933a9..7d16d87 100644 --- a/app/views/templates/admin_index.html.erb +++ b/app/views/templates/admin_index.html.erb @@ -1,12 +1,15 @@ -

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

+
+
+

<%= _('Templates') %>

-

- <%= _("If you wish to add an institutional template for a Data Management Plan, use the 'create template' button. You can create more than one template if desired e.g. one for researchers and one for PhD students.") %> -

-

- <%= _("Your template will be presented to users within your institution when no funder templates apply. If you want to add questions to funder templates use the 'customise template' options below.") %> -

+

+ <%= _("If you wish to add an institutional template for a Data Management Plan, use the 'create template' button. You can create more than one template if desired e.g. one for researchers and one for PhD students.") %> +

+

+ <%= _("Your template will be presented to users within your institution when no funder templates apply. If you want to add questions to funder templates use the 'customise template' options below.") %> +

+
+
diff --git a/app/views/templates/admin_new.html.erb b/app/views/templates/admin_new.html.erb index dcd6a6c..c6c148e 100644 --- a/app/views/templates/admin_new.html.erb +++ b/app/views/templates/admin_new.html.erb @@ -1,12 +1,16 @@ <% javascript "admin.js" %> -

- <%= _('New template') %> - -
- <%= link_to _('View all templates'), - admin_index_template_path, class: "btn btn-primary" %> +
+
+

+ <%= _('New template') %> + +
+ <%= link_to _('View all templates'), + admin_index_template_path, class: "btn btn-primary" %> +
+

-

+
diff --git a/app/views/templates/admin_template.html.erb b/app/views/templates/admin_template.html.erb index c833745..3d0d441 100644 --- a/app/views/templates/admin_template.html.erb +++ b/app/views/templates/admin_template.html.erb @@ -1,57 +1,62 @@ <% javascript 'admin.js' %> -

<%= @template.title %>

+ +
+
+

<%= @template.title %>

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

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

+
+

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

-
- <% if @template == @current && @template.customization_of.nil? %> - - <% end %> -
- <%= render partial: "templates/show_template", locals: {template: @template, current: @current, hash: @hash}%> -
-
+
+ <% if @template == @current && @template.customization_of.nil? %> + + <% end %> +
+ <%= render partial: "templates/show_template", locals: {template: @template, current: @current, hash: @hash}%> +
+
- - <% if @hash[:template][:phases].present? %> - <% if @hash[:template][:phases].length == 1 %> - <% @hash[:template][:phases].each do |phase_no, phase| %> - - <%= render partial: 'templates/show_phases_sections', locals: {phase: phase[:data], phase_hash: phase, template: @template, current: @current} %> - <% end %> + + <% if @hash[:template][:phases].present? %> + <% if @hash[:template][:phases].length == 1 %> + <% @hash[:template][:phases].each do |phase_no, phase| %> + + <%= render partial: 'templates/show_phases_sections', locals: {phase: phase[:data], phase_hash: phase, template: @template, current: @current} %> + <% end %> - <% else %> - <% (1..@hash[:template][:phases].length).each do |phase_no| %> - <% phase = @hash[:template][:phases][phase_no] %> -

<%= phase[:data].title %>

+ <% else %> + <% (1..@hash[:template][:phases].length).each do |phase_no| %> + <% phase = @hash[:template][:phases][phase_no] %> +

<%= phase[:data].title %>

-
- - <%= render partial: 'templates/show_phases_sections', locals: {phase: phase[:data], phase_hash: phase, template: @template, current: @current}%> -
- <% end %> - <% end %> - <% end %> -
+
+ + <%= render partial: 'templates/show_phases_sections', locals: {phase: phase[:data], phase_hash: phase, template: @template, current: @current}%> +
+ <% end %> + <% end %> + <% end %> +
-
-
-
+
+
+
-
+
diff --git a/app/views/templates/admin_template_history.html.erb b/app/views/templates/admin_template_history.html.erb index 27ef981..1b699c0 100644 --- a/app/views/templates/admin_template_history.html.erb +++ b/app/views/templates/admin_template_history.html.erb @@ -1,8 +1,12 @@ -

<%= _('Template History') %>

+
+
+

<%= _('Template History') %>

-

- <%= _('Here you can view previously published versions of your template. These can no longer be modified.')%> -

+

+ <%= _('Here you can view previously published versions of your template. These can no longer be modified.')%> +

+
+
diff --git a/app/views/token_permission_types/index.html.erb b/app/views/token_permission_types/index.html.erb index 7215979..67ed7ad 100644 --- a/app/views/token_permission_types/index.html.erb +++ b/app/views/token_permission_types/index.html.erb @@ -1,14 +1,15 @@ +
+
+ <% @token_types.each do |token_type|%> +

+ <%= token_type.token_type %> +

+
-<% @token_types.each do |token_type|%> -

- <%= token_type.token_type %> -

-
+
+ <%= token_type.text_description %> +
-
- - <%= token_type.text_description %> - -
- -<% end %> \ No newline at end of file + <% end %> +
+
\ No newline at end of file diff --git a/app/views/users/admin_grant_permissions.html.erb b/app/views/users/admin_grant_permissions.html.erb index 71386a4..69b5aa5 100644 --- a/app/views/users/admin_grant_permissions.html.erb +++ b/app/views/users/admin_grant_permissions.html.erb @@ -1,6 +1,8 @@ -

- <%= _('Edit User Privileges') %> -

+
+
+

<%= _('Edit User Privileges') %>

+
+
diff --git a/app/views/users/admin_index.html.erb b/app/views/users/admin_index.html.erb index 0ca966b..f1888fb 100644 --- a/app/views/users/admin_index.html.erb +++ b/app/views/users/admin_index.html.erb @@ -1,9 +1,11 @@ -

- <%= _('List of users') %> -

-

- <%= _('Below is a list of users registered for your organisation. You can sort the data by each field.')%> -

+
+
+

<%= _('List of users') %>

+

+ <%= _('Below is a list of users registered for your organisation. You can sort the data by each field.')%> +

+
+