get rid of sidebar

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