diff options
Diffstat (limited to 'app/views/refinery')
4 files changed, 6 insertions, 17 deletions
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 %> |