diff --git a/app/controllers/admin/features_controller.rb b/app/controllers/admin/features_controller.rb
index 8de1440..a50537d 100644
--- a/app/controllers/admin/features_controller.rb
+++ b/app/controllers/admin/features_controller.rb
@@ -17,17 +17,23 @@ class FeaturesController < AdminController
 
   def manage_fields
     @person_fields = Person.fields
+    @custom_person_fields = []
+    @environment.settings[:custom_person_fields].each{|k,v| @custom_person_fields << k if k =~ /^custom_field/ && ! @custom_person_fields.include?(k) }
     @enterprise_fields = Enterprise.fields
     @community_fields = Community.fields
   end
 
   def manage_person_fields
     environment.custom_person_fields = params[:person_fields]
+
+    #raise params[:person_fields].inspect
+
     if environment.save!
       session[:notice] = _('Person fields updated successfully.')
     else
       flash[:error] = _('Person fields not updated successfully.')
     end
+
     redirect_to :action => 'manage_fields'
   end
 
diff --git a/app/helpers/application_helper.rb b/app/helpers/application_helper.rb
index d41ab2a..ce01d42 100644
--- a/app/helpers/application_helper.rb
+++ b/app/helpers/application_helper.rb
@@ -809,6 +809,12 @@ module ApplicationHelper
     form_for(name, { :builder => NoosferoFormBuilder }.merge(options), &proc)
   end
 
+  def optional_custom_field(profile)
+    result = ""
+
+    result
+  end
+
   def optional_field(profile, name, field_html = nil, only_required = false, &block)
     result = ""
 
diff --git a/app/models/environment.rb b/app/models/environment.rb
index 50061c8..9e8984c 100644
--- a/app/models/environment.rb
+++ b/app/models/environment.rb
@@ -429,7 +429,9 @@ class Environment < ActiveRecord::Base
       schooling_status = values['schooling']
     end
 
-    self.settings[:custom_person_fields] = values.delete_if { |key, value| ! Person.fields.include?(key)}
+    self.settings[:custom_person_fields] = values.delete_if { |key, value|
+     ! ( Person.fields.include?(key) || key =~ /^custom_field/ )
+    }
     self.settings[:custom_person_fields].each_pair do |key, value|
       if value['required'] == 'true'
         self.settings[:custom_person_fields][key]['active'] = 'true'
@@ -445,6 +447,16 @@ class Environment < ActiveRecord::Base
     end
   end
 
+  def custom_person_fields_customs()
+    custom_fields = []
+    self.settings[:custom_person_fields].each{ |k,v| custom_fields << k if k =~ /^custom_field/ }
+    custom_fields
+  end
+
+  def custom_person_field_name(field)
+    self.settings[:custom_person_fields][field]['name']
+  end
+
   def custom_person_field(field, status)
     if (custom_person_fields[field] && custom_person_fields[field][status] == 'true')
       return true
diff --git a/app/models/person.rb b/app/models/person.rb
index d0d0521..6e534d0 100644
--- a/app/models/person.rb
+++ b/app/models/person.rb
@@ -152,7 +152,7 @@ class Person < Profile
   organization
   organization_website
   contact_phone
-  contact_information
+  contact_informatioin
   ]
 
   validates_multiparameter_assignments
diff --git a/app/views/features/_manage_person_fields.html.erb b/app/views/features/_manage_person_fields.html.erb
index 1d6eddf..c9b85c8 100644
--- a/app/views/features/_manage_person_fields.html.erb
+++ b/app/views/features/_manage_person_fields.html.erb
@@ -1,47 +1,80 @@
 <%= labelled_form_for(:environment, :url => {:action => 'manage_person_fields'}) do |f| %>
 
-<table id='person_fields_conf'>
+<table id='person_fields_conf' border="0">
   <tr>
     <th><%= _('Field') %></th>
     <th><%= _('Active') %></th>
     <th><%= _('Required') %></th>
     <th><%= _('Display on signup?') %></th>
+    <th>&nbsp;</th>
   </tr>
 
   <tr class='manage-fields-batch-actions'>
     <td>
       <%= _("Check/Uncheck All")%>
     </td>
-    <td>
+    <td align="center">
       <input type="checkbox" id="person_active" />
     </td>
-    <td>
+    <td align="center">
       <input type="checkbox" id="person_required" />
     </td>
-    <td>
+    <td align="center">
       <input type="checkbox" id="person_signup" />
     </td>
+    <td>&nbsp;</td>
   </tr>
 
   <% @person_fields.each do |field| %>
   <tr>
     <td><label for="person_fields[<%= field %>][active]"><%= _(field.humanize) %></label></td>
-    <td>
+    <td align="center">
       <%= hidden_field_tag  "person_fields[#{field}][active]", false %>
       <%= check_box_tag "person_fields[#{field}][active]", true, environment.custom_person_field(field, 'active'), :onclick => "active_action(this, 'person_fields[#{field}][required]', 'person_fields[#{field}][signup]')" %>
     </td>
-    <td>
+    <td align="center">
       <%= hidden_field_tag  "person_fields[#{field}][required]", false %>
       <%= check_box_tag "person_fields[#{field}][required]", true, environment.custom_person_field(field, 'required'), :onclick => "required_action('person_fields[#{field}][active]','person_fields[#{field}][required]', 'person_fields[#{field}][signup]')" %>
     </td>
-    <td>
+    <td align="center">
       <%= hidden_field_tag  "person_fields[#{field}][signup]", false %>
       <%= check_box_tag "person_fields[#{field}][signup]", true, environment.custom_person_field(field, 'signup'), :onclick => "signup_action('person_fields[#{field}][active]','person_fields[#{field}][required]', 'person_fields[#{field}][signup]')" %>
     </td>
+    <td>&nbsp;</td>
+  </tr>
+  <% end %>
+
+  <% @custom_person_fields.each do |field| %>
+  <tr>
+    <td>
+      <%= text_field_tag "person_fields[#{field}][name]", environment.custom_person_field_name(field) %>
+    </td>
+    <td align="center">
+      <%= hidden_field_tag  "person_fields[#{field}][active]", false %>
+      <%= check_box_tag "person_fields[#{field}][active]", true, environment.custom_person_field(field, 'active'), :onclick => "active_action(this, 'person_fields[#{field}][required]', 'person_fields[#{field}][signup]')" %>
+    </td>
+    <td align="center">
+      <%= hidden_field_tag  "person_fields[#{field}][required]", false %>
+      <%= check_box_tag "person_fields[#{field}][required]", true, environment.custom_person_field(field, 'required'), :onclick => "required_action('person_fields[#{field}][active]','person_fields[#{field}][required]', 'person_fields[#{field}][signup]')" %>
+    </td>
+    <td align="center">
+      <%= hidden_field_tag  "person_fields[#{field}][signup]", false %>
+      <%= check_box_tag "person_fields[#{field}][signup]", true, environment.custom_person_field(field, 'signup'), :onclick => "required_action('person_fields[#{field}][active]','person_fields[#{field}][required]', 'person_fields[#{field}][signup]')" %>
+    </td>
+    <td>
+      <a href="#" class="button icon-delete delete-link-list-row" title="Delete" onclick="return remove_custom_field(this);"><span>Delete</span></a>
+    </td>
   </tr>
   <% end %>
+
 </table>
 
+<br />
+
+<%= link_to_function(_('Add field'), 'add_new_field();', :class => 'button icon-add with-text') %>
+
+<%= javascript_include_tag 'edit-profile-fields.js' %>
+
 <script type='text/javascript'>// <!--
   var trs = jQuery('#person_fields_conf tr');
 
diff --git a/app/views/profile_editor/_person_form.html.erb b/app/views/profile_editor/_person_form.html.erb
index ca25acf..a26a059 100644
--- a/app/views/profile_editor/_person_form.html.erb
+++ b/app/views/profile_editor/_person_form.html.erb
@@ -64,3 +64,14 @@
 <%= optional_field(@person, 'professional_activity', f.text_field(:professional_activity, :rel => _('Professional activity'))) %>
 <%= optional_field(@person, 'organization', f.text_field(:organization, :rel => _('Organization'))) %>
 <%= optional_field(@person, 'organization_website', f.text_field(:organization_website, :rel => _('Organization website'))) %>
+
+<hr />
+
+<% @environment.custom_person_fields_customs.each { |k| %>
+  <br />
+  <%= label_tag environment.custom_person_field_name(k) %>
+  <%= optional_field(@person, k, text_field_tag("profile_data[#{k}]")) %>
+  <br />
+<% } %>
+
+<hr />
diff --git a/app/views/profile_editor/edit.html.erb b/app/views/profile_editor/edit.html.erb
index abef586..40cd35d 100644
--- a/app/views/profile_editor/edit.html.erb
+++ b/app/views/profile_editor/edit.html.erb
@@ -10,8 +10,12 @@
     </div>
   <% end %>
 
+  <hr />
+
   <%= render :partial => partial_for_class(@profile.class), :locals => { :f => f } %>
 
+  <hr />
+
   <div id="profile_change_picture_title">
     <h2><%= _('Change picture') %></h2>
     <span><%= unchangeable_privacy_field @profile %></span>
diff --git a/public/javascripts/edit-profile-fields.js b/public/javascripts/edit-profile-fields.js
new file mode 100644
index 0000000..dd4b6d1
--- /dev/null
+++ b/public/javascripts/edit-profile-fields.js
@@ -0,0 +1,105 @@
+function send_ajax(source_url) {
+  jQuery(".link-address").autocomplete({
+    source : function(request, response){
+      jQuery.ajax({
+        type: "GET",
+        url: source_url,
+        data: {query: request.term},
+        success: function(result){
+          response(result);
+        },
+        error: function(ajax, stat, errorThrown) {
+          console.log('Link not found : ' + errorThrown);
+        }
+      });
+    },
+
+    minLength: 3
+  });
+}
+
+function new_field_action(){
+  send_ajax(jQuery("#page_url").val());
+
+  jQuery(".delete-link-list-row").click(function(){
+    jQuery(this).parent().parent().remove();
+    return false;
+  });
+
+  jQuery(document).scrollTop(jQuery('#dropable-link-list').scrollTop());
+}
+
+function remove_custom_field(element) {
+  jQuery(element).parent().parent().remove();
+  return false;
+}
+
+function add_new_field() {
+
+  last_row = jQuery('#person_fields_conf > tbody:last tr:last');
+
+  if ( last_row.find('label').length == 1 ) {
+
+    var row = '<tr>' +
+                 '<td>' +
+                    '<input id="person_fields_custom_field_1_name" maxlength="20" name="person_fields[custom_field_1][name]" type="text" />' +
+                 '</td>' +
+                 '<td align="center"> ' +
+                    '<input id="person_fields_custom_field_1_active" name="person_fields[custom_field_1][active]" type="hidden" value="false" /> ' +
+                    '<input id="person_fields_custom_field_1_active" name="person_fields[custom_field_1][active]" type="checkbox" value="false" /> ' +
+                 '</td> ' +
+                 '<td align="center"> ' +
+                    '<input id="person_fields_custom_field_1_required" name="person_fields[custom_field_1][required]" type="hidden" value="false" /> ' +
+                    '<input id="person_fields_custom_field_1_required" name="person_fields[custom_field_1][required]" type="checkbox" value="true" /> ' +
+                 '</td> ' +
+                 '<td align="center"> ' +
+                    '<input id="person_fields_custom_field_1_signup" name="person_fields[custom_field_1][signup]" type="hidden" value="false" /> ' +
+                    '<input id="person_fields_custom_field_1_signup" name="person_fields[custom_field_1][signup]" type="checkbox" value="true" /> ' +
+                 '</td> ' +
+                 '<td> ' +
+                    '<a href="#" class="button icon-delete delete-link-list-row" title="Delete" onclick="return remove_custom_field(this);"><span>Delete</span></a> ' +
+                 '</td> ' +
+               '</tr>';
+
+    jQuery('#person_fields_conf > tbody:last').append(row);
+
+  }
+  else {
+
+    var new_field = jQuery('#person_fields_conf > tbody:last tr:last').clone();
+
+    var field = new_field.find('input');
+    //var chkboxes = field.filter(':checkbox');
+
+    var re = new RegExp( '\\d', 'g' );
+    var id = field.attr('id').match(re);
+    var next_id = parseInt(id) + 1;
+
+    jQuery.each( field, function( k, v ) {
+      v.id = v.id.replace(id, next_id);
+      v.name = v.name.replace(id, next_id);
+      if (v.type == 'text') { v.value = '' }
+      if (v.type == 'checkbox') { v.value = true; }
+      if (v.type == 'hidden') { v.value = false; }
+
+    });
+
+    //field.val('');
+
+    //chkboxes.attr('onclick', chkboxes.attr('onclick').replace(id, next_id));
+    //console.log( chkboxes );
+
+    jQuery('#person_fields_conf > tbody').append(new_field);
+
+  }
+
+}
+
+jQuery(document).ready(function(){
+  new_field_action();
+
+  //jQuery("#dropable-link-list").sortable({
+  //  revert: true,
+  //  axis: "y"
+  //});
+});
--
libgit2 0.21.2