diff --git a/app/views/admin/content/_article_list.html.erb b/app/views/admin/content/_article_list.html.erb index de3d18e109..8a2c0cc028 100644 --- a/app/views/admin/content/_article_list.html.erb +++ b/app/views/admin/content/_article_list.html.erb @@ -11,7 +11,7 @@ <%= format_date article.published_at %>
<%= published_or_not article %> - <%= (article.allow_comments?) ? link_to(article.comments.ham.size.to_s, :controller => '/admin/feedback', :id => article.id, :action => 'article') : '-' %> + <%= (article.allow_comments?) ? link_to(article.comments.ham.size.to_s, :controller => '/admin/feedback', :id => article.id, :action => 'article') : '-' %> <% end %> <%= display_pagination(@articles, 5, 'first', 'last')%> diff --git a/app/views/admin/content/index.html.erb b/app/views/admin/content/index.html.erb index b5391fc8de..8539bc0475 100644 --- a/app/views/admin/content/index.html.erb +++ b/app/views/admin/content/index.html.erb @@ -33,19 +33,12 @@
- - - - - - - - - - + + + +
<%= select_tag('search[category]', options_from_collection_for_select(Category.all, 'id', 'name'), {prompt: _("Select a category"), :class => 'span12'}) %><%= select_tag('search[user_id]', options_from_collection_for_select(User.all, 'id', 'name'), {prompt: _("Select an author"), :class => 'span12'}) %><%= select_tag('search[published_at]', options_for_select(Article.find_by_published_at), {prompt: _("Publication date"), :class => 'span12'}) %> -
<%= _("Title") %><%= _("Categories") %><%= _("Author")%><%= _("Date") %><%= _("Feedback")%><%= select_tag('search[category]', options_from_collection_for_select(Category.all, 'id', 'name'), {prompt: _("Select a category"), :class => 'span12'}) %><%= select_tag('search[user_id]', options_from_collection_for_select(User.all, 'id', 'name'), {prompt: _("Select an author"), :class => 'span12'}) %><%= select_tag('search[published_at]', options_for_select(Article.find_by_published_at), {prompt: _("Publication date"), :class => 'span12'}) %>