|
- Security check
+ <%= t('helpers.security_check') %>
|
<%= recaptcha_tags %>
@@ -86,7 +92,7 @@
- <%= f.submit :submit, :class => "btn btn-primary", :label => "Submit" %>
+ <%= f.submit :submit, :class => "btn btn-primary", :label => t('.submit') %>
<% end %>
@@ -94,7 +100,10 @@
- <%= raw t("contact_page.address_text_html") %>
+ <%= raw t("contact_page.address_text_html",
+ organisation_name: Rails.configuration.branding[:organisation][:name],
+ organisation_email: Rails.configuration.branding[:organisation][:email],
+ application_name: Rails.configuration.branding[:application][:name],) %>
diff --git a/app/views/contact_us/contacts/new_formtastic.html.erb b/app/views/contact_us/contacts/new_formtastic.html.erb
index fe182db..8554019 100644
--- a/app/views/contact_us/contacts/new_formtastic.html.erb
+++ b/app/views/contact_us/contacts/new_formtastic.html.erb
@@ -1,8 +1,8 @@
- <%= t('.contact_us') %>
-<%= semantic_form_for @contact, :url => contacts_path do |f| %>
- <%= f.input :name, :label => t('.name') if ContactUs.require_name %>
- <%= f.input :email, :label => t('.email') %>
- <%= f.input :subject, :label => t('.subject') if ContactUs.require_subject %>
- <%= f.input :message, :as => :text, :label => t('.message') %>
- <%= f.action :submit, :label => t('.submit'), :button_html => { :alt => t('.submit'), :id => 'contact_us_contact_submit', :title => t('.submit') } %>
-<% end %>
+ <%= t('.contact_us') %>
+<%= semantic_form_for @contact, :url => contacts_path do |f| %>
+ <%= f.input :name, :label => t('.name') if ContactUs.require_name %>
+ <%= f.input :email, :label => t('.email') %>
+ <%= f.input :subject, :label => t('.subject') if ContactUs.require_subject %>
+ <%= f.input :message, :as => :text, :label => t('.message') %>
+ <%= f.action :submit, :label => t('.submit'), :button_html => { :alt => t('.submit'), :id => 'contact_us_contact_submit', :title => t('.submit') } %>
+<% end %>
diff --git a/app/views/contact_us/contacts/new_simple_form.html.erb b/app/views/contact_us/contacts/new_simple_form.html.erb
index d863cf3..b4593f0 100644
--- a/app/views/contact_us/contacts/new_simple_form.html.erb
+++ b/app/views/contact_us/contacts/new_simple_form.html.erb
@@ -1,8 +1,8 @@
- <%= t('.contact_us') %>
-<%= simple_form_for @contact, :url => contacts_path do |f| %>
- <%= f.input :name, :label => t('.name') if ContactUs.require_name %>
- <%= f.input :email, :label => t('.email') %>
- <%= f.input :subject, :label => t('.subject') if ContactUs.require_subject %>
- <%= f.input :message, :as => :text, :label => t('.message') %>
- <%= f.button :submit, :label => t('.submit'), :button_html => { :alt => t('.submit'), :id => 'contact_us_contact_submit', :title => t('.submit') } %>
-<% end %>
+ <%= t('.contact_us') %>
+<%= simple_form_for @contact, :url => contacts_path do |f| %>
+ <%= f.input :name, :label => t('.name') if ContactUs.require_name %>
+ <%= f.input :email, :label => t('.email') %>
+ <%= f.input :subject, :label => t('.subject') if ContactUs.require_subject %>
+ <%= f.input :message, :as => :text, :label => t('.message') %>
+ <%= f.button :submit, :label => t('.submit'), :button_html => { :alt => t('.submit'), :id => 'contact_us_contact_submit', :title => t('.submit') } %>
+<% end %>
diff --git a/app/views/devise/confirmations/new.html.erb b/app/views/devise/confirmations/new.html.erb
index 9c27eb7..f5fadfb 100644
--- a/app/views/devise/confirmations/new.html.erb
+++ b/app/views/devise/confirmations/new.html.erb
@@ -1,12 +1,12 @@
- Resend confirmation instructions
-
-<%= 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.submit "Resend confirmation instructions" %>
-<% end %>
-
-<%= render "devise/shared/links" %>
+ <%= t('custom_devise.resend_confirmation') %>
+
+<%= 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.submit t('custom_devise.resend_confirmation') %>
+<% end %>
+
+<%= render "devise/shared/links" %>
diff --git a/app/views/devise/invitations/edit.html.erb b/app/views/devise/invitations/edit.html.erb
index c6071dc..4a4b73e 100644
--- a/app/views/devise/invitations/edit.html.erb
+++ b/app/views/devise/invitations/edit.html.erb
@@ -1,15 +1,15 @@
- <%= 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 3602bb4..3567356 100644
--- a/app/views/devise/invitations/new.html.erb
+++ b/app/views/devise/invitations/new.html.erb
@@ -1,14 +1,14 @@
- <%= 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/mailer/confirmation_instructions.html.erb b/app/views/devise/mailer/confirmation_instructions.html.erb
index 1769a1c..c1faca5 100644
--- a/app/views/devise/mailer/confirmation_instructions.html.erb
+++ b/app/views/devise/mailer/confirmation_instructions.html.erb
@@ -1,5 +1,5 @@
- Welcome to DMPonline, <%= @email %>!
-
- Thank you for registering at DMPonline. Please confirm your email address:
-
- <%= link_to 'Click here to confirm your account', confirmation_url(@resource, :confirmation_token => @token) %> (or copy <%= confirmation_url(@resource, :confirmation_token => @token) %> into your browser).
\ No newline at end of file
+ <%= t('custom_devise.welcome_to_DMP') %>, <%= @email %>!
+
+ <%= t('custom_devise.thank_you_and_confirm') %>
+
+ <%= link_to t('custom_devise.click_to_confirm'), confirmation_url(@resource, :confirmation_token => @token) %> <%= t('custom_devise.1st_part_copy') %> <%= confirmation_url(@resource, :confirmation_token => @token) %> <%= t('custom_devise.2nd_part_copy') %>
\ No newline at end of file
diff --git a/app/views/devise/mailer/invitation_instructions.html.erb b/app/views/devise/mailer/invitation_instructions.html.erb
index 741d130..7beb75d 100644
--- a/app/views/devise/mailer/invitation_instructions.html.erb
+++ b/app/views/devise/mailer/invitation_instructions.html.erb
@@ -1,8 +1,7 @@
- Hello <%= @resource.email %>!
-
- A colleague has invited you to contribute to their Data Management Plan at <%= link_to 'DMPonline', root_url %>
-
- <%= link_to 'Click here to accept the invitation', accept_invitation_url(@resource, :invitation_token => @token) %> (or copy <%= accept_invitation_url(@resource, :invitation_token => @token) %> into your browser).
-
- If you don't want to accept the invitation, please ignore this email.
-Your account won't be created until you access the link above and set your password.
\ No newline at end of file
+ <%= t('custom_devise.hello') %> <%= @resource.email %>!
+
+ <%= t('custom_devise.colleague_invited_you') %> <%= link_to t('tool_title'), root_url %>
+
+ <%= link_to t('custom_devise.click_to_accept'), accept_invitation_url(@resource, :invitation_token => @token) %> <%= t('custom_devise.1st_part_copy') %> <%= accept_invitation_url(@resource, :invitation_token => @token) %> <%= t('custom_devise.2nd_part_copy') %>
+
+<%= t('custom_devise.ignore_wont_be_created') %>
\ No newline at end of file
diff --git a/app/views/devise/mailer/reset_password_instructions.html.erb b/app/views/devise/mailer/reset_password_instructions.html.erb
index 31f5a1f..b4c0ac6 100644
--- a/app/views/devise/mailer/reset_password_instructions.html.erb
+++ b/app/views/devise/mailer/reset_password_instructions.html.erb
@@ -1,8 +1,7 @@
- Hello <%= @resource.email %>!
-
- Someone has requested a link to change your <%= link_to "DMPonline", root_url %> password. You can do this through the link below.
-
- <%= link_to 'Change my password', edit_password_url(@resource, :reset_password_token => @token) %>
-
- If you didn't request this, please ignore this email.
- Your password won't change until you access the link above and create a new one.
+ <%= t('custom_devise.hello') %> <%= @resource.email %>!
+
+ <%= t('custom_devise.1st_part_change_password') %> <%= link_to t('tool_title'), root_url %> <%= t('custom_devise.2nd_part_change_password') %>
+
+ <%= link_to 'Change my password', edit_password_url(@resource, :reset_password_token => @token) %>
+
+<%= t('custom_devise.1st_part_change_password') %>
diff --git a/app/views/devise/mailer/unlock_instructions.html.erb b/app/views/devise/mailer/unlock_instructions.html.erb
index c1e0d78..0346189 100644
--- a/app/views/devise/mailer/unlock_instructions.html.erb
+++ b/app/views/devise/mailer/unlock_instructions.html.erb
@@ -1,7 +1,7 @@
- Hello <%= @resource.email %>!
-
- Your <%= link_to "DMPonline", root_url %> account has been locked due to an excessive number of unsuccessful sign in attempts.
-
- Click the link below to unlock your account:
-
- <%= link_to 'Unlock my account', unlock_url(@resource, :unlock_token => @token) %>
\ No newline at end of file
+ <%= t('custom_devise.hello') %> <%= @resource.email %>!
+
+ <%= t('custom_devise.1st_part_locked') %><%= link_to t('tool_title'), root_url %><%= t('custom_devise.2nd_part_locked') %>
+
+ <%= t('custom_devise.click_to_unlock') %>
+
+ <%= link_to t('custom_devise.unlock'), unlock_url(@resource, :unlock_token => @token) %>
\ 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 08fbf6c..a82a78f 100644
--- a/app/views/devise/passwords/edit.html.erb
+++ b/app/views/devise/passwords/edit.html.erb
@@ -1,26 +1,26 @@
- <%= 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' %>
-
-
- <% end %>
-
- <%= render "devise/shared/links" %>
-
-
+ <%= 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' %>
+
+
+ <% end %>
+
+ <%= render "devise/shared/links" %>
+
+
diff --git a/app/views/devise/passwords/new.html.erb b/app/views/devise/passwords/new.html.erb
index 65d7702..f95b651 100644
--- a/app/views/devise/passwords/new.html.erb
+++ b/app/views/devise/passwords/new.html.erb
@@ -1,26 +1,26 @@
- <%= t("helpers.forgot_password") %>
-
-
- <%= form_for(resource, :as => resource_name, :url => password_path(resource_name), :html => { :method => :post }) do |f| %>
- <%= devise_error_messages! %>
-
-
-
- | <%= t("helpers.email") %>
- <%= t("helpers.send_password_info")%>
-
- |
- <%= f.email_field :email, :autofocus => true , :style => "width:95%;" %> |
-
-
-
-
-
-
- <%= f.submit t("helpers.send"), :class => "btn btn-primary", :id => "send_btn" %>
-
- <% end %>
-
-<%= render "devise/shared/links" %>
-
-
+ <%= t('helpers.forgot_password') %>
+
+
+ <%= form_for(resource, :as => resource_name, :url => password_path(resource_name), :html => { :method => :post }) do |f| %>
+ <%= devise_error_messages! %>
+
+
+
+ | <%= t("helpers.email") %>
+ <%= t("helpers.send_password_info")%>
+
+ |
+ <%= f.email_field :email, :autofocus => true , :style => "width:95%;" %> |
+
+
+
+
+
+
+ <%= f.submit t("helpers.send"), :class => "btn btn-primary", :id => "send_btn" %>
+
+ <% end %>
+
+<%= render "devise/shared/links" %>
+
+
diff --git a/app/views/devise/registrations/edit.html.erb b/app/views/devise/registrations/edit.html.erb
index 3335d44..9be1fed 100644
--- a/app/views/devise/registrations/edit.html.erb
+++ b/app/views/devise/registrations/edit.html.erb
@@ -1,14 +1,14 @@
<%= t("helpers.edit_profile") %>
- <%= raw t("helpers.user_details_text_html")%>
+<%= raw t("helpers.user_details_text_html") %>
- <%= form_for(resource, :as => resource_name, :url => registration_path(resource_name), :html => { :method => :put }) do |f| %>
- <%= hidden_field_tag :unlink_flag, "false" ,:id => "unlink_flag" %>
-
-
+ <%= form_for(resource, :as => resource_name, :url => registration_path(resource_name), :html => {:method => :put}) do |f| %>
+ <%= hidden_field_tag :unlink_flag, "false", :id => "unlink_flag" %>
+
+
- <%= raw t("helpers.user_details_paragraph_html")%>
+ <%= raw t("helpers.user_details_paragraph_html") %>
@@ -38,7 +38,7 @@
| <%= t("helpers.org_type.organisation") %> |
<%= collection_select(:user,
:organisation_id, Organisation.where("parent_id IS NULL").order("name"),
- :id, :name, {include_blank: t("helpers.org_type.organisation")},
+ :id, :name, {include_blank: constant("organisation_types.organisation")},
{ :class => "typeahead org_sign_up" }) %> |
<% other_organisations = Array.new %>
@@ -51,6 +51,13 @@
:as => :string,
:class => "text_field has-tooltip reg-input", "data-toggle" => "tooltip", "data-container" => "body", "title" => t("helpers.org_type.other_org_help_text") %>
+
+ | <%= t('helpers.user_details_language') %> |
+ <%= collection_select(:user,
+ :language_id, Language.all.order("name"),
+ :id, :name, {:selected => Language.where(default_language: true).first.id},
+ {:class => "typeahead org_sign_up"}) %> |
+
| <%= t("helpers.orcid_id") %> |
<%= f.text_field :orcid_id ,
@@ -58,6 +65,16 @@
:autocomplete => "off" ,
:class => "text_field has-tooltip", "data-toggle" => "tooltip", "data-html" => "true", "title" => t("helpers.orcid_html") %> |
+ <% unless @user.api_token.nil? %>
+
+ | <%= t("helpers.api_token") %> |
+ <%= @user.api_token %> |
+
+
+ | <%= t("helpers.api_info") %> |
+ <%= link_to( t("helpers.api_use"), controller: "token_permission_types", action: "index")%> |
+
+ <% end %>
@@ -80,7 +97,7 @@
<% if devise_mapping.confirmable? && resource.pending_reconfirmation? %>
- Currently waiting confirmation for: <%= resource.unconfirmed_email %>
+ <%= t('custom_devise.waiting_for_confirmation') %><%= resource.unconfirmed_email %>
<% end %>
| <%= t("helpers.current_password") %> |
@@ -109,20 +126,20 @@
<%# = button_to "Cancel my account", registration_path(resource_name), :data => { :confirm => "Are you sure?" }, :method => :delete %>
-
+
-
-
- <%= raw t("helpers.shibboleth_unlink_dialog_text")%>
-
-
+
+
+ <%= raw t("helpers.shibboleth_unlink_dialog_text") %>
+
+
<%= t('helpers.sign_up') %>
-<% unless session[:shibboleth_data].nil? %>
-
- <%= raw t('helpers.sign_up_shibboleth_alert_text_html')%>
-
- <% cookies[:show_shib_link] = { value: 'show_shib_link', expires: 3.hours.from_now } %>
-<% end %>
-
-
-
-
- <%= render :partial => 'shared/register_form', locals: {extended: true} %>
+ <%= t('helpers.sign_up') %>
+<% unless session[:shibboleth_data].nil? %>
+
+ <%= raw t('helpers.sign_up_shibboleth_alert_text_html')%>
+
+ <% cookies[:show_shib_link] = { value: 'show_shib_link', expires: 3.hours.from_now } %>
+<% end %>
+
+
+
+
+ <%= render :partial => 'shared/register_form', locals: {extended: true} %>
\ No newline at end of file
diff --git a/app/views/devise/sessions/new.html.erb b/app/views/devise/sessions/new.html.erb
index 2f0d3bb..95c5cf1 100644
--- a/app/views/devise/sessions/new.html.erb
+++ b/app/views/devise/sessions/new.html.erb
@@ -1,33 +1,33 @@
- <%= t("helpers.sign_in") %>
-
-
- <%= form_for(resource, :as => resource_name, :url => session_path(resource_name)) do |f| %>
-
-
-
- | <%= t("helpers.email") %> |
- <%= f.email_field :email, :autofocus => true %> |
-
-
- | <%= t("helpers.password") %> |
- <%= f.password_field :password %> |
-
-
- | |
- <% if devise_mapping.rememberable? -%>
-
- <%= f.check_box :remember_me %>
- <%= f.label :remember_me %>
-
- <% end -%>
- |
-
-
-
- <%= f.submit t("helpers.sign_in"), :class => "btn btn-primary" %>
-
-
- <% end %>
-
- <%= render "devise/shared/links" %>
-
+ <%= t("helpers.sign_in") %>
+
+
+ <%= form_for(resource, :as => resource_name, :url => session_path(resource_name)) do |f| %>
+
+
+
+ | <%= t("helpers.email") %> |
+ <%= f.email_field :email, :autofocus => true %> |
+
+
+ | <%= t("helpers.password") %> |
+ <%= f.password_field :password %> |
+
+
+ | |
+ <% if devise_mapping.rememberable? -%>
+
+ <%= f.check_box :remember_me %>
+ <%= f.label :remember_me %>
+
+ <% end -%>
+ |
+
+
+
+ <%= f.submit t("helpers.sign_in"), :class => "btn btn-primary" %>
+
+
+ <% end %>
+
+ <%= render "devise/shared/links" %>
+
diff --git a/app/views/devise/shared/_links.erb b/app/views/devise/shared/_links.erb
index 9de3361..44a1965 100644
--- a/app/views/devise/shared/_links.erb
+++ b/app/views/devise/shared/_links.erb
@@ -1,17 +1,17 @@
-<%- if devise_mapping.recoverable? && controller_name != 'passwords' %>
- <%= link_to t('helpers.forgot_password'), new_password_path(resource_name), :class => "a-orange"%>
-<% end -%>
-
-<%- if devise_mapping.confirmable? && controller_name != 'confirmations' %>
- <%= link_to t('helpers.no_pass_instructions'), new_confirmation_path(resource_name), :class => "a-orange"%>
-<% end -%>
-
-<%- if devise_mapping.lockable? && resource_class.unlock_strategy_enabled?(:email) && controller_name != 'unlocks' %>
- <%= link_to t('helpers.no_unlock_instructions'), new_unlock_path(resource_name), :class => "a-orange" %>
-<% end -%>
-
-<%#- if devise_mapping.omniauthable? %>
- <%#- resource_class.omniauth_providers.each do |provider| %>
- <%#= link_to "Sign in with #{provider.to_s.titleize}", omniauth_authorize_path(resource_name, provider) %>
- <%# end -%>
+<%- if devise_mapping.recoverable? && controller_name != 'passwords' %>
+ <%= link_to t('helpers.forgot_password'), new_password_path(resource_name), :class => "a-orange"%>
+<% end -%>
+
+<%- if devise_mapping.confirmable? && controller_name != 'confirmations' %>
+ <%= link_to t('helpers.no_pass_instructions'), new_confirmation_path(resource_name), :class => "a-orange"%>
+<% end -%>
+
+<%- if devise_mapping.lockable? && resource_class.unlock_strategy_enabled?(:email) && controller_name != 'unlocks' %>
+ <%= link_to t('helpers.no_unlock_instructions'), new_unlock_path(resource_name), :class => "a-orange" %>
+<% end -%>
+
+<%#- if devise_mapping.omniauthable? %>
+ <%#- resource_class.omniauth_providers.each do |provider| %>
+ <%#= link_to "Sign in with #{provider.to_s.titleize}", omniauth_authorize_path(resource_name, provider) %>
+ <%# end -%>
<%# end -%>
\ No newline at end of file
diff --git a/app/views/devise/unlocks/new.html.erb b/app/views/devise/unlocks/new.html.erb
index 020787f..40792b2 100644
--- a/app/views/devise/unlocks/new.html.erb
+++ b/app/views/devise/unlocks/new.html.erb
@@ -1,12 +1,12 @@
- Resend unlock instructions
-
-<%= 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.submit "Resend unlock instructions" %>
-<% end %>
-
-<%= render "devise/shared/links" %>
+ <%= t('custom_devise.resend_unlock') %>
+
+<%= 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.submit "Resend unlock instructions" %>
+<% end %>
+
+<%= render "devise/shared/links" %>
diff --git a/app/views/dmptemplates/_add_guidance.html.erb b/app/views/dmptemplates/_add_guidance.html.erb
index eae8cf7..de49775 100644
--- a/app/views/dmptemplates/_add_guidance.html.erb
+++ b/app/views/dmptemplates/_add_guidance.html.erb
@@ -1,6 +1,6 @@
- <%= form_for :guidance, :url => {:action => "admin_createguidance"}, :html => {:id => "new_guidance_form"} do |f| %>
+ <%= form_for :guidance, :url => {:action => "admin_create"}, :html => {:id => "new_guidance_form"} do |f| %>
| <%= t("org_admin.guidance.text_label") %> |
@@ -16,32 +16,32 @@
| <%= t("org_admin.guidance.by_theme_or_by_question") %> |
- <%= select_tag "g_options", options_for_select([[t("org_admin.guidance.by_themes_label"), 1],
+ <%= select_tag "g_options", options_for_select([[t("org_admin.guidance.by_themes_label"), 1],
[t("org_admin.guidance.by_question_label"), 2]]) %>
<%= link_to( image_tag("help_button.png"), "#", :class => "guidance_apply_to_popover", :rel => "popover", "data-html" => "true", "data-content" => t("org_admin.guidance.apply_to_help_text_html"))%>
-
-
+
+
<%= f.collection_select(:theme_ids,
- Theme.find(:all, :order => "title ASC"),
- :id, :title, {:prompt => false, :include_blank => "None"}, {:multiple => true})%>
+ Theme.all.order("title"),
+ :id, :title, {:prompt => false, :include_blank => t('helpers.none')}, {:multiple => true})%>
<%= link_to( image_tag("help_button.png"), "#", :class => "guidance_by_themes_popover", :rel => "popover", "data-html" => "true", "data-content" => t("org_admin.guidance.by_themes_help_text_html"))%>
-
-
+
+ |
| <%= t("org_admin.guidance.published") %> |
- <%= f.check_box :published , :as => :check_boxes%>
+ <%= f.check_box :published , :as => :check_boxes%>
@@ -53,25 +53,25 @@
<%= f.collection_select(:guidance_group_ids,
GuidanceGroup.where("organisation_id = ?", current_user.organisation_id).order("name ASC"),
- :id, :name, {:prompt => false, :include_blank => "None"}, {:multiple => false})%>
+ :id, :name, {:prompt => false, :include_blank => t('helpers.none')}, {:multiple => false})%>
<%= link_to( image_tag("help_button.png"), "#", :class => "guidance_group_select_popover", :rel => "popover", "data-html" => "true", "data-content" => t("org_admin.guidance.guidance_group_select_help_text_html"))%>
-
+
|
- |
+
-
+
-
+
-
+
<%= tinymce :content_css => asset_path("application.css") %>
<%end%>
@@ -82,12 +82,12 @@
\ No newline at end of file
diff --git a/app/views/dmptemplates/_add_question.html.erb b/app/views/dmptemplates/_add_question.html.erb
index f108516..1caf54c 100644
--- a/app/views/dmptemplates/_add_question.html.erb
+++ b/app/views/dmptemplates/_add_question.html.erb
@@ -1,9 +1,9 @@
<% @new_question = Question.new %>
@@ -38,7 +38,7 @@
+ <% i = 0 %>
+
<% 2.times {@new_question.options.build } %>
- <% i = 0 %>
- <% @new_question.options.each do |options_q|%>
- <%= f.fields_for :options, options_q do |op|%>
- <% i = i + 1%>
- <% options_q.number = i %>
- <%= render "option_fields", :f => op %>
- <%end%>
+ <% @new_question.options.each do |options_q|%>
+ <%= f.fields_for :options, options_q do |op|%>
+ <% i = i + 1%>
+ <% options_q.number = i %>
+ <%= render "option_fields", :f => op %>
+ <%end%>
- <%end%>
-
- |
-
+ <%end%>
- <%= link_to_add_object t("org_admin.add_option_label"), f, :options , "", i %>
-
+
+ <%= t("org_admin.add_option_label") %>
+
+
<%= f.check_box :option_comment_display, :as => :check_boxes%><%= f.label t("org_admin.questions.option_comment_display_checkbox"), :class => "checkbox inline"%>
@@ -153,8 +153,8 @@
<%= t("org_admin.questions.themes_label")%> |
<%= f.collection_select(:theme_ids,
- Theme.find(:all, :order => "title ASC"),
- :id, :title, {:prompt => false, :include_blank => "None"}, {:multiple => true})%>
+ Theme.all.order("title"),
+ :id, :title, {:prompt => false, :include_blank => t('helpers.none')}, {:multiple => true})%>
<%= link_to( image_tag("help_button.png"), "#", :class => "question_themes_popover", :rel => "popover", "data-html" => "true", "data-content" => t("org_admin.questions.question_themes_help_text_html"))%>
@@ -177,5 +177,3 @@
<%end%>
-
-
diff --git a/app/views/dmptemplates/_add_section.html.erb b/app/views/dmptemplates/_add_section.html.erb
index e5facd8..b445c85 100644
--- a/app/views/dmptemplates/_add_section.html.erb
+++ b/app/views/dmptemplates/_add_section.html.erb
@@ -1,54 +1,54 @@
-
-
-<% @new_section = Section.new %>
-<% @new_section.number = version.sections.count + 1 %>
-
-
-<%= form_for @new_section, :url => {:action => "admin_createsection"} do |f| %>
- <%= f.hidden_field :version_id, :value => version.id %>
- <%= f.hidden_field :organisation_id, :value => current_user.organisation.id %>
-
-
-
-
-
-
- <%= f.text_field :title, :as => :string, :class => "text_field", :placeholder => t("org_admin.templates.section_title_placeholder")%>
-
-
-
-
-
-
-
-
-
-
- | <%= t("org_admin.templates.phase_order_label") %> |
-
- <%= f.number_field :number, :in => 1..15, :class => "number_field has-tooltip", "data-toggle" => "tooltip", "title" => t("org_admin.templates.section_number_help_text") %> |
-
-
- | <%= t("org_admin.templates.desc_label") %> |
-
-
- <%= text_area_tag("section-desc", "" , class: "tinymce") %>
-
-
- <%= link_to( image_tag("help_button.png"), "#", :class => "section_desc_popover", :rel => "popover", "data-html" => "true", "data-content" => t("org_admin.templates.section_desc_help_text_html"))%>
-
- |
-
-
-
-
- <%= f.submit t("helpers.submit.save"), :class => "btn btn-primary" %>
- <%= link_to t("helpers.submit.cancel"), "#", :id => "", :class => "btn cancel" %>
-
-
-
-
-
-<%end%>
-
-
+
+
+<% @new_section = Section.new %>
+<% @new_section.number = version.sections.count + 1 %>
+
+
+<%= form_for @new_section, :url => {:action => "admin_createsection"} do |f| %>
+ <%= f.hidden_field :version_id, :value => version.id %>
+ <%= f.hidden_field :organisation_id, :value => current_user.organisation.id %>
+
+
+
+
+
+
+ <%= f.text_field :title, :as => :string, :class => "text_field", :placeholder => t("org_admin.templates.section_title_placeholder")%>
+
+
+
+
+
+
+
+
+
+
+ | <%= t("org_admin.templates.phase_order_label") %> |
+
+ <%= f.number_field :number, :in => 1..15, :class => "number_field has-tooltip", "data-toggle" => "tooltip", "title" => t("org_admin.templates.section_number_help_text") %> |
+
+
+ | <%= t("org_admin.templates.desc_label") %> |
+
+
+ <%= text_area_tag("section-desc", "" , class: "tinymce") %>
+
+
+ <%= link_to( image_tag("help_button.png"), "#", :class => "section_desc_popover", :rel => "popover", "data-html" => "true", "data-content" => t("org_admin.templates.section_desc_help_text_html"))%>
+
+ |
+
+
+
+
+ <%= f.submit t("helpers.submit.save"), :class => "btn btn-primary" %>
+ <%= link_to t("helpers.submit.cancel"), "#", :id => "", :class => "btn cancel" %>
+
+
+
+
+
+<%end%>
+
+
diff --git a/app/views/dmptemplates/_add_suggested_answer.html.erb b/app/views/dmptemplates/_add_suggested_answer.html.erb
index ec9d98b..03e11b7 100644
--- a/app/views/dmptemplates/_add_suggested_answer.html.erb
+++ b/app/views/dmptemplates/_add_suggested_answer.html.erb
@@ -1,25 +1,25 @@
-
-<%= form_for :suggested_answer, :url => {:action => "admin_createsuggestedanswer"} do |f| %>
- <%= f.hidden_field :organisation_id, :value => current_user.organisation.id %>
- <%= f.hidden_field :question_id, :value => question.id %>
-
-
-
- | <%= t("org_admin.questions.suggested_or_example_answer_label")%> |
-
-
- - <%= f.select :is_example, {t("org_admin.questions.example_answer_label") => true, t("org_admin.questions.suggested_answer_label") => false} %>
- - <%= f.text_area :text, :rows => 5 %>
-
-
- |
-
-
-
-
-
-
- <%= f.submit t("helpers.submit.save"), :class => "btn btn-primary" %>
- <%= link_to t("helpers.submit.cancel"), "#", :id => "cancel_suugested_answer", :class => "btn cancel" %>
-
-<%end%>
+
+<%= form_for :suggested_answer, :url => {:action => "admin_createsuggestedanswer"} do |f| %>
+ <%= f.hidden_field :organisation_id, :value => current_user.organisation.id %>
+ <%= f.hidden_field :question_id, :value => question.id %>
+
+
+
+ | <%= t("org_admin.questions.suggested_or_example_answer_label")%> |
+
+
+ - <%= f.select :is_example, {t("org_admin.questions.example_answer_label") => true, t("org_admin.questions.suggested_answer_label") => false} %>
+ - <%= f.text_area :text, :rows => 5 %>
+
+
+ |
+
+
+
+
+
+
+ <%= f.submit t("helpers.submit.save"), :class => "btn btn-primary" %>
+ <%= link_to t("helpers.submit.cancel"), "#", :id => "cancel_suugested_answer", :class => "btn cancel" %>
+
+<%end%>
diff --git a/app/views/dmptemplates/_admin_nav_tabs.html.erb b/app/views/dmptemplates/_admin_nav_tabs.html.erb
index f04a7a1..6974892 100644
--- a/app/views/dmptemplates/_admin_nav_tabs.html.erb
+++ b/app/views/dmptemplates/_admin_nav_tabs.html.erb
@@ -1,4 +1,4 @@
-
+
@@ -20,9 +20,9 @@
<% end %>
- <% if current_user.is_org_admin? && (dmptemplate.org_type != t("helpers.org_type.funder") || current_user.org_type == t("helpers.org_type.funder")) then %>
+ <% if current_user.is_org_admin? && (dmptemplate.org_type != constant("organisation_types.funder")|| current_user.org_type == constant("organisation_types.funder")) then %>
<% if active == 'add_plan' then %>
- -
+
-
<% else %>
-
<% end %>
diff --git a/app/views/dmptemplates/_edit_guidance.html.erb b/app/views/dmptemplates/_edit_guidance.html.erb
index 839e8e0..8debbca 100644
--- a/app/views/dmptemplates/_edit_guidance.html.erb
+++ b/app/views/dmptemplates/_edit_guidance.html.erb
@@ -1,26 +1,26 @@
-
-<%= form_for(suggested_answer, :url => admin_updatesuggestedanswer_dmptemplate_path(suggested_answer), :html => { :method => :put}) do |f| %>
- <%= f.hidden_field :organisation_id, :value => current_user.organisation.id %>
-
-
-
- | <%= t("org_admin.questions.suggested_or_example_answer_label")%> |
-
-
- - <%= f.select :is_example, {t("org_admin.questions.example_answer_label") => true, t("org_admin.questions.suggested_answer_label") => false} %>
- - <%= f.text_area :text, :rows => 5 %>
-
- |
-
-
-
-
-
-
- <%= f.submit t("helpers.submit.save"), :class => "btn btn-primary" %>
- <%= link_to t("helpers.submit.delete"), admin_destroysuggestedanswer_dmptemplate_path(:suggested_answer => suggested_answer.id),
- :confirm => t("org_admin.questions.delete_suggested_answer_message", :question_text => question.text ), :method => :delete, :class => "btn btn-primary"%>
- <%= hidden_field_tag :question_id, question.id, :class => "question_id" %>
- <%= link_to t("helpers.submit.cancel"), "#", :class => "btn cancel cancel_edit_suggested_answer" %>
-
-<%end%>
+
+<%= form_for(suggested_answer, :url => admin_updatesuggestedanswer_dmptemplate_path(suggested_answer), :html => { :method => :put}) do |f| %>
+ <%= f.hidden_field :organisation_id, :value => current_user.organisation.id %>
+
+
+
+ | <%= t("org_admin.questions.suggested_or_example_answer_label")%> |
+
+
+ - <%= f.select :is_example, {t("org_admin.questions.example_answer_label") => true, t("org_admin.questions.suggested_answer_label") => false} %>
+ - <%= f.text_area :text, :rows => 5 %>
+
+ |
+
+
+
+
+
+
+ <%= f.submit t("helpers.submit.save"), :class => "btn btn-primary" %>
+ <%= link_to t("helpers.submit.delete"), admin_destroysuggestedanswer_dmptemplate_path(:suggested_answer => suggested_answer.id),
+ :confirm => t("org_admin.questions.delete_suggested_answer_message", :question_text => question.text ), :method => :delete, :class => "btn btn-primary"%>
+ <%= hidden_field_tag :question_id, question.id, :class => "question_id" %>
+ <%= link_to t("helpers.submit.cancel"), "#", :class => "btn cancel cancel_edit_suggested_answer" %>
+
+<%end%>
diff --git a/app/views/dmptemplates/_edit_phase.html.erb b/app/views/dmptemplates/_edit_phase.html.erb
index 3d1ac1d..1536a48 100644
--- a/app/views/dmptemplates/_edit_phase.html.erb
+++ b/app/views/dmptemplates/_edit_phase.html.erb
@@ -1,45 +1,45 @@
-
-
-<%= form_for(phase, :url => admin_updatephase_dmptemplate_path(phase), :html => { :method => :put}) do |f| %>
-
-
- <%= t('org_admin.templates.phase_details_label')%>
-
-
- <%= raw t('org_admin.templates.phase_details_text_html')%>
-
-
-
-
-
-
- | <%= t('org_admin.templates.title_label') %> |
- <%= f.text_field :title,
- :as => :string,
- :class => 'text_field has-tooltip', 'data-toggle' => "tooltip", 'title' => t('org_admin.templates.phase_title_help_text') %> |
-
-
- | <%= t('org_admin.templates.phase_order_label') %> |
- <%= f.number_field :number, :in => 0..5, :class => "number_field has-tooltip", 'data-toggle' => "tooltip", 'title' => t('org_admin.templates.phase_number_help_text') %> |
-
-
- | <%= t('org_admin.templates.desc_label') %> |
-
-
- <%= text_area_tag("phase-desc", phase.description, class: "tinymce") %>
-
-
- <%= link_to( image_tag('help_button.png'), '#', :class => 'phase_desc_popover', :rel => "popover", 'data-html' => "true", 'data-content' => t('org_admin.templates.phase_desc_help_text_html'))%>
-
- |
-
-
-
-
-
-
- <%= f.submit t('helpers.submit.save'), :class => 'btn btn-primary' %>
- <%= link_to t('helpers.submit.cancel'), admin_phase_dmptemplate_path(phase), :class => 'btn cancel' %>
-
-
+
+
+<%= form_for(phase, :url => admin_updatephase_dmptemplate_path(phase), :html => { :method => :put}) do |f| %>
+
+
+ <%= t('org_admin.templates.phase_details_label')%>
+
+
+ <%= raw t('org_admin.templates.phase_details_text_html')%>
+
+
+
+
+
+
+ | <%= t('org_admin.templates.title_label') %> |
+ <%= f.text_field :title,
+ :as => :string,
+ :class => 'text_field has-tooltip', 'data-toggle' => "tooltip", 'title' => t('org_admin.templates.phase_title_help_text') %> |
+
+
+ | <%= t('org_admin.templates.phase_order_label') %> |
+ <%= f.number_field :number, :in => 0..5, :class => "number_field has-tooltip", 'data-toggle' => "tooltip", 'title' => t('org_admin.templates.phase_number_help_text') %> |
+
+
+ | <%= t('org_admin.templates.desc_label') %> |
+
+
+ <%= text_area_tag("phase-desc", phase.description, class: "tinymce") %>
+
+
+ <%= link_to( image_tag('help_button.png'), '#', :class => 'phase_desc_popover', :rel => "popover", 'data-html' => "true", 'data-content' => t('org_admin.templates.phase_desc_help_text_html'))%>
+
+ |
+
+
+
+
+
+
+ <%= f.submit t('helpers.submit.save'), :class => 'btn btn-primary' %>
+ <%= link_to t('helpers.submit.cancel'), admin_phase_dmptemplate_path(phase), :class => 'btn cancel' %>
+
+
<%end%>
\ No newline at end of file
diff --git a/app/views/dmptemplates/_edit_question.html.erb b/app/views/dmptemplates/_edit_question.html.erb
index c02d104..ab12c02 100644
--- a/app/views/dmptemplates/_edit_question.html.erb
+++ b/app/views/dmptemplates/_edit_question.html.erb
@@ -1,9 +1,9 @@
-
<%= form_for(question, :url => admin_updatequestion_dmptemplate_path(question), :html => { :method => :put}) do |f| %>
@@ -13,11 +13,10 @@
| <%= t("org_admin.questions.question_number_label")%> |
<%= f.number_field :number, :in => 1..50, :class => "number_field has-tooltip", "data-toggle" => "tooltip", "title" => t("org_admin.questions.number_help_text") %>
-
|
-
+
| <%= t("org_admin.questions.question_text_label")%> |
@@ -25,7 +24,7 @@
-
+
| <%= t("org_admin.questions.answer_format_label")%> |
@@ -33,15 +32,15 @@
<%= f.hidden_field :id,{ :class => "quest_id" } %>
<%= f.select :question_format_id,
- options_from_collection_for_select(QuestionFormat.find(:all, :order => "title ASC"),:id, :title, question.question_format_id),
+ options_from_collection_for_select(QuestionFormat.all.order("title"), :id, :title, question.question_format_id),
{}, :id => "#{question.id}-select-format"%>
<%= link_to( image_tag("help_button.png"), "#", :class => "question_format_popover", :rel => "popover", "data-html" => "true", "data-content" => t("org_admin.questions.question_format_help_text_html"))%>
-
-
-
+
+
+
-
+
<%= t("org_admin.questions.default_answer_label")%>
-
+
<%= t("org_admin.questions.default_answer_label")%>
-
+
-
+
-
+
-
+
| <%= t("org_admin.questions.suggested_or_example_answer_label")%> |
<% suggested_answer = question.suggested_answers.find_by_organisation_id(current_user.organisation.id) %>
- <% if question.suggested_answers == [] then %>
+ <% if suggested_answer.nil? then %>
<% suggested_answer = question.suggested_answers.build %>
<%end%>
<%= f.fields_for :suggested_answers, suggested_answer do |s|%>
@@ -129,11 +124,10 @@
<%= link_to( image_tag("help_button.png"), "#", :class => "suggested_answer_popover", :rel => "popover", "data-html" => "true", "data-content" => t("org_admin.questions.suggested_answer_help_text_html"))%>
-
+
|
-
| <%= t("org_admin.questions.guidance_label")%> |
@@ -143,29 +137,25 @@
<%= link_to( image_tag("help_button.png"), "#", :class => "question_guidance_popover", :rel => "popover", "data-html" => "true", "data-content" => t("org_admin.questions.question_guidance_help_text_html"))%>
-
+
-
-
| <%= t("org_admin.questions.themes_label")%> |
<%= f.collection_select(:theme_ids,
- Theme.find(:all, :order => "title ASC"),
+ Theme.all.order("title"),
:id, :title, {:prompt => false, :include_blank => "None"}, {:multiple => true})%>
<%= link_to( image_tag("help_button.png"), "#", :class => "question_themes_popover", :rel => "popover", "data-html" => "true", "data-content" => t("org_admin.questions.question_themes_help_text_html"))%>
-
|
-
+
-
<%= f.submit t("helpers.submit.save"), :class => "btn btn-primary" %>
@@ -182,4 +172,3 @@
<%= render :partial => "guidance_display", locals: {question: question}%>
<%end%>
-
diff --git a/app/views/dmptemplates/_edit_section.html.erb b/app/views/dmptemplates/_edit_section.html.erb
index 9e782bb..8f7f8b4 100644
--- a/app/views/dmptemplates/_edit_section.html.erb
+++ b/app/views/dmptemplates/_edit_section.html.erb
@@ -1,8 +1,8 @@
@@ -12,7 +12,7 @@
<%else%>
<% toggle = 'accordion-body collapse section-collapse' %>
<%end%>
-
+
<%if @new_sec then%>
<% toggle = 'accordion-body section-collapse in collapse'%>
<%end%>
@@ -22,7 +22,7 @@
<%= s.text_field :title, :as => :string, :class => 'text_field', :placeholder => t('org_admin.templates.section_title_placeholder') %>
-
+
@@ -56,7 +56,7 @@
<%= s.submit t('helpers.submit.save'), :class => 'btn btn-primary' %>
- <% if !section.version.published? || phase.dmptemplate.org_type == t("helpers.org_type.funder") then%>
+ <% if !section.version.published? || phase.dmptemplate.org_type == constant("organisation_types.funder") then%>
<%= link_to t("helpers.submit.delete"), admin_destroysection_dmptemplate_path(:section_id => section.id),
:confirm => t("org_admin.templates.section_delete_message", :section_title => section.title ), :method => :delete, :class => "btn btn-primary"%>
<%end%>
@@ -86,12 +86,13 @@
<%end%>
<% question_left = question_left - 1 %>
-
+
<%end%>
<%end%>
- <% if !section.version.published? || phase.dmptemplate.org_type == t("helpers.org_type.funder") then%>
+ <% if !section.version.published? || phase.dmptemplate.org_type == constant("organisation_types.funder") then%>
+
<%if @questions.count != 0 %>
<%end%>
diff --git a/app/views/dmptemplates/_edit_suggested_answer.html.erb b/app/views/dmptemplates/_edit_suggested_answer.html.erb
index e81eabc..2f78934 100644
--- a/app/views/dmptemplates/_edit_suggested_answer.html.erb
+++ b/app/views/dmptemplates/_edit_suggested_answer.html.erb
@@ -1,26 +1,26 @@
-
-<%= form_for(suggested_answer, :url => admin_updatesuggestedanswer_dmptemplate_path(suggested_answer), :html => { :method => :put}) do |f| %>
- <%= f.hidden_field :organisation_id, :value => current_user.organisation.id %>
-
-
-
- | <%= t('org_admin.questions.suggested_or_example_answer_label')%> |
-
-
- - <%= f.select :is_example, {t('org_admin.questions.example_answer_label') => true, t('org_admin.questions.suggested_answer_label') => false} %>
- - <%= f.text_area :text, :rows => 5 %>
-
- |
-
-
-
-
-
-
- <%= f.submit t('helpers.submit.save'), :class => 'btn btn-primary' %>
- <%= link_to t("helpers.submit.delete"), admin_destroysuggestedanswer_dmptemplate_path(:suggested_answer => suggested_answer.id),
- :confirm => t("org_admin.questions.delete_suggested_answer_message", :question_text => question.text ), :method => :delete, :class => "btn btn-primary"%>
- <%= hidden_field_tag :question_id, question.id, :class => "question_id" %>
- <%= link_to t('helpers.submit.cancel'), '#', :class => 'btn cancel cancel_edit_suggested_answer' %>
-
-<%end%>
+
+<%= form_for(suggested_answer, :url => admin_updatesuggestedanswer_dmptemplate_path(suggested_answer), :html => { :method => :put}) do |f| %>
+ <%= f.hidden_field :organisation_id, :value => current_user.organisation.id %>
+
+
+
+ | <%= t('org_admin.questions.suggested_or_example_answer_label')%> |
+
+
+ - <%= f.select :is_example, {t('org_admin.questions.example_answer_label') => true, t('org_admin.questions.suggested_answer_label') => false} %>
+ - <%= f.text_area :text, :rows => 5 %>
+
+ |
+
+
+
+
+
+
+ <%= f.submit t('helpers.submit.save'), :class => 'btn btn-primary' %>
+ <%= link_to t("helpers.submit.delete"), admin_destroysuggestedanswer_dmptemplate_path(:suggested_answer => suggested_answer.id),
+ :confirm => t("org_admin.questions.delete_suggested_answer_message", :question_text => question.text ), :method => :delete, :class => "btn btn-primary"%>
+ <%= hidden_field_tag :question_id, question.id, :class => "question_id" %>
+ <%= link_to t('helpers.submit.cancel'), '#', :class => 'btn cancel cancel_edit_suggested_answer' %>
+
+<%end%>
diff --git a/app/views/dmptemplates/_edit_template.html.erb b/app/views/dmptemplates/_edit_template.html.erb
index 1a8d6f8..dbea10a 100644
--- a/app/views/dmptemplates/_edit_template.html.erb
+++ b/app/views/dmptemplates/_edit_template.html.erb
@@ -1,52 +1,52 @@
-
-
-<%= form_for(dmptemplate, :url => admin_update_dmptemplate_path(dmptemplate), :html => { :method => :put}) do |f| %>
-
-
-
- | <%= t('org_admin.templates.title_label') %> |
- <%= f.text_field :title, :as => :string,
- :class => 'text_field has-tooltip', 'data-toggle' => "tooltip", 'title' => t('org_admin.templates.title_help_text') %> |
-
-
- | <%= t('org_admin.templates.desc_label') %> |
-
- <%= text_area_tag("template-desc", dmptemplate.description, class: "tinymce") %>
-
-
- <%= link_to( image_tag('help_button.png'), '#', :class => 'template_desc_popover', :rel => "popover", 'data-html' => "true", 'data-content' => t('org_admin.templates.desc_help_text_html'))%>
-
- |
-
-
- | <%= t('org_admin.templates.published_label') %> |
- <%if dmptemplate.published? || dmptemplate.has_published_versions? then%>
- <%= f.check_box :published, :as => :check_boxes %>
- <%else%>
- <%= t('org_admin.templates.cannot_publish')%>
- <%end%>
- |
-
-
- | <%= t('org_admin.templates.created') %> |
-
- <%= l dmptemplate.created_at.to_date, :formats => :short %>
- |
-
-
- | <%= t('org_admin.templates.last_updated') %> |
-
- <%= l dmptemplate.updated_at.to_date, :formats => :short %>
- |
-
-
-
-
-
- <%= f.submit t('helpers.submit.save'), :class => 'btn btn-primary' %>
- <%= link_to t('helpers.submit.cancel'), admin_template_dmptemplate_path(dmptemplate), :class => 'btn cancel' %>
-
-
-
-
+
+
+<%= form_for(dmptemplate, :url => admin_update_dmptemplate_path(dmptemplate), :html => { :method => :put}) do |f| %>
+
+
+
+ | <%= t('org_admin.templates.title_label') %> |
+ <%= f.text_field :title, :as => :string,
+ :class => 'text_field has-tooltip', 'data-toggle' => "tooltip", 'title' => t('org_admin.templates.title_help_text') %> |
+
+
+ | <%= t('org_admin.templates.desc_label') %> |
+
+ <%= text_area_tag("template-desc", dmptemplate.description, class: "tinymce") %>
+
+
+ <%= link_to( image_tag('help_button.png'), '#', :class => 'template_desc_popover', :rel => "popover", 'data-html' => "true", 'data-content' => t('org_admin.templates.desc_help_text_html'))%>
+
+ |
+
+
+ | <%= t('org_admin.templates.published_label') %> |
+ <%if dmptemplate.published? || dmptemplate.has_published_versions? then%>
+ <%= f.check_box :published, :as => :check_boxes %>
+ <%else%>
+ <%= t('org_admin.templates.cannot_publish')%>
+ <%end%>
+ |
+
+
+ | <%= t('org_admin.templates.created') %> |
+
+ <%= l dmptemplate.created_at.to_date, :formats => :short %>
+ |
+
+
+ | <%= t('org_admin.templates.last_updated') %> |
+
+ <%= l dmptemplate.updated_at.to_date, :formats => :short %>
+ |
+
+
+
+
+
+ <%= f.submit t('helpers.submit.save'), :class => 'btn btn-primary' %>
+ <%= link_to t('helpers.submit.cancel'), admin_template_dmptemplate_path(dmptemplate), :class => 'btn cancel' %>
+
+
+
+
<%end%>
\ No newline at end of file
diff --git a/app/views/dmptemplates/_edit_version.html.erb b/app/views/dmptemplates/_edit_version.html.erb
index 7e52bdf..416fdb7 100644
--- a/app/views/dmptemplates/_edit_version.html.erb
+++ b/app/views/dmptemplates/_edit_version.html.erb
@@ -1,47 +1,47 @@
-
-
-
-<%= form_for(version, :url => admin_updateversion_dmptemplate_path(version, :edit => edit, :phase => phase), :html => { :method => :put}) do |f| %>
-
-
- <%= t('org_admin.templates.version_details_label')%>
-
-
-
-
-
-
- | <%= t('org_admin.templates.title_label') %> |
- <%= f.text_field :title, :as => :string,
- :class => 'text_field has-tooltip', 'data-toggle' => "tooltip", 'title' => t('org_admin.templates.phase_title_help_text') %> |
-
-
-
- | <%= t('org_admin.templates.desc_label') %> |
-
- <%= text_area_tag("version-desc", version.description, class: "tinymce") %>
-
-
- <%= link_to( image_tag('help_button.png'), '#', :class => 'version_desc_popover', :rel => "popover", 'data-html' => "true", 'data-content' => t('org_admin.versions.desc_help_text_html'))%>
-
- |
-
-
- | <%= t('org_admin.templates.published_label') %> |
- <%= f.check_box :published, :as => :check_boxes %> |
-
-
-
-
-
-
-
- <%= f.submit t('helpers.submit.save'), :class => 'btn btn-primary' %>
- <%= link_to t('helpers.submit.cancel'), admin_phase_dmptemplate_path(phase), :class => 'btn cancel' %>
-
-
-
-<%end%>
-
-
+
+
+
+<%= form_for(version, :url => admin_updateversion_dmptemplate_path(version, :edit => edit, :phase => phase), :html => { :method => :put}) do |f| %>
+
+
+ <%= t('org_admin.templates.version_details_label')%>
+
+
+
+
+
+
+ | <%= t('org_admin.templates.title_label') %> |
+ <%= f.text_field :title, :as => :string,
+ :class => 'text_field has-tooltip', 'data-toggle' => "tooltip", 'title' => t('org_admin.templates.phase_title_help_text') %> |
+
+
+
+ | <%= t('org_admin.templates.desc_label') %> |
+
+ <%= text_area_tag("version-desc", version.description, class: "tinymce") %>
+
+
+ <%= link_to( image_tag('help_button.png'), '#', :class => 'version_desc_popover', :rel => "popover", 'data-html' => "true", 'data-content' => t('org_admin.versions.desc_help_text_html'))%>
+
+ |
+
+
+ | <%= t('org_admin.templates.published_label') %> |
+ <%= f.check_box :published, :as => :check_boxes %> |
+
+
+
+
+
+
+
+ <%= f.submit t('helpers.submit.save'), :class => 'btn btn-primary' %>
+ <%= link_to t('helpers.submit.cancel'), admin_phase_dmptemplate_path(phase), :class => 'btn cancel' %>
+
+
+
+<%end%>
+
+
\ No newline at end of file
diff --git a/app/views/dmptemplates/_guidance_display.html.erb b/app/views/dmptemplates/_guidance_display.html.erb
index 5e5ee3f..8438b71 100644
--- a/app/views/dmptemplates/_guidance_display.html.erb
+++ b/app/views/dmptemplates/_guidance_display.html.erb
@@ -1,47 +1,47 @@
-
-
-
-
- <% if !question.guidance.nil? && question.guidance != "" then %>
-
-
-
- <%= raw question.guidance %>
-
-
- <% end %>
-
- <% question.guidance_for_question(question, current_user.organisation).each_pair do |title,guidance| %>
-
-
-
- <%= raw guidance.text %>
-
-
- <% end %>
-
-
-
-
-
- <%= render :partial => "add_guidance", locals: {question: question} %>
-
-
+
+
+
+
+ <% if !question.guidance.nil? && question.guidance != "" then %>
+
+
+
+ <%= raw question.guidance %>
+
+
+ <% end %>
+
+ <% question.guidance_for_question(question, current_user.organisation).each_pair do |title,guidance| %>
+
+
+
+ <%= raw guidance.text %>
+
+
+ <% end %>
+
+
+
+
+
+ <%= render :partial => "add_guidance", locals: {question: question} %>
+
+
\ No newline at end of file
diff --git a/app/views/dmptemplates/_option_fields.html.erb b/app/views/dmptemplates/_option_fields.html.erb
index 54cea38..21f3e80 100644
--- a/app/views/dmptemplates/_option_fields.html.erb
+++ b/app/views/dmptemplates/_option_fields.html.erb
@@ -1,7 +1,7 @@
-
-
- | <%= f.number_field :number,:in => 1..20, :class => "number_field option"%> |
- <%= f.text_field :text, :as => :string, :class => "small_text_field" %> |
- <%= f.check_box :is_default %> |
- <%= f.hidden_field :_destroy %><%= link_to_function t('org_admin.remove_option_label'), "remove_object(this)"%> |
-
+
+
+ | <%= f.number_field :number,:in => 1..20, :class => "number_field option"%> |
+ <%= f.text_field :text, :as => :string, :class => "small_text_field" %> |
+ <%= f.check_box :is_default %> |
+ <%= f.hidden_field :_destroy %><%= t('org_admin.remove_option_label') %> |
+
diff --git a/app/views/dmptemplates/_preview_question.html.erb b/app/views/dmptemplates/_preview_question.html.erb
index f055bfa..79d6459 100644
--- a/app/views/dmptemplates/_preview_question.html.erb
+++ b/app/views/dmptemplates/_preview_question.html.erb
@@ -1,124 +1,124 @@
-
-
-
-
-
- <% q_format = question.question_format%>
-
-
-
-
-
-<%= render :partial => "guidance_display", locals: {question: question}%>
+
+
+
+
+
+ <% q_format = question.question_format%>
+
+
+
+
+
+<%= render :partial => "guidance_display", locals: {question: question}%>
diff --git a/app/views/dmptemplates/_show_phase.html.erb b/app/views/dmptemplates/_show_phase.html.erb
index af8c397..01117cf 100644
--- a/app/views/dmptemplates/_show_phase.html.erb
+++ b/app/views/dmptemplates/_show_phase.html.erb
@@ -4,18 +4,18 @@
<%= t('org_admin.templates.phase_details_label')%>
- <% if @phase.dmptemplate.org_type != t("helpers.org_type.funder") || current_user.org_type == t("helpers.org_type.funder") then %>
+ <% if @phase.dmptemplate.org_type != constant("organisation_types.funder") || current_user.org_type == constant("organisation_types.funder") then %>
<%= link_to t("org_admin.templates.edit_phase_details_label"), '#', :class => "btn btn-primary", :id => "edit_phase_button"%>
<%end%>
-<%if @phase.dmptemplate.org_type != t("helpers.org_type.funder") then%>
+<%if @phase.dmptemplate.org_type != constant("organisation_types.funder") then%>
<%= raw t('org_admin.templates.phase_details_text_html')%>
-
-<%end%>
+
+<%end%>
@@ -34,4 +34,4 @@
<%= raw @phase.description %> |
| |
diff --git a/app/views/dmptemplates/_show_phases_sections.html.erb b/app/views/dmptemplates/_show_phases_sections.html.erb
index e0640bc..6822565 100644
--- a/app/views/dmptemplates/_show_phases_sections.html.erb
+++ b/app/views/dmptemplates/_show_phases_sections.html.erb
@@ -1,36 +1,36 @@