diff options
Diffstat (limited to 'app/views/admin/dashboard/index.html.haml')
| -rw-r--r-- | app/views/admin/dashboard/index.html.haml | 24 |
1 files changed, 21 insertions, 3 deletions
diff --git a/app/views/admin/dashboard/index.html.haml b/app/views/admin/dashboard/index.html.haml index b0d4a3fd8f5..220a211cca6 100644 --- a/app/views/admin/dashboard/index.html.haml +++ b/app/views/admin/dashboard/index.html.haml @@ -1,5 +1,7 @@ - breadcrumb_title _("Dashboard") - page_title _("Dashboard") +- billable_users_url = help_page_path('subscriptions/self_managed/index', anchor: 'billable-users') +- billable_users_link_start = '<a href="%{url}" target="_blank" rel="noopener noreferrer nofollow">'.html_safe % { url: billable_users_url } - if @notices - @notices.each do |notice| @@ -8,7 +10,9 @@ = notice[:message].html_safe - if @license.present? && show_license_breakdown? - = render_if_exists 'admin/licenses/breakdown' + .license-panel.gl-mt-5 + = render_if_exists 'admin/licenses/summary' + = render_if_exists 'admin/licenses/breakdown' .admin-dashboard.gl-mt-3 .row @@ -22,10 +26,20 @@ = link_to(s_('AdminArea|New project'), new_project_path, class: "btn gl-button btn-success gl-w-full") .col-sm-4 .info-well.dark-well - .well-segment.well-centered + .well-segment.well-centered.gl-text-center = link_to admin_users_path do - %h3.text-center + %h3.gl-display-inline-block.gl-mb-0 = s_('AdminArea|Users: %{number_of_users}') % { number_of_users: approximate_count_with_delimiters(@counts, User) } + + %span.gl-outline-0.gl-ml-2{ href: "#", tabindex: "0", data: { container: "body", + toggle: "popover", + placement: "top", + html: "true", + trigger: "focus", + content: s_("AdminArea|All users created in the instance, including users who are not %{billable_users_link_start}billable users%{billable_users_link_end}.").html_safe % { billable_users_link_start: billable_users_link_start, billable_users_link_end: '</a>'.html_safe }, + } } + = sprite_icon('question', size: 16, css_class: 'gl-text-gray-700 gl-mb-1') + %hr .btn-group.d-flex{ role: 'group' } = link_to s_('AdminArea|New user'), new_admin_user_path, class: "btn gl-button btn-success gl-w-full" @@ -126,6 +140,10 @@ %span.float-right = Gitlab::Database.version %p + = _('Redis') + %span.float-right + = @redis_versions&.join(", ") + %p = link_to _("Gitaly Servers"), admin_gitaly_servers_path .row .col-md-4 |