diff --git a/app/views/layouts/_signin_signout.html.erb b/app/views/layouts/_signin_signout.html.erb index 66a6515..79cae62 100644 --- a/app/views/layouts/_signin_signout.html.erb +++ b/app/views/layouts/_signin_signout.html.erb @@ -11,13 +11,13 @@ <% end %> <% if current_user.can_org_admin? && !current_user.org_id.nil? %> <% if current_user.can_modify_org_details? && current_user.org.abbreviation.blank? %> -
  • <%= link_to _("Admin area"), admin_show_org_path(current_user.org_id), class: "signIn_dropdown_link" %>
  • +
  • <%= link_to _("Admin area"), admin_edit_org_path(current_user.org_id), class: "signIn_dropdown_link" %>
  • <% elsif current_user.can_modify_templates?%>
  • <%= link_to _("Admin area"), admin_index_template_path(current_user.org_id), class: "signIn_dropdown_link" %>
  • <% elsif current_user.can_modify_guidance? %>
  • <%= link_to _("Admin area"), admin_index_guidance_path(current_user.org_id), class: "signIn_dropdown_link" %>
  • <% elsif current_user.can_modify_org_details? %> -
  • <%= link_to _("Admin area"), admin_show_org_path(current_user.org_id), class: "signIn_dropdown_link" %>
  • +
  • <%= link_to _("Admin area"), admin_edit_org_path(current_user.org_id), class: "signIn_dropdown_link" %>
  • <% elsif current_user.can_grant_permissions? %>
  • <%= link_to _("Admin area"), admin_index_users_path, class: "signIn_dropdown_link" %>
  • <% end %> diff --git a/app/views/plans/index.html.erb b/app/views/plans/index.html.erb index 180c925..472143c 100644 --- a/app/views/plans/index.html.erb +++ b/app/views/plans/index.html.erb @@ -25,7 +25,7 @@ <%= render(partial: "shared/table_filter", - locals: {path: plan_path, placeholder: _('Filter plans')}) %> + locals: {path: plans_path, placeholder: _('Filter plans')}) %> <% end %> @@ -66,13 +66,13 @@ <% if plan.administerable_by?(current_user.id) then %>
  • <%= link_to _('Share'), - share_plan_path(plan) %>
  • + share_plan_path(plan) %> <% end %>
  • <%= link_to _('Download'), show_export_plan_path(plan) %>
  • -
  • <%= link_to _('Duplicate'), +
  • <%= link_to _('Make a copy'), duplicate_plan_path(plan) %>
  • <% if plan.owned_by?(current_user.id) then %> diff --git a/lib/assets/javascripts/dmproadmap/utils.js b/lib/assets/javascripts/dmproadmap/utils.js index 6c7e170..daaeadb 100644 --- a/lib/assets/javascripts/dmproadmap/utils.js +++ b/lib/assets/javascripts/dmproadmap/utils.js @@ -16,7 +16,7 @@ // Set an auto timeout so that the dropdown disappears after a second var dropdownTimer = setTimeout(function(){ $("#" + id + "-dropdown").css('visibility', 'hidden'); - }, 1080); + }, 1260); // If the user mouses over the dropdown clear the timeout timer. hide the dropdown when the mouse out $("#" + id + "-dropdown").mouseenter(function(){