Redesign project home page

Dmitriy Zaporozhets
1 parent e660da4f
Showing 2 changed files with 103 additions and 35 deletions Show diff stats
app/assets/stylesheets/sections/projects.scss
app/views/projects/show.html.haml
@@ -14,25 +14,67 @@
   }
 }
-.project_clone_panel {
-  @include border-radius(4px);
-  @include bg-gray-gradient;
-  padding: 4px 7px;
-  border: 1px solid #CCC;
-  margin-bottom: 20px;
+.project-home-panel {
+  .project-home-title {
+    font-size: 18px;
+    color: #777;
+    margin: 0;
+    line-height: 2;
+  }
+  .project-home-dropdown {
+    margin-left: 10px;
+    float: right;
+  }
+  .project-home-extra {
+    margin-top: 10px;
-  .btn {
-    padding: 4px 12px;
+    .project-home-desc {
+      float: left;
+      color: #999;
+    }
+
+    .project-home-links {
+      float: right;
+      a {
+        margin-left: 10px;
+      }
+    }
+  }
+
+  .public-label {
+    font-size: 14px;
+    background: #f1f1f1;
+    padding: 6px 10px;
+    border-radius: 4px;
+    margin-left: 10px;
+    color: #888;
+    text-shadow: 0 1px 1px #FFF;
   }
 }
-.project_clone_holder {
+.git-clone-holder {
+  float: right;
+
+  .btn {
+    border: none;
+    background: none;
+    box-shadow: none;
+    color: #29b;
+    padding: 6px;
+
+    &.active {
+      color: #333;
+      font-weight: bold;
+    }
+  }
+
   input[type="text"] {
+    margin-left: 5px;
     @extend .monospace;
-    border: 1px solid #BBB;
+    border: 1px solid #E1E1E1;
     box-shadow: none;
-    margin-left: -1px;
-    background: #FFF;
+    background: #FAFAFA;
+    padding: 6px 10px;
   }
 }
-= render 'clone_panel'
+.project-home-panel
+  .row
+    .span4
+      %h4.project-home-title
+        = @project.name_with_namespace
+        - if @project.public
+          %span.public-label Public
+    .span8
+      .project-home-dropdown
+        = render "dropdown"
+      .form-horizontal
+        = render "shared/clone_panel"
+  .project-home-extra.clearfix
+    .project-home-desc
+      - if @project.description.present?
+        = @project.description
+      - if can?(current_user, :admin_project, @project)
+        &ndash;
+        %strong= link_to 'Edit', edit_project_path
+
+    .project-home-links
+      = link_to pluralize(@repository.round_commit_count, 'commit'), project_commits_path(@project, @ref || @repository.root_ref)
+      = link_to pluralize(@repository.branch_names.count, 'branch'), project_branches_path(@project)
+      = link_to pluralize(@repository.tag_names.count, 'tag'), project_tags_path(@project)
+      %span.light.prepend-left-20= repository_size
+
+%hr
 .row
   .span9
     = render "events/event_last_push", event: @last_push
@@ -7,17 +33,29 @@
     .content_list
     .loading.hide
   .span3
-    .light-well
-      %h3.page-title
-        = @project.name
-      - if @project.description.present?
-        %p.light= @project.description
+    .clearfix
+      - if @project.forked_from_project
+        .alert.alert-success
+          %i.icon-code-fork
+          Forked from:
+          = link_to @project.forked_from_project.name_with_namespace, project_path(@project.forked_from_project)
+      - unless @project.empty_repo?
+        - if current_user && can?(current_user, :fork_project, @project) && @project.namespace != current_user.namespace
+          - if current_user.already_forked?(@project)
+            = link_to project_path(current_user.fork_of(@project)), class: 'btn btn-block' do
+              %i.icon-ok
+              Already forked
+          - else
+            = link_to fork_project_path(@project), title: "Fork", class: "btn btn-block", method: "POST" do
+              %i.icon-code-fork
+              Fork repository
-      %hr
-      %p
-      %p
-        %span.light Repo size is
-        = repository_size
+        - if can? current_user, :download_code, @project
+          = link_to archive_project_repository_path(@project), class: "btn btn-block" do
+            %i.icon-download-alt
+            %span Download
+    %br
+    .light-well
       %p
         %span.light Created at
         #{@project.created_at.stamp('Aug 22, 2013')}
@@ -27,19 +65,7 @@
           #{link_to @project.group.name, @project.group} Group
         - else
           #{link_to @project.owner_name, @project.owner}
-      - if @project.forked_from_project
-        %p
-          %i.icon-code-fork
-          Forked from:
-          = link_to @project.forked_from_project.name_with_namespace, project_path(@project.forked_from_project)
-      %hr
-      %p
-        = link_to pluralize(@repository.round_commit_count, 'commit'), project_commits_path(@project, @ref || @repository.root_ref)
-      %p
-        = link_to pluralize(@repository.branch_names.count, 'branch'), project_branches_path(@project)
-      %p
-        = link_to pluralize(@repository.tag_names.count, 'tag'), project_tags_path(@project)
       - if @project.gitlab_ci?
         %hr
	@@ -14,25 +14,67 @@		@@ -14,25 +14,67 @@
14	}	14	}
15	}	15	}
16		16
17	-.project_clone_panel {
18	- @include border-radius(4px);
19	- @include bg-gray-gradient;
20	- padding: 4px 7px;
21	- border: 1px solid #CCC;
22	- margin-bottom: 20px;	17	+.project-home-panel {
		18	+ .project-home-title {
		19	+ font-size: 18px;
		20	+ color: #777;
		21	+ margin: 0;
		22	+ line-height: 2;
		23	+ }
		24	+ .project-home-dropdown {
		25	+ margin-left: 10px;
		26	+ float: right;
		27	+ }
		28	+ .project-home-extra {
		29	+ margin-top: 10px;
23		30
24	- .btn {
25	- padding: 4px 12px;	31	+ .project-home-desc {
		32	+ float: left;
		33	+ color: #999;
		34	+ }
		35	+
		36	+ .project-home-links {
		37	+ float: right;
		38	+ a {
		39	+ margin-left: 10px;
		40	+ }
		41	+ }
		42	+ }
		43	+
		44	+ .public-label {
		45	+ font-size: 14px;
		46	+ background: #f1f1f1;
		47	+ padding: 6px 10px;
		48	+ border-radius: 4px;
		49	+ margin-left: 10px;
		50	+ color: #888;
		51	+ text-shadow: 0 1px 1px #FFF;
26	}	52	}
27	}	53	}
28		54
29	-.project_clone_holder {	55	+.git-clone-holder {
		56	+ float: right;
		57	+
		58	+ .btn {
		59	+ border: none;
		60	+ background: none;
		61	+ box-shadow: none;
		62	+ color: #29b;
		63	+ padding: 6px;
		64	+
		65	+ &.active {
		66	+ color: #333;
		67	+ font-weight: bold;
		68	+ }
		69	+ }
		70	+
30	input[type="text"] {	71	input[type="text"] {
		72	+ margin-left: 5px;
31	@extend .monospace;	73	@extend .monospace;
32	- border: 1px solid #BBB;	74	+ border: 1px solid #E1E1E1;
33	box-shadow: none;	75	box-shadow: none;
34	- margin-left: -1px;
35	- background: #FFF;	76	+ background: #FAFAFA;
		77	+ padding: 6px 10px;
36	}	78	}
37	}	79	}
38		80
1	-= render 'clone_panel'	1	+.project-home-panel
		2	+ .row
		3	+ .span4
		4	+ %h4.project-home-title
		5	+ = @project.name_with_namespace
		6	+ - if @project.public
		7	+ %span.public-label Public
		8	+ .span8
		9	+ .project-home-dropdown
		10	+ = render "dropdown"
		11	+ .form-horizontal
		12	+ = render "shared/clone_panel"
2		13
		14	+ .project-home-extra.clearfix
		15	+ .project-home-desc
		16	+ - if @project.description.present?
		17	+ = @project.description
		18	+ - if can?(current_user, :admin_project, @project)
		19	+ –
		20	+ %strong= link_to 'Edit', edit_project_path
		21	+
		22	+ .project-home-links
		23	+ = link_to pluralize(@repository.round_commit_count, 'commit'), project_commits_path(@project, @ref \|\| @repository.root_ref)
		24	+ = link_to pluralize(@repository.branch_names.count, 'branch'), project_branches_path(@project)
		25	+ = link_to pluralize(@repository.tag_names.count, 'tag'), project_tags_path(@project)
		26	+ %span.light.prepend-left-20= repository_size
		27	+
		28	+%hr
3	.row	29	.row
4	.span9	30	.span9
5	= render "events/event_last_push", event: @last_push	31	= render "events/event_last_push", event: @last_push
	@@ -7,17 +33,29 @@		@@ -7,17 +33,29 @@
7	.content_list	33	.content_list
8	.loading.hide	34	.loading.hide
9	.span3	35	.span3
10	- .light-well
11	- %h3.page-title
12	- = @project.name
13	- - if @project.description.present?
14	- %p.light= @project.description	36	+ .clearfix
		37	+ - if @project.forked_from_project
		38	+ .alert.alert-success
		39	+ %i.icon-code-fork
		40	+ Forked from:
		41	+ = link_to @project.forked_from_project.name_with_namespace, project_path(@project.forked_from_project)
		42	+ - unless @project.empty_repo?
		43	+ - if current_user && can?(current_user, :fork_project, @project) && @project.namespace != current_user.namespace
		44	+ - if current_user.already_forked?(@project)
		45	+ = link_to project_path(current_user.fork_of(@project)), class: 'btn btn-block' do
		46	+ %i.icon-ok
		47	+ Already forked
		48	+ - else
		49	+ = link_to fork_project_path(@project), title: "Fork", class: "btn btn-block", method: "POST" do
		50	+ %i.icon-code-fork
		51	+ Fork repository
15		52
16	- %hr
17	- %p
18	- %p
19	- %span.light Repo size is
20	- = repository_size	53	+ - if can? current_user, :download_code, @project
		54	+ = link_to archive_project_repository_path(@project), class: "btn btn-block" do
		55	+ %i.icon-download-alt
		56	+ %span Download
		57	+ %br
		58	+ .light-well
21	%p	59	%p
22	%span.light Created at	60	%span.light Created at
23	#{@project.created_at.stamp('Aug 22, 2013')}	61	#{@project.created_at.stamp('Aug 22, 2013')}
	@@ -27,19 +65,7 @@		@@ -27,19 +65,7 @@
27	#{link_to @project.group.name, @project.group} Group	65	#{link_to @project.group.name, @project.group} Group
28	- else	66	- else
29	#{link_to @project.owner_name, @project.owner}	67	#{link_to @project.owner_name, @project.owner}
30	- - if @project.forked_from_project
31	- %p
32	- %i.icon-code-fork
33	- Forked from:
34	- = link_to @project.forked_from_project.name_with_namespace, project_path(@project.forked_from_project)
35		68
36	- %hr
37	- %p
38	- = link_to pluralize(@repository.round_commit_count, 'commit'), project_commits_path(@project, @ref \|\| @repository.root_ref)
39	- %p
40	- = link_to pluralize(@repository.branch_names.count, 'branch'), project_branches_path(@project)
41	- %p
42	- = link_to pluralize(@repository.tag_names.count, 'tag'), project_tags_path(@project)
43		69
44	- if @project.gitlab_ci?	70	- if @project.gitlab_ci?
45	%hr	71	%hr