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

Merge branch 'master' of git://github.com/bsag/tracks

Browse source 
Conflicts:

	app/helpers/todos_helper.rb
	app/views/contexts/_mobile_context.rhtml
	app/views/todos/_mobile_todo.rhtml
	public/stylesheets/mobile.css
This commit is contained in:
Jakub A.Tesinsky 2008-12-03 11:59:09 +01:00
commit 3bc06d26e5
1636 changed files with 91514 additions and 60122 deletions
Download patch file Download diff file Expand all files Collapse all files

10
app/views/contexts/_mobile_context.rhtml
View file

@ -6,9 +6,17 @@ 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 -%>
<% end -%>=======
</table>
<% end -%>
>>>>>>> f3d7fac2a4e602c21c754770903217c0a5035629/app/views/contexts/_mobile_context.rhtml