Merge branch 'feature/new_landing' of /home/git/repositories/gitlab/gitlabhq

2 files changed, 45 insertions, 12 deletions

diff --git a/app/assets/stylesheets/common.scss b/app/assets/stylesheets/common.scss
index 66cc2ffc92d..6d80b22b3aa 100644
--- a/app/assets/stylesheets/common.scss
+++ b/app/assets/stylesheets/common.scss
@@ -373,3 +373,12 @@ table {
     text-align: center;
   }
 }
+
+.dashboard-intro-icon {
+  float: left;
+  font-size: 32px;
+  color: #AAA;
+  padding: 5px 0;
+  width: 50px;
+  min-height: 100px;
+}
diff --git a/app/views/dashboard/_zero_authorized_projects.html.haml b/app/views/dashboard/_zero_authorized_projects.html.haml
index ea5d8d6376f..79d5dca8845 100644
--- a/app/views/dashboard/_zero_authorized_projects.html.haml
+++ b/app/views/dashboard/_zero_authorized_projects.html.haml
@@ -1,12 +1,36 @@
-%h3.nothing_here_message
-  You don't have access to any projects.
-  %br
-  - if current_user.can_create_project?
-    You can create up to
-    = pluralize(current_user.projects_limit, "project") + "."
-    Click on the button below to add a new one
-    .link_holder
-      = link_to new_project_path, class: "btn btn-primary" do
-        New Project »
-  - else
-    If you are added to a project, it will be displayed here
+%h3.page-title Welcome to GitLab!
+%p.light Self Hosted Git Management application.
+%hr
+%div
+  .dashboard-intro-icon
+    %i.icon-bookmark-empty
+  %div
+    %p.slead
+      You don't have access to any projects right now.
+      %br
+      - if current_user.can_create_project?
+        You can create up to
+        %strong= pluralize(current_user.projects_limit, "project") + "."
+        Click on the button below to add a new one
+      - else
+        If you are added to a project, it will be displayed here
+
+    - if current_user.can_create_project?
+      .link_holder
+        = link_to new_project_path, class: "btn btn-new" do
+          New project »
+
+- if current_user.can_create_group?
+  %hr
+  %div
+    .dashboard-intro-icon
+      %i.icon-group
+    %div
+      %p.slead
+        You can create a group for several dependent projects.
+        %br
+        Group is the best way to manage projects and members
+      .link_holder
+        = link_to new_group_path, class: "btn btn-new" do
+          New group »
+