config/initializers/date_formats.rb @@ -1,3 +1,6 @@ class Topic < ActiveRecord::Base belongs_to :meeting + + validates_presence_of :title + validates_presence_of :description end app/models/topic.rb @@ -10,6 +10,7 @@ =# Using jRails plugin = javascript_include_tag :defaults = yield :head + = yield :unobtrusive_javascript %body #main %div.wrapper app/views/layouts/application.haml @@ -1,4 +1,7 @@ %li - = link_to topic.title, topic.link + - if topic.link.blank? + = topic.title + - else + = link_to topic.title, topic.link \- = topic.description \ No newline at end of file app/views/meetings/_topic.html.haml @@ -1,67 +1,69 @@ +- 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 + %p %strong Date: - =h @meeting.date + =h @meeting.date.to_s(:day_date) %p + %strong Time: + =h @meeting.date.to_s(:am_pm).downcase +%p %strong Venue: =h @meeting.venue %p %strong Topics: -%ul - -= link_to 'Create new topic', new_topic_path - -%p - %strong Attendees: -%ul{ :style => 'list-style:none; padding-left: 0' } - - for person in @meeting.attendees - %li.peep - = image_tag(person.gravatar_url(:size => 32), :alt => person.name, :valign => 'middle') - = person.name - -= link_to 'Edit', edit_meeting_path(@meeting) -| -= link_to 'Back', meetings_path - %ul#topic_list = render :partial => 'topic', :collection => Topic.all -%a#new_topic Add new topic -:javascript - $(document).ready(function(){ - $("#add_topic").hide(); - $("a#new_topic").toggle(function(){ - $("#add_topic").show('slow'); - },function(){ - $("#add_topic").hide('slow'); - }); - }); += link_to 'Add new topic', new_topic_path, :id => "new_topic" #add_topic - %h1 Editing 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 - %br = f.text_field :title %p = f.label :description - %br - = f.text_area :description + = f.text_field :description %p = f.label :link - %br = f.text_field :link = f.hidden_field :meeting_id, :value => @meeting.id %p - = f.submit "Update" \ No newline at end of file + = f.submit "Update" + +%p + %strong Attendees: +%ul{ :style => 'list-style:none; padding-left: 0' } + - for person in @meeting.attendees + %li.peep + = image_tag(person.gravatar_url(:size => 32), :alt => person.name, :valign => 'middle') + = person.name + += link_to 'Edit', edit_meeting_path(@meeting) +| += link_to 'Back', meetings_path \ No newline at end of file app/views/meetings/show.html.haml 73b80e3578ae1f2a203dfec41478e1f3a96b49f0 Michael MacDonald michaelm@amc.org.au http://github.com/artpop/crc_site/commit/df6c13e0467972927abf7219b16399ab7ffba02e df6c13e0467972927abf7219b16399ab7ffba02e 2008-10-25T07:02:15-07:00 2008-10-25T07:02:15-07:00 added two extra date formats, moved ajax toggle to head, added in toggling of link label text, fixed display of topics without a link fc366147e7bddf360489b63712d02256aee5fda7 Michael MacDonald michaelm@amc.org.au