@@ -27,7 +27,7 @@ class TopicsController < ApplicationController if @topic.save flash[:notice] = 'Topic was successfully created.' # redirect_to(@topic) - format.html { redirect_to meeting_path(@topic.meeting_id) } + format.html { redirect_to edit_meeting_path(@topic.meeting_id) } format.js else render :action => "new" app/controllers/topics_controller.rb @@ -1,8 +1,18 @@ - content_for :head do = stylesheet_link_tag 'ui.datepicker.css' = javascript_include_tag 'ui.datepicker.js' + +- content_for :unobtrusive_javascript do :javascript $(document).ready(function(){ + $("#add_topic").hide(); + $("a#new_topic").toggle(function(){ + $("#add_topic").show('slow'); + $("a#new_topic").text('Cancel'); + },function(){ + $("#add_topic").hide('slow'); + $("a#new_topic").text('Add new topic'); + }); $("#meeting_date").datepicker({ dateFormat: "DD, MM d, yy", showOn: "both", @@ -10,7 +20,7 @@ buttonImageOnly: true }); }); - + - form_for(@meeting) do |f| = f.error_messages @@ -22,6 +32,7 @@ = f.label :venue %br = f.text_field :venue + %h4 Attendees %ul{ :style => 'list-style:none; padding-left: 0'} - for person in Person.all @@ -29,4 +40,36 @@ = check_box_tag "meeting[attendee_ids][]", person.id, @meeting.attendees.include?(person) = person.name %p - = f.submit "Save" \ No newline at end of file + = f.submit "Save" + +- unless @meeting.new_record? + + %p + %strong Topics: + %ul#topic_list + = render :partial => 'topic', :collection => @meeting.topics + + %p= link_to 'Add new topic', new_topic_path, :id => "new_topic" + + #add_topic + %h3 Add a topic + -# TODO: should do this as unobtrusive + - form_remote_for :topic, :url => topics_path, :html => { :id => 'topic_form' } do |f| + = f.error_messages + + %p + = f.label :title + = f.text_field :title + + %p + = f.label :description + = f.text_field :description + + %p + = f.label :link + = f.text_field :link + + = f.hidden_field :meeting_id, :value => @meeting.id + + %p + = f.submit "Update" app/views/meetings/_form.html.haml @@ -1,16 +1,3 @@ -- content_for :unobtrusive_javascript do - :javascript - $(document).ready(function(){ - $("#add_topic").hide(); - $("a#new_topic").toggle(function(){ - $("#add_topic").show('slow'); - $("a#new_topic").text('Cancel'); - },function(){ - $("#add_topic").hide('slow'); - $("a#new_topic").text('Add new topic'); - }); - }); - = flash[:notice] %h2 Meeting Details @@ -28,33 +15,11 @@ %p %strong Topics: -%ul#topic_list - = render :partial => 'topic', :collection => Topic.all - -= link_to 'Add new topic', new_topic_path, :id => "new_topic" - -#add_topic - %h3 Add a topic - -# TODO: should do this as unobtrusive - - form_remote_for :topic, :url => topics_path, :html => { :id => 'topic_form' } do |f| - = f.error_messages - - %p - = f.label :title - = f.text_field :title - - %p - = f.label :description - = f.text_field :description - - %p - = f.label :link - = f.text_field :link - - = f.hidden_field :meeting_id, :value => @meeting.id - - %p - = f.submit "Update" +- if @meeting.topics.empty? + None +- else + %ul + = render :partial => 'topic', :collection => @meeting.topics %p %strong Attendees: app/views/meetings/show.html.haml df6c13e0467972927abf7219b16399ab7ffba02e Michael MacDonald michaelm@amc.org.au http://github.com/artpop/crc_site/commit/08f26049f92be7c45780b66ceb6634976c1e378e 08f26049f92be7c45780b66ceb6634976c1e378e 2008-10-26T07:33:48-07:00 2008-10-26T07:33:48-07:00 moved topic creation out of meeting show into meeting edit and fixed up topics list to only show topics for a meeting, not all topics 10cbc5dc8dc9635f4e3fbc9f884f7069e0e8047a Michael MacDonald michaelm@amc.org.au