Andreas/tracks
1
0
Fork 0
mirror of https://github.com/TracksApp/tracks.git synced 2026-01-30 20:55:17 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

fix failing cucumber tests

Browse source 
fix data export view
fix mentions of tag on tag page 
fix autocomplete for tags
This commit is contained in:
Reinier Balt 2012-07-11 15:35:21 +02:00
parent 4227aede6c
commit d6e66fa517
13 changed files with 28 additions and 21 deletions
Download patch file Download diff file Expand all files Collapse all files

10
app/helpers/todos_helper.rb
View file

@ -18,8 +18,8 @@ module TodosHelper
def remote_delete_menu_item(todo)
# TODO: what is the current way to do mouseover with css?
return link_to(
image_tag("delete_off.png",
:onmouseover => "this.src='#{path_to_image("delete_on.png")}'",
image_tag("delete_off.png",
:onmouseover => "this.src='#{path_to_image("delete_on.png")}'",
:onmouseout => "this.src='#{path_to_image("delete_off.png")}'",
:alt => t('todos.delete'), :align => "absmiddle")+" "+t('todos.delete'),
{:controller => 'todos', :action => 'destroy', :id => todo.id},
@ -64,8 +64,8 @@ module TodosHelper
def image_tag_for_defer(days)
# TODO: what is the current way to do mouseover with css?
image_tag("defer_#{days}_off.png",
:onmouseover => "this.src='#{path_to_image("defer_#{days}.png")}'",
image_tag("defer_#{days}_off.png",
:onmouseover => "this.src='#{path_to_image("defer_#{days}.png")}'",
:onmouseout => "this.src='#{path_to_image("defer_#{days}_off.png")}'",
:alt => t('todos.defer_x_days', :count => days), :align => "absmiddle")+" "+t('todos.defer_x_days', :count => days)
end
@ -143,7 +143,7 @@ module TodosHelper
end
def tag_span (tag, mobile=false)
content_tag(:span, :class => "tag #{tag.name.gsub(' ','-')}") { link_to(tag.name, tag_path(tag.name, :format => mobile ? :m : :html)) }
content_tag(:span, :class => "tag #{tag.name.gsub(' ','-')}") { link_to(tag.name, tag_path(tag.name, :format => mobile ? :m : nil)) }
end
def tag_list(todo=@todo, mobile=false)

10
app/views/data/index.en.html.erb
View file

@ -17,20 +17,20 @@
</tr>
<tr>
<td>YAML file containing all your actions, contexts, projects, tags and notes</td>
<td><%= link_to "YAML file", :controller => 'data', :action => 'yaml_export' %></td>
<td><%= link_to "YAML file", data_yaml_export_path %></td>
</tr>
<tr>
<td>CSV file containing all of your actions, with named contexts and projects</td>
<td><%= link_to "CSV file (actions, contexts and projects)", :controller => 'data', :action => 'csv_actions' %></td>
<td><%= link_to "CSV file (actions, contexts and projects)", data_csv_actions_path %></td>
</tr>
<tr>
<td>CSV file containing all your notes</td>
<td><%= link_to "CSV file (notes only)", :controller => 'data', :action => 'csv_notes' %></td>
<td><%= link_to "CSV file (notes only)", data_csv_notes_path %></td>
</tr>
<tr>
<td>XML file containing all your actions, contexts, projects, tags and notes</td>
<td><%= link_to "XML file (actions only)", :controller => 'data', :action => 'xml_export' %></td>
<td><%= link_to "XML file (actions only)", data_xml_export_path %></td>
</tr>
</table>
</table>
</div><!-- End of feeds -->
</div>

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

@ -8,7 +8,7 @@
<% if collapsible %>
<a href="#" class="container_toggle" id="toggle_completed"><%= image_tag("collapse.png") %></a>
<% end %>
<%= t('todos.completed_actions') %> <%= suffix %>
<%= t('todos.completed_actions') %> <%= raw suffix %>
</h2>
<div id="completed_containeritems" class="items toggle_target">

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

@ -3,7 +3,7 @@
<% if collapsible %>
<a href="#" class="container_toggle" id="toggle_deferred"><%= image_tag("collapse.png") %></a>
<% end %>
<%= t('todos.deferred_pending_actions') %> <%= append_descriptor ? append_descriptor : '' %>
<%= t('todos.deferred_pending_actions') %> <%= raw(append_descriptor ? append_descriptor : '') %>
</h2>
<div id="tickleritems" class="items toggle_target">

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

@ -3,7 +3,7 @@
<% if collapsible %>
<a href="#" class="container_toggle" id="toggle_deferred"><%= image_tag("collapse.png") %></a>
<% end %>
<%= t('todos.hidden_actions') %> <%= append_descriptor ? append_descriptor : '' %>
<%= t('todos.hidden_actions') %> <%= raw(append_descriptor ? append_descriptor : '') %>
</h2>
<div id="hiddenitems" class="items toggle_target">