From ae2946414cfcf5c008b9ce56bbe669affddf09ec Mon Sep 17 00:00:00 2001 From: Kushal Pandya Date: Fri, 12 Jan 2018 19:45:05 +0000 Subject: [PATCH] Move row containing Projects, Users and Groups count to the top --- app/views/admin/dashboard/index.html.haml | 56 +++++++++---------- ...2-update-admin-dashboard-content-order.yml | 5 ++ 2 files changed, 33 insertions(+), 28 deletions(-) create mode 100644 changelogs/unreleased/40492-update-admin-dashboard-content-order.yml diff --git a/app/views/admin/dashboard/index.html.haml b/app/views/admin/dashboard/index.html.haml index a24516355bf..509f559c120 100644 --- a/app/views/admin/dashboard/index.html.haml +++ b/app/views/admin/dashboard/index.html.haml @@ -3,6 +3,34 @@ %div{ class: container_class } .admin-dashboard.prepend-top-default + .row + .col-sm-4 + .info-well.dark-well + .well-segment.well-centered + = link_to admin_projects_path do + %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 + .info-well.dark-well + .well-segment.well-centered + = link_to admin_users_path do + %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 + .info-well.dark-well + .well-segment.well-centered + = link_to admin_groups_path do + %h3.text-center + Groups: + = number_with_delimiter(Group.count) + %hr + = link_to 'New group', new_admin_group_path, class: "btn btn-new" .row .col-md-4 .info-well @@ -135,34 +163,6 @@ = Gitlab::Database.adapter_name %span.pull-right = Gitlab::Database.version - .row - .col-sm-4 - .info-well.dark-well - .well-segment.well-centered - = link_to admin_projects_path do - %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 - .info-well.dark-well - .well-segment.well-centered - = link_to admin_users_path do - %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 - .info-well.dark-well - .well-segment.well-centered - = link_to admin_groups_path do - %h3.text-center - Groups: - = number_with_delimiter(Group.count) - %hr - = link_to 'New group', new_admin_group_path, class: "btn btn-new" .row .col-md-4 .info-well diff --git a/changelogs/unreleased/40492-update-admin-dashboard-content-order.yml b/changelogs/unreleased/40492-update-admin-dashboard-content-order.yml new file mode 100644 index 00000000000..2416b15b6d5 --- /dev/null +++ b/changelogs/unreleased/40492-update-admin-dashboard-content-order.yml @@ -0,0 +1,5 @@ +--- +title: Move row containing Projects, Users and Groups count to the top in admin dashboard +merge_request: 16421 +author: +type: changed