Download as
Browse Code »

Commit 0a08c775193af3ee566700017d85517b7f9829cd

Authored by Dmitriy Zaporozhets
1 parent 00d6ac29
Exists in master and in 4 other branches 6-8-stable, 7-0-stable, 7-0-stable-spb, spb-stable

Improve UX for project home page 

Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
Showing 3 changed files with 34 additions and 15 deletions   Show diff stats
app/assets/stylesheets/sections/projects.scss
  Diff comments   View file @0a08c77
@@ -16,7 +16,7 @@ @@ -16,7 +16,7 @@
16 16
17 .project-home-panel { 17 .project-home-panel {
18 border-bottom: 1px solid #DDD; 18 border-bottom: 1px solid #DDD;
19 - padding-bottom: 30px; 19 + padding-bottom: 25px;
20 margin-bottom: 30px; 20 margin-bottom: 30px;
21 21
22 .project-home-title { 22 .project-home-title {
@@ -166,3 +166,21 @@ ul.nav.nav-projects-tabs { @@ -166,3 +166,21 @@ ul.nav.nav-projects-tabs {
166 color: #777; 166 color: #777;
167 } 167 }
168 } 168 }
  169 +
  170 +.project-side {
  171 + .btn-block {
  172 + background-image: none;
  173 + background-color: #F1f1f1;
  174 + border-color: #EEE;
  175 + &:hover {
  176 + background-color: #eee;
  177 + border-color: #DDD;
  178 + }
  179 + }
  180 + .project-fork-icon {
  181 + float: left;
  182 + font-size: 26px;
  183 + margin-right: 10px;
  184 + line-height: 1.5;
  185 + }
  186 +}
app/views/projects/_dropdown.html.haml
  Diff comments   View file @0a08c77
@@ -6,15 +6,19 @@ @@ -6,15 +6,19 @@
6 - if @project.issues_enabled && can?(current_user, :write_issue, @project) 6 - if @project.issues_enabled && can?(current_user, :write_issue, @project)
7 %li 7 %li
8 = link_to url_for_new_issue, title: "New Issue" do 8 = link_to url_for_new_issue, title: "New Issue" do
9 - Issue 9 + New issue
10 - if @project.merge_requests_enabled && can?(current_user, :write_merge_request, @project) 10 - if @project.merge_requests_enabled && can?(current_user, :write_merge_request, @project)
11 %li 11 %li
12 = link_to new_project_merge_request_path(@project), title: "New Merge Request" do 12 = link_to new_project_merge_request_path(@project), title: "New Merge Request" do
13 - Merge Request 13 + New merge request
14 - if @project.snippets_enabled && can?(current_user, :write_snippet, @project) 14 - if @project.snippets_enabled && can?(current_user, :write_snippet, @project)
15 %li 15 %li
16 = link_to new_project_snippet_path(@project), title: "New Snippet" do 16 = link_to new_project_snippet_path(@project), title: "New Snippet" do
17 - Snippet 17 + New snippet
  18 + - if can?(current_user, :admin_team_member, @project)
  19 + %li
  20 + = link_to new_project_team_member_path(@project), title: "New project member" do
  21 + New project member
18 - if can? current_user, :push_code, @project 22 - if can? current_user, :push_code, @project
19 %li.divider 23 %li.divider
20 %li 24 %li
@@ -26,9 +30,4 @@ @@ -26,9 +30,4 @@
26 %i.icon-tag 30 %i.icon-tag
27 Git tag 31 Git tag
28 32
29 - - if can?(current_user, :admin_team_member, @project)  
30 - %li.divider  
31 - %li  
32 - = link_to new_project_team_member_path(@project), title: "New project member" do  
33 - Project member  
34 33
app/views/projects/show.html.haml
  Diff comments   View file @0a08c77
@@ -34,19 +34,20 @@ @@ -34,19 +34,20 @@
34 = render 'shared/event_filter' 34 = render 'shared/event_filter'
35 .content_list 35 .content_list
36 .loading.hide 36 .loading.hide
37 - .span3 37 + .span3.project-side
38 .clearfix 38 .clearfix
39 - if @project.forked_from_project 39 - if @project.forked_from_project
40 .alert.alert-success 40 .alert.alert-success
41 - %i.icon-code-fork 41 + %i.icon-code-fork.project-fork-icon
42 Forked from: 42 Forked from:
  43 + %br
43 = link_to @project.forked_from_project.name_with_namespace, project_path(@project.forked_from_project) 44 = link_to @project.forked_from_project.name_with_namespace, project_path(@project.forked_from_project)
44 - unless @project.empty_repo? 45 - unless @project.empty_repo?
45 - if current_user && can?(current_user, :fork_project, @project) && @project.namespace != current_user.namespace 46 - if current_user && can?(current_user, :fork_project, @project) && @project.namespace != current_user.namespace
46 - if current_user.already_forked?(@project) 47 - if current_user.already_forked?(@project)
47 = link_to project_path(current_user.fork_of(@project)), class: 'btn btn-block' do 48 = link_to project_path(current_user.fork_of(@project)), class: 'btn btn-block' do
48 - %i.icon-ok  
49 - Already forked 49 + %i.icon-compass
  50 + Go to fork
50 - else 51 - else
51 = link_to fork_project_path(@project), title: "Fork", class: "btn btn-block", method: "POST" do 52 = link_to fork_project_path(@project), title: "Fork", class: "btn btn-block", method: "POST" do
52 %i.icon-code-fork 53 %i.icon-code-fork
@@ -56,8 +57,9 @@ @@ -56,8 +57,9 @@
56 = link_to archive_project_repository_path(@project), class: "btn btn-block" do 57 = link_to archive_project_repository_path(@project), class: "btn btn-block" do
57 %i.icon-download-alt 58 %i.icon-download-alt
58 %span Download 59 %span Download
59 - %br  
60 - .light-well 60 + = link_to project_compare_index_path(@project, from: @repository.root_ref, to: @ref || @repository.root_ref), class: 'btn btn-block' do
  61 + Compare code
  62 + .prepend-top-10
61 %p 63 %p
62 %span.light Created on 64 %span.light Created on
63 #{@project.created_at.stamp('Aug 22, 2013')} 65 #{@project.created_at.stamp('Aug 22, 2013')}