Merged updates from trunk into stable branch

[feedcatcher.git] / app / views / feed / index.html.erb

diff --git a/app/views/feed/index.html.erb b/app/views/feed/index.html.erb
index b9e082a693c98b95455e7b2181f66d357432e798..1a6534bccacfe37d3203d18d5b7e1c48e3c35a88 100644 (file)
--- a/app/views/feed/index.html.erb
+++ b/app/views/feed/index.html.erb
@@ -1,7 +1,7 @@
 <h1>Feeds available</h1>
 
 <% form_tag :action => 'update' do %>
-  <p>Set feed <%= text_field_tag :feed_name, '', :size => 20 %>
+  <p>Set feed <%= text_field_tag :new_feed_name, '', :size => 20 %>
     to include <%= text_field_tag :title, '', :size => 30 %>
     containing  <%= text_field_tag :description, '', :size => 50 %>
     <%= submit_tag 'Update' %></p>
@@ -9,6 +9,6 @@
 
 <ul>
 <% for feed in @feeds %>
-  <li><%= link_to(h(feed.feed_name), (feed_url(:feed_name => feed.feed_name))) %></li>
+  <li><%= link_to( h(feed.feed_name), (feed_url(:feed_name => feed.feed_name))) %></li>
 <% end %>
 </ul>
\ No newline at end of file