From b911e3010ba3a361522f2a74336a588af23cd4bb Mon Sep 17 00:00:00 2001
From: Reinier Balt <lrbalt@gmail.com>
Date: Sat, 24 Mar 2012 10:52:44 +0100
Subject: [PATCH] fix #1252 by updating the todo ical feed and adding comment
 that todo ical is not for calendars. Also fix layout of feeds page

---
 app/views/feedlist/_feed_for_context.html.erb | 36 +++++++++----------
 app/views/feedlist/_feed_for_project.html.erb |  2 +-
 app/views/todos/index.ics.erb                 |  2 +-
 config/locales/en.yml                         |  2 +-
 4 files changed, 19 insertions(+), 23 deletions(-)

diff --git a/app/views/feedlist/_feed_for_context.html.erb b/app/views/feedlist/_feed_for_context.html.erb
index 33e8b6d9..0ffa13e1 100644
--- a/app/views/feedlist/_feed_for_context.html.erb
+++ b/app/views/feedlist/_feed_for_context.html.erb
@@ -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>
\ No newline at end of file
diff --git a/app/views/feedlist/_feed_for_project.html.erb b/app/views/feedlist/_feed_for_project.html.erb
index 53d80462..0372e571 100644
--- a/app/views/feedlist/_feed_for_project.html.erb
+++ b/app/views/feedlist/_feed_for_project.html.erb
@@ -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>
diff --git a/app/views/todos/index.ics.erb b/app/views/todos/index.ics.erb
index 7d90b64a..7fee3a19 100644
--- a/app/views/todos/index.ics.erb
+++ b/app/views/todos/index.ics.erb
@@ -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
diff --git a/config/locales/en.yml b/config/locales/en.yml
index a12d2dc8..da3e7b1c 100644
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -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