Improved profile & team member show

Dmitriy Zaporozhets
1 parent fea64946
Showing 9 changed files with 139 additions and 81 deletions Show diff stats
app/assets/stylesheets/common.scss
app/models/user.rb
app/views/dashboard/index.html.haml
app/views/devise/sessions/new.html.erb
app/views/devise/shared/_links.erb
app/views/profile/show.html.haml
app/views/team_members/show.html.haml
db/migrate/20120323221339_add_bio_field_to_user.rb
db/schema.rb
@@ -358,12 +358,15 @@ img.lil_av {
   top: 3px;
 }
-.media-grid { 
-  h3, h2 , h4 {
-    &.media_h { 
-      padding-left:10px;
-      float:left;
-    }
+.profile_avatar_holder { 
+  float:left;
+  width:90px;
+  height:90px;
+  margin-right:20px;
+  img { 
+    width:90px;
+    height:90px;
+    background:#eee;
   }
 }
@@ -5,13 +5,19 @@ class User &lt; ActiveRecord::Base
          :recoverable, :rememberable, :trackable, :validatable, :omniauthable
   # Setup accessible (or protected) attributes for your model
-  attr_accessible :email, :password, :password_confirmation, :remember_me,
+  attr_accessible :email, :password, :password_confirmation, :remember_me, :bio,
                   :name, :projects_limit, :skype, :linkedin, :twitter, :dark_scheme, :theme_id
   has_many :users_projects, :dependent => :destroy
   has_many :projects, :through => :users_projects
   has_many :my_own_projects, :class_name => "Project", :foreign_key => :owner_id
   has_many :keys, :dependent => :destroy
+
+  has_many :recent_events, 
+    :class_name => "Event",
+    :foreign_key => :author_id,
+    :order => "id DESC"
+
   has_many :issues,
     :foreign_key => :author_id,
     :dependent => :destroy
@@ -38,6 +44,7 @@ class User &lt; ActiveRecord::Base
             :presence => true,
             :numericality => {:greater_than_or_equal_to => 0}
+  validates :bio, :length => { :within => 0..255 }
   before_create :ensure_authentication_token
   alias_attribute :private_token, :authentication_token
@@ -34,6 +34,15 @@
                   %br
                   = link_to new_project_path, :class => "btn" do 
                     New Project » 
+            - else 
+              %hr
+              %div
+                You've reached project limit for your account. 
+                You cannot create new projects.
+                .link_holder
+                  %br
+                  = link_to profile_path, :class => "btn" do 
+                    Your Profile » 
         .span10.left= render "dashboard/projects_feed", :projects => @active_projects
       - if @last_push
         .padded.prepend-top-20
@@ -9,6 +9,13 @@
   <br/>
   <%= f.submit "Sign in", :class => "primary btn" %>
   <div class="right"> <%= render :partial => "devise/shared/links" %></div>
+
+  <%- if devise_mapping.omniauthable? %>
+    <%- resource_class.omniauth_providers.each do |provider| %>
+      <hr/>
+      <%= link_to "Sign in with #{provider.to_s.titleize}", omniauth_authorize_path(resource_name, provider), :class => "btn primary" %><br />
+    <% end -%>
+  <% end -%>
   <% if ldap_enable? -%>
     <p><%= link_to "via LDAP", user_omniauth_authorize_path(:ldap)%></p>
   <% end -%>
@@ -17,9 +17,3 @@
 <%- if devise_mapping.lockable? && resource_class.unlock_strategy_enabled?(:email) && controller_name != 'unlocks' %>
   <%= link_to "Didn't receive unlock instructions?", new_unlock_path(resource_name) %><br />
 <% end -%>
-
-<%- if devise_mapping.omniauthable? %>
-  <%- resource_class.omniauth_providers.each do |provider| %>
-    <%= link_to "Sign in with #{provider.to_s.titleize}", omniauth_authorize_path(resource_name, provider) %><br />
-  <% end -%>
-<% end -%>
-.media-grid
-  = link_to "#" do
-    = image_tag gravatar_icon(@user.email, 90), :class => "thumbnail"
-  %h3.media_h
-    = @user.name
-    %br
-    %small
-      = @user.email
-
-  .right
-    %p.alert-message.block-message You can change your avatar at gravatar.com
-
+.row
+  .span10
+    .profile_avatar_holder
+      = image_tag gravatar_icon(@user.email, 90), :class => "styled_image"
+    %h3
+      = @user.name
+      %br
+      %small
+        = @user.email
+  
+  .span6.right
+    %div
+      %div
+        %h5.cgray
+          Personal projects: 
+          %span.right
+            %span= current_user.my_own_projects.count
+            of 
+            %span= current_user.projects_limit
+        %h5.cgray
+          SSH public keys:
+          %span.right
+            %span= current_user.keys.count
 %hr
 = form_for @user, :url => profile_update_path, :method => :put do |f|
@@ -18,23 +29,39 @@
       %ul
         - @user.errors.full_messages.each do |msg|
           %li= msg
-
-  .clearfix
-    = f.label :name
-    .input= f.text_field :name
-  .clearfix
-    = f.label :email
-    .input= f.text_field :email
-  .clearfix
-    = f.label :skype
-    .input= f.text_field :skype
-  .clearfix
-    = f.label :linkedin
-    .input= f.text_field :linkedin
-  .clearfix
-    = f.label :twitter
-    .input= f.text_field :twitter
+  .row
+    .span9
+      .clearfix
+        = f.label :name
+        .input
+          = f.text_field :name, :class => "xlarge"
+          %span.help-block Enter youre name, so people you know can recognize you.
+      .clearfix
+        = f.label :email
+        .input
+          = f.text_field :email, :class => "xlarge"
+          %span.help-block We also use email for avatar detection
+      .clearfix
+        = f.label :skype
+        .input= f.text_field :skype, :class => "xlarge"
+      .clearfix
+        = f.label :linkedin
+        .input= f.text_field :linkedin, :class => "xlarge"
+      .clearfix
+        = f.label :twitter
+        .input= f.text_field :twitter, :class => "xlarge"
+      .clearfix
+        = f.label :bio
+        .input
+          = f.text_area :bio, :rows => 6, :class => "xlarge", :maxlength => 250
+          %span.help-block About yourself in fewer than 250 characters.
+    .span7.right
+      %p.alert-message.block-message 
+        %strong Tip:
+        You can change your avatar at gravatar.com
   .actions
     = f.submit 'Save', :class => "primary btn"
+-#= link_to "New project", new_project_path, :class => "btn small padded"
+-#= link_to "New public key", new_key_path, :class => "btn small"
 - allow_admin = can? current_user, :admin_project, @project
 - user = @team_member.user
-.media-grid
-  = link_to "#" do
-    = image_tag gravatar_icon(user.email, 60), :class => "thumbnail", :width => 60
-  %h3.media_h
-    = user.name
-    %br
-    %small= user.email
-
-.back_link
-  = link_to team_project_path(@project), :class => "" do 
-    &larr; To team list
-%br
-%table.zebra-striped.borders
-  %tr
-    %td Name
-    %td= user.name
+.row
+  .span8
+    .profile_avatar_holder
+      = image_tag gravatar_icon(user.email, 90), :class => "styled_image"
+    %h3
+      = user.name
+      %br
+      %small
+        = user.email
+    %br
+    .back_link
+      %br
+      = link_to team_project_path(@project), :class => "" do 
+        &larr; To team list
-  %tr
-    %td Email
-    %td= user.email
+  .span8.right
+    %div
+      %div
+        %h5.cgray
+          Member since: 
+          %span.right
+            = @team_member.created_at.stamp("Aug 21, 2011") 
+        %h5.cgray
+          Project Access: 
+          %small (#{link_to "read more", help_permissions_path, :class => "vlink"})
+          %span.right
+            = form_for(@team_member, :as => :team_member, :url => project_team_member_path(@project, @team_member)) do |f|
+              = f.select :project_access, options_for_select(Project.access_options, @team_member.project_access), {}, :class => "project-access-select", :disabled => !allow_admin
-  %tr
-    %td Member since
-    %td= @team_member.created_at.stamp("Aug 21, 2011")
-  %tr
-    %td
-      Project Access
-      (#{link_to "read more", help_permissions_path, :class => "vlink"})
-
-    %td
-      = form_for(@team_member, :as => :team_member, :url => project_team_member_path(@project, @team_member)) do |f|
-        = f.select :project_access, options_for_select(Project.access_options, @team_member.project_access), {}, :class => "project-access-select", :disabled => !allow_admin
+%div.prepend-top-20
   - unless user.skype.empty?
-    %tr
-      %td Skype:
-      %td= user.skype
+    %p
+      %b Skype:
+      = user.skype
   - unless user.linkedin.empty?
-    %tr
-      %td LinkedIn:
-      %td= user.linkedin
+    %p
+      %b LinkedIn:
+      = user.linkedin
   - unless user.twitter.empty?
-    %tr
-      %td Twitter:
-      %td= user.twitter
+    %p
+      %b Twitter:
+      = user.twitter
+    - unless user.bio.empty?
+      %p
+        %b Bio:
+        = user.bio
+
+= render user.recent_events.limit(3)
+
 - if can? current_user, :admin_project, @project
   .actions
@@ -0,0 +1,5 @@
+class AddBioFieldToUser < ActiveRecord::Migration
+  def change
+    add_column :users, :bio, :string, :null => true
+  end
+end
@@ -11,7 +11,7 @@
 #
 # It's strongly recommended to check this file into your version control system.
-ActiveRecord::Schema.define(:version => 20120315132931) do
+ActiveRecord::Schema.define(:version => 20120323221339) do
   create_table "events", :force => true do |t|
     t.string   "target_type"
@@ -155,6 +155,7 @@ ActiveRecord::Schema.define(:version =&gt; 20120315132931) do
     t.string   "authentication_token"
     t.boolean  "dark_scheme",                           :default => false, :null => false
     t.integer  "theme_id",                              :default => 1,     :null => false
+    t.string   "bio"
   end
   add_index "users", ["email"], :name => "index_users_on_email", :unique => true
	@@ -34,6 +34,15 @@		@@ -34,6 +34,15 @@
34	%br	34	%br
35	= link_to new_project_path, :class => "btn" do	35	= link_to new_project_path, :class => "btn" do
36	New Project »	36	New Project »
		37	+ - else
		38	+ %hr
		39	+ %div
		40	+ You've reached project limit for your account.
		41	+ You cannot create new projects.
		42	+ .link_holder
		43	+ %br
		44	+ = link_to profile_path, :class => "btn" do
		45	+ Your Profile »
37	.span10.left= render "dashboard/projects_feed", :projects => @active_projects	46	.span10.left= render "dashboard/projects_feed", :projects => @active_projects
38	- if @last_push	47	- if @last_push
39	.padded.prepend-top-20	48	.padded.prepend-top-20
	@@ -9,6 +9,13 @@		@@ -9,6 +9,13 @@
9	<br/>	9	<br/>
10	<%= f.submit "Sign in", :class => "primary btn" %>	10	<%= f.submit "Sign in", :class => "primary btn" %>
11	<div class="right"> <%= render :partial => "devise/shared/links" %></div>	11	<div class="right"> <%= render :partial => "devise/shared/links" %></div>
		12	+
		13	+ <%- if devise_mapping.omniauthable? %>
		14	+ <%- resource_class.omniauth_providers.each do \|provider\| %>
		15	+ <hr/>
		16	+ <%= link_to "Sign in with #{provider.to_s.titleize}", omniauth_authorize_path(resource_name, provider), :class => "btn primary" %><br />
		17	+ <% end -%>
		18	+ <% end -%>
12	<% if ldap_enable? -%>	19	<% if ldap_enable? -%>
13	<p><%= link_to "via LDAP", user_omniauth_authorize_path(:ldap)%></p>	20	<p><%= link_to "via LDAP", user_omniauth_authorize_path(:ldap)%></p>
14	<% end -%>	21	<% end -%>
	@@ -17,9 +17,3 @@		@@ -17,9 +17,3 @@
17	<%- if devise_mapping.lockable? && resource_class.unlock_strategy_enabled?(:email) && controller_name != 'unlocks' %>	17	<%- if devise_mapping.lockable? && resource_class.unlock_strategy_enabled?(:email) && controller_name != 'unlocks' %>
18	<%= link_to "Didn't receive unlock instructions?", new_unlock_path(resource_name) %><br />	18	<%= link_to "Didn't receive unlock instructions?", new_unlock_path(resource_name) %><br />
19	<% end -%>	19	<% end -%>
20	-
21	-<%- if devise_mapping.omniauthable? %>
22	- <%- resource_class.omniauth_providers.each do \|provider\| %>
23	- <%= link_to "Sign in with #{provider.to_s.titleize}", omniauth_authorize_path(resource_name, provider) %><br />
24	- <% end -%>
25	-<% end -%>
1	-.media-grid
2	- = link_to "#" do
3	- = image_tag gravatar_icon(@user.email, 90), :class => "thumbnail"
4	- %h3.media_h
5	- = @user.name
6	- %br
7	- %small
8	- = @user.email
9	-
10	- .right
11	- %p.alert-message.block-message You can change your avatar at gravatar.com
12	-	1	+.row
		2	+ .span10
		3	+ .profile_avatar_holder
		4	+ = image_tag gravatar_icon(@user.email, 90), :class => "styled_image"
		5	+ %h3
		6	+ = @user.name
		7	+ %br
		8	+ %small
		9	+ = @user.email
		10	+
		11	+ .span6.right
		12	+ %div
		13	+ %div
		14	+ %h5.cgray
		15	+ Personal projects:
		16	+ %span.right
		17	+ %span= current_user.my_own_projects.count
		18	+ of
		19	+ %span= current_user.projects_limit
		20	+ %h5.cgray
		21	+ SSH public keys:
		22	+ %span.right
		23	+ %span= current_user.keys.count
13	%hr	24	%hr
14		25
15	= form_for @user, :url => profile_update_path, :method => :put do \|f\|	26	= form_for @user, :url => profile_update_path, :method => :put do \|f\|
	@@ -18,23 +29,39 @@		@@ -18,23 +29,39 @@
18	%ul	29	%ul
19	- @user.errors.full_messages.each do \|msg\|	30	- @user.errors.full_messages.each do \|msg\|
20	%li= msg	31	%li= msg
21	-
22	- .clearfix
23	- = f.label :name
24	- .input= f.text_field :name
25	- .clearfix
26	- = f.label :email
27	- .input= f.text_field :email
28	- .clearfix
29	- = f.label :skype
30	- .input= f.text_field :skype
31	- .clearfix
32	- = f.label :linkedin
33	- .input= f.text_field :linkedin
34	- .clearfix
35	- = f.label :twitter
36	- .input= f.text_field :twitter	32	+ .row
		33	+ .span9
		34	+ .clearfix
		35	+ = f.label :name
		36	+ .input
		37	+ = f.text_field :name, :class => "xlarge"
		38	+ %span.help-block Enter youre name, so people you know can recognize you.
		39	+ .clearfix
		40	+ = f.label :email
		41	+ .input
		42	+ = f.text_field :email, :class => "xlarge"
		43	+ %span.help-block We also use email for avatar detection
		44	+ .clearfix
		45	+ = f.label :skype
		46	+ .input= f.text_field :skype, :class => "xlarge"
		47	+ .clearfix
		48	+ = f.label :linkedin
		49	+ .input= f.text_field :linkedin, :class => "xlarge"
		50	+ .clearfix
		51	+ = f.label :twitter
		52	+ .input= f.text_field :twitter, :class => "xlarge"
		53	+ .clearfix
		54	+ = f.label :bio
		55	+ .input
		56	+ = f.text_area :bio, :rows => 6, :class => "xlarge", :maxlength => 250
		57	+ %span.help-block About yourself in fewer than 250 characters.
		58	+ .span7.right
		59	+ %p.alert-message.block-message
		60	+ %strong Tip:
		61	+ You can change your avatar at gravatar.com
37		62
38	.actions	63	.actions
39	= f.submit 'Save', :class => "primary btn"	64	= f.submit 'Save', :class => "primary btn"
40		65
		66	+-#= link_to "New project", new_project_path, :class => "btn small padded"
		67	+-#= link_to "New public key", new_key_path, :class => "btn small"
@@ -0,0 +1,5 @@		@@ -0,0 +1,5 @@
	1	+class AddBioFieldToUser < ActiveRecord::Migration
	2	+ def change
	3	+ add_column :users, :bio, :string, :null => true
	4	+ end
	5	+end