Merge branch 'master' into new-gui

This commit is contained in:
Reinier Balt 2013-09-25 16:22:47 +02:00
commit d44538f604
18 changed files with 328 additions and 119 deletions

View file

@ -27,12 +27,16 @@ module FeedlistHelper
return html.html_safe
end
def all_feed_links(object, symbol)
feed_links([:rss, :txt, :ical], { :controller=> 'todos', :action => 'index', symbol => object.to_param }, content_tag(:strong, object.name))
end
def all_feed_links_for_project(project)
feed_links([:rss, :txt, :ical], { :controller=> 'todos', :action => 'index', :project_id => project.to_param }, content_tag(:strong, project.name))
all_feed_links(project, :project_id)
end
def all_feed_links_for_context(context)
feed_links([:rss, :txt, :ical], { :controller=> 'todos', :action => 'index', :context_id => context.to_param }, content_tag(:strong, context.name))
all_feed_links(context, :context_id)
end
protected
@ -44,5 +48,6 @@ module FeedlistHelper
def user_token_hash
{ :token => current_user.token }
end
end