Download as
Browse Code »

Commit 2758921daba1f0b72561b917312c4c866689154d

Authored by Daniela Feitosa
1 parent 013b8132
Exists in master and in 22 other branches angular_poc, api-article-archived, article-readonly, backup-7-jan-2016, captcha_serpro_plugin, content-manager-hostspot, export-comment-paragraph, fix_event_date_issue, login-captcha, master_rails3, new_video_plugin, pg_search_rank, production, refactor_with_role, refactor_with_role_scope, remove_profile_cat_icons, resend_confirmation_email, staging, staging_rails3, tasks_keep_filter_params, theme-brasil-digital-from-staging, travis

Enhancements on signup screen 

Template options appears after all fields
Fixed width of radio input
Fixed translation of usp field tip
Showing 3 changed files with 4 additions and 3 deletions   Show diff stats
app/views/account/_signup_form.rhtml
  Diff comments   View file @2758921
@@ -72,14 +72,14 @@ @@ -72,14 +72,14 @@
72 72
73 <div id="signup-form-profile"> 73 <div id="signup-form-profile">
74 74
75 - <%= template_options(Person, 'profile_data') %>  
76 -  
77 <% labelled_fields_for :profile_data, @person do |f| %> 75 <% labelled_fields_for :profile_data, @person do |f| %>
78 <%= render :partial => 'profile_editor/person_form', :locals => {:f => f} %> 76 <%= render :partial => 'profile_editor/person_form', :locals => {:f => f} %>
79 <% end %> 77 <% end %>
80 78
81 <%= @plugins.dispatch(:signup_extra_contents).collect { |content| instance_eval(&content) }.join("") %> 79 <%= @plugins.dispatch(:signup_extra_contents).collect { |content| instance_eval(&content) }.join("") %>
82 80
  81 + <%= template_options(Person, 'profile_data') %>
  82 +
83 <% unless @terms_of_use.blank? %> 83 <% unless @terms_of_use.blank? %>
84 <div id='terms-of-use-box' class='formfieldline'> 84 <div id='terms-of-use-box' class='formfieldline'>
85 <%= labelled_check_box(_('I accept the %s') % link_to(_('terms of use'), {:controller => 'home', :action => 'terms'}, :target => '_blank'), 'user[terms_accepted]') %> 85 <%= labelled_check_box(_('I accept the %s') % link_to(_('terms of use'), {:controller => 'home', :action => 'terms'}, :target => '_blank'), 'user[terms_accepted]') %>
po/pt/noosfero.po
  Diff comments   View file @2758921
@@ -10287,7 +10287,7 @@ msgid &quot;&quot; @@ -10287,7 +10287,7 @@ msgid &quot;&quot;
10287 "if you have one." 10287 "if you have one."
10288 msgstr "" 10288 msgstr ""
10289 "O número USP garante poderes especiais nesta rede. Não esqueça de preenchê-" 10289 "O número USP garante poderes especiais nesta rede. Não esqueça de preenchê-"
10290 -"lo se você possuir um se você possuir um." 10290 +"lo se você possuir um."
10291 10291
10292 #: plugins/stoa/lib/stoa_plugin.rb:24 plugins/stoa/lib/stoa_plugin.rb:34 10292 #: plugins/stoa/lib/stoa_plugin.rb:24 plugins/stoa/lib/stoa_plugin.rb:34
10293 msgid "Birth date (yyyy-mm-dd)" 10293 msgid "Birth date (yyyy-mm-dd)"
public/stylesheets/application.css
  Diff comments   View file @2758921
@@ -5731,6 +5731,7 @@ li.profile-activity-item.upload_image .activity-gallery-images-count-1 img { @@ -5731,6 +5731,7 @@ li.profile-activity-item.upload_image .activity-gallery-images-count-1 img {
5731 #signup-form input[type=radio] { 5731 #signup-form input[type=radio] {
5732 height: auto; 5732 height: auto;
5733 margin: 0px 5px 0px 3px; 5733 margin: 0px 5px 0px 3px;
  5734 + width: auto;
5734 } 5735 }
5735 5736
5736 #signup-form .fieldgroup { 5737 #signup-form .fieldgroup {