Skip to content

G
gitlab-ce
Commit 46e6be38 authored by tauriedavis's avatar tauriedavis
Browse files
Options

Port of 32838-admin-panel-spacing to EE

parent ad8e7eb1
Hide whitespace changes
Inline Side-by-side
Showing with 232 additions and 211 deletions
app/assets/stylesheets/framework/wells.scss
View file @ 46e6be38
......@@ -3,6 +3,7 @@
color: $gl-text-color;
border: 1px solid $border-color;
border-radius: $border-radius-default;
margin-bottom: $gl-padding;
.well-segment {
padding: $gl-padding;
......@@ -21,6 +22,11 @@
font-size: 12px;
}
}
&.admin-well h4 {
border-bottom: 1px solid $border-color;
padding-bottom: 8px;
}
}
.icon-container {
......@@ -53,6 +59,14 @@
padding: 15px;
}
.dark-well {
background-color: $gray-normal;
.btn {
width: 100%;
}
}
.well-centered {
h1 {
font-weight: normal;
......
app/views/admin/dashboard/index.html.haml
View file @ 46e6be38
......@@ -8,200 +8,200 @@
.admin-dashboard.prepend-top-default
.row
.col-md-4
%h4 Statistics
%hr
%p
Forks
%span.light.pull-right
= number_with_delimiter(ForkedProjectLink.count)
%p
Issues
%span.light.pull-right
= number_with_delimiter(Issue.count)
%p
Merge Requests
%span.light.pull-right
= number_with_delimiter(MergeRequest.count)
%p
Notes
%span.light.pull-right
= number_with_delimiter(Note.count)
%p
Snippets
%span.light.pull-right
= number_with_delimiter(Snippet.count)
%p
SSH Keys
%span.light.pull-right
= number_with_delimiter(Key.count)
%p
Milestones
%span.light.pull-right
= number_with_delimiter(Milestone.count)
%p
Active Users
%span.light.pull-right
= number_with_delimiter(User.active.count)
.info-well
.well-segment.admin-well
%h4 Statistics
%p
Forks
%span.light.pull-right
= number_with_delimiter(ForkedProjectLink.count)
%p
Issues
%span.light.pull-right
= number_with_delimiter(Issue.count)
%p
Merge Requests
%span.light.pull-right
= number_with_delimiter(MergeRequest.count)
%p
Notes
%span.light.pull-right
= number_with_delimiter(Note.count)
%p
Snippets
%span.light.pull-right
= number_with_delimiter(Snippet.count)
%p
SSH Keys
%span.light.pull-right
= number_with_delimiter(Key.count)
%p
Milestones
%span.light.pull-right
= number_with_delimiter(Milestone.count)
%p
Active Users
%span.light.pull-right
= number_with_delimiter(User.active.count)
.col-md-4
%h4
Features
%hr
- sign_up = "Sign up"
%p{ "aria-label" => "#{sign_up}: status " + (signup_enabled? ? "on" : "off") }
= sign_up
%span.light.pull-right
= boolean_to_icon signup_enabled?
- ldap = "LDAP"
%p{ "aria-label" => "#{ldap}: status " + (Gitlab.config.ldap.enabled ? "on" : "off") }
= ldap
%span.light.pull-right
= boolean_to_icon Gitlab.config.ldap.enabled
- gravatar = "Gravatar"
%p{ "aria-label" => "#{gravatar}: status " + (gravatar_enabled? ? "on" : "off") }
= gravatar
%span.light.pull-right
= boolean_to_icon gravatar_enabled?
- omniauth = "OmniAuth"
%p{ "aria-label" => "#{omniauth}: status " + (Gitlab.config.omniauth.enabled ? "on" : "off") }
= omniauth
%span.light.pull-right
= boolean_to_icon Gitlab.config.omniauth.enabled
- reply_email = "Reply by email"
%p{ "aria-label" => "#{reply_email}: status " + (Gitlab::IncomingEmail.enabled? ? "on" : "off") }
= reply_email
%span.light.pull-right
= boolean_to_icon Gitlab::IncomingEmail.enabled?
- elastic = "Elasticsearch"
%p{ "aria-label" => "#{elastic}: status " + (current_application_settings.elasticsearch_search? ? "on" : "off") }
= elastic
%span.light.pull-right
= boolean_to_icon current_application_settings.elasticsearch_search?
- geo = "Geo"
%p{ "aria-label" => "#{geo}: status " + (Gitlab::Geo.enabled? ? "on" : "off") }
= geo
%span.light.pull-right
= boolean_to_icon Gitlab::Geo.enabled?
- container_reg = "Container Registry"
%p{ "aria-label" => "#{container_reg}: status " + (Gitlab.config.registry.enabled ? "on" : "off") }
= container_reg
%span.light.pull-right
= boolean_to_icon Gitlab.config.registry.enabled
- gitlab_pages = 'GitLab Pages'
- gitlab_pages_enabled = Gitlab.config.pages.enabled
%p{ "aria-label" => "#{gitlab_pages}: status " + (gitlab_pages_enabled ? "on" : "off") }
= gitlab_pages
%span.light.pull-right
= boolean_to_icon gitlab_pages_enabled
- gitlab_shared_runners = 'Shared Runners'
- gitlab_shared_runners_enabled = Gitlab.config.gitlab_ci.shared_runners_enabled
%p{ "aria-label" => "#{gitlab_shared_runners}: status " + (gitlab_shared_runners_enabled ? "on" : "off") }
= gitlab_shared_runners
%span.light.pull-right
= boolean_to_icon gitlab_shared_runners_enabled
.info-well
.well-segment.admin-well
%h4 Features
- sign_up = "Sign up"
%p{ "aria-label" => "#{sign_up}: status " + (signup_enabled? ? "on" : "off") }
= sign_up
%span.light.pull-right
= boolean_to_icon signup_enabled?
- ldap = "LDAP"
%p{ "aria-label" => "#{ldap}: status " + (Gitlab.config.ldap.enabled ? "on" : "off") }
= ldap
%span.light.pull-right
= boolean_to_icon Gitlab.config.ldap.enabled
- gravatar = "Gravatar"
%p{ "aria-label" => "#{gravatar}: status " + (gravatar_enabled? ? "on" : "off") }
= gravatar
%span.light.pull-right
= boolean_to_icon gravatar_enabled?
- omniauth = "OmniAuth"
%p{ "aria-label" => "#{omniauth}: status " + (Gitlab.config.omniauth.enabled ? "on" : "off") }
= omniauth
%span.light.pull-right
= boolean_to_icon Gitlab.config.omniauth.enabled
- reply_email = "Reply by email"
%p{ "aria-label" => "#{reply_email}: status " + (Gitlab::IncomingEmail.enabled? ? "on" : "off") }
= reply_email
%span.light.pull-right
= boolean_to_icon Gitlab::IncomingEmail.enabled?
- elastic = "Elasticsearch"
%p{ "aria-label" => "#{elastic}: status " + (current_application_settings.elasticsearch_search? ? "on" : "off") }
= elastic
%span.light.pull-right
= boolean_to_icon current_application_settings.elasticsearch_search?
- geo = "Geo"
%p{ "aria-label" => "#{geo}: status " + (Gitlab::Geo.enabled? ? "on" : "off") }
= geo
%span.light.pull-right
= boolean_to_icon Gitlab::Geo.enabled?
- container_reg = "Container Registry"
%p{ "aria-label" => "#{container_reg}: status " + (Gitlab.config.registry.enabled ? "on" : "off") }
= container_reg
%span.light.pull-right
= boolean_to_icon Gitlab.config.registry.enabled
- gitlab_pages = 'GitLab Pages'
- gitlab_pages_enabled = Gitlab.config.pages.enabled
%p{ "aria-label" => "#{gitlab_pages}: status " + (gitlab_pages_enabled ? "on" : "off") }
= gitlab_pages
%span.light.pull-right
= boolean_to_icon gitlab_pages_enabled
- gitlab_shared_runners = 'Shared Runners'
- gitlab_shared_runners_enabled = Gitlab.config.gitlab_ci.shared_runners_enabled
%p{ "aria-label" => "#{gitlab_shared_runners}: status " + (gitlab_shared_runners_enabled ? "on" : "off") }
= gitlab_shared_runners
%span.light.pull-right
= boolean_to_icon gitlab_shared_runners_enabled
.col-md-4
%h4
Components
- if current_application_settings.version_check_enabled
.pull-right
= version_status_badge
%hr
%p
GitLab
%span.pull-right
= Gitlab::VERSION
%p
GitLab Shell
%span.pull-right
= Gitlab::Shell.new.version
%p
GitLab Workhorse
%span.pull-right
= gitlab_workhorse_version
%p
GitLab API
%span.pull-right
= API::API::version
- if Gitlab::Geo.enabled?
%p
Geo
%span.pull-right
- if Gitlab::Geo.current_node
= Gitlab::Geo.current_node.primary ? 'Primary node' : 'Secondary node'
- else
Undefined
%p
Git
%span.pull-right
= Gitlab::Git.version
%p
Ruby
%span.pull-right
#{RUBY_VERSION}p#{RUBY_PATCHLEVEL}
%p
Rails
%span.pull-right
#{Rails::VERSION::STRING}
%p
= Gitlab::Database.adapter_name
%span.pull-right
= Gitlab::Database.version
%hr
.info-well
.well-segment.admin-well
%h4
Components
- if current_application_settings.version_check_enabled
.pull-right
= version_status_badge
%p
GitLab
%span.pull-right
= Gitlab::VERSION
%p
GitLab Shell
%span.pull-right
= Gitlab::Shell.new.version
%p
GitLab Workhorse
%span.pull-right
= gitlab_workhorse_version
%p
GitLab API
%span.pull-right
= API::API::version
- if Gitlab::Geo.enabled?
%p
Geo
%span.pull-right
- if Gitlab::Geo.current_node
= Gitlab::Geo.current_node.primary ? 'Primary node' : 'Secondary node'
- else
Undefined
%p
Git
%span.pull-right
= Gitlab::Git.version
%p
Ruby
%span.pull-right
#{RUBY_VERSION}p#{RUBY_PATCHLEVEL}
%p
Rails
%span.pull-right
#{Rails::VERSION::STRING}
%p
= Gitlab::Database.adapter_name
%span.pull-right
= Gitlab::Database.version
.row
.col-sm-4
.light-well.well-centered
%h4 Projects
.data
.info-well.dark-well
.well-segment.well-centered
= link_to admin_projects_path do
%h1= number_with_delimiter(Project.cached_count)
%h3.text-center
Projects:
= number_with_delimiter(Project.cached_count)
%hr
= link_to('New project', new_project_path, class: "btn btn-new")
.col-sm-4
.light-well.well-centered
%h4 Users
.data
.info-well.dark-well
.well-segment.well-centered
= link_to admin_users_path do
%h1= number_with_delimiter(User.count)
%h3.text-center
Users:
= number_with_delimiter(User.count)
%hr
= link_to 'New user', new_admin_user_path, class: "btn btn-new"
.col-sm-4
.light-well.well-centered
%h4 Groups
.data
.info-well.dark-well
.well-segment.well-centered
= link_to admin_groups_path do
%h1= number_with_delimiter(Group.count)
%h3.text-center
Groups
= number_with_delimiter(Group.count)
%hr
= link_to 'New group', new_admin_group_path, class: "btn btn-new"
.row.prepend-top-10
.row
.col-md-4
%h4 Latest projects
%hr
- @projects.each do |project|
%p
= link_to project.name_with_namespace, [:admin, project.namespace.becomes(Namespace), project], class: 'str-truncated-60'
%span.light.pull-right
#{time_ago_with_tooltip(project.created_at)}
.info-well
.well-segment.admin-well
%h4 Latest projects
- @projects.each do |project|
%p
= link_to project.name_with_namespace, [:admin, project.namespace.becomes(Namespace), project], class: 'str-truncated-60'
%span.light.pull-right
#{time_ago_with_tooltip(project.created_at)}
.col-md-4
%h4 Latest users
%hr
- @users.each do |user|
%p
= link_to [:admin, user], class: 'str-truncated-60' do
= user.name
%span.light.pull-right
#{time_ago_with_tooltip(user.created_at)}
.info-well
.well-segment.admin-well
%h4 Latest users
- @users.each do |user|
%p
= link_to [:admin, user], class: 'str-truncated-60' do
= user.name
%span.light.pull-right
#{time_ago_with_tooltip(user.created_at)}
.col-md-4
%h4 Latest groups
%hr
- @groups.each do |group|
%p
= link_to [:admin, group], class: 'str-truncated-60' do
= group.full_name
%span.light.pull-right
#{time_ago_with_tooltip(group.created_at)}
.info-well
.well-segment.admin-well
%h4 Latest groups
- @groups.each do |group|
%p
= link_to [:admin, group], class: 'str-truncated-60' do
= group.full_name
%span.light.pull-right
#{time_ago_with_tooltip(group.created_at)}
app/views/admin/licenses/_breakdown.html.haml
View file @ 46e6be38
......@@ -13,37 +13,40 @@
.license-panel.prepend-top-default
.row
.col-sm-4
.light-well
%h4 Users in License
.data
%h1.center= licensed_users
%hr
- if @license.will_expire?
Your license is valid from
%strong
#{@license.starts_at} to
%strong<>
#{@license.expires_at}
\.
The
%a{ href: 'https://about.gitlab.com/license-faq/' } true-up model
allows having more users, and additional users will incur a retroactive charge on renewal.
.col-sm-4
.light-well
%h4 Maximum Users
.data
%h1.center= number_with_delimiter historical
%hr
This is the highest peak of users on your installation since the license started, and this is the minimum
number you need to purchase when you renew your license.
.col-sm-4
.light-well
%h4 Users over License
.data
%h1.center= number_with_delimiter users_over_license
%hr
.info-well.dark-well
.well-segment.well-centered
%h3.center
Users in License:
= licensed_users
%hr
- if @license.will_expire?
Your license is valid from
%strong
#{@license.starts_at} to
%strong<>
#{@license.expires_at}
\.
The
%a{ href: 'https://about.gitlab.com/license-faq/' } true-up model
has a retroactive charge for these users at the next renewal. If you want to update your
license sooner to prevent this, please contact
#{mail_to 'sales@gitlab.com'}.
allows having more users, and additional users will incur a retroactive charge on renewal.
.col-sm-4
.info-well.dark-well
.well-segment.well-centered
%h3.center
Maximum Users:
= number_with_delimiter historical
%hr
This is the highest peak of users on your installation since the license started, and this is the minimum
number you need to purchase when you renew your license.
.col-sm-4
.info-well.dark-well
.well-segment.well-centered
%h3.center
Users over License:
= number_with_delimiter users_over_license
%hr
The
%a{ href: 'https://about.gitlab.com/license-faq/' } true-up model
has a retroactive charge for these users at the next renewal. If you want to update your
license sooner to prevent this, please contact
#{mail_to 'sales@gitlab.com'}.
changelogs/unreleased/32838-admin-panel-spacing.yml 0 → 100644
View file @ 46e6be38
---
title: Add wells to admin dashboard overview to fix spacing problems
merge_request:
author:
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7