Download as
Browse Code »

Commit d6b051c5be5d7be1519ce31b897c89216715cb53

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

get rid of sidebar

Showing 12 changed files with 28 additions and 121 deletions   Show diff stats
app/views/issues/_show.html.haml
  Diff comments   View file @d6b051c
@@ -20,7 +20,7 @@ @@ -20,7 +20,7 @@
20 20
21 21
22 = link_to project_issue_path(issue.project, issue) do 22 = link_to project_issue_path(issue.project, issue) do
23 - %p.row_title= truncate(issue.title, :length => 60) 23 + %p.row_title= truncate(issue.title, :length => 100)
24 24
25 25
26 26
app/views/layouts/_project_side_right.html.haml
View file @62707bb
@@ -1,8 +0,0 @@ @@ -1,8 +0,0 @@
1 -%aside.project-right  
2 - - if content_for? :sidebar_all  
3 - = render :sidebar_all  
4 - - else  
5 - - if content_for? :sidebar_top_block  
6 - = yield :sidebar_top_block  
7 - = render "widgets/project_member"  
8 - = render "widgets/recent_projects"  
app/views/layouts/_projects_side.html.haml
View file @62707bb
@@ -1,21 +0,0 @@ @@ -1,21 +0,0 @@
1 -%aside.projects  
2 - - if current_user.can_create_project?  
3 - .widget  
4 - You can create up to  
5 - = current_user.projects_limit  
6 - projects. Click on link below to add a new one  
7 - .link_holder  
8 - = link_to new_project_path, :class => "" do  
9 - New Project »  
10 -  
11 - - if current_user.is_admin?  
12 - .widget  
13 - You have administrator privilegies. You can configure application following this button:  
14 - .link_holder  
15 - = link_to admin_root_path, :class => "", :title => "Admin" do  
16 - Visit Admin Area »  
17 -  
18 - - if current_user.projects.count > 0  
19 - = render "widgets/recent_projects"  
20 -  
21 -  
app/views/layouts/profile.html.haml
  Diff comments   View file @d6b051c
@@ -13,6 +13,4 @@ @@ -13,6 +13,4 @@
13 = link_to keys_path, :class => controller.controller_name == "keys" ? "current" : nil do 13 = link_to keys_path, :class => controller.controller_name == "keys" ? "current" : nil do
14 SSH Keys 14 SSH Keys
15 .content 15 .content
16 - .row  
17 - .span12= yield  
18 - .sidebar= render "layouts/projects_side" 16 + = yield
app/views/layouts/project.html.haml
  Diff comments   View file @d6b051c
@@ -7,10 +7,5 @@ @@ -7,10 +7,5 @@
7 .container 7 .container
8 = render :partial => "layouts/project_menu" 8 = render :partial => "layouts/project_menu"
9 .content 9 .content
10 - - if @full_content  
11 - = yield  
12 - - else  
13 - .row  
14 - .span12= yield  
15 - .sidebar= render "layouts/project_side_right" 10 + = yield
16 11
app/views/merge_requests/_merge_request.html.haml
  Diff comments   View file @d6b051c
@@ -10,4 +10,4 @@ @@ -10,4 +10,4 @@
10 → 10 →
11 %span.label= merge_request.target_branch 11 %span.label= merge_request.target_branch
12 = link_to project_merge_request_path(merge_request.project, merge_request) do 12 = link_to project_merge_request_path(merge_request.project, merge_request) do
13 - %p.row_title= truncate(merge_request.title, :length => 60) 13 + %p.row_title= truncate(merge_request.title, :length => 100)
app/views/projects/_project_head.html.haml
  Diff comments   View file @d6b051c
@@ -2,11 +2,6 @@ @@ -2,11 +2,6 @@
2 %li{ :class => "#{'active' if current_page?(project_path(@project)) }" } 2 %li{ :class => "#{'active' if current_page?(project_path(@project)) }" }
3 = link_to project_path(@project), :class => "activities-tab tab" do 3 = link_to project_path(@project), :class => "activities-tab tab" do
4 Show 4 Show
5 - - if can? current_user, :admin_project, @project  
6 - %li{ :class => "#{'active' if current_page?(edit_project_path(@project)) }" }  
7 - = link_to edit_project_path(@project), :class => "stat-tab tab " do  
8 - Edit  
9 -  
10 %li{ :class => " #{'active' if (controller.controller_name == "team_members") || current_page?(team_project_path(@project)) }" } 5 %li{ :class => " #{'active' if (controller.controller_name == "team_members") || current_page?(team_project_path(@project)) }" }
11 = link_to team_project_path(@project), :class => "team-tab tab" do 6 = link_to team_project_path(@project), :class => "team-tab tab" do
12 Team 7 Team
@@ -18,11 +13,15 @@ @@ -18,11 +13,15 @@
18 Snippets 13 Snippets
19 14
20 - if can? current_user, :admin_project, @project 15 - if can? current_user, :admin_project, @project
21 - %li{:class => "#{'active' if controller.controller_name == "hooks" }"}  
22 - = link_to project_hooks_path(@project) do  
23 - %span  
24 - Hooks  
25 - %li{:class => "#{'active' if controller.controller_name == "deploy_keys"}"} 16 + %li.right{:class => "#{'active' if controller.controller_name == "deploy_keys"}"}
26 = link_to project_deploy_keys_path(@project) do 17 = link_to project_deploy_keys_path(@project) do
27 %span 18 %span
28 Deploy Keys 19 Deploy Keys
  20 + %li.right{:class => "#{'active' if controller.controller_name == "hooks" }"}
  21 + = link_to project_hooks_path(@project) do
  22 + %span
  23 + Hooks
  24 + %li.right{ :class => "#{'active' if current_page?(edit_project_path(@project)) }" }
  25 + = link_to edit_project_path(@project), :class => "stat-tab tab " do
  26 + Edit
  27 +
app/views/projects/_team.html.haml
  Diff comments   View file @d6b051c
1 -%ul.media-grid 1 +%ul.unstyled.ui-box
2 - @project.users_projects.each do |up| 2 - @project.users_projects.each do |up|
3 = render(:partial => 'team_members/show', :locals => {:member => up}) 3 = render(:partial => 'team_members/show', :locals => {:member => up})
4 4
app/views/projects/show.html.haml
  Diff comments   View file @d6b051c
1 = render "project_head" 1 = render "project_head"
2 %h3 2 %h3
3 = @project.name 3 = @project.name
4 - - if can? current_user, :download_code, @project  
5 - = link_to "Download", archive_project_repository_path(@project), :class => "btn small right" 4 + %span.right
  5 + - if can? current_user, :download_code, @project
  6 + = link_to "Download", archive_project_repository_path(@project), :class => "btn small padded"
  7 + - if @project.merge_requests_enabled && can?(current_user, :write_merge_request, @project)
  8 + = link_to new_project_merge_request_path(@project), :title => "New Merge Request", :class => "btn small padded" do
  9 + Merge Request
  10 + - if @project.issues_enabled && can?(current_user, :write_issue, @project)
  11 + = link_to new_project_issue_path(@project), :title => "New Issue", :class => "btn small" do
  12 + Issue
6 .back_link 13 .back_link
7 = link_to projects_path do 14 = link_to projects_path do
8 ← To projects list 15 ← To projects list
app/views/team_members/_show.html.haml
  Diff comments   View file @d6b051c
1 - user = member.user 1 - user = member.user
2 - allow_admin = can? current_user, :admin_project, @project 2 - allow_admin = can? current_user, :admin_project, @project
3 -%li{:id => dom_id(member), :class => "team_member_row"}  
4 - = link_to project_team_member_path(@project, member), :title => user.name do  
5 - = image_tag gravatar_icon(user.email, 60), :class => "thumbnail" 3 +%li{:id => dom_id(member), :class => "team_member_row wll"}
  4 + .left
  5 + = link_to project_team_member_path(@project, member), :title => user.name do
  6 + = image_tag gravatar_icon(user.email, 60), :class => "styled_image"
6 .row 7 .row
7 .span8 8 .span8
8 %h4 9 %h4
9 = truncate(user.name, :lenght => 24) 10 = truncate(user.name, :lenght => 24)
  11 + %br
10 %small= truncate user.email, :lenght => 24 12 %small= truncate user.email, :lenght => 24
11 13
12 .span3 14 .span3
app/views/widgets/_project_member.html.haml
View file @62707bb
@@ -1,54 +0,0 @@ @@ -1,54 +0,0 @@
1 -- member = @project.team_member_by_id(current_user.id)  
2 -.widget  
3 - .media-grid  
4 - %li  
5 - = link_to project_team_member_path(@project, member), :title => current_user.name do  
6 - = image_tag gravatar_icon(current_user.email, 60), :class => "thumbnail", :width => 60  
7 - %h4  
8 - Hey,  
9 - #{truncate current_user.first_name, :lenght => 24}!  
10 -  
11 - %p  
12 - - if @project.issues_enabled  
13 - %span  
14 - Assigned Issues:  
15 - = current_user.assigned_issues.opened.count  
16 - %br  
17 - - if @project.merge_requests_enabled  
18 - %span  
19 - Assigned Requests:  
20 - = current_user.assigned_merge_requests.opened.count  
21 - %br  
22 - %br  
23 - - if @project.merge_requests_enabled && can?(current_user, :write_merge_request, @project)  
24 - = link_to new_project_merge_request_path(@project), :title => "New Merge Request", :class => "btn small padded" do  
25 - Merge Request  
26 - - if @project.issues_enabled && can?(current_user, :write_issue, @project)  
27 - = link_to new_project_issue_path(@project), :title => "New Issue", :class => "btn small" do  
28 - Issue  
29 -  
30 - %hr  
31 - %p  
32 - Your access level in this project is  
33 - %code #{member.project_access_human}  
34 - %br  
35 - Visit member card for more information  
36 -  
37 - .link_holder  
38 - = link_to project_team_member_path(@project, member), :title => current_user.name do  
39 - = "Member Card »"  
40 -  
41 -  
42 -  
43 --#- if can? current_user, :write_project, @project  
44 - .widget  
45 - - if @project.issues_enabled && @project.merge_requests_enabled  
46 - .span3  
47 - %p You have access to create new issue or merge request.  
48 - %div  
49 - = link_to new_project_issue_path(@project), :title => "New Issue", :class => "" do  
50 - New Issue »  
51 - %div  
52 - = link_to new_project_merge_request_path(@project), :title => "New Merge Request", :class => "" do  
53 - New Merge Request »  
54 -  
app/views/widgets/_recent_projects.html.haml
View file @62707bb
@@ -1,11 +0,0 @@ @@ -1,11 +0,0 @@
1 -- if current_user.projects.count > 0  
2 - %div.widget  
3 - %h4  
4 - Recent Projects:  
5 - %ul  
6 - - current_user.projects.order("id DESC").limit(5).each do |project|  
7 - %li  
8 - = link_to project_path(project) do  
9 - = project.name  
10 - .link_holder  
11 - = link_to "Projects » ", projects_path