From 3a8c189acc5b9215bd8429d0be99dd6a0d9b4021 Mon Sep 17 00:00:00 2001 From: Daniela Feitosa + Paulo Meirelles Date: Thu, 8 Nov 2012 19:38:52 -0200 Subject: [PATCH] Redesigning signup screen --- app/helpers/application_helper.rb | 4 ++-- app/views/account/_signup_form.rhtml | 70 ++++++++++++++++++++++++++++------------------------------------------ plugins/stoa/public/javascripts/signup_complement.js | 6 +++--- public/stylesheets/application.css | 94 +++++++++++++++++++++++++--------------------------------------------------------------------- 4 files changed, 58 insertions(+), 116 deletions(-) diff --git a/app/helpers/application_helper.rb b/app/helpers/application_helper.rb index 8b9ba01..bffff20 100644 --- a/app/helpers/application_helper.rb +++ b/app/helpers/application_helper.rb @@ -1340,8 +1340,8 @@ module ApplicationHelper content_tag('li', labelled_radio_button(template.name, "#{field_name}[template_id]", template.id, counter==1)) end.join("\n") - content_tag('div', content_tag('span', _('Template:')) + - content_tag('ul', radios, :style => 'list-style: none; padding-left: 0; margin-top: 0.5em;'), + content_tag('div', content_tag('label', _('Template'), :for => 'template-options', :class => 'formlabel') + + content_tag('ul', radios, :style => 'list-style: none; padding-left: 20px; margin-top: 0.5em;'), :id => 'template-options', :style => 'margin-top: 1em' ) diff --git a/app/views/account/_signup_form.rhtml b/app/views/account/_signup_form.rhtml index 47e2932..0c08820 100644 --- a/app/views/account/_signup_form.rhtml +++ b/app/views/account/_signup_form.rhtml @@ -6,14 +6,17 @@
- <%= environment.default_hostname %>/ -
-
- <%= required f.text_field(:login, :onchange => 'this.value = convToValidLogin(this.value);', :rel => s_('signup|Login')) %> -

 

+
+ <%= label(:profile_data, :login, _('Username'), {:class => 'formlabel'}) %> + <%= environment.default_hostname %>/ +
+
+ <%= required text_field(:profile_data, :login, :id => 'user_login', :onchange => 'this.value = convToValidLogin(this.value);') %> +

 

+
+ <%= content_tag(:small, _('Choose your login name carefully! It will be your network access and you will not be able to change it later.'), :id => 'signup-balloon') %> +
- <%= content_tag(:small, _('Choose your login name carefully! It will be your network access and you will not be able to change it later.'), :id => 'signup-balloon') %> -
<%= observe_field 'user_login', :url => { :action => 'check_url' }, @@ -26,19 +29,17 @@
<%= required f.password_field(:password, :id => 'user_pw') %> - <%= f.text_field(:password_clear, :value => _('password')) %> <%= content_tag(:small,_('Choose a password that you can remember easily. It must have at least 4 characters.'), :id => 'password-balloon') %>

 

<%= required f.password_field(:password_confirmation) %> - <%= f.text_field(:password_confirmation_clear, :value => _('password confirmation')) %>

 

- <%= required f.text_field(:email, :rel => _('e-Mail')) %> + <%= required f.text_field(:email) %> <%= content_tag(:small,_('This e-mail address will be used to contact you.')) %>

 

@@ -62,8 +63,10 @@ }" %> - <%= label :profile_data, :name %> - <%= required text_field(:profile_data, :name, :rel => _('Full name')) %> +
+ <%= label(:profile_data, :name, _('Full name'), {:class => 'formlabel'}) %> + <%= required text_field(:profile_data, :name) %> +
@@ -99,6 +102,9 @@