New project page improved. User profile improved. Show issues, participant on Milestone show page.
This commit is contained in:
parent
af99e4afe1
commit
c9af8e7579
20 changed files with 200 additions and 117 deletions
|
@ -6,7 +6,7 @@
|
|||
%hr
|
||||
= form_for @user, :url => profile_password_path, :method => :put do |f|
|
||||
.data
|
||||
.alert-message.block-message.warning
|
||||
.alert.alert-info
|
||||
%p After successfull password update you will be redirected to login page where you should login with new password
|
||||
-if @user.errors.any?
|
||||
.alert-message.block-message.error
|
||||
|
@ -33,7 +33,7 @@
|
|||
%hr
|
||||
= form_for @user, :url => profile_reset_private_token_path, :method => :put do |f|
|
||||
.data
|
||||
.alert-message.block-message.warning
|
||||
.alert.alert-info
|
||||
%p Private token used to access application resources without authentication.
|
||||
%hr
|
||||
%p * required for rss feed
|
||||
|
|
|
@ -1,26 +1,12 @@
|
|||
.row
|
||||
.span8
|
||||
.profile_avatar_holder
|
||||
= image_tag gravatar_icon(@user.email, 90), :class => "styled_image"
|
||||
%h3
|
||||
= @user.name
|
||||
%br
|
||||
%small
|
||||
= @user.email
|
||||
|
||||
.span4.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
|
||||
.profile_avatar_holder
|
||||
= image_tag gravatar_icon(@user.email, 90), :class => "styled_image"
|
||||
%h3
|
||||
= @user.name
|
||||
%br
|
||||
%small
|
||||
= @user.email
|
||||
|
||||
|
||||
%hr
|
||||
|
||||
= form_for @user, :url => profile_update_path, :method => :put, :html => { :class => "edit_user form-horizontal" } do |f|
|
||||
|
@ -41,6 +27,8 @@
|
|||
.controls
|
||||
= f.text_field :email, :class => "input-xlarge"
|
||||
%span.help-block We also use email for avatar detection.
|
||||
|
||||
%hr
|
||||
.control-group
|
||||
= f.label :skype, :class => "control-label"
|
||||
.controls= f.text_field :skype, :class => "input-xlarge"
|
||||
|
@ -56,12 +44,27 @@
|
|||
= f.text_area :bio, :rows => 6, :class => "input-xlarge", :maxlength => 250
|
||||
%span.help-block Tell us about yourself in fewer than 250 characters.
|
||||
.span5.right
|
||||
%p.alert-message.block-message
|
||||
|
||||
%p.alert.alert-info
|
||||
%strong Tip:
|
||||
You can change your avatar at gravatar.com
|
||||
|
||||
%h4
|
||||
Personal projects:
|
||||
%small.right
|
||||
%span= current_user.my_own_projects.count
|
||||
of
|
||||
%span= current_user.projects_limit
|
||||
.progress
|
||||
.bar{:style => "width: #{current_user.projects_limit_percent}%;"}
|
||||
|
||||
%h4
|
||||
SSH public keys:
|
||||
%small.right
|
||||
%span= current_user.keys.count
|
||||
|
||||
= link_to "Add Public Key", new_key_path, :class => "btn small right"
|
||||
|
||||
|
||||
.form-actions
|
||||
= f.submit 'Save', :class => "btn-primary btn"
|
||||
|
||||
-#= link_to "New project", new_project_path, :class => "btn small padded"
|
||||
-#= link_to "New public key", new_key_path, :class => "btn small"
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue