diff options
| author | Annabel Dunstone Gray <annabel.dunstone@gmail.com> | 2018-01-12 19:46:38 +0000 |
|---|---|---|
| committer | Annabel Dunstone Gray <annabel.dunstone@gmail.com> | 2018-01-12 19:46:38 +0000 |
| commit | e4aa2bd30f32f6df167b7c728a2f92897fe28736 (patch) | |
| tree | a4ab423a8977a4fd1b42102dbdd02cd2f0130d85 | |
| parent | 214cf9c2c5031b0682d6cad437b2137a9bf56a38 (diff) | |
| parent | ae2946414cfcf5c008b9ce56bbe669affddf09ec (diff) | |
| download | gitlab-ce-e4aa2bd30f32f6df167b7c728a2f92897fe28736.tar.gz | |
Merge branch '40492-update-admin-dashboard-content-order' into 'master'
Move row containing Projects, Users and Groups count to the top
Closes #40492
See merge request gitlab-org/gitlab-ce!16421
| -rw-r--r-- | app/views/admin/dashboard/index.html.haml | 56 | ||||
| -rw-r--r-- | changelogs/unreleased/40492-update-admin-dashboard-content-order.yml | 5 |
2 files changed, 33 insertions, 28 deletions
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 @@ -4,6 +4,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 .well-segment.admin-well.admin-well-statistics @@ -136,34 +164,6 @@ %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 .well-segment.admin-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 |