diff --git a/app/models/event.rb b/app/models/event.rb index 12e2993..743a1a7 100644 --- a/app/models/event.rb +++ b/app/models/event.rb @@ -98,47 +98,19 @@ class Event < Article start_date..(end_date||start_date) end - # FIXME this shouldn't be needed - include ActionView::Helpers::TagHelper - include ActionView::Helpers::UrlHelper - include DatesHelper + def first_paragraph + paragraphs = Nokogiri::HTML.fragment(self.body).css('p') + paragraphs.empty? ? '' : paragraphs.first.to_html + end def to_html(options = {}) + event = self + format = options[:format] - result = '' - html = ::Builder::XmlMarkup.new(:target => result) - - html.div(:class => 'event-info' ) { - html.ul(:class => 'event-data' ) { - html.li(:class => 'event-dates' ) { - html.span _('When:') - html.text! show_period(start_date, end_date) - } if start_date.present? || end_date.present? - html.li { - html.span _('URL:') - html.a(self.link || "", 'href' => self.link || "") - } if self.link.present? - html.li { - html.span _('Address:') - html.text! self.address || "" - } if self.address.present? - } - - # TODO: some good soul, please clean this ugly hack: - if self.body - html.div('_____XXXX_DESCRIPTION_GOES_HERE_XXXX_____', :class => 'event-description') - end - } - - if self.body - if options[:format] == 'short' - result.sub!('_____XXXX_DESCRIPTION_GOES_HERE_XXXX_____', display_short_format(self)) - else - result.sub!('_____XXXX_DESCRIPTION_GOES_HERE_XXXX_____', self.body) - end + proc do + render :file => 'content_viewer/event_page', :locals => { :event => event, + :format => format } end - - result end def duration diff --git a/app/views/content_viewer/event_page.html.erb b/app/views/content_viewer/event_page.html.erb new file mode 100644 index 0000000..71bb66c --- /dev/null +++ b/app/views/content_viewer/event_page.html.erb @@ -0,0 +1,41 @@ +
+
+ <% if event.image && event.image.thumbnails_processed %> + <%= image_tag(event.image.thumbnails.select{|thumb| thumb.thumbnail == "big"}.first.public_filename) %> + <% else %> + <%= image_tag("/images/icons-app/image-loading-thumb.png") %> + <% end %> +
+
+ <% if event.start_date.present? || event.end_date.present? %> + + <%= show_period(event.start_date, event.end_date) %> + + <% end %> + <% if event.link.present? %> + + <%= link_to event.link, event.link %> + + <% end %> + <% if event.address.present? %> + + + <%= event.address %> + + + <% end %> +
+
+ +
+ <% if format == 'short' %> + <%= display_short_format event, :comments_link => false, :read_more_link => false %> + <% else %> +
+ <%= event.article_lead %> +
+
+ <%= event.body %> +
+ <% end %> +
diff --git a/features/events.feature b/features/events.feature index 22772e2..6156458 100644 --- a/features/events.feature +++ b/features/events.feature @@ -17,7 +17,7 @@ Feature: events Then I should see "November 2009" within ".current-month" Scenario: go to next month in global agenda - Given I am on /assets/events?year=2009&month=11 + Given I am on /search/events?year=2009&month=11 When I follow "December" Then I should see "December 2009" within ".current-month" @@ -27,7 +27,7 @@ Feature: events Then I should see "September 2009" within ".current-month" Scenario: go to previous month in global agenda - Given I am on /assets/events?year=2009&month=11 + Given I am on /search/events?year=2009&month=11 When I follow "October" Then I should see "October 2009" within ".current-month" @@ -43,7 +43,7 @@ Feature: events Scenario: go to specific day in global agenda Given I am on the homepage - When I am on /assets/events?year=2009&month=11&day=12 + When I am on /search/events?year=2009&month=11&day=12 Then I should see "Events for November, 2009" Scenario: list events for specific day @@ -88,7 +88,7 @@ Feature: events And the following events | owner | name | start_date | | josemanuel | Manuel Birthday | 2009-10-24 | - When I am on /assets/events?year=2009&month=10&day=24 + When I am on /search/events?year=2009&month=10&day=24 Then I should see "Another Conference" And I should see "Manuel Birthday" @@ -157,9 +157,10 @@ Feature: events Then I should not see "New events" link Scenario: display environment name in global agenda - When I am on /assets/events + When I am on /search/events Then I should see "Colivre.net's Events" + @selenium Scenario: published events should be listed in the agenda too Given the following community diff --git a/public/designs/themes/base/style.css b/public/designs/themes/base/style.css index b737daf..84b53f4 100644 --- a/public/designs/themes/base/style.css +++ b/public/designs/themes/base/style.css @@ -1401,3 +1401,87 @@ table.profile th { table#recaptcha_table tr:hover td { background-color: #fff; } + +/* Noosfero Events */ + +.event-card { + float: left; + padding-top: 33px; + width: 494px; + height: 116px; + background-repeat: no-repeat; +} + +.event-image { + position: relative; + float: left; + padding-right: 22px; + width: 130px; + height: 130px; +} + +.about-event { + position: relative; + float: left; + height: 160px; + width: 300px; + max-width: 300px; +} + +.about-event > span { + display: block; + max-width: inherit; + margin-left: 20px; + padding-left: 21px; + line-height: 13px; + margin-right: 11px; +} + +.about-event .event-date { + margin-top: 3px; +} + +.about-event .event-address { + margin-top: 19px; +} + +.about-event .event-address span { + display: block; + margin-left: 0px; + margin-top: 4.4px; + line-height: 14px; +} + +.event-date { + background: url('/images/calendar_date_select/calendar-icon.png') no-repeat left center; + padding: 5px; +} + +.event-link { + background: url('/images/globe-icon.png') no-repeat left center; + margin-top: 18px; +} + +.event-link a { +} + +.event-address { + background: url('/images/icone_pin.png') no-repeat left top; +} + +.event-body { + float: left; +} + +.event-body .event-lead { + margin-left: 2px; + width: 494px; + font-weight: bold; + margin-bottom: -3px; +} + +.event-body .event-content p { + margin-top: 20px; + width: 494px; + padding-left: 2px; +} diff --git a/public/images/calendar_date_select/calendar-icon.png b/public/images/calendar_date_select/calendar-icon.png new file mode 100644 index 0000000..6ea0a2b Binary files /dev/null and b/public/images/calendar_date_select/calendar-icon.png differ diff --git a/public/images/globe-icon.png b/public/images/globe-icon.png new file mode 100644 index 0000000..a15bbab Binary files /dev/null and b/public/images/globe-icon.png differ diff --git a/public/images/icone_pin.png b/public/images/icone_pin.png new file mode 100644 index 0000000..3dcfed8 Binary files /dev/null and b/public/images/icone_pin.png differ diff --git a/test/unit/event_test.rb b/test/unit/event_test.rb index 7947abf..36eb8f0 100644 --- a/test/unit/event_test.rb +++ b/test/unit/event_test.rb @@ -109,17 +109,18 @@ class EventTest < ActiveSupport::TestCase end should 'provide nice display format' do - e = build(Event, :start_date => Date.new(2008,1,1), :end_date => Date.new(2008,1,1), :link => 'http://www.myevent.org', :body => 'my somewhat short description') + event = build(Event, :start_date => Date.new(2008,1,1), :end_date => Date.new(2008,1,1), :link => 'http://www.myevent.org', :body => '

my somewhat short description

') + display = instance_eval(&event.to_html) - assert_tag_in_string e.to_html, :content => Regexp.new("January 1, 2008") - assert_tag_in_string e.to_html, :content => 'my somewhat short description' - assert_tag_in_string e.to_html, :tag => 'a', :attributes => { :href => 'http://www.myevent.org' }, :content => 'http://www.myevent.org' + assert_tag_in_string display, :content => Regexp.new("January 1, 2008") + assert_tag_in_string display, :content => Regexp.new('my somewhat short description') + assert_tag_in_string display, :content => Regexp.new('http://www.myevent.org') end should 'not crash when body is blank' do e = Event.new assert_nil e.body - assert_no_match(/_____XXXX_DESCRIPTION_GOES_HERE_XXXX_____/, e.to_html) + assert_no_match(/_____XXXX_DESCRIPTION_GOES_HERE_XXXX_____/, instance_eval(&e.to_html)) end should 'add http:// to the link if not already present' do @@ -141,10 +142,19 @@ class EventTest < ActiveSupport::TestCase assert_equal '', a.link end + should 'get the first paragraph' do + profile = create_user('testuser').person + event = create(Event, :profile => profile, :name => 'test', + :body => '

first paragraph

second paragraph

', + :link => 'www.colivre.coop.br', :start_date => Date.today) + + assert_match '

first paragraph

', event.first_paragraph + end + should 'not escape HTML in body' do a = build(Event, :body => '

a paragraph of text

', :link => 'www.gnu.org') - assert_match '

a paragraph of text

', a.to_html + assert_match '

a paragraph of text

', instance_eval(&a.to_html) end should 'filter HTML in body' do @@ -324,7 +334,7 @@ class EventTest < ActiveSupport::TestCase environment = fast_create(Environment) environment.languages = nil profile = fast_create(Person, :environment_id => environment.id) - + event = Event.new(:profile => profile) assert !event.translatable? @@ -337,11 +347,11 @@ class EventTest < ActiveSupport::TestCase event = fast_create(Event, :profile_id => profile.id) assert !event.translatable? - + environment.languages = ['en','pt','fr'] environment.save - event.reload + event.reload assert event.translatable? end -- libgit2 0.21.2