show.html.erb in muck-raker-0.1.46

- old
+ new

@@ -20,10 +20,23 @@
     <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 -%>
+  <% if @load_feeds_on_server -%>
+    <% if @show_combined -%>
+      <ul class="combined-feed-list">
+        <%= render :partial => 'topics/simple_entry', :collection => @server_loaded_data_feeds %>
+      </ul>
+      <script type="text/javascript">
+        jQuery(document).ready(function() {
+          apply_show_entry_content();
+        });
+      </script>
+    <% else -%>
+      <%= render :partial => 'topics/feed', :collection => @server_loaded_general_feeds %>
+    <% end -%>
+  <% elsif @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>