Add text/tips to clarify various user counts in self-managed admin panels

app/views/admin/dashboard/index.html.haml

 - 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|
@@ -22,10 +24,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"

ee/app/views/admin/dashboard/_billable_users_text.html.haml

+- 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 }
+
 = s_('AdminArea|Billable users')
+%span.gl-outline-0.gl-ml-2{ href: "#", tabindex: "0", role: "button", data: { container: "body",
+  toggle: "popover",
+  placement: "top",
+  html: "true",
+  trigger: "focus",
+  content: s_("AdminArea|%{billable_users_link_start}Learn more%{billable_users_link_end} about what defines a billable user").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')

ee/app/views/admin/licenses/_breakdown.html.haml

@@ -13,6 +13,8 @@
 
 - true_up_url = 'https://about.gitlab.com/license-faq/'
 - true_up_link_start = '<a href="%{url}">'.html_safe % { url: true_up_url }
+- 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 }
 - link_end = '</a>'.html_safe
 
 .license-panel.gl-mt-5
@@ -57,7 +59,7 @@
             = number_with_delimiter current_active_user_count
           %hr
             %p
-            = _('This is the number of currently active users on your installation, and this is the minimum number you need to purchase when you renew your license.')
+            = _('This is the number of %{billable_users_link_start}billable users%{link_end} on your installation, and this is the minimum number you need to purchase when you renew your license.').html_safe % { billable_users_link_start: billable_users_link_start, link_end: link_end }
   .d-flex.gl-pb-5
     .col-sm-6.d-flex.pl-0
       .info-well.dark-well.flex-fill.gl-mb-0

ee/changelogs/unreleased/233820-add-text-tips-to-clarify-various-user-counts-in-self-managed-ad.yml

+---
+title: Add text/tips to clarify various user counts in self-managed admin panels
+merge_request: 44986
+author:
+type: other

locale/gitlab.pot

@@ -1856,9 +1856,15 @@ msgstr ""
 msgid "Admin notes"
 msgstr ""
 
+msgid "AdminArea|%{billable_users_link_start}Learn more%{billable_users_link_end} about what defines a billable user"
+msgstr ""
+
 msgid "AdminArea|Active users"
 msgstr ""
 
+msgid "AdminArea|All users created in the instance, including users who are not %{billable_users_link_start}billable users%{billable_users_link_end}."
+msgstr ""
+
 msgid "AdminArea|Billable users"
 msgstr ""
 
@@ -27346,7 +27352,7 @@ msgstr ""
 msgid "This is the highest peak of users on your installation since the license started."
 msgstr ""
 
-msgid "This is the number of currently active users on your installation, and this is the minimum number you need to purchase when you renew your license."
+msgid "This is the number of %{billable_users_link_start}billable users%{link_end} on your installation, and this is the minimum number you need to purchase when you renew your license."
 msgstr ""
 
 msgid "This is your current session"