<?xml version="1.0" encoding="UTF-8"?>
<commit>
  <added type="array">
    <added>
      <filename>app/controllers/topics_controller.rb</filename>
    </added>
    <added>
      <filename>app/helpers/topics_helper.rb</filename>
    </added>
    <added>
      <filename>app/models/topic.rb</filename>
    </added>
    <added>
      <filename>app/views/topics/edit.html.erb</filename>
    </added>
    <added>
      <filename>app/views/topics/index.html.erb</filename>
    </added>
    <added>
      <filename>app/views/topics/new.html.erb</filename>
    </added>
    <added>
      <filename>app/views/topics/show.html.erb</filename>
    </added>
    <added>
      <filename>db/migrate/20081023140716_create_topics.rb</filename>
    </added>
    <added>
      <filename>spec/controllers/topics_controller_spec.rb</filename>
    </added>
    <added>
      <filename>spec/controllers/topics_routing_spec.rb</filename>
    </added>
    <added>
      <filename>spec/fixtures/topics.yml</filename>
    </added>
    <added>
      <filename>spec/helpers/topics_helper_spec.rb</filename>
    </added>
    <added>
      <filename>spec/models/topic_spec.rb</filename>
    </added>
    <added>
      <filename>spec/views/topics/edit.html.erb_spec.rb</filename>
    </added>
    <added>
      <filename>spec/views/topics/index.html.erb_spec.rb</filename>
    </added>
    <added>
      <filename>spec/views/topics/new.html.erb_spec.rb</filename>
    </added>
    <added>
      <filename>spec/views/topics/show.html.erb_spec.rb</filename>
    </added>
  </added>
  <modified type="array">
    <modified>
      <diff>@@ -1,2 +1,4 @@
 Flesh out the meetings function
-- I've generated a meetings scaffold and want to have a facility to record details about meetings like members who attended and what was discussed and links to any resources
\ No newline at end of file
+- I've generated a meetings scaffold and want to have a facility to record details about meetings like members who attended and what was discussed and links to any resources
+- play around with the datepicker - what about time? and customising the datepicker, maybe make it inline
+- topics should probably be a nested resource of meetings
\ No newline at end of file</diff>
      <filename>TODO</filename>
    </modified>
    <modified>
      <diff>@@ -7,7 +7,8 @@ class Meeting &lt; ActiveRecord::Base
   # returns an array of all the meetings held before today in order from latest to oldest (reverse chronological order)
   # past.first returns the last held meeting prior to today
   named_scope :past, :conditions =&gt; ['date &lt; ?', Date.today], :order =&gt; 'date DESC'
-  
+
+  has_many    :topics,       :dependent =&gt; :destroy
   has_many    :attendances,  :dependent =&gt; :destroy
   has_many    :attendees,    :through =&gt; :attendances, :order =&gt; :name, :source =&gt; :person
 </diff>
      <filename>app/models/meeting.rb</filename>
    </modified>
    <modified>
      <diff>@@ -5,6 +5,15 @@
 %p
   %strong Venue:
   =h @meeting.venue
+  
+%p
+  %strong Topics:
+%ul
+  - for topic in @meeting.topics
+    %li
+      = link_to topic.title, topic.link
+      \-
+      = topic.description
 
 %p
   %strong Attendees:</diff>
      <filename>app/views/meetings/show.html.haml</filename>
    </modified>
    <modified>
      <diff>@@ -1,4 +1,6 @@
 ActionController::Routing::Routes.draw do |map|
+  map.resources :topics
+
   map.resources :meetings
 
 </diff>
      <filename>config/routes.rb</filename>
    </modified>
    <modified>
      <diff>@@ -9,7 +9,7 @@
 #
 # It's strongly recommended to check this file into your version control system.
 
-ActiveRecord::Schema.define(:version =&gt; 20081020105053) do
+ActiveRecord::Schema.define(:version =&gt; 20081023140716) do
 
   create_table &quot;attendances&quot;, :force =&gt; true do |t|
     t.integer  &quot;person_id&quot;,  :limit =&gt; 11
@@ -81,4 +81,13 @@ ActiveRecord::Schema.define(:version =&gt; 20081020105053) do
     t.string   &quot;twitter_user&quot;
   end
 
+  create_table &quot;topics&quot;, :force =&gt; true do |t|
+    t.string   &quot;title&quot;
+    t.text     &quot;description&quot;
+    t.string   &quot;link&quot;
+    t.integer  &quot;meeting_id&quot;,  :limit =&gt; 11
+    t.datetime &quot;created_at&quot;
+    t.datetime &quot;updated_at&quot;
+  end
+
 end</diff>
      <filename>db/schema.rb</filename>
    </modified>
  </modified>
  <removed type="array"/>
  <parents type="array">
    <parent>
      <id>d09b1b63fb9c1eefd41963b0436772d9dde61ab4</id>
    </parent>
  </parents>
  <author>
    <name>Michael MacDonald</name>
    <email>michaelm@amc.org.au</email>
  </author>
  <url>http://github.com/artpop/crc_site/commit/f10022b0044347b59ccff24bee6e132d3cae3168</url>
  <id>f10022b0044347b59ccff24bee6e132d3cae3168</id>
  <committed-date>2008-10-23T07:17:14-07:00</committed-date>
  <authored-date>2008-10-23T07:17:14-07:00</authored-date>
  <message>added topics scaffold</message>
  <tree>1038118a0bb96c211c16bb5458934d82ec643b4d</tree>
  <committer>
    <name>Michael MacDonald</name>
    <email>michaelm@amc.org.au</email>
  </committer>
</commit>
