aboutsummaryrefslogtreecommitdiffstats
path: root/app
diff options
context:
space:
mode:
Diffstat (limited to 'app')
-rw-r--r--app/assets/images/refinery/blog/icons/add.pngbin0 -> 733 bytes
-rw-r--r--app/controllers/refinery/blog/posts_controller.rb4
-rw-r--r--app/models/refinery/blog/post.rb10
-rw-r--r--app/views/refinery/blog/admin/categories/_category.html.erb2
-rw-r--r--app/views/refinery/blog/admin/categories/_form.html.erb4
-rw-r--r--app/views/refinery/blog/admin/posts/_form.html.erb6
-rw-r--r--app/views/refinery/blog/admin/shared/_locale_picker.html.erb11
7 files changed, 13 insertions, 24 deletions
diff --git a/app/assets/images/refinery/blog/icons/add.png b/app/assets/images/refinery/blog/icons/add.png
new file mode 100644
index 0000000..6332fef
--- /dev/null
+++ b/app/assets/images/refinery/blog/icons/add.png
Binary files differ
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 %>