get rid of sidebar

diff --git a/app/views/issues/_show.html.haml b/app/views/issues/_show.html.haml
index 1d5cbd2..9d86a5f 100644 (file)
--- a/app/views/issues/_show.html.haml
+++ b/app/views/issues/_show.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)
 
 
 

diff --git a/app/views/layouts/_project_side_right.html.haml b/app/views/layouts/_project_side_right.html.haml
deleted file mode 100644 (file)
index cc4e6b1..0000000
--- a/app/views/layouts/_project_side_right.html.haml
+++ /dev/null
@@ -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"

diff --git a/app/views/layouts/_projects_side.html.haml b/app/views/layouts/_projects_side.html.haml
deleted file mode 100644 (file)
index 4f0a2e4..0000000
--- a/app/views/layouts/_projects_side.html.haml
+++ /dev/null
@@ -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"
-
-

diff --git a/app/views/layouts/profile.html.haml b/app/views/layouts/profile.html.haml
index 3e049f4..96f9615 100644 (file)
--- a/app/views/layouts/profile.html.haml
+++ b/app/views/layouts/profile.html.haml
@@ -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

diff --git a/app/views/layouts/project.html.haml b/app/views/layouts/project.html.haml
index e79161d..d9843c6 100644 (file)
--- a/app/views/layouts/project.html.haml
+++ b/app/views/layouts/project.html.haml
@@ -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
 

diff --git a/app/views/merge_requests/_merge_request.html.haml b/app/views/merge_requests/_merge_request.html.haml
index 583cc44..1b8166c 100644 (file)
--- a/app/views/merge_requests/_merge_request.html.haml
+++ b/app/views/merge_requests/_merge_request.html.haml
@@ -10,4 +10,4 @@
     →
     %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)

diff --git a/app/views/projects/_project_head.html.haml b/app/views/projects/_project_head.html.haml
index ebf0748..7102b5d 100644 (file)
--- a/app/views/projects/_project_head.html.haml
+++ b/app/views/projects/_project_head.html.haml
@@ -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
+ 

diff --git a/app/views/projects/_team.html.haml b/app/views/projects/_team.html.haml
index 876270a..9d71554 100644 (file)
--- a/app/views/projects/_team.html.haml
+++ b/app/views/projects/_team.html.haml
@@ -1,4 +1,4 @@
-%ul.media-grid
+%ul.unstyled.ui-box
   - @project.users_projects.each do |up|
     = render(:partial => 'team_members/show', :locals => {:member => up})
 

diff --git a/app/views/projects/show.html.haml b/app/views/projects/show.html.haml
index c30837b..cbac118 100644 (file)
--- a/app/views/projects/show.html.haml
+++ b/app/views/projects/show.html.haml
@@ -1,8 +1,15 @@
 = 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 
     ← To projects list

diff --git a/app/views/team_members/_show.html.haml b/app/views/team_members/_show.html.haml
index febdef1..a9d723d 100644 (file)
--- a/app/views/team_members/_show.html.haml
+++ b/app/views/team_members/_show.html.haml
@@ -1,12 +1,14 @@
 - 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

diff --git a/app/views/widgets/_project_member.html.haml b/app/views/widgets/_project_member.html.haml
deleted file mode 100644 (file)
index 131853f..0000000
--- a/app/views/widgets/_project_member.html.haml
+++ /dev/null
@@ -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 »
-

diff --git a/app/views/widgets/_recent_projects.html.haml b/app/views/widgets/_recent_projects.html.haml
deleted file mode 100644 (file)
index 7f1028b..0000000
--- a/app/views/widgets/_recent_projects.html.haml
+++ /dev/null
@@ -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