Andreas/tracks
1
0
Fork 0
mirror of https://github.com/TracksApp/tracks.git synced 2026-03-16 09:16:32 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

do a big refactor of rendering collections of todos for home page, tag page, project page, context page

Browse source
This commit is contained in:
Reinier Balt 2013-03-10 20:38:10 +01:00
parent f22dfc1f9b
commit 22b371ef8c
20 changed files with 910 additions and 816 deletions
Download patch file Download diff file Expand all files Collapse all files

27
app/views/projects/_project.html.erb
View file

@ -5,18 +5,19 @@
cache [project, @source_view, current_user.date.strftime("%Y%m%d")] do
%>
<%= render :partial => "project_settings_container", :locals => {:project => project} if source_view_is :project %>
<div id="p<%= project.id %>" class="container project" style="display:<%= (collapsible && @not_done.empty?) ? "none" : "block" %>">
<h2>
<%= container_toggle("toggle_p#{project.id}") if collapsible %>
<%= source_view_is(:project) ? t('projects.actions_in_project_title') : show_project_name(project) %>
</h2>
<div id="p<%= project.id %>items" class="items toggle_target">
<div id="p<%= project.id %>empty-nd" style="display:<%= @not_done.empty? ? 'block' : 'none'%>;">
<div class="message"><p><%= t('projects.no_actions_in_project') %></p></div>
</div>
<%= render :partial => "todos/todo", :collection => @not_done, :locals => { :parent_container_type => "project" } %>
</div>
</div>
<%=
title = source_view_is(:project) ? t('projects.actions_in_project_title') : show_project_name(project)
render :partial => 'todos/collection',
:object => @not_done,
:locals => { :settings => {
:id => "p#{project.id}",
:collapsible => settings[:collapsible],
:title => title,
:container_name => 'project',
:show_empty_containers => @show_empty_containers
}}
%>
<% end %>

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

@ -1,14 +1,20 @@
<%
deferred_pending_options = {:append_descriptor => nil, :parent_container_type => 'project'}
done_todo_options = {
:append_descriptor => t('projects.last_completed_in_project', :number=>prefs.show_number_completed),
:suppress_project => true,
:parent_container_type => 'project'
}
-%>
<div id="display_box">
<div id="project-next-prev">
<%= project_next_prev %>
</div>
<%= project_next_prev %>
<%= render :partial => @project, :locals => {:collapsible => false } %>
<%= render :partial => "todos/deferred", :object => @deferred_todos, :locals => { :collapsible => false, :append_descriptor => t('projects.todos_append'), :parent_container_type => 'project', :pending => @pending_todos } %>
<% unless @max_completed==0 -%>
<%= render :partial => "todos/completed", :object => @done, :locals => { :collapsible => false, :suppress_project => true, :append_descriptor => t('projects.todos_append') } %>
<% end -%>
<%= render :partial => @project, :locals => {:settings => {:collapsible => false }} %>
<%= show_deferred_pending_todos(@deferred_todos, @pending_todos, deferred_pending_options) %>
<%= show_done_todos(@done, done_todo_options) unless @done.nil? %>
<div class="container">
<div id="notes">
<div class="add_note_link"><%= link_to t('projects.add_note'), '#' %> </div>
@ -29,4 +35,4 @@
<div id="input_box">
<%= render :partial => "shared/add_new_item_form" %>
<%= render :file => "sidebar/sidebar" %>
</div><!-- End of input box -->
</div>