diff --git a/app/views/orgs/admin_edit.html.erb b/app/views/orgs/admin_edit.html.erb index 67030c7..5d4da43 100644 --- a/app/views/orgs/admin_edit.html.erb +++ b/app/views/orgs/admin_edit.html.erb @@ -2,7 +2,7 @@ <% javascript 'admin.js' %>

- <%= t('org_admin.org_details_label') %> + <%= _('Organisation details') %>

@@ -13,12 +13,12 @@ - - + + - + - + - + <%end%> - + - + - - + + - - + + - +
<%= t('org_admin.org_name') %><%= f.text_field :name, as: :string, class: 'text_field has-tooltip', data_toggle: "tooltip", title: t('org_admin.name_help_text') %><%= _('Name') %><%= f.text_field :name, as: :string, class: 'text_field has-tooltip', data_toggle: "tooltip", title: _("Please enter your organisation's name.") %>
<%= t('org_admin.org_abbr') %><%= _('Abbreviation') %>
<%= f.text_field :abbreviation, as: :string, class: 'text_field' %> @@ -30,39 +30,39 @@ <% if @org.logo.present? %>
<%= t('org_admin.org_logo') %><%= _('Logo') %> <%= image_tag @org.logo.url %>
<%= f.check_box :remove_logo %>   <%= t('org_admin.remove_logo') %><%= f.check_box :remove_logo %>   <%= _('If you decide to use the default DMPRoadmap logo, please check this box to remove your current logo.') %>
<%= t('org_admin.new_org_logo') %><%= _('Upload a new logo file') %> <%= f.file_field :logo %>
<%= t('org_admin.org_banner_text') %><%= _('Top banner text') %> <%= text_area_tag("org_banner_text", @org.banner_text, class: "tinymce") %>
<%= t('org_admin.org_target_url') %><%= f.text_field :target_url, as: :string, class: 'text_field has-tooltip', data_toggle: "tooltip", title: t('org_admin.target_url_help_text') %><%= _('Website') %><%= f.text_field :target_url, as: :string, class: 'text_field has-tooltip', data_toggle: "tooltip", title: _('Please enter a valid web address.') %>
<%= t('org_admin.org_contact_email') %><%= f.text_field :contact_email, as: :string, class: 'text_field has-tooltip', data_toggle: "tooltip", title: t('org_admin.org_contact_email_help_text') %><%= _('Contact Email') %><%= f.text_field :contact_email, as: :string, class: 'text_field has-tooltip', data_toggle: "tooltip", title: _('The email address of an administrator at your organisation. Your users will use this address if they have questions.') %>
<%= t('org_admin.org_type') %><%= _('Organisation type') %> <%= @org.organisation_type %>
@@ -71,8 +71,8 @@
- <%= f.submit t('helpers.submit.save'), class: 'btn btn-primary' %> - <%= link_to t('helpers.submit.cancel'), :back, class: 'btn btn-primary' %> + <%= f.submit _('Save'), class: 'btn btn-primary' %> + <%= link_to _('Cancel'), :back, class: 'btn btn-primary' %>
<% end %> diff --git a/app/views/orgs/admin_show.html.erb b/app/views/orgs/admin_show.html.erb index 55ed7b1..fe91c9c 100644 --- a/app/views/orgs/admin_show.html.erb +++ b/app/views/orgs/admin_show.html.erb @@ -1,9 +1,9 @@ <%= stylesheet_link_tag "admin" %>

- <%= t('org_admin.org_details_label') %> + <%= _('Organisation details') %>

-<%= t('org_admin.org_text')%> +<%= _('These are the basic details for your organisation.')%>
@@ -14,7 +14,7 @@ <% if @org.name.present? then %> - + <% if @org.logo.present? then %> @@ -25,48 +25,48 @@ <% if @org.abbreviation.present? then %> - + <% end %> <% if @org.banner_text.present? then %> - + <% end %> <% if @org.target_url.present? then %> - + <% end %> <% if @org.contact_email.present? then %> - + <% end %> <% if @org.org_type != 0 then %> - + <% end %> <% if @org.parent_id.present? then %> - + <% end %> - +
<%= t('org_admin.org_name') %><%= _('Name') %> <%= @org.name %>
<%= t('org_admin.org_abbr') %><%= _('Abbreviation') %> <%= @org.abbreviation %>
<%= t('org_admin.org_banner_text') %><%= _('Top banner text') %> <%= raw @org.banner_text %>
<%= t('org_admin.org_target_url') %><%= _('Website') %> <%= @org.target_url %>
<%= t('org_admin.org_contact_email') %><%= _('Contact Email') %> <%= @org.contact_email %>
<%= t('org_admin.org_type') %><%= _('Organisation type') %> <%= @org.organisation_type %>
<%= t('org_admin.parent_org') %><%= _('Main organisation') %> <%= @org.parent.name %>
<%= t('org_admin.last_updated') %><%= _('Last updated') %> <%= l @org.updated_at.to_date, formats: :short %>
@@ -75,7 +75,7 @@
- <%= link_to t("helpers.submit.edit"), admin_edit_org_path(current_user.org), class: 'btn btn-primary'%> + <%= link_to _('Edit'), admin_edit_org_path(current_user.org), class: 'btn btn-primary'%>