mirror of
https://github.com/TracksApp/tracks.git
synced 2026-02-16 20:28:09 +01:00
Merge branch 'master' into railsupdate
This commit is contained in:
commit
df26cf6e87
4 changed files with 10 additions and 11 deletions
|
|
@ -117,7 +117,7 @@ module TodosHelper
|
|||
"<span class=\"tag\">" +
|
||||
link_to(t.name, {:action => "tag", :controller => "todos", :id => t.name+".m"}) +
|
||||
"</span>"}.join('')
|
||||
"<span class=\"tags\">#{tag_list}</span>"
|
||||
if not tag_list.empty? then "<span class=\"tags\">#{tag_list}</span>" end
|
||||
end
|
||||
|
||||
def deferred_due_date
|
||||
|
|
|
|||
|
|
@ -6,9 +6,9 @@ if not @not_done.empty?
|
|||
# only show a context when there are actions in it
|
||||
-%>
|
||||
<h2><%=mobile_context.name%></h2>
|
||||
<table cellpadding="0" cellspacing="0" border="0">
|
||||
<table cellpadding="0" cellspacing="0" border="0" class="c">
|
||||
<%= render :partial => "todos/mobile_todo",
|
||||
:collection => @not_done,
|
||||
:locals => { :parent_container_type => "context" }-%>
|
||||
</table>
|
||||
<% end -%>
|
||||
<% end -%>
|
||||
|
|
|
|||
|
|
@ -4,8 +4,7 @@ if mobile_todo.starred?
|
|||
else
|
||||
bullet = "<span class=r>» </span>"
|
||||
end -%>
|
||||
<div class="t" id="<%= dom_id(mobile_todo) %>">
|
||||
<tr valign="top"><td><%= bullet %></td><td><%
|
||||
<tr class="t" id="<%= dom_id(mobile_todo) %>" valign="top"><td><%= bullet %></td><td><%
|
||||
if mobile_todo.completed?
|
||||
-%><span class="m_t_d">
|
||||
<% else
|
||||
|
|
@ -23,4 +22,4 @@ end -%>
|
|||
")</span>" -%>
|
||||
<% end -%>
|
||||
<%= tag_list_mobile -%>
|
||||
</span></td></tr></div>
|
||||
</span></td></tr>
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue