Merge branch 'master' into new-nav-fix-contextual-breadcrumbs

3 files changed, 93 insertions, 47 deletions

diff --git a/app/views/dashboard/projects/_blank_state_admin_welcome.html.haml b/app/views/dashboard/projects/_blank_state_admin_welcome.html.haml
new file mode 100644
index 00000000000..209afd4aab4
--- /dev/null
+++ b/app/views/dashboard/projects/_blank_state_admin_welcome.html.haml
@@ -0,0 +1,33 @@
+.blank-state
+  .blank-state-icon
+    = custom_icon("add_new_user", size: 50)
+  .blank-state-body
+    %h3.blank-state-title
+      Add user
+    %p.blank-state-text
+      Add your team members and others to GitLab.
+    = link_to new_admin_user_path, class: "btn btn-new" do
+      New user
+
+.blank-state
+  .blank-state-icon
+    = custom_icon("configure_server", size: 50)
+  .blank-state-body
+    %h3.blank-state-title
+      Configure GitLab
+    %p.blank-state-text
+      Make adjustments to how your GitLab instance is set up.
+    = link_to admin_root_path, class: "btn btn-new" do
+      Configure
+
+- if current_user.can_create_group?
+  .blank-state
+    .blank-state-icon
+      = custom_icon("add_new_group", size: 50)
+    .blank-state-body
+      %h3.blank-state-title
+        Create a group
+      %p.blank-state-text
+        Groups are a great way to organise projects and people.
+      = link_to new_group_path, class: "btn btn-new" do
+        New group
diff --git a/app/views/dashboard/projects/_blank_state_welcome.html.haml b/app/views/dashboard/projects/_blank_state_welcome.html.haml
new file mode 100644
index 00000000000..a93a3415ee1
--- /dev/null
+++ b/app/views/dashboard/projects/_blank_state_welcome.html.haml
@@ -0,0 +1,48 @@
+- public_project_count = ProjectsFinder.new(current_user: current_user).execute.count
+
+- if current_user.can_create_group?
+  .blank-state
+    .blank-state-icon
+      = custom_icon("add_new_group", size: 50)
+    .blank-state-body
+      %h3.blank-state-title
+        Create a group for several dependent projects.
+      %p.blank-state-text
+        Groups are the best way to manage projects and members.
+      = link_to new_group_path, class: "btn btn-new" do
+        New group
+
+.blank-state
+  .blank-state-icon
+    = custom_icon("add_new_project", size: 50)
+  .blank-state-body
+    %h3.blank-state-title
+      Create a project
+    %p.blank-state-text
+      - if current_user.can_create_project?
+        You don't have access to any projects right now.
+        You can create up to
+        %strong= number_with_delimiter(current_user.projects_limit)
+        = succeed "." do
+          = "project".pluralize(current_user.projects_limit)
+      - else
+        If you are added to a project, it will be displayed here.
+    - if current_user.can_create_project?
+      = link_to new_project_path, class: "btn btn-new" do
+        New project
+
+- if public_project_count > 0
+  .blank-state
+    .blank-state-icon
+      = custom_icon("globe", size: 50)
+    .blank-state-body
+      %h3.blank-state-title
+        Explore public projects
+      %p.blank-state-text
+        There are
+        = number_with_delimiter(public_project_count)
+        public projects on this server.
+        Public projects are an easy way to allow
+        everyone to have read-only access.
+      = link_to trending_explore_projects_path, class: "btn btn-new" do
+        Browse projects
diff --git a/app/views/dashboard/projects/_zero_authorized_projects.html.haml b/app/views/dashboard/projects/_zero_authorized_projects.html.haml
index 8843d4e7c84..ad3fac6d164 100644
--- a/app/views/dashboard/projects/_zero_authorized_projects.html.haml
+++ b/app/views/dashboard/projects/_zero_authorized_projects.html.haml
@@ -1,47 +1,12 @@
-- publicish_project_count = ProjectsFinder.new(current_user: current_user).execute.count
-.blank-state.blank-state-welcome
-  %h2.blank-state-welcome-title
-    Welcome to GitLab
-  %p.blank-state-text
-    Code, test, and deploy together
-
-- if current_user.can_create_group?
-  .blank-state
-    .blank-state-icon
-      = custom_icon("group", size: 50)
-    %h3.blank-state-title
-      You can create a group for several dependent projects.
-    %p.blank-state-text
-      Groups are the best way to manage projects and members.
-    = link_to new_group_path, class: "btn btn-new" do
-      New group
-
-.blank-state
-  .blank-state-icon
-    = custom_icon("project", size: 50)
-  %h3.blank-state-title
-    You don't have access to any projects right now
-  %p.blank-state-text
-    - if current_user.can_create_project?
-      You can create up to
-      %strong= number_with_delimiter(current_user.projects_limit)
-      = succeed "." do
-        = "project".pluralize(current_user.projects_limit)
-    - else
-      If you are added to a project, it will be displayed here.
-  - if current_user.can_create_project?
-    = link_to new_project_path, class: "btn btn-new" do
-      New project
-
-- if publicish_project_count > 0
-  .blank-state
-    .blank-state-icon
-      = icon("globe")
-    %h3.blank-state-title
-      There are
-      = number_with_delimiter(publicish_project_count)
-      public projects on this server.
-    %p.blank-state-text
-      Public projects are an easy way to allow everyone to have read-only access.
-    = link_to trending_explore_projects_path, class: "btn btn-new" do
-      Browse projects
+.row.blank-state-parent-container
+  .section-container.section-welcome{ class: "#{ 'section-admin-welcome' if current_user.admin? }" }
+    .container.section-body
+      .blank-state.blank-state-welcome
+        %h2.blank-state-welcome-title
+          Welcome to GitLab
+        %p.blank-state-text
+          Code, test, and deploy together
+      - if current_user.admin?
+        = render "blank_state_admin_welcome"
+      - else
+        = render "blank_state_welcome"