From da51259f32a4e28d1651956b3cf0c7d3b0f6375a Mon Sep 17 00:00:00 2001 From: Maxwell Salzberg <maxwell@joindiaspora.com> Date: Tue, 9 Aug 2011 17:00:35 -0700 Subject: [PATCH] update dates on some views, give the accept invite form some padding --- app/views/invitations/edit.mobile.haml | 39 +++++++++++++++----------- app/views/sessions/new.mobile.haml | 2 +- 2 files changed, 23 insertions(+), 18 deletions(-) diff --git a/app/views/invitations/edit.mobile.haml b/app/views/invitations/edit.mobile.haml index b5823585ad..ad425750c0 100644 --- a/app/views/invitations/edit.mobile.haml +++ b/app/views/invitations/edit.mobile.haml @@ -1,18 +1,23 @@ -= 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.hidden_field :invitation_token +-# Copyright (c) 2011, Diaspora Inc. This file is +-# licensed under the Affero General Public License version 3 or later. See +-# the COPYRIGHT file. - = f.submit t('registrations.new.create_my_account') - %br - = render :partial => "devise/shared/links" +#login_form + = 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.hidden_field :invitation_token + + = f.submit t('registrations.new.create_my_account') + %br + = render :partial => "devise/shared/links" diff --git a/app/views/sessions/new.mobile.haml b/app/views/sessions/new.mobile.haml index 4869f50722..b24183f3cf 100644 --- a/app/views/sessions/new.mobile.haml +++ b/app/views/sessions/new.mobile.haml @@ -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 -# the COPYRIGHT file. -- GitLab