@@ -11,14 +11,15 @@ Authors Jeremy Voorhis -- http://jvoorhis.com Original implementation -Jarkko Laine -- http://jlaine.net/ -Dynamic enhancements for starting week on Monday and highlighting weekends - Geoffrey Grosenbach -- http://nubyonrails.com Test suite and conversion to a Rails plugin -Tom Armitage -- http://infovore.org -Improvements to markup (abbreviations on day-headings, <caption>); introduction of :accessible option. +Contributors +============ + +* Jarkko Laine http://jlaine.net/ +* Tom Armitage http://infovore.org +* Bryan Larsen http://larsen.st Usage ===== README.txt @@ -18,6 +18,10 @@ text-align: center; } +thead tr { + color: black; +} + .monthName th { font-weight: normal; text-align: right; generators/calendar_styles/templates/grey/style.css @@ -34,6 +34,8 @@ module CalendarHelper # # :show_today => false # Highlights today on the calendar using the CSS class 'today'. # # Defaults to true. + # :previous_month_text => nil # Displayed left of the month name if set + # :next_month_text => nil # Displayed right of the month name if set # # For more customization, you can pass a code block to this method, that will get one argument, a Date object, # and return a values for the individual table cells. The block can return an array, [cell_text, cell_attrs], @@ -77,7 +79,9 @@ module CalendarHelper :abbrev => (0..2), :first_day_of_week => 0, :accessible => false, - :show_today => true + :show_today => true, + :previous_month_text => nil, + :next_month_text => nil } options = defaults.merge options @@ -92,8 +96,18 @@ module CalendarHelper day_names.push(day_names.shift) end - cal = %(<table class="#{options[:table_class]}" border="0" cellspacing="0" cellpadding="0">) - cal << %(<caption class="#{options[:month_name_class]}"></caption><thead><tr><th colspan="7">#{Date::MONTHNAMES[options[:month]]}</th></tr><tr class="#{options[:day_name_class]}">) + # TODO Use some kind of builder instead of straight HTML + cal = %(<table class="#{options[:table_class]}" border="0" cellspacing="0" cellpadding="0">) + cal << %(<thead><tr>) + if options[:previous_month_text] or options[:next_month_text] + cal << %(<th colspan="2">#{options[:previous_month_text]}</th>) + colspan=3 + else + colspan=7 + end + cal << %(<th colspan="#{colspan}" class="#{options[:month_name_class]}">#{Date::MONTHNAMES[options[:month]]}</th>) + cal << %(<th colspan="2">#{options[:next_month_text]}</th>) if options[:next_month_text] + cal << %(</tr><tr class="#{options[:day_name_class]}">) day_names.each do |d| unless d[options[:abbrev]].eql? d cal << "<th scope='col'><abbr title='#{d}'>#{d[options[:abbrev]]}</abbr></th>" lib/calendar_helper.rb @@ -14,11 +14,13 @@ class CalendarHelperTest < Test::Unit::TestCase # include Inflector # include ActionController::Assertions::SelectorAssertions include CalendarHelper - + def test_with_output - output = "<h2>Past Month</h2>" + calendar_with_defaults - output << "<h2>Current Month</h2>" + calendar_for_this_month + output = [] + %w(calendar_with_defaults calendar_for_this_month calendar_with_next_and_previous).each do |methodname| + output << "<h2>#{methodname}</h2>\n" + send(methodname.to_sym) + "\n\n" + end write_sample "sample.html", output end @@ -118,6 +120,13 @@ class CalendarHelperTest < Test::Unit::TestCase calendar options end + def calendar_with_next_and_previous + calendar_for_this_month({ + :previous_month_text => "PREVIOUS", + :next_month_text => "NEXT" + }) + end + def write_sample(filename, content) FileUtils.mkdir_p "test/output" File.open("test/output/#{filename}", 'w') do |f| test/test_calendar_helper.rb a3293b8bdf7ec487d66f6b05f55156b42432e1fe topfunky topfunky@798a5b91-ee08-0410-b43b-a734d69ea54e http://github.com/adzap/calendar_helper/commit/95d48a253a77f30b203c7416358a027d820b1c01 95d48a253a77f30b203c7416358a027d820b1c01 2008-01-04T09:36:42-08:00 2008-01-04T09:36:42-08:00 Previous and next text option git-svn-id: http://topfunky.net/svn/plugins/calendar_helper@261 798a5b91-ee08-0410-b43b-a734d69ea54e 07006e0fee468b531d5e7d6f0f332b5d21950fac topfunky topfunky@798a5b91-ee08-0410-b43b-a734d69ea54e