project membership widget. css fixes

app/assets/stylesheets/reset_bootstrap.scss

@@ -36,3 +36,7 @@ a {
   }
 }
 
+.widget { 
+  padding:20px;
+  margin-bottom:20px;
+}

app/controllers/projects_controller.rb

@@ -96,6 +96,7 @@ class ProjectsController < ApplicationController
   end
 
   def graph
+    render_full_content
     @days_json, @commits_json = GraphCommit.to_graph(project)
   end
 

app/models/users_project.rb

@@ -32,6 +32,14 @@ class UsersProject < ActiveRecord::Base
       c.update_project(project.path, project)
     end
   end
+
+  def project_access_human
+    Project.access_options.key(self.project_access)
+  end
+
+  def repo_access_human
+    Repository.access_options.key(self.repo_access)
+  end
 end
 # == Schema Information
 #

app/views/devise/sessions/new.html.erb

@@ -4,7 +4,7 @@
   <%= f.password_field :password, :class => "text bottom", :placeholder => "Password"  %>
 
   <% if devise_mapping.rememberable? -%>
-    <div class="clearfix"> <%= f.label :remember_me %><%= f.check_box :remember_me %></div>
+    <div class="clearfix"> <%= f.label :remember_me %> &nbsp; <%= f.check_box :remember_me %></div>
   <% end -%>
   <br/>
   <%= f.submit "Sign in", :class => "primary btn" %>

app/views/layouts/_project_side_right.html.haml

@@ -4,43 +4,5 @@
   - else
     - if content_for? :sidebar_top_block
       = yield :sidebar_top_block
-    - else
+    = render "widgets/project_member"
-      - if can? current_user, :write_project, @project
+    = render "widgets/recent_projects"
-        .alert-message.block-message.info
-          You have access to create new issue or merge request.
-          %div
-            = link_to new_project_issue_path(@project), :title => "New Issue", :class => "btn small" do 
-              New Issue »
-          %div
-            = link_to new_project_merge_request_path(@project), :title => "New Merge Request", :class => "btn small" do 
-              New Merge Request »
-
-  - if current_user.projects.count > 0
-    %div.entry
-      %h5
-        Recent Projects:
-      %ul
-        - current_user.projects.order("id DESC").limit(5).each do |project|
-          %li
-            = link_to project_path(project) do
-              = project.name
-      = link_to "More  » ", projects_path
-
-    -#%h4
-      -#Recent Issues:
-    -#%ul
-      -#- current_user.assigned_issues.order("id DESC").limit(5).each do |issue|
-        -#%li
-          -#= link_to project_issue_path(issue.project, issue) do
-            -#= truncate issue.title
-
-
-    -#%h4
-      -#Recent Requests:
-    -#%ul
-      -#- current_user.assigned_merge_requests.order("id DESC").limit(5).each do |issue|
-        -#%li
-          -#= link_to project_merge_request_path(issue.project, issue) do
-            -#= truncate issue.title
-
-

app/views/widgets/_project_member.html.haml

@@ -0,0 +1,28 @@
+- 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, 90), :class => "thumbnail"
+  .row
+    .span4
+      %h4
+        = truncate(current_user.name, :lenght => 24)
+      - if @project.owner == current_user
+        %span.label Project Owner
+
+    .span3
+      %span.label= member.project_access_human
+      %span.label= member.repo_access_human
+
+  - if can? current_user, :write_project, @project
+    %hr 
+    .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 »
+

app/views/widgets/_recent_projects.html.haml

@@ -0,0 +1,10 @@
+- 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_to "More  » ", projects_path