0
@@ -25,6 +25,22 @@ module ApplicationHelper
0
     case property.to_sym
0
     when :fullname then 'Full name'
0
     when :dob then 'Birth date'
0
+    when :address_business then 'Address'
0
+    when :address_additional then 'Additional'
0
+    when :address_additional_business then 'Additional'
0
+    when :postcode_business then 'Postcode'
0
+    when :city_business then 'City'
0
+    when :state_business then 'State'
0
+    when :country_business then 'Country'
0
+    when :im_aim then 'AIM'
0
+    when :im_icq then 'ICQ'
0
+    when :im_msn then 'MSN'
0
+    when :im_yahoo then 'Yahoo'
0
+    when :im_jabber then 'Jabber'
0
+    when :im_skype then 'Skype'
0
+    when :image_default then 'Image URL'
0
+    when :web_default then 'Website URL'
0
+    when :web_blog then 'Blog URL'
0
     else property.to_s.humanize
0
     end
0
   end

0
@@ -8,8 +8,7 @@ class Persona < ActiveRecord::Base
0
   
0
   before_destroy :check_deletable!
0
   
0
-  attr_accessible :title, :nickname, :email, :fullname, :postcode
0
-  attr_accessible :country, :language, :timezone, :gender, :dob
0
+  attr_protected :account_id, :deletable
0
   
0
   class NotDeletable < StandardError; end
0
   
0
@@ -34,14 +33,40 @@ class Persona < ActiveRecord::Base
0
   # Mappings for SReg names and AX Type URIs to attributes
0
   def self.mappings
0
     { 'nickname' => ['nickname', 'http://axschema.org/namePerson/friendly'],
0
-      'email'    => ['email', 'http://axschema.org/contact/email'],
0
+      'email' => ['email', 'http://axschema.org/contact/email'],
0
       'fullname' => ['fullname', 'http://axschema.org/namePerson'],
0
       'postcode' => ['postcode', 'http://axschema.org/contact/postalCode/home'],
0
-      'country'  => ['country', 'http://axschema.org/contact/country/home'],
0
+      'country' => ['country', 'http://axschema.org/contact/country/home'],
0
       'language' => ['language', 'http://axschema.org/pref/language'],
0
       'timezone' => ['timezone', 'http://axschema.org/pref/timezone'],
0
-      'gender'   => ['gender', 'http://axschema.org/person/gender'],
0
-      'dob'      => ['dob', 'http://axschema.org/birthDate'] }
0
+      'gender' => ['gender', 'http://axschema.org/person/gender'],
0
+      'dob' => ['dob', 'http://axschema.org/birthDate'],
0
+      'address' => ['http://axschema.org/contact/postalAddress/home'],
0
+      'address_additional' => ['http://axschema.org/contact/postalAddressAdditional/home'],
0
+      'city' => ['http://axschema.org/contact/city/home'],
0
+      'state' => ['http://axschema.org/contact/state/home'],
0
+      'company_name' => ['http://axschema.org/company/name'],
0
+      'job_title' => ['http://axschema.org/company/title'],
0
+      'address_business' => ['http://axschema.org/contact/postalAddress/business'],
0
+      'address_additional_business' => ['http://axschema.org/contact/postalAddressAdditional/business'],
0
+      'postcode_business' => ['http://axschema.org/contact/postalCode/business'],
0
+      'city_business' => ['http://axschema.org/contact/city/business'],
0
+      'state_business' => ['http://axschema.org/contact/state/business'],
0
+      'country_business' => ['http://axschema.org/contact/country/business'],
0
+      'phone_home' => ['http://axschema.org/contact/phone/home'],
0
+      'phone_mobile' => ['http://axschema.org/contact/phone/cell'],
0
+      'phone_work' => ['http://axschema.org/contact/phone/business'],
0
+      'phone_fax' => ['http://axschema.org/contact/phone/fax'],
0
+      'im_aim' => ['http://axschema.org/contact/IM/AIM'],
0
+      'im_icq' => ['http://axschema.org/contact/IM/ICQ'],
0
+      'im_msn' => ['http://axschema.org/contact/IM/MSN'],
0
+      'im_yahoo' => ['http://axschema.org/contact/IM/Yahoo'],
0
+      'im_jabber' => ['http://axschema.org/contact/IM/Jabber'],
0
+      'im_skype' => ['http://axschema.org/contact/IM/Skype'],
0
+      'image_default' => ['http://axschema.org/media/image/default'],
0
+      'biography' => ['http://axschema.org/media/biography'],
0
+      'web_default' => ['http://axschema.org/contact/web/default'],
0
+      'web_blog' => ['http://axschema.org/contact/web/blog'] }
0
   end
0
   
0
 end

0
@@ -1,43 +1,154 @@
0
-	<div class="row space">
0
+	<div class="row inline space">
0
     <%= form.label :title %>
0
     <%= form.text_field :title %>
0
   </div>
0
   
0
-	<h3>Properties</h3>
0
-	<div class="row">
0
+	<h3>Personal information</h3>
0
+	<div class="row inline">
0
     <%= form.label :nickname, property_label_text(:nickname) %>
0
     <%= form.text_field :nickname %>
0
   </div>
0
-	<div class="row">
0
+	<div class="row inline">
0
     <%= form.label :fullname, property_label_text(:fullname) %>
0
     <%= form.text_field :fullname %>
0
   </div>
0
-	<div class="row">
0
+	<div class="row inline">
0
     <%= form.label :email, property_label_text(:email) %>
0
     <%= form.text_field :email %>
0
   </div>
0
-	<div class="row">
0
+	<div class="row inline">
0
+		<%= form.label :address, property_label_text(:address) %>
0
+  	<%= form.text_field :address %>
0
+	</div>
0
+	<div class="row inline">
0
+		<%= form.label :address_additional, property_label_text(:address_additional) %>
0
+  	<%= form.text_field :address_additional %>
0
+	</div>
0
+	<div class="row inline">
0
     <%= form.label :postcode, property_label_text(:postcode) %>
0
     <%= form.text_field :postcode %>
0
   </div>
0
-	<div class="row">
0
+	<div class="row inline">
0
+		<%= form.label :city, property_label_text(:city) %>
0
+  	<%= form.text_field :city %>
0
+	</div>
0
+	<div class="row inline">
0
+		<%= form.label :state, property_label_text(:state) %>
0
+  	<%= form.text_field :state %>
0
+	</div>
0
+	<div class="row inline">
0
     <%= form.label :country, property_label_text(:country) %>
0
     <%= form.select :country, Country.find(:all).map { |l| [ l.name, l.code ] }, { :include_blank => true } %>
0
   </div>
0
-	<div class="row">
0
+	<div class="row inline">
0
     <%= form.label :language, property_label_text(:language) %>
0
     <%= form.select :language, Language.find(:all).map { |l| [ l.name, l.code ] }, { :include_blank => true } %>
0
   </div>
0
-	<div class="row">
0
+	<div class="row inline">
0
     <%= form.label :timezone, property_label_text(:timezone) %>
0
     <%= form.select :timezone, Timezone.find(:all).map { |l| [ l.name, l.name ] }, { :include_blank => true } %>
0
   </div>
0
-	<div class="row">
0
+	<div class="row inline">
0
     <%= form.label :gender, property_label_text(:gender) %>
0
     <%= form.select :gender, [['Male', 'M'], ['Female', 'F']], { :include_blank => true } %>
0
   </div>
0
-	<div class="row">
0
+	<div class="row inline space">
0
     <%= form.label :dob_3i, property_label_text(:dob) %>
0
     <%= form.date_select :dob, :order => [:day, :month, :year], :start_year => 1950, :end_year => Date.today.year, :include_blank => true %>
0
   </div>
0
 
0
+	<h3>Professional information</h3>
0
+	<div class="row inline">
0
+		<%= form.label :company_name, property_label_text(:company_name) %>
0
+  	<%= form.text_field :company_name %>
0
+	</div>
0
+	<div class="row inline">
0
+		<%= form.label :job_title, property_label_text(:job_title) %>
0
+  	<%= form.text_field :job_title %>
0
+	</div>
0
+	<div class="row inline">
0
+		<%= form.label :address_business, property_label_text(:address_business) %>
0
+  	<%= form.text_field :address_business %>
0
+	</div>
0
+	<div class="row inline">
0
+		<%= form.label :address_additional_business, property_label_text(:address_additional_business) %>
0
+  	<%= form.text_field :address_additional_business %>
0
+	</div>
0
+	<div class="row inline">
0
+		<%= form.label :postcode_business, property_label_text(:postcode_business) %>
0
+  	<%= form.text_field :postcode_business %>
0
+	</div>
0
+	<div class="row inline">
0
+		<%= form.label :city_business, property_label_text(:city_business) %>
0
+  	<%= form.text_field :city_business %>
0
+	</div>
0
+	<div class="row inline">
0
+		<%= form.label :state_business, property_label_text(:state_business) %>
0
+  	<%= form.text_field :state_business %>
0
+	</div>
0
+	<div class="row inline space">
0
+		<%= form.label :country_business, property_label_text(:country_business) %>
0
+  	<%= form.select :country_business, Country.find(:all).map { |l| [ l.name, l.code ] }, { :include_blank => true } %>
0
+	</div>
0
+	
0
+	<h3>Phone</h3>
0
+	<div class="row inline">
0
+		<%= form.label :phone_home, property_label_text(:phone_home) %>
0
+  	<%= form.text_field :phone_home %>
0
+	</div>
0
+	<div class="row inline">
0
+		<%= form.label :phone_mobile, property_label_text(:phone_mobile) %>
0
+  	<%= form.text_field :phone_mobile %>
0
+	</div>
0
+	<div class="row inline">
0
+		<%= form.label :phone_fax, property_label_text(:phone_fax) %>
0
+  	<%= form.text_field :phone_fax %>
0
+	</div>
0
+	<div class="row inline space">
0
+		<%= form.label :phone_work, property_label_text(:phone_work) %>
0
+  	<%= form.text_field :phone_work %>
0
+	</div>
0
+	
0
+	<h3>Instant Messaging</h3>
0
+	<div class="row inline">
0
+		<%= form.label :im_aim, property_label_text(:im_aim) %>
0
+  	<%= form.text_field :im_aim %>
0
+	</div>
0
+	<div class="row inline">
0
+		<%= form.label :im_icq, property_label_text(:im_icq) %>
0
+  	<%= form.text_field :im_icq %>
0
+	</div>
0
+	<div class="row inline">
0
+		<%= form.label :im_msn, property_label_text(:im_msn) %>
0
+  	<%= form.text_field :im_msn %>
0
+	</div>
0
+	<div class="row inline">
0
+		<%= form.label :im_yahoo, property_label_text(:im_yahoo) %>
0
+  	<%= form.text_field :im_yahoo %>
0
+	</div>
0
+	<div class="row inline">
0
+		<%= form.label :im_jabber, property_label_text(:im_jabber) %>
0
+  	<%= form.text_field :im_jabber %>
0
+	</div>
0
+	<div class="row inline space">
0
+		<%= form.label :im_skype, property_label_text(:im_skype) %>
0
+  	<%= form.text_field :im_skype %>
0
+	</div>
0
+
0
+	<h3>Other information</h3>
0
+	<div class="row inline">
0
+		<%= form.label :biography, property_label_text(:biography) %>
0
+  	<%= form.text_field :biography %>
0
+	</div>
0
+	<div class="row inline">
0
+		<%= form.label :image_default, property_label_text(:image_default) %>
0
+  	<%= form.text_field :image_default %>
0
+	</div>
0
+	<div class="row inline">
0
+		<%= form.label :web_default, property_label_text(:web_default) %>
0
+  	<%= form.text_field :web_default %>
0
+	</div>
0
+	<div class="row inline">
0
+		<%= form.label :web_blog, property_label_text(:web_blog) %>
0
+  	<%= form.text_field :web_blog %>
0
+	</div>

0
@@ -2,8 +2,8 @@
0
 <%= error_messages_for :persona %>
0
 
0
 <% form_for @persona, :url => account_persona_path(@persona) do |persona| %>
0
-	<%= render :partial => "personas/form", :object => persona %>
0
+	<%= render :partial => 'personas/form', :object => persona %>
0
   <div>
0
-		<%= persona.submit "update" %>
0
+		<%= persona.submit 'update', :class => 'labelspace' %>
0
   </div>
0
 <% end %>

0
@@ -3,8 +3,8 @@
0
 <%= error_messages_for :persona %>
0
 
0
 <% form_for @persona, :url => account_persona_path(@persona) do |persona| %>
0
-	<%= render :partial => "personas/form", :object => persona %>
0
+	<%= render :partial => 'personas/form', :object => persona %>
0
   <div>
0
-		<%= persona.submit "create" %>
0
+		<%= persona.submit 'create', :class => 'labelspace' %>
0
   </div>
0
 <% end %>

0
@@ -61,8 +61,6 @@ module OpenidServerSystem
0
     ax_resp = OpenID::AX::FetchResponse.new
0
     ax_args = data.reverse_merge('mode' => 'fetch_response')
0
     ax_resp.parse_extension_args(ax_args)
0
-    ax_args = ax_resp.get_extension_args(ax_fetch_request)
0
-    ax_resp.parse_extension_args(ax_args)
0
     resp.add_extension(ax_resp)
0
     resp
0
   end

0
@@ -39,11 +39,13 @@ input.space             { margin-right: 0.7em; }
0
 select#persona_dob_1i   { width: 6em; }
0
 select#persona_dob_2i   { width: 13em; }
0
 select#persona_dob_3i   { width: 5em; }
0
-div.row                 { margin: 0 0 0.7em 0; }
0
+div.row                 { margin: 0 0 0.7em 0; clear: both; }
0
 div.space               { margin: 0 0 1.7em 0; }
0
 label                   { display: block; }
0
 label.check             { display: inline; margin: 0 2em 0 0.2em; }
0
 label.note              { display: inline; margin: 0 0 0 0.4em; }
0
+div.inline label        { float: left; width: 8.5em; }
0
+.labelspace             { margin-left: 10.5em; }
0
 .options a              { margin-right: 0.7em; }
0
 .note                   { font-size: 0.9em; color: #AAA; font-weight: normal; }
0
 .note a,