diff --git a/plugins/event/lib/event_block_helper.rb b/plugins/event/lib/event_block_helper.rb new file mode 100644 index 0000000..690c0f9 --- /dev/null +++ b/plugins/event/lib/event_block_helper.rb @@ -0,0 +1,10 @@ +module EventBlockHelper + include DatesHelper + + def date_to_html(date) + content_tag(:span, show_day_of_week(date, true), :class => 'week-day') + + content_tag(:span, month_name(date.month, true), :class => 'month') + + content_tag(:span, date.day.to_s, :class => 'day') + + content_tag(:span, date.year.to_s, :class => 'year') + end +end diff --git a/plugins/event/lib/event_plugin/event_block.rb b/plugins/event/lib/event_plugin/event_block.rb index 2d0b221..9844bde 100644 --- a/plugins/event/lib/event_plugin/event_block.rb +++ b/plugins/event/lib/event_plugin/event_block.rb @@ -1,6 +1,4 @@ class EventPlugin::EventBlock < Block - include DatesHelper - attr_accessible :all_env_events, :limit, :future_only, :date_distance_limit settings_items :all_env_events, :type => :boolean, :default => false @@ -74,13 +72,6 @@ class EventPlugin::EventBlock < Block end end - def date_to_html(date) - content_tag(:span, show_day_of_week(date, true), :class => 'week-day') + - content_tag(:span, month_name(date.month, true), :class => 'month') + - content_tag(:span, date.day.to_s, :class => 'day') + - content_tag(:span, date.year.to_s, :class => 'year') - end - def self.expire_on { :profile => [:article], :environment => [:article] } end diff --git a/plugins/event/test/unit/event_block_helper_test.rb b/plugins/event/test/unit/event_block_helper_test.rb new file mode 100644 index 0000000..3141ea6 --- /dev/null +++ b/plugins/event/test/unit/event_block_helper_test.rb @@ -0,0 +1,14 @@ +require 'test_helper' + +class EventBlockHelperTest < ActionView::TestCase + include EventBlockHelper + + should 'write formatable data in html' do + html = 'Tue'+ + 'Sep'+ + '27'+ + '1983' + + assert_equal html, date_to_html(Date.new 1983, 9, 27) + end +end diff --git a/plugins/event/test/unit/event_block_test.rb b/plugins/event/test/unit/event_block_test.rb index cae424a..cb80e3c 100644 --- a/plugins/event/test/unit/event_block_test.rb +++ b/plugins/event/test/unit/event_block_test.rb @@ -97,15 +97,6 @@ class EventBlockTest < ActiveSupport::TestCase assert_match /Today/, @block.human_time_left(0) end - should 'write formatable data in html' do - html = 'Tue'+ - 'Sep'+ - '27'+ - '1983' - - assert_equal html, @block.date_to_html(Date.new 1983, 9, 27) - end - should 'show unlimited time distance events' do @block.box.owner = @env @block.all_env_events = true diff --git a/plugins/event/views/event_plugin/event_block_item.html.erb b/plugins/event/views/event_plugin/event_block_item.html.erb index 76d28e3..fa8578b 100644 --- a/plugins/event/views/event_plugin/event_block_item.html.erb +++ b/plugins/event/views/event_plugin/event_block_item.html.erb @@ -1,4 +1,6 @@ <% + extend EventBlockHelper + # compute layout values ev_days_tag = '' if event.duration > 1 @@ -18,7 +20,7 @@ <%= link_to(safe_join([ content_tag('time', - block.date_to_html(event.start_date), + date_to_html(event.start_date), :itemprop => 'startDate', :datetime => show_date(event.start_date), :class => 'date ' + img_class, :style => bg, -- libgit2 0.21.2