renaming helper, bumping some versions

Oleg committed Oct 27, 2010
commit 07e879324de7116a535592cb8a7acb26f044d07d
Showing 5 changed files with 7 additions and 7 deletions
Gemfile +1 -1
@@ @@ -3,7 +3,7 @@ source 'http://rubygems.org'
gem 'rails', '>=3.0.1'
gem 'sqlite3-ruby', :require => 'sqlite3'
gem 'active_link_to', '>=0.0.6'
- gem 'paperclip', '>=2.3.3'
+ gem 'paperclip', '>=2.3.5'
gem 'mime-types', :require => 'mime/types'
group :test do
Gemfile.lock +2 -2
@@ @@ -47,7 +47,7 @@ GEM
mime-types
treetop (>= 1.4.5)
mime-types (1.16)
- paperclip (2.3.4)
+ paperclip (2.3.5)
activerecord
activesupport
polyglot (0.3.1)
@@ @@ -85,6 +85,6 @@ DEPENDENCIES
active_link_to (>= 0.0.6)
jeweler (>= 1.4.0)
mime-types
- paperclip (>= 2.3.3)
+ paperclip (>= 2.3.5)
rails (>= 3.0.1)
sqlite3-ruby
Rakefile +2 -2
@@ @@ -16,9 +16,9 @@ begin
gem.email = 'oleg@theworkinggroup.ca'
gem.homepage = 'http://github.com/theworkinggroup/comfortable-mexican-sofa'
gem.authors = ['Oleg Khabarov', 'The Working Group Inc']
- gem.add_dependency('rails', '>=3.0.0')
+ gem.add_dependency('rails', '>=3.0.1')
gem.add_dependency('active_link_to', '>=0.0.6')
- gem.add_dependency('paperclip', '>=2.3.3')
+ gem.add_dependency('paperclip', '>=2.3.5')
end
Jeweler::GemcutterTasks.new
rescue LoadError
app/views/layouts/cms_admin.html.erb +1 -1
@@ @@ -16,7 +16,7 @@
<%= active_link_to 'Layouts', cms_admin_layouts_path %>
<%= active_link_to 'Pages', cms_admin_pages_path %>
<%= active_link_to 'Snippets', cms_admin_snippets_path %>
- <%= hook :navigation %>
+ <%= cms_hook :navigation %>
</div>
</div>
<div class='right_column'>
comfortable_mexican_sofa/view_methods.rb b/lib/comfortable_mexican_sofa/view_methods.rb +1 -1
@@ @@ -16,7 +16,7 @@ module ComfortableMexicanSofa::ViewMethods
end
# Injects some content somewhere inside cms admin area
- def hook(name)
+ def cms_hook(name)
ComfortableMexicanSofa::ViewHooks.render(name, self)
end
end