Andreas/tracks
1
0
Fork 0
mirror of https://github.com/TracksApp/tracks.git synced 2025-12-16 23:30:12 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merging.

Browse source
This commit is contained in:
Jakub A.Tesinsky 2008-12-03 12:03:23 +01:00
parent 3bc06d26e5
commit eadeafbe24
4 changed files with 1 additions and 22 deletions
Download patch file Download diff file Expand all files Collapse all files

4
app/helpers/todos_helper.rb
View file

@ -117,11 +117,7 @@ module TodosHelper
"<span class=\"tag\">" + "<span class=\"tag\">" +
link_to(t.name, {:action => "tag", :controller => "todos", :id => t.name+".m"}) + link_to(t.name, {:action => "tag", :controller => "todos", :id => t.name+".m"}) +
"</span>"}.join('') "</span>"}.join('')
<<<<<<< HEAD/app/helpers/todos_helper.rb
if tag_list.empty? then "" else "<span class=\"tags\">#{tag_list}</span>" end if tag_list.empty? then "" else "<span class=\"tags\">#{tag_list}</span>" end
=======
if not tag_list.empty? then "<span class=\"tags\">#{tag_list}</span>" end
>>>>>>> f3d7fac2a4e602c21c754770903217c0a5035629/app/helpers/todos_helper.rb
end end
def deferred_due_date def deferred_due_date

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

@ -6,17 +6,10 @@ if not @not_done.empty?
# only show a context when there are actions in it # only show a context when there are actions in it
-%> -%>
<h2><%=mobile_context.name%></h2> <h2><%=mobile_context.name%></h2>
<<<<<<< HEAD/app/views/contexts/_mobile_context.rhtml
<ul class="c"> <ul class="c">
=======
<table cellpadding="0" cellspacing="0" border="0" class="c"> <table cellpadding="0" cellspacing="0" border="0" class="c">
>>>>>>> f3d7fac2a4e602c21c754770903217c0a5035629/app/views/contexts/_mobile_context.rhtml
<%= render :partial => "todos/mobile_todo", <%= render :partial => "todos/mobile_todo",
:collection => @not_done, :collection => @not_done,
:locals => { :parent_container_type => "context" }-%> :locals => { :parent_container_type => "context" }-%>
<<<<<<< HEAD/app/views/contexts/_mobile_context.rhtml
</ul> </ul>
<% end -%>=======
</table>
<% end -%> <% end -%>
>>>>>>> f3d7fac2a4e602c21c754770903217c0a5035629/app/views/contexts/_mobile_context.rhtml

9
app/views/todos/_mobile_todo.rhtml
View file

@ -6,11 +6,7 @@ else
bullet = "<span class=\"r\">&raquo;&nbsp;</span>" bullet = "<span class=\"r\">&raquo;&nbsp;</span>"
li_class = "" li_class = ""
end -%> end -%>
<<<<<<< HEAD/app/views/todos/_mobile_todo.rhtml
<li id="<%= dom_id(mobile_todo) %>" <%= li_class %>><%= bullet %><% <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? if mobile_todo.completed?
-%><span class="m_t_d"> -%><span class="m_t_d">
<% else <% else
@ -28,7 +24,4 @@ end -%>
")</span>" -%> ")</span>" -%>
<% end -%> <% end -%>
<%= tag_list_mobile -%> <%= tag_list_mobile -%>
<<<<<<< HEAD/app/views/todos/_mobile_todo.rhtml </span></li>
</span></li>=======
</span></td></tr>
>>>>>>> f3d7fac2a4e602c21c754770903217c0a5035629/app/views/todos/_mobile_todo.rhtml

3
public/stylesheets/mobile.css
View file

@ -124,7 +124,6 @@ span.prj, span.ctx{
.errors { .errors {
background: #FFC2C2; background: #FFC2C2;
<<<<<<< HEAD/public/stylesheets/mobile.css
} }
ul.c li.star { ul.c li.star {
@ -156,10 +155,8 @@ span.r {
#database_auth_form table td { #database_auth_form table td {
width:7em; width:7em;
}=======
} }
table.c { table.c {
margin-left: 5px; margin-left: 5px;
} }
>>>>>>> f3d7fac2a4e602c21c754770903217c0a5035629/public/stylesheets/mobile.css