summaryrefslogtreecommitdiff
path: root/app/views
diff options
context:
space:
mode:
authorAnnabel Dunstone Gray <annabel.dunstone@gmail.com>2017-11-07 12:53:02 -0700
committerAnnabel Dunstone Gray <annabel.dunstone@gmail.com>2017-11-08 12:58:10 -0700
commitf014fce11901f9815c9da038c212775a4780e05e (patch)
treedd3b22f8b318918e39d80c43b2fb3291e6d69604 /app/views
parent250d606aab8a6f3450f1bfdc40047337a5ac19c5 (diff)
downloadgitlab-ce-f014fce11901f9815c9da038c212775a4780e05e.tar.gz
Add four blocks to each welcome page
Diffstat (limited to 'app/views')
-rw-r--r--app/views/dashboard/projects/_blank_state_admin_welcome.html.haml19
-rw-r--r--app/views/dashboard/projects/_blank_state_welcome.html.haml19
2 files changed, 28 insertions, 10 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
index 486ca8d3924..4fe40054170 100644
--- a/app/views/dashboard/projects/_blank_state_admin_welcome.html.haml
+++ b/app/views/dashboard/projects/_blank_state_admin_welcome.html.haml
@@ -1,14 +1,14 @@
.row
.col-md-6
- = link_to new_admin_user_path, class: "blank-state-link" do
+ = link_to new_project_path, class: "blank-state-link" do
.blank-state
.blank-state-icon
- = custom_icon("add_new_user", size: 50)
+ = custom_icon("add_new_project", size: 50)
.blank-state-body
%h3.blank-state-title
- Add user
+ Create a project
%p.blank-state-text
- Add your team members and others to GitLab.
+ Projects are where you store your code, access issues, wiki and other features of GitLab.
- if current_user.can_create_group?
.col-md-6
@@ -23,6 +23,17 @@
Groups are a great way to organize projects and people.
.col-md-6
+ = link_to "new_admin_user_path", class: "blank-state-link" do
+ .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.
+
+ .col-md-6
= link_to admin_root_path, class: "blank-state-link" do
.blank-state
.blank-state-icon
diff --git a/app/views/dashboard/projects/_blank_state_welcome.html.haml b/app/views/dashboard/projects/_blank_state_welcome.html.haml
index 91874784531..981609797a7 100644
--- a/app/views/dashboard/projects/_blank_state_welcome.html.haml
+++ b/app/views/dashboard/projects/_blank_state_welcome.html.haml
@@ -11,11 +11,7 @@
%h3.blank-state-title
Create a project
%p.blank-state-text
- 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)
+ Projects are where you store your code, access issues, wiki and other features of GitLab.
- else
.blank-state
.blank-state-icon
@@ -34,7 +30,7 @@
= custom_icon("add_new_group", size: 50)
.blank-state-body
%h3.blank-state-title
- Create a group for several dependent projects.
+ Create a group
%p.blank-state-text
Groups are the best way to manage projects and members.
@@ -55,3 +51,14 @@
public projects on this server.
Public projects are an easy way to allow
everyone to have read-only access.
+
+ .col-md-6
+ = link_to "https://docs.gitlab.com/", class: "blank-state-link" do
+ .blank-state
+ .blank-state-icon
+ = custom_icon("globe", size: 50)
+ .blank-state-body
+ %h3.blank-state-title
+ Learn more about GitLab
+ %p.blank-state-text
+ Take a look at the documentation to discover all of GitLab's capabilities.