diff --git a/app/helpers/profile_helper.rb b/app/helpers/profile_helper.rb index a508c75..eb6ad68 100644 --- a/app/helpers/profile_helper.rb +++ b/app/helpers/profile_helper.rb @@ -20,10 +20,12 @@ module ProfileHelper zip = display_field(_('ZIP code:'), profile, :zip_code) phone = display_field(_('Contact phone:'), profile, :contact_phone) email = display_field(_('e-Mail:'), profile, :email) { |email| link_to_email(email) } - if address.blank? && zip.blank? && phone.blank? && email.blank? + personal_website = display_field(_('Personal website:'), profile, :personal_website) + jabber = display_field(_('Jabber:'), profile, :jabber_id) + if address.blank? && zip.blank? && phone.blank? && email.blank? && personal_website.blank? && jabber.blank? '' else - content_tag('tr', content_tag('th', _('Contact'), { :colspan => 2 })) + address + zip + phone + email + content_tag('tr', content_tag('th', _('Contact'), { :colspan => 2 })) + address + zip + phone + email + personal_website + jabber end end diff --git a/app/models/person.rb b/app/models/person.rb index 26f717d..7170359 100644 --- a/app/models/person.rb +++ b/app/models/person.rb @@ -157,6 +157,8 @@ class Person < Profile birth_date cell_phone comercial_phone + jabber_id + personal_website schooling professional_activity organization diff --git a/app/views/profile_editor/_person_form.rhtml b/app/views/profile_editor/_person_form.rhtml index 1acad7e..336ae7a 100644 --- a/app/views/profile_editor/_person_form.rhtml +++ b/app/views/profile_editor/_person_form.rhtml @@ -13,6 +13,8 @@ <%= optional_field(@person, 'contact_phone', labelled_form_field(_('Home phone'), text_field(:profile_data, :contact_phone, :rel => _('Contact phone')))) %> <%= optional_field(@person, 'cell_phone', f.text_field(:cell_phone, :rel => _('Cell phone'))) %> <%= optional_field(@person, 'comercial_phone', f.text_field(:comercial_phone, :rel => _('Comercial phone'))) %> +<%= optional_field(@person, 'jabber_id', f.text_field(:jabber_id, :rel => _('Jabber'))) %> +<%= optional_field(@person, 'personal_website', f.text_field(:personal_website, :rel => _('Personal website'))) %> <%= optional_field(@person, 'sex', f.radio_group(:profile_data, :sex, [ ['male',_('Male')], ['female',_('Female')] ])) %> <%= optional_field(@person, 'birth_date', labelled_form_field(_('Birth date'), '