From 03e459de437bd75593181b7c5edc173ad64b234d Mon Sep 17 00:00:00 2001 From: Jacques Distler Date: Tue, 2 Dec 2008 01:18:00 -0600 Subject: [PATCH] Feeds Page on Published Web Readers of Published Webs were allowed to subscribe to the Atom feeds. Now let them actually access the 'feeds' page, from which they may do so. --- app/controllers/application.rb | 2 +- app/views/navigation.rhtml | 5 +++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/app/controllers/application.rb b/app/controllers/application.rb index 3fb89a89..e0809a06 100644 --- a/app/controllers/application.rb +++ b/app/controllers/application.rb @@ -197,7 +197,7 @@ class ApplicationController < ActionController::Base end def authorization_needed? - not %w( login authenticate published atom_with_headlines atom_with_content).include?(action_name) + not %w( login authenticate feeds published atom_with_headlines atom_with_content).include?(action_name) end def authorized? diff --git a/app/views/navigation.rhtml b/app/views/navigation.rhtml index 6bf833ee..58d77975 100644 --- a/app/views/navigation.rhtml +++ b/app/views/navigation.rhtml @@ -14,7 +14,7 @@ end <%= list_item 'All Pages', {:action => 'list'}, 'Alphabetically sorted list of pages', 'A' %> | <%= list_item 'Recently Revised', {:action =>'recently_revised'}, 'Pages sorted by when they were last changed', 'U' %> | <%= list_item 'Authors', {:action => 'authors'}, 'Who wrote what' %> | - <%= list_item 'Feeds', {:action => 'feeds'}, 'Subscribe to changes by RSS' %> | + <%= list_item 'Feeds', {:action => 'feeds'}, 'Subscribe to changes by Atom' %> | <%= list_item 'Export', {:action => 'export'}, 'Download a zip with all the pages in this wiki', 'X' %> | <% form_tag({ :controller => 'wiki', :action => 'search', :web => @web.address}, {'id' => 'navigationSearchForm', 'method' => 'get', 'accept-charset' => 'utf-8' }) do %> @@ -23,6 +23,7 @@ end onblur="this.value == '' ? this.value = 'Search' : true" /> <% end %> <% else %> - <%= list_item 'Home Page', {:action => 'published', :id => 'HomePage'}, 'Home, Sweet Home', 'H' %> + <%= list_item 'Home Page', {:action => 'published', :id => 'HomePage'}, 'Home, Sweet Home', 'H' %> | + <%= list_item 'Feeds', {:action => 'feeds'}, 'Subscribe to changes by Atom' %> <% end%>