Bug #300: Displays pending state and successor information

Pending state is displayed in the date_span. Successor information is displayed in the tooltip of a successor icon placed after the action description.

Conflicts:

	app/helpers/todos_helper.rb
	public/javascripts/application.js
This commit is contained in:
Eric Allen 2009-11-04 22:45:02 -05:00
parent 2bf48a15cb
commit 6d97bca57f
7 changed files with 16 additions and 10 deletions

View file

@ -24,12 +24,12 @@ parameters += "&_tag_name=#{@tag_name}" if @source_view == 'tag'
<div class="description<%= staleness_class( todo ) %>">
<%= date_span -%>
<span class="todo.descr"><%= h sanitize(todo.description) %></span>
<%= successors_span %>
<%= image_tag_for_recurring_todo(todo) if @todo.from_recurring_todo? %>
<%= tag_list %>
<%= deferred_due_date %>
<%= project_and_context_links( parent_container_type, :suppress_context => suppress_context, :suppress_project => suppress_project ) %>
<%= render(:partial => "todos/toggle_notes", :locals => { :item => todo }) if todo.notes? %>
<%= render(:partial => "todos/toggle_dependencies", :locals => { :item => todo }) if todo.uncompleted_predecessors.empty? or !todo.successors.empty? %>
</div>
</div>
<div id="<%= dom_id(todo, 'edit') %>" class="edit-form" style="display:none">

View file

@ -1,5 +0,0 @@
<%= link_to(image_tag( 'blank.png', :width=>'16', :height=>'16', :border=>'0' ), "#", {:class => 'show_dependencies', :title => 'Show dependencies'}) %>
<div class="todo_dependencies" id="<%= dom_id(item, 'dependencies') %>" style="display:none">
<p>Links</p>
</div>