Skip to content

G
gitlab-ce
Commit 45ee128e authored by Annabel Dunstone Gray's avatar Annabel Dunstone Gray
Browse files
Options

Merge branch '32838-admin-panel-spacing' into 'master' 

32838 Add wells to admin dashboard overview to fix spacing problems

Closes #32838

See merge request !12467
parents 98768953 9c7f3fab
Hide whitespace changes
Inline Side-by-side
Showing with 179 additions and 161 deletions
app/assets/stylesheets/framework/wells.scss
View file @ 45ee128e
...@@ -3,6 +3,7 @@ ...@@ -3,6 +3,7 @@
color: $gl-text-color; color: $gl-text-color;
border: 1px solid $border-color; border: 1px solid $border-color;
border-radius: $border-radius-default; border-radius: $border-radius-default;
margin-bottom: $gl-padding;
.well-segment { .well-segment {
padding: $gl-padding; padding: $gl-padding;
...@@ -21,6 +22,11 @@ ...@@ -21,6 +22,11 @@
font-size: 12px; font-size: 12px;
} }
} }
&.admin-well h4 {
border-bottom: 1px solid $border-color;
padding-bottom: 8px;
}
} }
.icon-container { .icon-container {
...@@ -53,6 +59,14 @@ ...@@ -53,6 +59,14 @@
padding: 15px; padding: 15px;
} }
.dark-well {
background-color: $gray-normal;
.btn {
width: 100%;
}
}
.well-centered { .well-centered {
h1 { h1 {
font-weight: normal; font-weight: normal;
......
app/views/admin/dashboard/index.html.haml
View file @ 45ee128e
...@@ -5,182 +5,182 @@ ...@@ -5,182 +5,182 @@
.admin-dashboard.prepend-top-default .admin-dashboard.prepend-top-default
.row .row
.col-md-4 .col-md-4
%h4 Statistics .info-well
%hr .well-segment.admin-well
%p %h4 Statistics
Forks %p
%span.light.pull-right Forks
= number_with_delimiter(ForkedProjectLink.count) %span.light.pull-right
%p = number_with_delimiter(ForkedProjectLink.count)
Issues %p
%span.light.pull-right Issues
= number_with_delimiter(Issue.count) %span.light.pull-right
%p = number_with_delimiter(Issue.count)
Merge Requests %p
%span.light.pull-right Merge Requests
= number_with_delimiter(MergeRequest.count) %span.light.pull-right
%p = number_with_delimiter(MergeRequest.count)
Notes %p
%span.light.pull-right Notes
= number_with_delimiter(Note.count) %span.light.pull-right
%p = number_with_delimiter(Note.count)
Snippets %p
%span.light.pull-right Snippets
= number_with_delimiter(Snippet.count) %span.light.pull-right
%p = number_with_delimiter(Snippet.count)
SSH Keys %p
%span.light.pull-right SSH Keys
= number_with_delimiter(Key.count) %span.light.pull-right
%p = number_with_delimiter(Key.count)
Milestones %p
%span.light.pull-right Milestones
= number_with_delimiter(Milestone.count) %span.light.pull-right
%p = number_with_delimiter(Milestone.count)
Active Users %p
%span.light.pull-right Active Users
= number_with_delimiter(User.active.count) %span.light.pull-right
= number_with_delimiter(User.active.count)
.col-md-4 .col-md-4
%h4 .info-well
Features .well-segment.admin-well
%hr %h4 Features
- sign_up = "Sign up" - sign_up = "Sign up"
%p{ "aria-label" => "#{sign_up}: status " + (signup_enabled? ? "on" : "off") } %p{ "aria-label" => "#{sign_up}: status " + (signup_enabled? ? "on" : "off") }
= sign_up = sign_up
%span.light.pull-right %span.light.pull-right
= boolean_to_icon signup_enabled? = boolean_to_icon signup_enabled?
- ldap = "LDAP" - ldap = "LDAP"
%p{ "aria-label" => "#{ldap}: status " + (Gitlab.config.ldap.enabled ? "on" : "off") } %p{ "aria-label" => "#{ldap}: status " + (Gitlab.config.ldap.enabled ? "on" : "off") }
= ldap = ldap
%span.light.pull-right %span.light.pull-right
= boolean_to_icon Gitlab.config.ldap.enabled = boolean_to_icon Gitlab.config.ldap.enabled
- gravatar = "Gravatar" - gravatar = "Gravatar"
%p{ "aria-label" => "#{gravatar}: status " + (gravatar_enabled? ? "on" : "off") } %p{ "aria-label" => "#{gravatar}: status " + (gravatar_enabled? ? "on" : "off") }
= gravatar = gravatar
%span.light.pull-right %span.light.pull-right
= boolean_to_icon gravatar_enabled? = boolean_to_icon gravatar_enabled?
- omniauth = "OmniAuth" - omniauth = "OmniAuth"
%p{ "aria-label" => "#{omniauth}: status " + (Gitlab.config.omniauth.enabled ? "on" : "off") } %p{ "aria-label" => "#{omniauth}: status " + (Gitlab.config.omniauth.enabled ? "on" : "off") }
= omniauth = omniauth
%span.light.pull-right %span.light.pull-right
= boolean_to_icon Gitlab.config.omniauth.enabled = boolean_to_icon Gitlab.config.omniauth.enabled
- reply_email = "Reply by email" - reply_email = "Reply by email"
%p{ "aria-label" => "#{reply_email}: status " + (Gitlab::IncomingEmail.enabled? ? "on" : "off") } %p{ "aria-label" => "#{reply_email}: status " + (Gitlab::IncomingEmail.enabled? ? "on" : "off") }
= reply_email = reply_email
%span.light.pull-right %span.light.pull-right
= boolean_to_icon Gitlab::IncomingEmail.enabled? = boolean_to_icon Gitlab::IncomingEmail.enabled?
- container_reg = "Container Registry" - container_reg = "Container Registry"
%p{ "aria-label" => "#{container_reg}: status " + (Gitlab.config.registry.enabled ? "on" : "off") } %p{ "aria-label" => "#{container_reg}: status " + (Gitlab.config.registry.enabled ? "on" : "off") }
= container_reg = container_reg
%span.light.pull-right %span.light.pull-right
= boolean_to_icon Gitlab.config.registry.enabled = boolean_to_icon Gitlab.config.registry.enabled
- gitlab_pages = 'GitLab Pages' - gitlab_pages = 'GitLab Pages'
- gitlab_pages_enabled = Gitlab.config.pages.enabled - gitlab_pages_enabled = Gitlab.config.pages.enabled
%p{ "aria-label" => "#{gitlab_pages}: status " + (gitlab_pages_enabled ? "on" : "off") } %p{ "aria-label" => "#{gitlab_pages}: status " + (gitlab_pages_enabled ? "on" : "off") }
= gitlab_pages = gitlab_pages
%span.light.pull-right %span.light.pull-right
= boolean_to_icon gitlab_pages_enabled = boolean_to_icon gitlab_pages_enabled
- gitlab_shared_runners = 'Shared Runners' - gitlab_shared_runners = 'Shared Runners'
- gitlab_shared_runners_enabled = Gitlab.config.gitlab_ci.shared_runners_enabled - gitlab_shared_runners_enabled = Gitlab.config.gitlab_ci.shared_runners_enabled
%p{ "aria-label" => "#{gitlab_shared_runners}: status " + (gitlab_shared_runners_enabled ? "on" : "off") } %p{ "aria-label" => "#{gitlab_shared_runners}: status " + (gitlab_shared_runners_enabled ? "on" : "off") }
= gitlab_shared_runners = gitlab_shared_runners
%span.light.pull-right %span.light.pull-right
= boolean_to_icon gitlab_shared_runners_enabled = boolean_to_icon gitlab_shared_runners_enabled
.col-md-4 .col-md-4
%h4 .info-well
Components .well-segment.admin-well
- if current_application_settings.version_check_enabled %h4
.pull-right Components
= version_status_badge - if current_application_settings.version_check_enabled
.pull-right
%hr = version_status_badge
%p %p
GitLab GitLab
%span.pull-right %span.pull-right
= Gitlab::VERSION = Gitlab::VERSION
%p %p
GitLab Shell GitLab Shell
%span.pull-right %span.pull-right
= Gitlab::Shell.new.version = Gitlab::Shell.new.version
%p %p
GitLab Workhorse GitLab Workhorse
%span.pull-right %span.pull-right
= gitlab_workhorse_version = gitlab_workhorse_version
%p %p
GitLab API GitLab API
%span.pull-right %span.pull-right
= API::API::version = API::API::version
%p %p
Git Git
%span.pull-right %span.pull-right
= Gitlab::Git.version = Gitlab::Git.version
%p %p
Ruby Ruby
%span.pull-right %span.pull-right
#{RUBY_VERSION}p#{RUBY_PATCHLEVEL} #{RUBY_VERSION}p#{RUBY_PATCHLEVEL}
%p
%p Rails
Rails %span.pull-right
%span.pull-right #{Rails::VERSION::STRING}
#{Rails::VERSION::STRING} %p
= Gitlab::Database.adapter_name
%p %span.pull-right
= Gitlab::Database.adapter_name = Gitlab::Database.version
%span.pull-right
= Gitlab::Database.version
%hr
.row .row
.col-sm-4 .col-sm-4
.light-well.well-centered .info-well.dark-well
%h4 Projects .well-segment.well-centered
.data
= link_to admin_projects_path do = link_to admin_projects_path do
%h1= number_with_delimiter(Project.cached_count) %h3.text-center
Projects:
= number_with_delimiter(Project.cached_count)
%hr %hr
= link_to('New project', new_project_path, class: "btn btn-new") = link_to('New project', new_project_path, class: "btn btn-new")
.col-sm-4 .col-sm-4
.light-well.well-centered .info-well.dark-well
%h4 Users .well-segment.well-centered
.data
= link_to admin_users_path do = link_to admin_users_path do
%h1= number_with_delimiter(User.count) %h3.text-center
Users:
= number_with_delimiter(User.count)
%hr %hr
= link_to 'New user', new_admin_user_path, class: "btn btn-new" = link_to 'New user', new_admin_user_path, class: "btn btn-new"
.col-sm-4 .col-sm-4
.light-well.well-centered .info-well.dark-well
%h4 Groups .well-segment.well-centered
.data
= link_to admin_groups_path do = link_to admin_groups_path do
%h1= number_with_delimiter(Group.count) %h3.text-center
Groups
= number_with_delimiter(Group.count)
%hr %hr
= link_to 'New group', new_admin_group_path, class: "btn btn-new" = link_to 'New group', new_admin_group_path, class: "btn btn-new"
.row
.row.prepend-top-10
.col-md-4 .col-md-4
%h4 Latest projects .info-well
%hr .well-segment.admin-well
- @projects.each do |project| %h4 Latest projects
%p - @projects.each do |project|
= link_to project.name_with_namespace, [:admin, project.namespace.becomes(Namespace), project], class: 'str-truncated-60' %p
%span.light.pull-right = link_to project.name_with_namespace, [:admin, project.namespace.becomes(Namespace), project], class: 'str-truncated-60'
#{time_ago_with_tooltip(project.created_at)} %span.light.pull-right
#{time_ago_with_tooltip(project.created_at)}
.col-md-4 .col-md-4
%h4 Latest users .info-well
%hr .well-segment.admin-well
- @users.each do |user| %h4 Latest users
%p - @users.each do |user|
= link_to [:admin, user], class: 'str-truncated-60' do %p
= user.name = link_to [:admin, user], class: 'str-truncated-60' do
%span.light.pull-right = user.name
#{time_ago_with_tooltip(user.created_at)} %span.light.pull-right
#{time_ago_with_tooltip(user.created_at)}
.col-md-4 .col-md-4
%h4 Latest groups .info-well
%hr .well-segment.admin-well
- @groups.each do |group| %h4 Latest groups
%p - @groups.each do |group|
= link_to [:admin, group], class: 'str-truncated-60' do %p
= group.full_name = link_to [:admin, group], class: 'str-truncated-60' do
%span.light.pull-right = group.full_name
#{time_ago_with_tooltip(group.created_at)} %span.light.pull-right
#{time_ago_with_tooltip(group.created_at)}
changelogs/unreleased/32838-admin-panel-spacing.yml 0 → 100644
View file @ 45ee128e
---
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