Andreas/tracks
1
0
Fork 0
mirror of https://github.com/TracksApp/tracks.git synced 2025-12-26 12:08:47 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

fix #1252 by updating the todo ical feed and adding comment that todo ical is not for calendars. Also fix layout of feeds page

Browse source
This commit is contained in:
Reinier Balt 2012-03-24 10:52:44 +01:00
parent 163389d914
commit b911e3010b
4 changed files with 19 additions and 23 deletions
Download patch file Download diff file Expand all files Collapse all files

36
app/views/feedlist/_feed_for_context.html.erb
View file

@ -1,25 +1,21 @@
<% context = @active_contexts.empty? ? @hidden_contexts.first : @active_contexts.first
-%>
<% context = @active_contexts.empty? ? @hidden_contexts.first : @active_contexts.first -%>
<h4><%= t('feedlist.context_centric_actions') %>:</h4>
<ul>
<% if @active_contexts.empty? && @hidden_contexts.empty? -%>
<ul><li><%= t('feedlist.context_needed') %></li></ul>
<li><%= t('feedlist.context_needed') %></li>
<% else -%>
<ul>
<li><%= t('common.numbered_step', :number => 1) %> - <%= t('feedlist.choose_context') %>:
<select name="feed-contexts" id="feed-contexts">
<%= options_from_collection_for_select(@active_contexts, "id", "name", @active_contexts.first.id) unless @active_contexts.empty?-%>
<%= options_from_collection_for_select(@hidden_contexts, "id", "name") -%>
</select>
</li>
<li><%= t('common.numbered_step', :number => 2) %> - <%= t('feedlist.select_feed_for_context') %>
<div id="feedicons-context">
<div id="feeds-for-context">
<li><%= all_feed_links_for_context(context) %></li>
</div>
<li><%= t('common.numbered_step', :number => 1) %> - <%= t('feedlist.choose_context') %>:
<select name="feed-contexts" id="feed-contexts">
<%= options_from_collection_for_select(@active_contexts, "id", "name", @active_contexts.first.id) unless @active_contexts.empty?-%>
<%= options_from_collection_for_select(@hidden_contexts, "id", "name") -%>
</select>
</li>
<li><%= t('common.numbered_step', :number => 2) %> - <%= t('feedlist.select_feed_for_context') %>
<div id="feedicons-context">
<div id="feeds-for-context">
<%= all_feed_links_for_context(context) %>
</div>
</li>
</ul>
</div>
</li>
<% end -%>
</ul>

2
app/views/feedlist/_feed_for_project.html.erb
View file

@ -14,7 +14,7 @@
<li><%= t('common.numbered_step', :number => 2) %> - <%= t('feedlist.select_feed_for_project') %>
<div id="feedicons-project">
<div id="feeds-for-project">
<li><%= all_feed_links_for_project(project) %></li>
<%= all_feed_links_for_project(project) %>
</div>
</div>
</li>

2
app/views/todos/index.ics.erb
View file

@ -1,6 +1,6 @@
BEGIN:VCALENDAR
PRODID:-//TRACKS//<%= TRACKS_VERSION %>//EN
VERSION:2.0
PRODID:-//rousette.org.uk//Tracks 1.04//EN
CALSCALE:GREGORIAN
METHOD:PUBLISH
BEGIN:VTIMEZONE

2
config/locales/en.yml
View file

@ -843,7 +843,7 @@ en:
projects_and_actions: Active projects with their actions
context_needed: There needs to be at least one context before you can request a feed
actions_due_next_week: Actions due in 7 days or earlier
notice_incomplete_only: "Note: All feeds show only actions that have not been marked as done, unless stated otherwise."
notice_incomplete_only: "Note: All feeds show only actions that have not been marked as done, unless stated otherwise. These iCal feeds can be added to todo lists. If you want to show due todos in a calendar, use the iCal feed on the calendar page"
all_actions: All actions
actions_completed_last_week: Actions completed in the last 7 days
context_centric_actions: Feeds for incomplete actions in a specific context