diff --git a/app/controllers/plans_controller.rb b/app/controllers/plans_controller.rb index 361660b3b5..2a3fccff17 100644 --- a/app/controllers/plans_controller.rb +++ b/app/controllers/plans_controller.rb @@ -17,6 +17,10 @@ def index @organisationally_or_publicly_visible = Plan.organisationally_or_publicly_visible(current_user).page(1) end + + if params[:plan].present? + @template = Template.find(params[:plan][:template_id]) + end end # GET /plans/new diff --git a/app/helpers/template_helper.rb b/app/helpers/template_helper.rb index 3905e98735..2a8392eddc 100644 --- a/app/helpers/template_helper.rb +++ b/app/helpers/template_helper.rb @@ -33,4 +33,22 @@ def links_to_a_elements(links, separator = ", ") a.join(separator) end + # Generate a direct plan creation link based on provided template + # @param template [Template] template used for plan creation + # @param hidden [Boolean] should the link be hidden? + # @param text [String] text for the link + # @param id [String] id for the link element + def direct_link(template, hidden = false, text = nil, id = nil) + params = { org_id: template.org.id, funder_id: '-1', template_id: template.id } + cls = text.nil? ? 'direct-link' : 'direct-link btn btn-default' + style = hidden ? 'display: none' : '' + + link_to(plans_url(plan: params), method: :post, title: _('Create plan'), class: cls, id: id, style: style) do + if text.nil? + ''.html_safe + else + text.html_safe + end + end + end end diff --git a/app/javascript/packs/application.js b/app/javascript/packs/application.js index adbe7ed762..d612b09ed2 100644 --- a/app/javascript/packs/application.js +++ b/app/javascript/packs/application.js @@ -47,3 +47,4 @@ import '../views/usage/index'; import '../views/users/notification_preferences'; import '../views/users/admin_grant_permissions'; import '../views/super_admin/notifications/edit'; +import '../views/public_templates/show'; diff --git a/app/javascript/views/plans/index.js b/app/javascript/views/plans/index.js index b030b67f4e..b3cd74c1eb 100644 --- a/app/javascript/views/plans/index.js +++ b/app/javascript/views/plans/index.js @@ -26,4 +26,6 @@ $(() => { $(paginableSelector).on('ajax:error', '.set_test_plan', () => { // TODO adequate error handling for network error }); + + $('#create-modal').modal('show'); }); diff --git a/app/javascript/views/public_templates/show.js b/app/javascript/views/public_templates/show.js new file mode 100644 index 0000000000..16bf07f7dc --- /dev/null +++ b/app/javascript/views/public_templates/show.js @@ -0,0 +1,15 @@ +$(() => { + $('.copy-link').click((e) => { + const link = $(e.currentTarget).siblings('.direct-link'); + + $('#link-modal').on('show.bs.modal', () => { + $('#link').val(link.attr('href')); + }); + }); + + $('#copy-link-btn').click(() => { + $('#link').select(); + // eslint-disable-next-line + document.execCommand('copy'); + }); +}); diff --git a/app/views/paginable/templates/_organisational.html.erb b/app/views/paginable/templates/_organisational.html.erb index e19df20425..0fdba4df2a 100644 --- a/app/views/paginable/templates/_organisational.html.erb +++ b/app/views/paginable/templates/_organisational.html.erb @@ -76,14 +76,18 @@ 'data-confirm': _('Are you sure you want to remove "%{template_title}"? Any published versions will become unavailable to users.') % { template_title: template.title} %> <% end %> -
  • <%= link_to template_export_org_admin_template_url(template, format: :pdf), - title: export_as_pdf, - target: '_blank', - class: 'has-new-window-popup-info' do %> - <%= export_as_pdf %> - <%= _('(new window)') %> - <%= _('Opens in new window') %> - <% end %> +
  • <%= link_to template_export_org_admin_template_url(template, format: :pdf), + title: export_as_pdf, + target: '_blank', + class: 'has-new-window-popup-info' do %> + <%= export_as_pdf %> + <%= _('(new window)') %> + <%= _('Opens in new window') %> + <% end %> +
    • +
  • + <%= direct_link(template, true) %> + <%= _('Copy link') %>
    • @@ -94,3 +98,5 @@ + +<%= render 'shared/copy_link_modal' %> diff --git a/app/views/paginable/templates/_publicly_visible.html.erb b/app/views/paginable/templates/_publicly_visible.html.erb index 824234e6ba..df28a59265 100644 --- a/app/views/paginable/templates/_publicly_visible.html.erb +++ b/app/views/paginable/templates/_publicly_visible.html.erb @@ -8,6 +8,7 @@ <%= _('Organisation Name') %> <%= paginable_sort_link('orgs.name') %> <%= _('Last Updated') %> <%= paginable_sort_link('templates.updated_at') %> <%= _('Funder Links') %> + <%= _('Actions') %> <%= _('Sample Plans') %>
    <%= _('(if available)') %> <%= sample_plans_tooltip %> @@ -39,6 +40,10 @@ <%= sanitize links_to_a_elements(template.links['funder'], '
    ') %> + + <%= direct_link(template) %> + + <%= sanitize links_to_a_elements(template.links['sample_plan'], '
    ') %> @@ -46,4 +51,6 @@ <% end %> - \ No newline at end of file + + +<%= render 'shared/copy_link_modal' %> diff --git a/app/views/plans/index.html.erb b/app/views/plans/index.html.erb index e3d33cd997..2687edb611 100644 --- a/app/views/plans/index.html.erb +++ b/app/views/plans/index.html.erb @@ -43,3 +43,5 @@ <% end %> + +<%= render 'shared/create_plan_modal' unless @template.nil? %> diff --git a/app/views/shared/_copy_link_modal.html.erb b/app/views/shared/_copy_link_modal.html.erb new file mode 100644 index 0000000000..c9c8d07441 --- /dev/null +++ b/app/views/shared/_copy_link_modal.html.erb @@ -0,0 +1,16 @@ + diff --git a/app/views/shared/_create_plan_modal.html.erb b/app/views/shared/_create_plan_modal.html.erb new file mode 100644 index 0000000000..6523ae48c0 --- /dev/null +++ b/app/views/shared/_create_plan_modal.html.erb @@ -0,0 +1,15 @@ +