diff --git a/app/views/guidances/admin_index.html.erb b/app/views/guidances/admin_index.html.erb index 3f1ae3b..a740ba9 100644 --- a/app/views/guidances/admin_index.html.erb +++ b/app/views/guidances/admin_index.html.erb @@ -2,7 +2,7 @@

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

@@ -14,89 +14,96 @@ <% if @guidance_groups.length > 0 then%> - +
+
- - - - - + + + + <% !@guidance_groups.each do |guidance_gr| %> - + - - - - - <% end %>
<%= _('Name') %><%= _('Published') %><%= _('Optional subset') %><%= _('Last updated') %><%= _('Actions') %> + <%= _('Name') %><%= _('Published') %><%= _('Optional subset') %><%= _('Last updated') %>
<%= 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"%> + 		+
+ + +
    +
  • <%= link_to _('Edit'), admin_edit_guidance_group_path(guidance_gr) %>
    • +
  • <%= 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 %>
    • +
+
+ <%end%>
- <%= _('Create a guidance group') %> + <%= _('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 > TABLE_FILTER_MIN_ROWS %> - + <%= render(partial: "shared/table_filter", locals: {path: admin_index_guidance_path, placeholder: _('Filter guidance')}) %> <% end %> - - - - - + + + + <% @guidances.each do |guidance| %> <% if guidance.in_group_belonging_to?(current_user.org_id) then %> - + @@ -106,37 +113,49 @@ <%= th.title %> <% end %> - <% else %> - - <% end %> - <% if guidance.guidance_group.present? then %> - - <% else %> - - <% end %> + <% 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') %> + <%= _('Text') %><%= _('Themes') %><%= _('Guidance group') %><%= _('Last updated') %>
<%= guidance.text.html_safe%> - - + <% else %> + + - - <%= guidance.guidance_group.name %> - - - - + <%= 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"%> +
+ + +
    +
  • <%= link_to _('Edit'), admin_edit_guidance_path(guidance) %>
    • +
  • <%= 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 %>
    • +
+
+ <% end %>
- <%= _('Create guidance') %> + <%= _('Create guidance') %>
diff --git a/app/views/plans/index.html.erb b/app/views/plans/index.html.erb index 9567967..ee17cf7 100644 --- a/app/views/plans/index.html.erb +++ b/app/views/plans/index.html.erb @@ -65,7 +65,7 @@ + <% end %> diff --git a/app/views/templates/admin_index.html.erb b/app/views/templates/admin_index.html.erb index 520cafb..2eec2dd 100644 --- a/app/views/templates/admin_index.html.erb +++ b/app/views/templates/admin_index.html.erb @@ -18,14 +18,14 @@ <% if @org_templates.length > 0 then %>
- +
- + @@ -53,19 +53,26 @@ <%= l last_temp_updated.to_date, formats: :short %> +
+ + +
<% end %> @@ -73,7 +80,7 @@ <% end %> - + <%= _('Create a template') %> @@ -84,14 +91,14 @@ <% if @funder_templates.length > 0 then %>
-
<%= _('Title') %> <%= _('Description') %> <%= _('Status') %> <%= _('Last updated') %><%= _('Actions') %>
-
    -
  • <%= link_to _('Edit'), admin_template_template_path(id: hash[:current].id) %>
    • -
  • <%= link_to _('History'), admin_template_history_template_path(id: hash[:current].id) %>
    • - <% if hash[:live].nil? %> -
  • <%= link_to _('Publish'), admin_publish_template_path(hash[:current]), method: :put %>
    • - <% elsif hash[:current].dirty? %> -
  • <%= link_to _('Publish changes'), admin_publish_template_path(hash[:current]), method: :put %>
    • - <% else %> -
  • <%= link_to _('Unpublish'), admin_unpublish_template_path(hash[:current]), method: :put %>
    • - <% end %> -
  • <%= link_to _('Copy'), admin_copy_template_path(id: hash[:current].id), method: :put %>
    • -
-
+
- @@ -123,35 +130,42 @@ <%= l last_updated.to_date, formats: :short %> <% end %> diff --git a/app/views/users/admin_grant_permissions.html.erb b/app/views/users/admin_grant_permissions.html.erb index e70d80d..2dc172e 100644 --- a/app/views/users/admin_grant_permissions.html.erb +++ b/app/views/users/admin_grant_permissions.html.erb @@ -1,6 +1,6 @@
-

<%= _('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 58d8acc..4c49368 100644 --- a/app/views/users/admin_index.html.erb +++ b/app/views/users/admin_index.html.erb @@ -1,7 +1,7 @@
-

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

-

+

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

+

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

<%= _('Title') %> <%= _('Description') %> <%= _('Status') %> <%= _('Last updated') %><%= _('Actions') %> +
-
    - <% if hash[:current].customization_of.nil? %> -
  • - <%= link_to _('Customise'), admin_customize_template_path(hash[:current]), method: :get %> -
    • - <% else %> - <% if hash[:stale] %> -
  • - <%= link_to _('Transfer customisation'), admin_transfer_customization_template_path(hash[:funder_live]) %> -
    • - <% else %> -
  • - <%= link_to _('Edit customisation'), admin_template_template_path(hash[:current]) %> -
    • - <% end %> - <% end %> - <% if !hash[:current].customization_of.nil? && !hash[:stale] %> - <% if hash[:live].nil? || hash[:current].dirty? %> -
  • - <%= link_to _('Publish'), admin_publish_template_path(hash[:current]), method: :put %> -
    • - <% end %> - <% if hash[:live].present? %> -
  • - <%= link_to _('Unpublish'), admin_unpublish_template_path(hash[:current]), method: :put %> -
    • - <% end %> - <% end %> -
+
+ +
    + <% if hash[:current].customization_of.nil? %> +
  • + <%= link_to _('Customise'), admin_customize_template_path(hash[:current]), method: :get %> +
    • + <% else %> + <% if hash[:stale] %> +
  • + <%= link_to _('Transfer customisation'), admin_transfer_customization_template_path(hash[:funder_live]) %> +
    • + <% else %> +
  • + <%= link_to _('Edit customisation'), admin_template_template_path(hash[:current]) %> +
    • + <% end %> + <% end %> + <% if !hash[:current].customization_of.nil? && !hash[:stale] %> + <% if hash[:live].nil? || hash[:current].dirty? %> +
  • + <%= link_to _('Publish'), admin_publish_template_path(hash[:current]), method: :put %> +
    • + <% end %> + <% if hash[:live].present? %> +
  • + <%= link_to _('Unpublish'), admin_unpublish_template_path(hash[:current]), method: :put %> +
    • + <% end %> + <% end %> +
+