diff --git a/app/views/layouts/_navigation.html.erb b/app/views/layouts/_navigation.html.erb index 00fecdc..24966ff 100644 --- a/app/views/layouts/_navigation.html.erb +++ b/app/views/layouts/_navigation.html.erb @@ -43,21 +43,39 @@
  • > <%= link_to _('Create plans'), new_plan_path %>
    • - - - - + - - - +
  • > + <%= link_to _('Help'), help_path %> +
    • <% end %> -
  • <%= link_to _('My Dashboard'), plans_path %>
    • +
  • + <%= link_to _('My Dashboard'), plans_path %> +
    • - <% if current_user.can_org_admin? %> -
  • <%= link_to _('Admin'), plans_path %>
    • + <% + if current_user.can_org_admin? && !current_user.org_id.nil? && !action_name.include?("admin_") + link = nil + + if current_user.can_modify_org_details? && current_user.org.abbreviation.blank? + link = admin_edit_org_path(current_user.org_id) + elsif current_user.can_modify_templates? + link = admin_index_template_path(current_user.org_id) + elsif current_user.can_modify_guidance? + link = admin_index_guidance_path(current_user.org_id) + elsif current_user.can_modify_org_details? + link = admin_edit_org_path(current_user.org_id) + elsif current_user.can_grant_permissions? + link = admin_index_users_path + end + end + %> + <% unless link.nil? %> +
  • + <%= link_to _('Admin'), link %> +
    • <% end %> <% end %> - + \ No newline at end of file diff --git a/app/views/layouts/_signin_signout.html.erb b/app/views/layouts/_signin_signout.html.erb index d6a08ae..613520d 100644 --- a/app/views/layouts/_signin_signout.html.erb +++ b/app/views/layouts/_signin_signout.html.erb @@ -1,33 +1,10 @@ <% if user_signed_in? %> - + <%= _('Signed in as') %> <%= current_user.name(false) %> | - - - - - - - - - - - - - - - - - - - - - - - <%= link_to _('Logout'), destroy_user_session_path, method: :delete, class: "left-indent right-indent" %> | diff --git a/app/views/plans/index.html.erb b/app/views/plans/index.html.erb index edbffd5..1c265c4 100644 --- a/app/views/plans/index.html.erb +++ b/app/views/plans/index.html.erb @@ -2,7 +2,7 @@ <% javascript "views/plans/index.js" %>

    - <%= _('My plans') %> + <%= _('My Dashboard') %>

    diff --git a/app/views/plans/share.html.erb b/app/views/plans/share.html.erb index 338e387..22b513a 100644 --- a/app/views/plans/share.html.erb +++ b/app/views/plans/share.html.erb @@ -14,7 +14,7 @@ <% @plan.template.phases.each do |phase| %> <% end %> diff --git a/app/views/plans/show.html.erb b/app/views/plans/show.html.erb index af86338..1fda9ce 100644 --- a/app/views/plans/show.html.erb +++ b/app/views/plans/show.html.erb @@ -11,7 +11,7 @@ <% @plan.template.phases.each do |phase| %> <% end %> diff --git a/app/views/plans/show_export.html.erb b/app/views/plans/show_export.html.erb index 3270041..f0224a0 100644 --- a/app/views/plans/show_export.html.erb +++ b/app/views/plans/show_export.html.erb @@ -13,7 +13,7 @@ <% @plan.template.phases.each do |phase| %> <% end %> diff --git a/lib/assets/stylesheets/dmproadmap/base.scss b/lib/assets/stylesheets/dmproadmap/base.scss index 0258fee..ee7c9ac 100644 --- a/lib/assets/stylesheets/dmproadmap/base.scss +++ b/lib/assets/stylesheets/dmproadmap/base.scss @@ -280,6 +280,10 @@ line-height: 20px; } } + li.highlight-color-button { + color: $highlight-color; + background-color: $highlight-background-color; + } li.active, ul li:hover { color: $primary-color; background-color: $white; diff --git a/lib/assets/stylesheets/dmproadmap/forms.scss b/lib/assets/stylesheets/dmproadmap/forms.scss index 9a8ec64..316edf1 100644 --- a/lib/assets/stylesheets/dmproadmap/forms.scss +++ b/lib/assets/stylesheets/dmproadmap/forms.scss @@ -597,7 +597,7 @@ position: relative; fieldset { - padding-bottom: 15px; + margin-bottom: 10px; } #plan_title {