nocebo/diaspora
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

made user sign up and invitation accept slightly nicer, w/tipsy tooltips and instructions

Browse source
This commit is contained in:
maxwell 2010-12-03 13:57:47 -08:00
parent 8e8398fdea
commit 85a85716c6
3 changed files with 41 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

38
app/views/invitations/edit.html.haml
View file

@ -1,16 +1,28 @@
= javascript_include_tag "validation"
:javascript
$(function() {
$('#user_new [title]').tipsy({trigger: 'focus', gravity: 'w'});
$("#user_username").focus();
});
= form_for(resource, :as => resource_name, :url => invitation_path(resource_name), :html => {:method => :put }) do |f|
%p
= f.label :username
= f.text_field :username
%p
= f.label :password
= f.password_field :password
%p
= f.label :password_confirmation
= f.password_field :password_confirmation
.span-12.prepend-6.last
.floating
%h3
= t('registrations.new.sign_up_for_diaspora')
= form_for(resource, :as => resource_name, :url => invitation_path(resource_name), :html => {:method => :put }) do |f|
%p
= f.label :username , t('username')
= f.text_field :username, :title => t('registrations.new.enter_username')
%p
= f.label :email , t('email')
= f.text_field :email, :title => t('registrations.new.enter_email')
%p
= f.label :password , t('password')
= f.password_field :password, :title => t('registrations.new.enter_password')
%p
= f.label :password_confirmation , t('password_confirmation')
= f.password_field :password_confirmation, :title => t('registrations.new.enter_password_again')
= f.submit t('registrations.new.sign_up')
= f.hidden_field :invitation_token
= f.submit t('.sign_up')
= render :partial => "devise/shared/links"

17
app/views/registrations/new.html.haml
View file

@ -1,5 +1,11 @@
= javascript_include_tag "validation"
:javascript
$(function() {
$('#user_new [title]').tipsy({trigger: 'focus', gravity: 'w'});
$("#user_username").focus();
});
.span-12.prepend-6.last
.floating
%h3
@ -7,16 +13,17 @@
= form_for(resource, :as => resource_name, :url => registration_path(resource_name)) do |f|
%p
= f.label :username , t('username')
= f.text_field :username
%p
= f.text_field :username, :title => t('.enter_username')
%p
= f.label :email , t('email')
= f.text_field :email
= f.text_field :email, :title => t('.enter_email')
%p
= f.label :password , t('password')
= f.password_field :password
= f.password_field :password, :title => t('.enter_password')
%p
= f.label :password_confirmation , t('password_confirmation')
= f.password_field :password_confirmation
= f.password_field :password_confirmation, :title => t('.enter_password_again')
= f.submit t('.sign_up')

4
config/locales/diaspora/en.yml
View file

@ -257,6 +257,10 @@ en:
new:
sign_up: "Sign up"
sign_up_for_diaspora: "Sign up for Diaspora"
enter_email: "Enter an e-mail"
enter_username: "Pick a username (only letters, numbers, and underscores)"
enter_password: "Enter a password"
enter_password_again: "Enter the same password as before"
create:
success: "You've joined Diaspora!"
edit: