From 25ea467c5eed19cb90cec9b875ce014342b0b4b7 Mon Sep 17 00:00:00 2001
From: Tim Madden <tim@connect2mrkt.com>
Date: Wed, 17 Oct 2012 14:37:19 -0500
Subject: [PATCH 1/4] restoring route of /m instead of just /mobile

---
 config/routes.rb | 1 +
 1 file changed, 1 insertion(+)

diff --git a/config/routes.rb b/config/routes.rb
index cb133922..8f182f51 100644
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -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

From c46122bb345bac787d58ba59423a85b033134f9f Mon Sep 17 00:00:00 2001
From: tim madden <tim@connect2mrkt.com>
Date: Wed, 17 Oct 2012 14:48:31 -0500
Subject: [PATCH 2/4] Changing mobile layout so that links always show so link
 fill across

---
 app/views/layouts/mobile.m.erb | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/views/layouts/mobile.m.erb b/app/views/layouts/mobile.m.erb
index b9d433e0..ca46f34f 100644
--- a/app/views/layouts/mobile.m.erb
+++ b/app/views/layouts/mobile.m.erb
@@ -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>

From 6d3a6611c8a900cb8e0b1ced1932716e87181cd2 Mon Sep 17 00:00:00 2001
From: tim madden <tim@connect2mrkt.com>
Date: Wed, 17 Oct 2012 14:52:58 -0500
Subject: [PATCH 3/4] adding links to footers to go between mobile and full
 site

---
 app/views/layouts/mobile.m.erb    | 1 +
 app/views/shared/_footer.html.erb | 1 +
 config/locales/en.yml             | 2 ++
 3 files changed, 4 insertions(+)

diff --git a/app/views/layouts/mobile.m.erb b/app/views/layouts/mobile.m.erb
index ca46f34f..65f231fb 100644
--- a/app/views/layouts/mobile.m.erb
+++ b/app/views/layouts/mobile.m.erb
@@ -30,6 +30,7 @@
   <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" -%>
diff --git a/app/views/shared/_footer.html.erb b/app/views/shared/_footer.html.erb
index 5738f661..913efc70 100644
--- a/app/views/shared/_footer.html.erb
+++ b/app/views/shared/_footer.html.erb
@@ -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>
diff --git a/config/locales/en.yml b/config/locales/en.yml
index 64a87ee7..b8d42297 100644
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -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:"

From 92cfeb4188e3f6f9f1400246eb3e303cfd710974 Mon Sep 17 00:00:00 2001
From: tim madden <tim@connect2mrkt.com>
Date: Wed, 17 Oct 2012 15:02:36 -0500
Subject: [PATCH 4/4] adding home link to mobile footer to fill it out

---
 app/views/layouts/mobile.m.erb | 1 +
 1 file changed, 1 insertion(+)

diff --git a/app/views/layouts/mobile.m.erb b/app/views/layouts/mobile.m.erb
index 65f231fb..7ee541ad 100644
--- a/app/views/layouts/mobile.m.erb
+++ b/app/views/layouts/mobile.m.erb
@@ -27,6 +27,7 @@
 <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>