From 9803e0885e87c4e578d651bd1b1ce300a03f88a7 Mon Sep 17 00:00:00 2001
From: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
Date: Tue, 21 Feb 2012 22:46:34 +0200
Subject: [PATCH] Project sidebar improved

---
 app/controllers/admin/projects_controller.rb |  2 +-
 app/views/projects/show.html.haml            |  8 +++----
 app/views/widgets/_project_member.html.haml  | 24 ++++++++++++++++----
 3 files changed, 25 insertions(+), 9 deletions(-)

diff --git a/app/controllers/admin/projects_controller.rb b/app/controllers/admin/projects_controller.rb
index 2c6363c6..868bec7c 100644
--- a/app/controllers/admin/projects_controller.rb
+++ b/app/controllers/admin/projects_controller.rb
@@ -52,7 +52,7 @@ class Admin::ProjectsController < ApplicationController
   def update
     @admin_project = Project.find_by_code(params[:id])
 
-    owner_id = params[:project][:owner_id]
+    owner_id = params[:project].delete(:owner_id)
 
     if owner_id 
       @admin_project.owner = User.find(owner_id)
diff --git a/app/views/projects/show.html.haml b/app/views/projects/show.html.haml
index 91828006..04ffa53b 100644
--- a/app/views/projects/show.html.haml
+++ b/app/views/projects/show.html.haml
@@ -14,9 +14,9 @@
       = text_field_tag :project_clone, @project.url_to_repo, :class => "xlarge one_click_select git_clone_url"
 
 = simple_format @project.description
-
-.ui-box
-  %h5.cgray Recent Activity
-  .content_list= render "feed"
+- unless @activities.blank?
+  .ui-box
+    %h5.cgray Recent Activity
+    .content_list= render "feed"
 
 
diff --git a/app/views/widgets/_project_member.html.haml b/app/views/widgets/_project_member.html.haml
index cbe8ce54..cdaa726c 100644
--- a/app/views/widgets/_project_member.html.haml
+++ b/app/views/widgets/_project_member.html.haml
@@ -5,9 +5,9 @@
       = 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
-    Hi, 
-    = truncate current_user.first_name, :lenght => 24
-    !
+    Hey, 
+    #{truncate current_user.first_name, :lenght => 24}!
+
   %p 
     - if @project.issues_enabled
       Assigned issues:
@@ -19,9 +19,25 @@
       %br
       Your merge requests:
       = current_user.assigned_merge_requests.opened.count
+      %br
+    %br
+    - if @project.merge_requests_enabled
+      = link_to new_project_merge_request_path(@project), :title => "New Merge Request", :class => "btn small" do 
+        Merge Request
+    - if @project.issues_enabled
+      = 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 
-      = "Access: #{member.project_access_human} »"
+      = "Member Card »"