update dates on some views, give the accept invite form some padding
This commit is contained in:
parent
333081f8b1
commit
da51259f32
2 changed files with 23 additions and 18 deletions
|
|
@ -1,18 +1,23 @@
|
||||||
= form_for(resource, :as => resource_name, :url => invitation_path(resource_name), :html => {:method => :put }) do |f|
|
-# Copyright (c) 2011, Diaspora Inc. This file is
|
||||||
%p
|
-# licensed under the Affero General Public License version 3 or later. See
|
||||||
= f.label :username , t('username')
|
-# the COPYRIGHT file.
|
||||||
= 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.hidden_field :invitation_token
|
|
||||||
|
|
||||||
= f.submit t('registrations.new.create_my_account')
|
#login_form
|
||||||
%br
|
= form_for(resource, :as => resource_name, :url => invitation_path(resource_name), :html => {:method => :put }) do |f|
|
||||||
= render :partial => "devise/shared/links"
|
%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.hidden_field :invitation_token
|
||||||
|
|
||||||
|
= f.submit t('registrations.new.create_my_account')
|
||||||
|
%br
|
||||||
|
= render :partial => "devise/shared/links"
|
||||||
|
|
|
||||||
|
|
@ -1,4 +1,4 @@
|
||||||
-# Copyright (c) 2010, Diaspora Inc. This file is
|
-# Copyright (c) 2011, Diaspora Inc. This file is
|
||||||
-# licensed under the Affero General Public License version 3 or later. See
|
-# licensed under the Affero General Public License version 3 or later. See
|
||||||
-# the COPYRIGHT file.
|
-# the COPYRIGHT file.
|
||||||
|
|
||||||
|
|
|
||||||
Loading…
Reference in a new issue