diff options
| -rw-r--r-- | app/assets/images/refinery/blog/icons/add.png | bin | 0 -> 733 bytes | |||
| -rw-r--r-- | app/controllers/refinery/blog/posts_controller.rb | 4 | ||||
| -rw-r--r-- | app/models/refinery/blog/post.rb | 10 | ||||
| -rw-r--r-- | app/views/refinery/blog/admin/categories/_category.html.erb | 2 | ||||
| -rw-r--r-- | app/views/refinery/blog/admin/categories/_form.html.erb | 4 | ||||
| -rw-r--r-- | app/views/refinery/blog/admin/posts/_form.html.erb | 6 | ||||
| -rw-r--r-- | app/views/refinery/blog/admin/shared/_locale_picker.html.erb | 11 | ||||
| -rw-r--r-- | config/locales/en.yml | 4 | ||||
| -rw-r--r-- | lib/refinery/blog.rb | 1 | ||||
| -rw-r--r-- | refinerycms-blog.gemspec | 4 |
10 files changed, 18 insertions, 28 deletions
diff --git a/app/assets/images/refinery/blog/icons/add.png b/app/assets/images/refinery/blog/icons/add.png Binary files differnew file mode 100644 index 0000000..6332fef --- /dev/null +++ b/app/assets/images/refinery/blog/icons/add.png diff --git a/app/controllers/refinery/blog/posts_controller.rb b/app/controllers/refinery/blog/posts_controller.rb index ed94a8d..b5caa33 100644 --- a/app/controllers/refinery/blog/posts_controller.rb +++ b/app/controllers/refinery/blog/posts_controller.rb @@ -10,7 +10,7 @@ module Refinery def index # Rss feeders are greedy. Let's give them every blog post instead of paginating. - (@posts = Post.live.includes(:comments, :categories).with_globalize) if request.format.rss? + (@posts = Post.live.includes(:comments, :categories)) if request.format.rss? respond_with (@posts) do |format| format.html format.rss { render :layout => false } @@ -71,7 +71,7 @@ module Refinery def tagged @tag = ActsAsTaggableOn::Tag.find(params[:tag_id]) @tag_name = @tag.name - @posts = Post.tagged_with(@tag_name).with_globalize.page(params[:page]) + @posts = Post.live.tagged_with(@tag_name).page(params[:page]) end protected diff --git a/app/models/refinery/blog/post.rb b/app/models/refinery/blog/post.rb index 86973da..4ee009e 100644 --- a/app/models/refinery/blog/post.rb +++ b/app/models/refinery/blog/post.rb @@ -93,7 +93,7 @@ module Refinery end def by_month(date) - where(:published_at => date.beginning_of_month..date.end_of_month).with_globalize + where(:published_at => date.beginning_of_month..date.end_of_month) end def by_archive(date) @@ -106,11 +106,11 @@ module Refinery end def published_dates_older_than(date) - published_before(date).with_globalize.pluck(:published_at) + published_before(date).pluck(:published_at) end def recent(count) - live.limit(count).with_globalize + live.limit(count) end def popular(count) @@ -118,11 +118,11 @@ module Refinery end def previous(item) - published_before(item.published_at).with_globalize.first + published_before(item.published_at).first end def uncategorized - live.includes(:categories).where(Refinery::Categorization.table_name => { :blog_category_id => nil }).with_globalize + live.includes(:categories).where(Refinery::Categorization.table_name => { :blog_category_id => nil }) end def next(current_record) diff --git a/app/views/refinery/blog/admin/categories/_category.html.erb b/app/views/refinery/blog/admin/categories/_category.html.erb index 24a1b78..c1cfa15 100644 --- a/app/views/refinery/blog/admin/categories/_category.html.erb +++ b/app/views/refinery/blog/admin/categories/_category.html.erb @@ -13,7 +13,7 @@ </span> <span class='actions'> <%= link_to refinery_icon_tag("application_edit.png"), - refinery.edit_blog_admin_category_path(category, :dialog => true, :height => 325), + refinery.edit_blog_admin_category_path(category), :title => t('.edit') %> <%= link_to refinery_icon_tag("delete.png"), refinery.blog_admin_category_path(category), :class => "cancel confirm-delete", diff --git a/app/views/refinery/blog/admin/categories/_form.html.erb b/app/views/refinery/blog/admin/categories/_form.html.erb index f2148ea..a0fd55b 100644 --- a/app/views/refinery/blog/admin/categories/_form.html.erb +++ b/app/views/refinery/blog/admin/categories/_form.html.erb @@ -3,8 +3,8 @@ :object => f.object, :include_object_name => true %> - <%= render "/refinery/blog/admin/shared/locale_picker", - :current_locale => Thread.current[:globalize_locale] %> + <%= render '/refinery/admin/locale_picker', + :current_locale => Globalize.locale %> <div class='field'> <%= f.label :title -%> diff --git a/app/views/refinery/blog/admin/posts/_form.html.erb b/app/views/refinery/blog/admin/posts/_form.html.erb index 7b63520..39cb318 100644 --- a/app/views/refinery/blog/admin/posts/_form.html.erb +++ b/app/views/refinery/blog/admin/posts/_form.html.erb @@ -3,14 +3,14 @@ :object => f.object, :include_object_name => true %> - <%= render "/refinery/blog/admin/shared/locale_picker", - :current_locale => Thread.current[:globalize_locale] %> + <%= render '/refinery/admin/locale_picker', + :current_locale => Globalize.locale %> <div class='field'> <%= f.label :title -%> <%= f.text_field :title, :class => 'larger widest' -%> </div> - + <div class='field'> <div id='page-tabs' class='clearfix ui-tabs ui-widget ui-widget-content ui-corner-all'> <ul id='page_parts'> diff --git a/app/views/refinery/blog/admin/shared/_locale_picker.html.erb b/app/views/refinery/blog/admin/shared/_locale_picker.html.erb deleted file mode 100644 index e162364..0000000 --- a/app/views/refinery/blog/admin/shared/_locale_picker.html.erb +++ /dev/null @@ -1,11 +0,0 @@ -<input type='hidden' name='switch_locale' id='switch_locale' value='<%= local_assigns[:current_locale] %>' /> -<% if (locales ||= Refinery::I18n.frontend_locales).present? and locales.many? %> - <ul id='switch_locale_picker' class='clearfix'> - <% locales.each do |locale| %> - <li<%= " class='selected'" if locale.to_s == local_assigns[:current_locale].to_s %>> - <%= link_to refinery_icon_tag("flags/#{locale}.png", :size => "32x22"), - refinery.url_for(:switch_locale => locale) %> - </li> - <% end %> - </ul> -<% end %> diff --git a/config/locales/en.yml b/config/locales/en.yml index b98921f..471b3e4 100644 --- a/config/locales/en.yml +++ b/config/locales/en.yml @@ -108,7 +108,7 @@ en: title: RSS Feed subscribe: Subscribe posts: - other: Other Posts + other: Latest Posts created_at: 'Posted on %{when}' read_more: Read more comments: @@ -136,7 +136,7 @@ en: comments: title: Comments add: Make a Comment - other: Other Blog Posts + other: Latest Blog Posts filed_in: Filed in tagged: Tagged submit: Send comment diff --git a/lib/refinery/blog.rb b/lib/refinery/blog.rb index 52f73e0..3fc0ce1 100644 --- a/lib/refinery/blog.rb +++ b/lib/refinery/blog.rb @@ -3,6 +3,7 @@ require 'refinerycms-settings' require 'filters_spam' require 'rails_autolink' require 'acts_as_indexed' +require 'friendly_id' module Refinery autoload :BlogGenerator, 'generators/refinery/blog/blog_generator' diff --git a/refinerycms-blog.gemspec b/refinerycms-blog.gemspec index 3449c93..7af148d 100644 --- a/refinerycms-blog.gemspec +++ b/refinerycms-blog.gemspec @@ -1,6 +1,5 @@ # Encoding: UTF-8 -$:.push File.expand_path('../lib', __FILE__) -require 'refinery/blog/version' +require File.expand_path('../lib/refinery/blog/version', __FILE__) version = Refinery::Blog::Version.to_s @@ -24,4 +23,5 @@ Gem::Specification.new do |s| s.add_dependency 'acts-as-taggable-on' s.add_dependency 'seo_meta', '~> 1.3.0' s.add_dependency 'rails_autolink', '~> 1.0.7' + s.add_dependency 'friendly_id', '~> 4.0.4' end |
