Skip to content
Browse files

Improved profile & team member show

  • Loading branch information...
1 parent fea6494 commit 1c6df8e075abf87c6911be7ca9a691d48b7d4009 @randx randx committed
View
15 app/assets/stylesheets/common.scss
@@ -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;
}
}
View
9 app/models/user.rb
@@ -5,13 +5,19 @@ class User < 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 < 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
View
9 app/views/dashboard/index.html.haml
@@ -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
View
7 app/views/devise/sessions/new.html.erb
@@ -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 -%>
View
6 app/views/devise/shared/_links.erb
@@ -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 -%>
View
83 app/views/profile/show.html.haml
@@ -1,15 +1,26 @@
-.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"
View
83 app/views/team_members/show.html.haml
@@ -1,54 +1,59 @@
- 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
View
5 db/migrate/20120323221339_add_bio_field_to_user.rb
@@ -0,0 +1,5 @@
+class AddBioFieldToUser < ActiveRecord::Migration
+ def change
+ add_column :users, :bio, :string, :null => true
+ end
+end
View
3 db/schema.rb
@@ -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 @@
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

0 comments on commit 1c6df8e

Please sign in to comment.
Something went wrong with that request. Please try again.