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

improve mobile sign up and sign in view

Browse source
This commit is contained in:
Diaspora Europe 2012-03-07 17:01:16 +01:00
parent 76450f7882
commit 92a857533e
2 changed files with 36 additions and 32 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

56
app/views/registrations/new.mobile.haml
View file

@ -7,34 +7,36 @@
.stream .stream
#login_form #login_form
.login-container .login-container
%h2
= t('users.getting_started.welcome')
= form_for(resource, :as => resource_name, :html => {:class => 'new_user_form'}, :url => registration_path(resource_name), :validate => true) do |f| = form_for(resource, :as => resource_name, :html => {:class => 'new_user_form'}, :url => registration_path(resource_name), :validate => true) do |f|
.row %fieldset
.row %legend
= t('welcome')
.control-group
= f.label :username, t('username') = f.label :username, t('username')
.centered .controls
= f.text_field :username = f.text_field :username
%span.host_uri %span.host_uri
= diaspora_id_host = diaspora_id_host
.row
.row .control-group
= f.label :email, t('email') = f.label :email, t('email')
.centered .controls
= f.email_field :email = f.text_field :email
.row
.row .control-group
= f.label :password, t('password') = f.label :password, t('password')
.centered .controls
= f.password_field :password = f.password_field :password
.row
.row .control-group
= f.label :password_confirmation, t('password_confirmation') = f.label :password_confirmation, t('password_confirmation')
.centered .controls
= f.password_field :password_confirmation = f.password_field :password_confirmation
.row
= f.submit t('registrations.new.create_my_account'), :class => 'login-submit' .controls
= link_to t('.sign_up'), new_user_session_path() = f.submit t('registrations.new.create_my_account'), :class => 'btn primary'
= link_to t('devise.sessions.new.sign_in'), new_user_session_path()
%footer %footer
= link_to t('layouts.application.toggle'), toggle_mobile_path

12
app/views/sessions/new.mobile.haml
View file

@ -8,7 +8,7 @@
= form_for(resource, :as => resource_name, :url => session_path(resource_name), :html => {:class => 'form-horizontal'}) do |f| = form_for(resource, :as => resource_name, :url => session_path(resource_name), :html => {:class => 'form-horizontal'}) do |f|
%fieldset %fieldset
%legend %legend
Log in = t('devise.sessions.new.login')
.control-group .control-group
= f.label :username, t('username'), :class => "control-label" = f.label :username, t('username'), :class => "control-label"
@ -26,8 +26,10 @@
= f.submit t('devise.sessions.new.sign_in'), :class => 'btn primary' = f.submit t('devise.sessions.new.sign_in'), :class => 'btn primary'
%footer %footer
- if display_password_reset_link?
= link_to "Forgot Password?", new_password_path(resource_name)
- if display_registration_link? - if display_registration_link?
= link_to t('.sign_up'), new_registration_path(resource_name) = link_to t('devise.shared.links.sign_up'), new_registration_path(resource_name)
- if display_password_reset_link?
= link_to t('devise.passwords.new.forgot_password'), new_password_path(resource_name)
= link_to t('layouts.application.toggle'), toggle_mobile_path