show.html.erb in muck-raker-0.1.45

- old
+ new

@@ -2,31 +2,39 @@
   <%= render :partial => 'topics/rss_discover', :collection => @feeds %>
 <% end -%>
 
 <%= output_errors('', {:class => 'help-box'}) %>
 
-<div class="span-17 column">
-  <h2><%= @title %></h2>
-</div>
-
-<div class="span-7 column">
+<div id="search-header" class="span-24 column center">
   <%= topics_form %>
 </div>
 
 <div class="span-24 column">
   <%= link_to t('muck.raker.photos'), photos_topic_path(params[:id], :service_ids => params[:service_ids]) %>
   <%= link_to t('muck.raker.videos'), videos_topic_path(params[:id], :service_ids => params[:service_ids]) %>
+  <%= link_to t('muck.raker.download_opml', :terms => @title), @opml_path %>
 </div>
 
 <div class="span-14 column datafeeds">
-  <div id="calculated-feeds">
-    <%= google_feeds(@general_feeds, @show_controls, @number_of_items, @number_of_images, @number_of_videos) %>
-  </div>
-
-  <div id="discovered_feeds">
-    <%= google_feeds(@discovered_feeds, @show_controls, @number_of_items, @number_of_images, @number_of_videos) %>
-  </div>
+  
+  <% if @show_google_search -%>
+    <div id="search-results">
+      <%= google_search('Google Search', [], @terms, %w{web video blog news image local book patent}, 'google_search', I18n.locale) %>
+    </div>
+  <% end -%>
+  
+  <% if @show_combined -%>
+    <%= google_combined_feeds(@general_feeds + @discovered_feeds) %>
+  <% else -%>
+    <div id="calculated-feeds">
+      <%= google_feeds(@general_feeds, @show_controls, @number_of_items, @number_of_images, @number_of_videos) %>
+    </div>
+    <div id="discovered_feeds">
+      <%= google_feeds(@discovered_feeds, @show_controls, @number_of_items, @number_of_images, @number_of_videos) %>
+    </div>
+  <% end -%>
+  
 </div>
 
 <div class="span-10 column datafeeds">
   <%= google_feeds(@photo_feeds, @show_controls, @number_of_items, @number_of_images, @number_of_videos) %>
   <%= google_feeds(@video_feeds, @show_controls, @number_of_items, @number_of_images, @number_of_videos) %>
@@ -34,14 +42,15 @@
   <%= google_feeds(@bookmark_feeds, @show_controls, @number_of_items, @number_of_images, @number_of_videos) %>
 </div>
 
 <div class="span-24 column">
   <%= link_to t('muck.raker.generate_new_topic'), new_topic_path %>
-  <%= link_to t('muck.raker.download_opml', :terms => @title), @opml_path %>
+  
   <!--
   <a href="http://www.google.com/reader/view/feed/<%=CGI.escape(request.url)%>" title="<%=@title%>">
     <img src="http://buttons.googlesyndication.com/fusion/add.gif" border="0" alt="Add to Google" />
   </a>
   -->
 </div>
 
-<%= render :partial => 'google/feeds_scripts' %>
\ No newline at end of file
+<%= render :partial => 'google/feeds_scripts' %>
+