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

Merge pull request #115 from maddentim/fixes

Browse source 
Fixes
This commit is contained in:
Reinier Balt 2012-10-24 14:06:02 -07:00
commit dd5d8b21a7
4 changed files with 8 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

6
app/views/layouts/mobile.m.erb
View file

@ -17,8 +17,8 @@
<div id="topbar"><h1><% if @down_count -%><span class="count" id="badge_count"><%= @down_count %></span><% end -%> <%=
l(Date.today, :format => current_user.prefs.title_date_format) -%></h1>
<ul class="nav">
<li class="link"><%= (link_to(t('layouts.mobile_navigation.new_action'), new_todo_path(new_todo_params))) unless @new_mobile -%></li>
<li class="link"><%= (link_to(t('layouts.mobile_navigation.home'), todos_path(:format => 'm'))) unless @home -%></li>
<li class="link"><%= (link_to(t('layouts.mobile_navigation.new_action'), new_todo_path(new_todo_params))) -%></li>
<li class="link"><%= (link_to(t('layouts.mobile_navigation.home'), todos_path(:format => 'm'))) -%></li>
<li class="link"><%= (link_to(t('layouts.mobile_navigation.contexts'), contexts_path(:format => 'm'))) -%></li>
<li class="link"><%= (link_to(t('layouts.mobile_navigation.projects'), projects_path(:format => 'm'))) -%></li>
<li class="link"><%= (link_to(t('layouts.mobile_navigation.starred'), tag_path("starred", :format => 'm'))) -%></li>
@ -27,9 +27,11 @@
<div id="content"><%= render_flash -%><%= yield -%></div>
<hr/><% if current_user && !current_user.prefs.nil? -%>
<ul class="nav">
<li class="link"><%= (link_to(t('layouts.mobile_navigation.home'), todos_path(:format => 'm'))) -%></li>
<li class="link"><%= (link_to(t('layouts.mobile_navigation.logout'), logout_path(:format => 'm'))) -%></li>
<li class="link"><%= (link_to(t('layouts.mobile_navigation.tickler'), tickler_path(:format => :m))) -%></li>
<li class="link"><%= (link_to(t('layouts.mobile_navigation.feeds'), feeds_path(:format=>:m))) -%></li>
<li class="link"><%= (link_to(t('layouts.mobile_navigation.full'), todos_path(:format => 'html'))) -%></li>
</ul>
<% end -%>
<%= render :partial => "shared/footer" -%>

1
app/views/shared/_footer.html.erb
View file

@ -4,4 +4,5 @@
<a href="mailto:tracksapp@googlegroups.com?subject=Tracks feedback"><%= t('common.email')%></a> |
<a href="http://www.getontracks.org/"><%= t('common.website')%></a> |
<a href="http://getontracks.org/development"><%= t('common.contribute')%></a></p>
<a href="/m"><%= t('layouts.navigation.mobile')%></a>
</div>

2
config/locales/en.yml
View file

@ -10,6 +10,7 @@ en:
new_action: New
logout: Logout
feeds: Feeds
full: Full Site
starred: Starred
projects: Projects
tickler: Tickler
@ -49,6 +50,7 @@ en:
preferences_title: Show my preferences
admin: Admin
help: "?"
mobile: Mobile Site
integrations:
opensearch_description: Search in Tracks
applescript_next_action_prompt: "Description of next action:"

1
config/routes.rb
View file

@ -108,6 +108,7 @@ Tracksapp::Application.routes.draw do
match 'todos/all_done/tag/:name' => "todos#all_done_tag", :as => :all_done_tag
match 'auto_complete_for_predecessor' => 'todos#auto_complete_for_predecessor'
match 'mobile' => 'todos#index', :format => 'm'
match 'm' => 'todos#index', :format => 'm'
resources :recurring_todos do
member do