diff --git a/app/views/contact_us/contacts/new.html.erb b/app/views/contact_us/contacts/new.html.erb index 57596a5..5204126 100644 --- a/app/views/contact_us/contacts/new.html.erb +++ b/app/views/contact_us/contacts/new.html.erb @@ -4,119 +4,106 @@ };
- <%= raw t("contact_page.intro_text_html", - organisation_name: Rails.configuration.branding[:organisation][:name], - organisation_email: Rails.configuration.branding[:organisation][:email], - organisation_url: Rails.configuration.branding[:organisation][:url], - application_name: Rails.configuration.branding[:application][:name], - application_url: Rails.configuration.branding[:application][:url], - application_issue_list_url: Rails.configuration.branding[:application][:issue_list_url]) %> - <%= raw t("contact_page.github_text_html") %> + <%= 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]} %>
| - <%= f.label :name, (t('.name') + content_tag(:abbr, "*", :class => "required")).html_safe %> - | -
- <% if user_signed_in? then %>
- <%= f.text_field :name, :value => current_user.name(false) %>
- <% else %>
- <%= f.text_field :name %>
- <% end %>
- <% if f.object.errors[:name].present? %>
- <%= f.object.errors[:name].join(" and ") %> - <% end %> - |
-
| - <%= f.label :email, (t('.email') + content_tag(:abbr, "*", :class => "required")).html_safe %> - | -
- <% if user_signed_in? then %>
- <%= f.email_field :email, :value => current_user.email %>
- <% else %>
- <%= f.email_field :email %>
- <% end %>
- <% if f.object.errors[:email].present? %>
- <%= f.object.errors[:email].join(" and ") %> - <% end %> - |
-
| - <%= f.label :subject, (t('.subject') + content_tag(:abbr, "*", :class => "required")).html_safe %> - | -
- <%= f.text_field :subject %>
- <% if f.object.errors[:subject].present? %>
- <%= f.object.errors[:subject].join(" and ") %> - <% end %> - |
-
| - <%= f.label :message, (t('.message') + content_tag(:abbr, "*", :class => "required")).html_safe %> - | -
- <%= f.text_area :message, :rows => 10 %>
- <% if f.object.errors[:message].present? %>
- <%= f.object.errors[:message].join(" and ") %> - <% end %> - |
-
| - <%= t('helpers.security_check') %> - | -- <%= recaptcha_tags %> - | -
Helpline: %{organisation_telephone}
+Email %{organisation_email}
") % + { organisation_name: Rails.configuration.branding[:organisation][:name], + organisation_address_line1: Rails.configuration.branding[:organisation][:address_line1], + organisation_address_line2: Rails.configuration.branding[:organisation][:address_line2], + organisation_address_line3: Rails.configuration.branding[:organisation][:address_line3], + organisation_address_line4: Rails.configuration.branding[:organisation][:address_line4], + organisation_address_country: Rails.configuration.branding[:organisation][:address_country], + organisation_telephone: Rails.configuration.branding[:organisation][:telephone], + organisation_email: Rails.configuration.branding[:organisation][:email], + application_name: Rails.configuration.branding[:application][:name]} %> + +- <%= raw suggested_answer.text %> -
-<%= comments_label_with_count %>
- <%else%> -<%= _('Share note') %>
- <%end%> -<%= raw _("
Please select from the following drop-down so we can determine what questions and guidance should be displayed in your plan.
")%> -Briefly summarise the type of study (or studies) to help others understand the purposes for which the data are being collected or created.
Briefly summarise the type of study (or studies) to help others understand the purposes for which the data are being collected or created.
You can give other people access to your plan here. There are three permission levels.
Add each collaborator in turn by entering their email address below, choosing a permission level and clicking "Add collaborator".
Those you invite will receive an email notification that they have access to this plan, inviting them to register with %{application_name} if they don\'t already have an account. A notification is also issued when a user\'s permission level is changed.
') % { application_name: Rails.configuration.branding[:application][:name] } %> + + <%= raw _('You can give other people access to your plan here. There are three permission levels.
Add each collaborator in turn by entering their email address below, choosing a permission level and clicking "Add collaborator".
Those you invite will receive an email notification that they have access to this plan, inviting them to register with %{application_name} if they don\'t already have an account. A notification is also issued when a user\'s permission level is changed.
') % { application_name: Rails.configuration.branding[:application][:name] } %> -| <%= _('Email address')%> | -<%= _('Permissions')%> | -- | ||||||
|---|---|---|---|---|---|---|---|---|
| <%= role.user.name %> | -- <% if role.creator? then %> - <%= _('Owner')%> - <% else %> - <%= form_for role, :url => {:controller => :roles, :action => :update, :id => role.id }, :html=>{:method=>:put} do |f| %> - <%= f.select :access_level, {_('Co-owner') => 3, _('Editor') => 2, _('Read only') => 1}, {}, {:id => "#{role.id}-can-edit", :class => "toggle-existing-user-access has-tooltip", 'data-toggle' => "tooltip", 'title' => _('Editors can contribute to plans. Co-owners have additional rights to edit plan details and control access.') } %> - <% end %> - <% end %> - | -
+
- <%= _('Add collaborator')%>- -
- <% new_role = Role.new %>
- <% new_role.plan = @plan %>
- <%= semantic_form_for new_role, :url => {:controller => :roles, :action => :create }, :html=>{:method=>:post} do |f| %>
- <%= f.inputs do %>
- <%= f.input :plan_id, :as => :hidden %>
- <%= f.semantic_fields_for :user do |user| %>
- <%= user.email_field :email, :for => :user, :name => "user", :label => false, placeholder: _('Email') %>
+ <%= link_to _('Remove user access'), role, method: :delete, data: { confirm: _('Are you sure?') }, :class => "a-orange" %>
+ <% end %>
+ |
+