From c44f919890cd4e46b0420caa5fdf96c8e65af4a5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ug=CC=A7is=20Ozols?= <ugis.ozolss@gmail.com>
Date: Wed, 7 Aug 2013 15:57:47 +0300
Subject: Use refinerycms-acts-as-indexed for search functionality.

Also simplify index views for posts, categories and comments by
removing redundant code.
---
 app/views/refinery/blog/admin/_submenu.html.erb    |  2 +-
 .../refinery/blog/admin/categories/index.html.erb  | 22 +++++--------
 .../refinery/blog/admin/comments/index.html.erb    | 37 ++++++++--------------
 app/views/refinery/blog/admin/posts/index.html.erb | 22 +++++--------
 4 files changed, 31 insertions(+), 52 deletions(-)

(limited to 'app/views/refinery/blog')

diff --git a/app/views/refinery/blog/admin/_submenu.html.erb b/app/views/refinery/blog/admin/_submenu.html.erb
index 3de05e5..03426b7 100644
--- a/app/views/refinery/blog/admin/_submenu.html.erb
+++ b/app/views/refinery/blog/admin/_submenu.html.erb
@@ -1,7 +1,7 @@
 <nav id='actions' class='multilist'>
   <ul class='search_list'>
     <li class='not_a_link'>
-      <%= render "/refinery/admin/search", :url => refinery.blog_admin_posts_path %>
+      <%= render "/refinery/admin/search", :url => request.path %>
     </li>
   </ul>
 
diff --git a/app/views/refinery/blog/admin/categories/index.html.erb b/app/views/refinery/blog/admin/categories/index.html.erb
index 451abc5..f5e021a 100644
--- a/app/views/refinery/blog/admin/categories/index.html.erb
+++ b/app/views/refinery/blog/admin/categories/index.html.erb
@@ -1,21 +1,15 @@
 <%= render '/refinery/blog/admin/submenu' %>
+<%= render 'refinery/admin/search_header', :url => request.path %>
 <div id='records'>
-  <% if searching? %>
-    <h2><%= t('results_for', :scope => 'refinery.admin.search',
-                             :query => params[:search]) %></h2>
-    <% if @categories.any? %>
-      <%= render :partial => "blog_categories",
-                 :collection => @categories %>
-    <% else %>
-      <p><%= t('no_results', :scope => 'refinery.admin.search') %></p>
-    <% end %>
-  <% else %>
-    <% if @categories.any? %>
-      <%= will_paginate @categories %>
+  <% if @categories.any? %>
+    <%= will_paginate @categories %>
 
-      <%= render "sortable_list" %>
+    <%= render "sortable_list" %>
 
-      <%= will_paginate @categories %>
+    <%= will_paginate @categories %>
+  <% else %>
+    <% if searching? %>
+      <%= t('no_results', :scope => 'refinery.admin.search') %>
     <% else %>
       <p>
         <strong>
diff --git a/app/views/refinery/blog/admin/comments/index.html.erb b/app/views/refinery/blog/admin/comments/index.html.erb
index 53c368e..c09e59b 100644
--- a/app/views/refinery/blog/admin/comments/index.html.erb
+++ b/app/views/refinery/blog/admin/comments/index.html.erb
@@ -1,30 +1,21 @@
-<%= render '/refinery/blog/admin/submenu' %>
+<%= render 'refinery/blog/admin/submenu' %>
+<%= render 'refinery/admin/search_header', :url => request.path %>
 <div id='records'>
-  <% if searching? %>
-    <h2><%= t('results_for', :scope => 'shared.admin.search', :query => params[:search]) %></h2>
-    <% if @comments.any? %>
-      <%= will_paginate @comments %>
+  <% if @comments.any? %>
+    <%= will_paginate @comments %>
 
-      <ul>
-        <%= render :partial => "blog_comments",
-                   :collection => @comments %>
-      </ul>
+    <%= render "sortable_list" %>
 
-      <%= will_paginate @comments %>
-    <% else %>
-      <p><%= t('search_no_results', :scope => 'admin') %></p>
-    <% end %>
+    <%= will_paginate @comments %>
   <% else %>
-    <% if @comments.any? %>
-      <%= will_paginate @comments %>
-
-      <%= render "sortable_list" %>
-
-      <%= will_paginate @comments %>
+    <% if searching? %>
+      <%= t('no_results', :scope => 'refinery.admin.search') %>
     <% else %>
-      <h3>
-        <%= t('.no_items_yet', :type => action_name.gsub('index', 'new').downcase) %>
-      </h3>
-    <% end %>
+      <p>
+        <strong>
+          <%= t('.no_items_yet', :type => action_name.gsub('index', 'new').downcase) %>
+        </strong>
+      </p>
   <% end %>
+<% end %>
 </div>
diff --git a/app/views/refinery/blog/admin/posts/index.html.erb b/app/views/refinery/blog/admin/posts/index.html.erb
index 19c4ccf..03da02c 100644
--- a/app/views/refinery/blog/admin/posts/index.html.erb
+++ b/app/views/refinery/blog/admin/posts/index.html.erb
@@ -1,21 +1,15 @@
 <%= render '/refinery/blog/admin/submenu' %>
+<%= render 'refinery/admin/search_header', :url => request.path %>
 <div id='records'>
-  <% if searching? %>
-    <h2><%= t('results_for', :scope => 'refinery.admin.search', :query => params[:search]) %></h2>
-    <% if @posts.any? %>
-    <ul>
-      <%= render :partial => "post", :collection => @posts %>
-    </ul>
-    <% else %>
-      <p><%= t('no_results', :scope => 'refinery.admin.search') %></p>
-    <% end %>
-  <% else %>
-    <% if @posts.any? %>
-      <%= will_paginate @posts %>
+  <% if @posts.any? %>
+    <%= will_paginate @posts %>
 
-      <%= render "sortable_list" %>
+    <%= render "sortable_list" %>
 
-      <%= will_paginate @posts %>
+    <%= will_paginate @posts %>
+  <% else %>
+    <% if searching? %>
+      <%= t('no_results', :scope => 'refinery.admin.search') %>
     <% else %>
       <p>
         <strong>
-- 
cgit v1.2.3