diff --git a/.hgignore b/.hgignore
index e312c88..a74dc4a 100644
--- a/.hgignore
+++ b/.hgignore
@@ -5,3 +5,4 @@ public/upload/*
*.log
*.orig
config/database.yml
+config/application.rb
diff --git a/app/helpers/application_helper.rb b/app/helpers/application_helper.rb
index 832c45b..ed0f70c 100644
--- a/app/helpers/application_helper.rb
+++ b/app/helpers/application_helper.rb
@@ -18,6 +18,7 @@
require 'digest/md5'
module ApplicationHelper
+ include CalendarHelper
# Converte para o timezone local
def tz(time_at)
@@ -77,7 +78,7 @@ module ApplicationHelper
end
def gravatar_url_for(email, size=80)
- "http://www.gravatar.com/avatar.php?gravatar_id=#{Digest::MD5.hexdigest(email)}&size=#{size}&default=#{App.default_avatar}_#{size}.png"
+ "http://www.gravatar.com/avatar.php?gravatar_id=#{Digest::MD5.hexdigest(email)}&size=#{size}&default=#{u(App.default_avatar)}_#{size}.png"
end
def action_icon(action_name, description, options = {}, html_options = {})
diff --git a/config/environment.rb b/config/environment.rb
index 0380c88..f868e7e 100644
--- a/config/environment.rb
+++ b/config/environment.rb
@@ -80,5 +80,6 @@ Rails::Initializer.run do |config|
config.gem "hpricot"
config.gem "icalendar"
config.gem "will_paginate"
+ config.gem "calendar_helper"
config.gem 'thoughtbot-shoulda', :lib => 'shoulda/rails', :source => "http://gems.github.com"
end
diff --git a/vendor/plugins/calendar_helper/MIT-LICENSE b/vendor/plugins/calendar_helper/MIT-LICENSE
deleted file mode 100644
index 304ba06..0000000
--- a/vendor/plugins/calendar_helper/MIT-LICENSE
+++ /dev/null
@@ -1,20 +0,0 @@
-Copyright (c) 2006 Jeremy Voorhis and Geoffrey Grosenbach
-
-Permission is hereby granted, free of charge, to any person obtaining
-a copy of this software and associated documentation files (the
-"Software"), to deal in the Software without restriction, including
-without limitation the rights to use, copy, modify, merge, publish,
-distribute, sublicense, and/or sell copies of the Software, and to
-permit persons to whom the Software is furnished to do so, subject to
-the following conditions:
-
-The above copyright notice and this permission notice shall be
-included in all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
diff --git a/vendor/plugins/calendar_helper/README b/vendor/plugins/calendar_helper/README
deleted file mode 100644
index 9aba94f..0000000
--- a/vendor/plugins/calendar_helper/README
+++ /dev/null
@@ -1,30 +0,0 @@
-CalendarHelper
-==============
-
-A simple helper for creating an HTML calendar. The "calendar" method will be automatically available to your view templates.
-
-There is also a Rails generator that copies some stylesheets for use alone or alongside existing stylesheets.
-
-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
-
-Usage
-=====
-
-See the RDoc (or use "rake rdoc").
-
-To copy the CSS files, use
-
- ./script/generate calendar_styles
-
-CSS will be copied to subdirectories of public/stylesheets/calendar.
-
diff --git a/vendor/plugins/calendar_helper/Rakefile b/vendor/plugins/calendar_helper/Rakefile
deleted file mode 100644
index 6875f6a..0000000
--- a/vendor/plugins/calendar_helper/Rakefile
+++ /dev/null
@@ -1,22 +0,0 @@
-require 'rake'
-require 'rake/testtask'
-require 'rake/rdoctask'
-
-desc 'Default: run unit tests.'
-task :default => :test
-
-desc 'Test the calendar_helper plugin.'
-Rake::TestTask.new(:test) do |t|
- t.libs << 'lib'
- t.pattern = 'test/**/test_*.rb'
- t.verbose = true
-end
-
-desc 'Generate documentation for the calendar_helper plugin.'
-Rake::RDocTask.new(:rdoc) do |rdoc|
- rdoc.rdoc_dir = 'rdoc'
- rdoc.title = 'CalendarHelper'
- rdoc.options << '--line-numbers' << '--inline-source'
- rdoc.rdoc_files.include('README')
- rdoc.rdoc_files.include('lib/**/*.rb')
-end
diff --git a/vendor/plugins/calendar_helper/about.yml b/vendor/plugins/calendar_helper/about.yml
deleted file mode 100644
index 1c33258..0000000
--- a/vendor/plugins/calendar_helper/about.yml
+++ /dev/null
@@ -1,7 +0,0 @@
-author: topfunky
-summary: Generates a table-based HTML calendar that can be styled with CSS. Also includes a generator with relevant stylesheets.
-homepage: http://nubyonrails.com
-plugin: http://topfunky.net/svn/plugins/calendar_helper
-license: MIT
-version: 0.2
-rails_version: 1.0+
diff --git a/vendor/plugins/calendar_helper/generators/calendar_styles/calendar_styles_generator.rb b/vendor/plugins/calendar_helper/generators/calendar_styles/calendar_styles_generator.rb
deleted file mode 100644
index 5e6280e..0000000
--- a/vendor/plugins/calendar_helper/generators/calendar_styles/calendar_styles_generator.rb
+++ /dev/null
@@ -1,20 +0,0 @@
-class CalendarStylesGenerator < Rails::Generator::Base
-
- def manifest
- record do |m|
- calendar_themes_dir = "public/stylesheets/calendar"
- m.directory calendar_themes_dir
-
- # Copy files
- %w(red blue grey).each do |dir|
- m.directory File.join(calendar_themes_dir, dir)
- m.file File.join("#{dir}/style.css"), File.join(calendar_themes_dir, "#{dir}/style.css")
- end
-
- # Dir.read("vendor/public/calendar_helper/generators/calendar_styles/templates").each do |dir|
-# m.file "orig", File.join(calendar_themes_dir, dir.name, "some_file.css")
-# end
-
- end
- end
-end
diff --git a/vendor/plugins/calendar_helper/generators/calendar_styles/templates/blue/style.css b/vendor/plugins/calendar_helper/generators/calendar_styles/templates/blue/style.css
deleted file mode 100644
index f1c40d4..0000000
--- a/vendor/plugins/calendar_helper/generators/calendar_styles/templates/blue/style.css
+++ /dev/null
@@ -1,63 +0,0 @@
-/*
- A blue based theme, inspired by Blinksale and their ColorBurn widget. http://firewheeldesign.com
-
- AUTHOR: Geoffrey Grosenbach http://nubyonrails.com
-
- Colors:
- Light Blue: bbccff
- White: eeddee
- Turq: 003355
- Cream: ffffdd
-*/
-
-.calendar {
- margin: auto;
-}
-
-.monthName th {
- font-weight: normal;
- text-align: right;
- padding-top: 1em;
- padding-bottom: 0.7em;
-}
-
-.dayName th {
- font-size: 0.7em;
- padding-top: 0.6em;
- padding-bottom: 0.3em;
- background-color: #303030;
- color: white;
-}
-
-.otherMonth, .day, .specialDay {
- padding: 0.7em 1em;
- border-right: 1px solid white;
-
-}
-
-.otherMonth {
- color: #eeeeee;
- background-color: white;
-}
-
-.day, .specialDay {
- text-align: center;
- border-bottom: 1px dotted #bbbbbb;
- background-color: #bbccff;
-}
-.specialDay {
- background-color: #003355;
- color: white;
-}
-.specialDay a, .specialDay a:visited, .specialDay a:hover {
- color: white;
- text-decoration: none;
- padding: 1em;
-}
-.specialDay a:hover {
- color: white;
- background-color: black;
-}
-.weekendDay {
- background-color: #ffffdd;
-}
diff --git a/vendor/plugins/calendar_helper/generators/calendar_styles/templates/grey/style.css b/vendor/plugins/calendar_helper/generators/calendar_styles/templates/grey/style.css
deleted file mode 100644
index 45947b4..0000000
--- a/vendor/plugins/calendar_helper/generators/calendar_styles/templates/grey/style.css
+++ /dev/null
@@ -1,74 +0,0 @@
-/*
- A grey based theme, inspired by Blinksale and their ColorBurn widget. http://firewheeldesign.com
-
- AUTHOR: Geoffrey Grosenbach http://nubyonrails.com
-
- Colors:
- dk: 787888
- lt: 4f4f5b
- lter: a8a8a8
- white: ffffff
-*/
-
-/* TODO */
-
-.calendar {
- margin: auto;
- color: white;
- text-align: center;
-}
-
-.monthName th {
- font-weight: normal;
- text-align: right;
- padding-top: 1em;
- padding-bottom: 0.7em;
- color: black;
-}
-
-.dayName th {
- font-size: 0.7em;
- padding-top: 0.6em;
- padding-bottom: 0.3em;
- background-color: #303030;
- color: white;
- border-bottom: 1px solid white;
-}
-
-.otherMonth, .day, .specialDay {
- padding: 0.7em 1em;
- border-right: 1px solid #111111;
-}
-
-.otherMonth {
- color: #999999;
- background-color: #4f4f5b;
-}
-
-.day, .specialDay {
- border-bottom: 1px solid #111111;
- background-color: #333333;
-}
-.specialDay {
- background-color: #a8a8a8;
- color: black;
-}
-.specialDay a, .specialDay a:visited, .specialDay a:hover {
- color: white;
- text-decoration: none;
- padding: 1em;
-}
-.specialDay a:hover {
- color: white;
- background-color: black;
-}
-.weekendDay {
- background-color: #787888;
-}
-
-Colors:
- dk: 787888
- lt: 4f4f5b
- lter: a8a8a8
- white: ffffff
-
diff --git a/vendor/plugins/calendar_helper/generators/calendar_styles/templates/red/style.css b/vendor/plugins/calendar_helper/generators/calendar_styles/templates/red/style.css
deleted file mode 100644
index 71393c0..0000000
--- a/vendor/plugins/calendar_helper/generators/calendar_styles/templates/red/style.css
+++ /dev/null
@@ -1,56 +0,0 @@
-/*
- A red, white, and grey theme.
-
- AUTHOR: Geoffrey Grosenbach http://nubyonrails.com
-*/
-
-.calendar {
- margin: auto;
-}
-
-.monthName th {
- font-weight: normal;
- text-align: right;
- padding-top: 1em;
- padding-bottom: 0.7em;
-}
-
-.dayName th {
- font-size: 0.7em;
- padding-top: 0.6em;
- padding-bottom: 0.3em;
- background-color: #303030;
- color: white;
-}
-
-.otherMonth, .day, .specialDay {
- padding: 0.7em 1em;
- border-right: 1px solid white;
-
-}
-
-.otherMonth {
- color: #eeeeee;
-}
-.weekendDay {
- background-color: #eeeeee;
-}
-
-.day, .specialDay {
- text-align: center;
- border-bottom: 1px dotted #bbbbbb;
-}
-
-.specialDay {
- background-color: #d10a21;
- color: white;
-}
-.specialDay a, .specialDay a:visited, .specialDay a:hover {
- color: white;
- text-decoration: none;
- padding: 1em;
-}
-.specialDay a:hover {
- color: white;
- background-color: black;
-}
diff --git a/vendor/plugins/calendar_helper/init.rb b/vendor/plugins/calendar_helper/init.rb
deleted file mode 100644
index 8f128a7..0000000
--- a/vendor/plugins/calendar_helper/init.rb
+++ /dev/null
@@ -1 +0,0 @@
-ActionView::Base.send :include, CalendarHelper
diff --git a/vendor/plugins/calendar_helper/lib/calendar_helper.rb b/vendor/plugins/calendar_helper/lib/calendar_helper.rb
deleted file mode 100644
index 72cf4f6..0000000
--- a/vendor/plugins/calendar_helper/lib/calendar_helper.rb
+++ /dev/null
@@ -1,138 +0,0 @@
-require 'date'
-
-# CalendarHelper allows you to draw a databound calendar with fine-grained CSS formatting
-module CalendarHelper
- # Returns an HTML calendar. In its simplest form, this method generates a plain
- # calendar (which can then be customized using CSS) for a given month and year.
- # However, this may be customized in a variety of ways -- changing the default CSS
- # classes, generating the individual day entries yourself, and so on.
- #
- # The following options are required:
- # :year # The year number to show the calendar for.
- # :month # The month number to show the calendar for.
- #
- # The following are optional, available for customizing the default behaviour:
- # :table_class => "calendar" # The class for the
tag.
- # :month_name_class => "monthName" # The class for the name of the month, at the top of the table.
- # :other_month_class => "otherMonth" # Not implemented yet.
- # :day_name_class => "dayName" # The class is for the names of the weekdays, at the top.
- # :day_class => "day" # The class for the individual day number cells.
- # This may or may not be used if you specify a block (see below).
- # :abbrev => (0..2) # This option specifies how the day names should be abbreviated.
- # Use (0..2) for the first three letters, (0..0) for the first, and
- # (0..-1) for the entire name.
- # :first_day_of_week => 0 # Renders calendar starting on Sunday. Use 1 for Monday, and so on.
- #
- # 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],
- # cell_text being the text that is displayed and cell_attrs a hash containing the attributes for the
tag
- # (this can be used to change the
's class for customization with CSS).
- # This block can also return the cell_text only, in which case the
's class defaults to the value given in
- # +:day_class+. If the block returns nil, the default options are used.
- #
- # Example usage:
- # calendar(:year => 2005, :month => 6) # This generates the simplest possible calendar.
- # calendar({:year => 2005, :month => 6, :table_class => "calendar_helper"}) # This generates a calendar, as
- # # before, but the
's class
- # # is set to "calendar_helper".
- # calendar(:year => 2005, :month => 6, :abbrev => (0..-1)) # This generates a simple calendar but shows the
- # # entire day name ("Sunday", "Monday", etc.) instead
- # # of only the first three letters.
- # calendar(:year => 2005, :month => 5) do |d| # This generates a simple calendar, but gives special days
- # if listOfSpecialDays.include?(d) # (days that are in the array listOfSpecialDays) one CSS class,
- # [d.mday, {:class => "specialDay"}] # "specialDay", and gives the rest of the days another CSS class,
- # else # "normalDay". You can also use this highlight today differently
- # [d.mday, {:class => "normalDay"}] # from the rest of the days, etc.
- # end
- # end
- #
- # An additional 'weekend' class is applied to weekend days.
- #
- # For consistency with the themes provided in the calendar_styles generator, use "specialDay" as the CSS class for marked days.
- #
- def calendar(options = {}, &block)
- raise(ArgumentError, "No year given") unless options.has_key?(:year)
- raise(ArgumentError, "No month given") unless options.has_key?(:month)
-
- block ||= Proc.new {|d| nil}
-
- defaults = {
- :table_class => 'calendar',
- :month_name_class => 'monthName',
- :other_month_class => 'otherMonth',
- :day_name_class => 'dayName',
- :day_class => 'day',
- :abbrev => (0..2),
- :first_day_of_week => 0
- }
- options = defaults.merge options
-
- first = Date.civil(options[:year], options[:month], 1)
- last = Date.civil(options[:year], options[:month], -1)
-
- first_weekday = first_day_of_week(options[:first_day_of_week])
- last_weekday = last_day_of_week(options[:first_day_of_week])
-
- day_names = Date::DAYNAMES.dup
- first_weekday.times do
- day_names.push(day_names.shift)
- end
-
- cal = %(