ActionItem833: enhancing view for person fields

Daniela Feitosa
1 parent 0ba97d30
Showing 3 changed files with 23 additions and 18 deletions Show diff stats
app/helpers/application_helper.rb
app/views/account/_signup_form.rhtml
app/views/profile_editor/_person_form.rhtml
@@ -691,8 +691,12 @@ module ApplicationHelper
     form_for(name, object, { :builder => NoosferoFormBuilder }.merge(options), &proc)
   end
-  def custom_field(profile, name, field_html, options = {})
+  def custom_field(profile, name, field_html = nil, options = {}, &block)
     result = ""
+    if block
+      field_html ||= ''
+      field_html += capture(&block)
+    end
     if (controller.action_name == 'signup')
       if profile.signup_fields.include?(name)
         result = field_html
@@ -705,6 +709,11 @@ module ApplicationHelper
     if profile.required_fields.include?(name)
       result = required(result)
     end
+
+    if block
+      concat(result, block.binding)
+    end
+
     result
   end
@@ -21,7 +21,7 @@ in this environment.&#39;) % environment.name %&gt;
 <small><%= help %></small>
 <%= required f.text_field(:email,
-    :help => help=_('We\'ll send you an e-mail to validate your registration.')) %>
+    :help => help=_('This e-mail address will be used to contact you about events that deserve your attention.')) %>
 <small><%= help %></small>
 <%= required f.password_field(:password,
 <% @person ||= @profile %>
-<%= custom_field(@person, 'nickname', f.text_field(:nickname, :maxlength => 16, :size => 30)) %>
-
-<% nickname_tip = "<div><small><em>" + _('A short name by which you like to be known. Will be used in friends listings, community member listings etc.') + "</em></small></div>" %>
-<% if controller.action_name == 'signup' %>
-  <% if @person.signup_fields.include?('nickname') %>
-    <%= nickname_tip %>
-  <% end%>
-<% elsif @person.active_fields.include?('nickname') %>
-  <%= nickname_tip %>
+<% custom_field(@person, 'nickname') do %>
+  <%= f.text_field(:nickname, :maxlength => 16, :size => 30) %>
+  <div>
+    <small><%= _('A short name by which you like to be known. Will be used in friends listings, community member listings etc.') %></small>
+  </div>
 <% end %>
 <%= custom_field(@person, 'contact_information', f.text_field(:contact_information)) %>
@@ -24,13 +20,13 @@
 <%= custom_field(@person, 'country', select_country(_('Country'), 'profile_data', 'country', {:class => 'type-select'})) %>
 <%= custom_field(@person, 'nationality', f.text_field(:nationality)) %>
-<% if @person.active_fields.include?('schooling') %>
-  <% schooling_label = "<label class='formlabel' for='profile_data_schooling'>#{_('Schooling')}</label>" %>
-  <div class="formfieldline"><%= @person.required_fields.include?('schooling') ? required(schooling_label) : schooling_label %>
-      <div class="formfield type-select">
-        <%= custom_field(@person, 'schooling', select_schooling('profile_data', 'schooling', {:class => 'select-schooling'})) %>
-        <%= custom_field(@person, 'schooling_status', select_schooling_status('profile_data', 'schooling_status', {:class => 'select-schooling'})) %>
-      </div>
+<% custom_field(@person, 'schooling') do %>
+  <div class="formfieldline">
+    <label class='formlabel' for='profile_data_schooling'><%= _('Schooling') %></label>
+    <div class="formfield type-select">
+      <%= select_schooling('profile_data', 'schooling', {:class => 'select-schooling'}) %>
+      <%= select_schooling_status('profile_data', 'schooling_status', {:class => 'select-schooling'}) %>
+    </div>
   </div>
 <% end %>
	@@ -21,7 +21,7 @@ in this environment.') % environment.name %>		@@ -21,7 +21,7 @@ in this environment.') % environment.name %>
21	<small><%= help %></small>	21	<small><%= help %></small>
22		22
23	<%= required f.text_field(:email,	23	<%= required f.text_field(:email,
24	- :help => help=_('We\'ll send you an e-mail to validate your registration.')) %>	24	+ :help => help=_('This e-mail address will be used to contact you about events that deserve your attention.')) %>
25	<small><%= help %></small>	25	<small><%= help %></small>
26		26
27	<%= required f.password_field(:password,	27	<%= required f.password_field(:password,