Some stuff.

app/decorators/flat_decorator.rb

@@ -45,7 +45,7 @@ def availability
   end
 
   # overwrites the attribute
-  def visit_at
+  def visit_at_with_distance
     return unless model.visit_at
     s = I18n.l(model.visit_at, :format => :german)
     s << " (%s)" % h.content_tag('i', h.distance_of_time_in_words_to_now(model.visit_at))
@@ -57,7 +57,7 @@ def comment
   end
 
   def contact
-    h.auto_link("#{model.contact_person} #{model.phone}")
+    h.auto_link("#{model.contact_person || '(no contact given)'}, #{model.phone || '(no phone given)'}")
   end
 
   def subtitle_with_contact

app/models/flat/options.rb

@@ -3,6 +3,7 @@ module Flat::Options
     new
     contact
     contacted
+    contacted_2nd_time
     want_to_visit
     visit_scheduled
     visited

app/views/flats/_overview_map.html.erb

@@ -5,7 +5,8 @@ function initialize() {
   // set up new map
   var mapOptions = {
     zoom: 13,
-    mapTypeId: google.maps.MapTypeId.ROADMAP
+    mapTypeId: google.maps.MapTypeId.ROADMAP,
+    scaleControl: true
   };  
   map = new google.maps.Map(document.getElementById("map_canvas"), mapOptions);
 

app/views/visits/_flat.html.haml

@@ -1,15 +1,14 @@
-= link_to(h(flat.street), flat, :class => "street-name")
+= link_to(h(flat.street), edit_flat_path(flat), :class => "street-name")
 , 
 = flat.neighbourhood
 
 = image_tag 'http://www.wg-gesucht.de/favicon.ico' if flat.scraped?
-%small= link_to 'edit', edit_flat_path(flat)
 %br
 = "#{flat.square_meters}m²"
 = number_to_currency(flat.price, :unit => '€', :precision => 0)
 = number_to_currency(flat.square_meter_price, :unit => '€', :separator => ",", :precision => 0) + "/m²"
--
-Phone: 
-=raw flat.phone.blank? ? "<b style='color:#d00'><i>missing</i></b>" : flat.phone
+
+
+= raw flat.contact
 
 = flat.priority

app/views/visits/show.html.haml

@@ -9,6 +9,7 @@
 
   %ol
     - flats.reverse.each do |flat|
+      - flat = FlatDecorator.decorate(flat) # HACK!
       %li{:class => (flat.visit_passed?) ? 'passed' : nil}
         %time= l(flat.visit_at, :format => "%H:%M")
         = render :partial => "flat", :locals => { :flat => flat }