Andreas/tracks
1
0
Fork 0
mirror of https://github.com/TracksApp/tracks.git synced 2026-02-28 10:04:07 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

#300: Added pending items to deferred block in project view

Browse source
This commit is contained in:
Henrik Bohre 2009-05-19 16:08:01 +02:00 • committed by Eric Allen
parent 947172f435
commit 5b1acce71e
2 changed files with 6 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

2
app/views/projects/show.html.erb
View file

@ -4,7 +4,7 @@
</div> </div>
<%= render :partial => "projects/project", :locals => { :project => @project, :collapsible => false } %> <%= render :partial => "projects/project", :locals => { :project => @project, :collapsible => false } %>
<%= render :partial => "todos/deferred", :locals => { :deferred => @deferred, :collapsible => false, :append_descriptor => "in this project", :parent_container_type => 'project' } %> <%= render :partial => "todos/deferred", :locals => { :deferred => @deferred, :collapsible => false, :append_descriptor => "in this project", :parent_container_type => 'project', :pending => @pending } %>
<% unless @max_completed==0 -%> <% unless @max_completed==0 -%>
<%= render :partial => "todos/completed", :locals => { :done => @done, :collapsible => false, :suppress_project => true, :append_descriptor => "in this project" } %> <%= render :partial => "todos/completed", :locals => { :done => @done, :collapsible => false, :suppress_project => true, :append_descriptor => "in this project" } %>
<% end -%> <% end -%>

9
app/views/todos/_deferred.rhtml
View file

@ -3,15 +3,16 @@
<% if collapsible %> <% if collapsible %>
<a href="#" class="container_toggle" id="toggle_deferred"><%= image_tag("collapse.png") %></a> <a href="#" class="container_toggle" id="toggle_deferred"><%= image_tag("collapse.png") %></a>
<% end %> <% end %>
Deferred actions <%= append_descriptor ? append_descriptor : '' %> Deferred/pending actions <%= append_descriptor ? append_descriptor : '' %>
</h2> </h2>
<div id="tickleritems" class="items toggle_target"> <div id="tickleritems" class="items toggle_target">
<div id="tickler-empty-nd" style="display:<%= deferred.empty? ? 'block' : 'none'%>;"> <div id="tickler-empty-nd" style="display:<%= deferred.empty? && pending.empty? ? 'block' : 'none'%>;">
<div class="message"><p>Currently there are no deferred actions</p></div> <div class="message"><p>Currently there are no deferred or pending actions</p></div>
</div> </div>
<%= render :partial => "todos/todo", :collection => deferred, :locals => { :parent_container_type => parent_container_type } %> <%= render :partial => "todos/todo", :collection => deferred, :locals => { :parent_container_type => parent_container_type } %>
<%= render :partial => "todos/todo", :collection => pending, :locals => { :parent_container_type => parent_container_type } %>
</div><!-- [end:items] --> </div><!-- [end:items] -->
</div><!-- [end:tickler] --> </div><!-- [end:tickler] -->