0
@@ -3,7 +3,7 @@ module RecurringTodosHelper
0
   def recurrence_time_span(rt)
0
     case rt.ends_on
0
     when "no_end_date"
0
-      return ""
0
+      return rt.start_from.nil? ? "" : "from " + format_date(rt.start_from)
0
     when "ends_on_number_of_times"
0
       return "for "+rt.number_of_occurences.to_s + " times"
0
     when "ends_on_end_date"
0
@@ -11,7 +11,7 @@ module RecurringTodosHelper
0
       ends = rt.end_date.nil? ? "" : " until " + format_date(rt.end_date)
0
       return starts+ends
0
     else
0
-      raise Exception.new, "unknown recurrence time span selection (#{self.ends_on})"    
0
+      raise Exception.new, "unknown recurrence time span selection (#{self.ends_on})"
0
     end
0
   end
0
   
0
@@ -28,10 +28,10 @@ module RecurringTodosHelper
0
     
0
   def recurring_todo_tag_list
0
     tags_except_starred = @recurring_todo.tags.reject{|t| t.name == Todo::STARRED_TAG_NAME}
0
-    tag_list = tags_except_starred.collect{|t| "<span class=\"tag #{t.name.gsub(' ','-')}\">" + 
0
+    tag_list = tags_except_starred.collect{|t| "<span class=\"tag #{t.name.gsub(' ','-')}\">" +
0
         # link_to(t.name, :controller => "todos", :action => "tag", :id =>
0
         # t.name) + TODO: tag view for recurring_todos (yet?)
0
-      t.name + 
0
+      t.name +
0
         "</span>"}.join('')
0
     "<span class='tags'>#{tag_list}</span>"
0
   end
0
@@ -44,7 +44,7 @@ module RecurringTodosHelper
0
     str
0
   end
0
   
0
-  def recurring_todo_remote_star_icon 
0
+  def recurring_todo_remote_star_icon
0
     str = link_to( image_tag_for_star(@recurring_todo),
0
       toggle_star_recurring_todo_path(@recurring_todo),
0
       :class => "icon star_item", :title => "star the action '#{@recurring_todo.description}'")

0
@@ -6,7 +6,16 @@
0
   <div class="description">
0
     <span class="todo.descr"><%= sanitize(recurring_todo.description) %></span> <%= recurring_todo_tag_list %>
0
     <span class='recurrence_pattern'>
0
-      [<%=recurrence_target(recurring_todo)%> <%= recurring_todo.recurrence_pattern %> <%= recurrence_time_span(recurring_todo) %>]
0
+      <%
0
+         rt = recurrence_target(recurring_todo)
0
+         rp = recurring_todo.recurrence_pattern
0
+         # only add space if recurrence_pattern has content
0
+         rp = " " + rp if !rp.nil?
0
+         rts = recurrence_time_span(recurring_todo)
0
+         # only add space if recurrence_time_span has content
0
+         rts = " " + rts if !(rts == "")
0
+      %>
0
+      [<%=rt%><%=rp%><%=rts%>]
0
     </span>
0
   </div>
0
 </div>