mirror of
https://github.com/TracksApp/tracks.git
synced 2026-02-27 09:34:08 +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
34 lines
1.4 KiB
Text
34 lines
1.4 KiB
Text
<% @todo = mobile_todo
|
|
if mobile_todo.starred?
|
|
bullet = "<span class=\"star\">"+image_tag("menustar_small.gif")+"</span>"
|
|
li_class = " class=\"star\""
|
|
else
|
|
bullet = "<span class=\"r\">» </span>"
|
|
li_class = ""
|
|
end -%>
|
|
<<<<<<< HEAD/app/views/todos/_mobile_todo.rhtml
|
|
<li id="<%= dom_id(mobile_todo) %>" <%= li_class %>><%= bullet %><%
|
|
=======
|
|
<tr class="t" id="<%= dom_id(mobile_todo) %>" valign="top"><td><%= bullet %></td><td><%
|
|
>>>>>>> f3d7fac2a4e602c21c754770903217c0a5035629/app/views/todos/_mobile_todo.rhtml
|
|
if mobile_todo.completed?
|
|
-%><span class="m_t_d">
|
|
<% else
|
|
-%><span class="m_t">
|
|
<% end -%>
|
|
<%= date_span -%> <%= link_to mobile_todo.description, formatted_todo_path(mobile_todo, :m) -%>
|
|
<% if parent_container_type == 'context' or parent_container_type == 'tag' -%>
|
|
<%= "<span class=prj> (" +
|
|
link_to(mobile_todo.project.name, formatted_project_path(mobile_todo.project, :m)) +
|
|
")</span>" unless mobile_todo.project.nil? -%>
|
|
<% end
|
|
if parent_container_type == 'project' or parent_container_type == 'tag' -%>
|
|
<%= "<span class=ctx> (" +
|
|
link_to(mobile_todo.context.name, formatted_context_path(mobile_todo.context, :m)) +
|
|
")</span>" -%>
|
|
<% end -%>
|
|
<%= tag_list_mobile -%>
|
|
<<<<<<< HEAD/app/views/todos/_mobile_todo.rhtml
|
|
</span></li>=======
|
|
</span></td></tr>
|
|
>>>>>>> f3d7fac2a4e602c21c754770903217c0a5035629/app/views/todos/_mobile_todo.rhtml
|