Add address to new contact form.

app/controllers/contacts_controller.rb

@@ -19,11 +19,13 @@ class ContactsController < ApplicationController
     c = Contact.new
     c.firstname = params[:contact][:firstname]
     c.lastname = params[:contact][:lastname]
-    c.street = params[:contact][:street]
-    c.housenr = params[:contact][:housenr]
-    c.plz = params[:contact][:plz]
-    c.place = params[:contact][:place]
-    c.country = params[:contact][:country]
+
+    c.build_address
+    c.address.street = params[:contact][:street]
+    c.address.housenr = params[:contact][:housenr]
+    c.address.zipcode = params[:contact][:zipcode]
+    c.address.place = params[:contact][:place]
+    c.address.country = params[:contact][:country]
     
     # birthdate comes with the year as optional value
     c.birth_year = params[:birth_year].to_i unless params[:birth_year].blank?

app/views/contacts/_form.html.erb

@@ -1,5 +1,6 @@
 <%= form_for @contact, :html => {:class => "new_data_form"} do |f| %>
-  <fieldset>
+
+ <fieldset>
     <legend>Contact details</legend>
     <table>
       <tr>
@@ -11,40 +12,24 @@
 	<td><%= f.text_field :lastname %></td>
       </tr>
 
-      <!-- temp -->
-      <tr>
-	<td colspan="2">
-	  <% if @contact.address.nil? %>
-	  address: nil
-	  <% else %>
-	  address: hat was
-	  street: <%= @contact.address.street %>
-	  <% end %>
-	</td>
-      </tr>
-
-      <% f.fields_for :address do |address_f| %>
-      <tr>
-	<td align="right"><%= address_f.label :street, "Street name" %></td>
-	<td><%= address_f.text_field :street %></td>
-     <tr>
-	<td align="right"><%= label_tag(:housenr, "House number") %></td>
-	<td><%= address_f.text_field :housenr %></td>
-      </tr>
-      <tr>
-	<td align="right"><%= label_tag(:zipcode, "Zip code") %></td>
-	<td><%= address_f.text_field :zipcode %></td>
-      </tr>
-      <tr>
-	<td align="right"><%= label_tag(:place, "Place") %></td>
-	<td><%= address_f.text_field :place %></td>
-      </tr>
-      <tr>
-	<td align="right"><%= label_tag(:country, "Country") %></td>
-	<td><%= address_f.text_field :country %></td>
-      </tr>
-      <% end %> <%# fields_for :adress %>
+      <%= f.fields_for :address do |address_f| %>
+      <div class="row">
+	<div class="threecol"><%= address_f.label :street, "Street &middot; no.".html_safe %></div>
+	<div class="fivecol"><%= address_f.text_field :street %></div>
+	<div class="twocol"><%= address_f.text_field :housenr %></div>
+     </div>
+      <div class="row">
+	<div class="threecol"><%= label_tag(:zipcode, "ZIP &middot; Place".html_safe) %></div>
+	<div class="twocol"><%= address_f.text_field :zipcode %></div>
+	<div class="fivecol"><%= address_f.text_field :place %></div>
+      </div>
+      <div class="row">
+	<div class="threecol"><%= label_tag(:country, "Country") %></div>
+	<div class="sevencol"><%= address_f.text_field :country %></div>
+      </div>
+     <% end %> <%# fields_for :adress %>
 
+      <table>
       <%= f.fields_for :emails do |emails_f| %>
         <%= render "email_fields", :f => emails_f %>
       <% end %> <%# fields_for :emails %>

app/views/contacts/index.html.erb

@@ -28,8 +28,8 @@
     <% unless c.address.nil? %>
       <%= c.address.street + " " + c.address.housenr %>
       <br />
-      <%= c.plz + " " + c.place %><%= ", " unless c.country.blank? %>
-      <%= c.country %>
+      <%= c.address.zipcode + " " + c.address.place %><%= ", " unless c.address.country.blank? %>
+      <%= c.address.country %>
     <% end %>
   </div>
   <div class="twocol">