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

Dmitriy Zaporozhets
2 parents a056fc2d 4002561e
Showing 2 changed files with 45 additions and 12 deletions Show diff stats
app/assets/stylesheets/common.scss
app/views/dashboard/_zero_authorized_projects.html.haml
@@ -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;
+}
-%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 »
+
	@@ -373,3 +373,12 @@ table {		@@ -373,3 +373,12 @@ table {
373	text-align: center;	373	text-align: center;
374	}	374	}
375	}	375	}
		376	+
		377	+.dashboard-intro-icon {
		378	+ float: left;
		379	+ font-size: 32px;
		380	+ color: #AAA;
		381	+ padding: 5px 0;
		382	+ width: 50px;
		383	+ min-height: 100px;
		384	+}
1	-%h3.nothing_here_message
2	- You don't have access to any projects.
3	- %br
4	- - if current_user.can_create_project?
5	- You can create up to
6	- = pluralize(current_user.projects_limit, "project") + "."
7	- Click on the button below to add a new one
8	- .link_holder
9	- = link_to new_project_path, class: "btn btn-primary" do
10	- New Project »
11	- - else
12	- If you are added to a project, it will be displayed here	1	+%h3.page-title Welcome to GitLab!
		2	+%p.light Self Hosted Git Management application.
		3	+%hr
		4	+%div
		5	+ .dashboard-intro-icon
		6	+ %i.icon-bookmark-empty
		7	+ %div
		8	+ %p.slead
		9	+ You don't have access to any projects right now.
		10	+ %br
		11	+ - if current_user.can_create_project?
		12	+ You can create up to
		13	+ %strong= pluralize(current_user.projects_limit, "project") + "."
		14	+ Click on the button below to add a new one
		15	+ - else
		16	+ If you are added to a project, it will be displayed here
		17	+
		18	+ - if current_user.can_create_project?
		19	+ .link_holder
		20	+ = link_to new_project_path, class: "btn btn-new" do
		21	+ New project »
		22	+
		23	+- if current_user.can_create_group?
		24	+ %hr
		25	+ %div
		26	+ .dashboard-intro-icon
		27	+ %i.icon-group
		28	+ %div
		29	+ %p.slead
		30	+ You can create a group for several dependent projects.
		31	+ %br
		32	+ Group is the best way to manage projects and members
		33	+ .link_holder
		34	+ = link_to new_group_path, class: "btn btn-new" do
		35	+ New group »
		36	+