added back the tooltip explaining username constatrains on the accept invite flow

This commit is contained in:
Ilyaaaaaaaaaaaaa Zhitomirskiy 2011-08-24 17:21:13 -07:00
parent 121c0c97f8
commit 2708b0b695
3 changed files with 26 additions and 13 deletions

View file

@ -47,7 +47,9 @@ class InvitationsController < Devise::InvitationsController
flash[:notice] = I18n.t 'registrations.create.success'
sign_in_and_redirect(:user, user)
else
redirect_to accept_user_invitation_path(:invitation_token => params[:user][:invitation_token]), :error => user.errors.full_messages.join(", ")
user.errors.delete(:person)
flash[:error] = user.errors.full_messages.join(", ")
redirect_to accept_user_invitation_path(:invitation_token => params[:user][:invitation_token])
end
end

View file

@ -1,4 +1,6 @@
= javascript_include_tag "validation"
= javascript_tag "Diaspora.Page = 'InvitationsEdit';"
:javascript
$(function() {
$("#user_username").focus();
@ -13,6 +15,8 @@
= t('.your_account_awaits')
%h3.accept_invitation_text
= t('.accept_your_invitation')
- flash.each do |name, msg|
%p{:class => "login_#{name}"}= msg
.span-10
%br

View file

@ -0,0 +1,7 @@
Diaspora.Pages.InvitationsEdit = function() {
var self = this;
this.subscribe("page/ready", function(evt, body) {
$('#user_username').tipsy({trigger: 'select', gravity: 'w'});
});
};