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

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

Browse source
This commit is contained in:
Reinier Balt 2008-07-04 18:28:28 +02:00
commit 2f1b15fed3
3 changed files with 13 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

6
app/views/feedlist/index.html.erb
View file

@ -54,6 +54,10 @@
<%= text_formatted_link({:controller => 'projects', :action => 'index', :only_active_with_no_next_actions => true}) %>
Active projects with no next actions
</li>
<li>
<%= text_formatted_link({:controller => 'projects', :action => 'index', :projects_and_actions => true}) %>
Active projects with their actions
</li>
<li><h4>Feeds for incomplete actions in a specific context:</h4>
<ul>
<% for context in @contexts %>
@ -84,4 +88,4 @@
<div id="input_box">
<%= render "sidebar/sidebar" %>
</div><!-- End of input box -->
</div><!-- End of input box -->

2
app/views/todos/_todo.html.erb
View file

@ -12,7 +12,7 @@
<%= remote_toggle_checkbox unless source_view_is :deferred %>
<div class="description<%= staleness_class( todo ) %>">
<%= date_span -%>
<span class="todo.descr"><%= sanitize(todo.description) %></span>
<span class="todo.descr"><%= h sanitize(todo.description) %></span>
<%= tag_list %>
<%= deferred_due_date %>
<%= project_and_context_links( parent_container_type, :suppress_context => suppress_context, :suppress_project => suppress_project ) %>