mirror of
https://github.com/TracksApp/tracks.git
synced 2025-12-30 22:08:49 +01:00
3bc06d26e5
Conflicts: app/helpers/todos_helper.rb app/views/contexts/_mobile_context.rhtml app/views/todos/_mobile_todo.rhtml public/stylesheets/mobile.css
22 lines
797 B
Text
22 lines
797 B
Text
<%
|
|
# select actions from this context
|
|
@not_done = @not_done_todos.select {|t| t.context_id == mobile_context.id }
|
|
|
|
if not @not_done.empty?
|
|
# only show a context when there are actions in it
|
|
-%>
|
|
<h2><%=mobile_context.name%></h2>
|
|
<<<<<<< HEAD/app/views/contexts/_mobile_context.rhtml
|
|
<ul class="c">
|
|
=======
|
|
<table cellpadding="0" cellspacing="0" border="0" class="c">
|
|
>>>>>>> f3d7fac2a4e602c21c754770903217c0a5035629/app/views/contexts/_mobile_context.rhtml
|
|
<%= render :partial => "todos/mobile_todo",
|
|
:collection => @not_done,
|
|
:locals => { :parent_container_type => "context" }-%>
|
|
<<<<<<< HEAD/app/views/contexts/_mobile_context.rhtml
|
|
</ul>
|
|
<% end -%>=======
|
|
</table>
|
|
<% end -%>
|
|
>>>>>>> f3d7fac2a4e602c21c754770903217c0a5035629/app/views/contexts/_mobile_context.rhtml
|