From 110d3daf957ad4aba7e98a8fb8b2cbeaf6e611ab Mon Sep 17 00:00:00 2001
From: Reinier Balt <lrbalt@gmail.com>
Date: Tue, 3 Aug 2010 22:27:54 +0200
Subject: [PATCH] Fix #969 by implementing a new mobile view for notes.

Did not create tests for it
---
 app/controllers/todos_controller.rb     |  16 ++++++++++++++--
 app/views/todos/_mobile_todo.rhtml      |   1 +
 app/views/todos/mobile_show_notes.rhtml |   5 +++++
 config/routes.rb                        |   3 +++
 public/images/mobile_notes.png          | Bin 0 -> 3624 bytes
 5 files changed, 23 insertions(+), 2 deletions(-)
 create mode 100644 app/views/todos/mobile_show_notes.rhtml
 create mode 100644 public/images/mobile_notes.png

diff --git a/app/controllers/todos_controller.rb b/app/controllers/todos_controller.rb
index 425ec678..dc865d81 100644
--- a/app/controllers/todos_controller.rb
+++ b/app/controllers/todos_controller.rb
@@ -8,7 +8,7 @@ class TodosController < ApplicationController
   append_before_filter :init, :except => [ :destroy, :completed,
     :completed_archive, :check_deferred, :toggle_check, :toggle_star,
     :edit, :update, :create, :calendar, :auto_complete_for_predecessor, :remove_predecessor, :add_predecessor]
-  append_before_filter :get_todo_from_params, :only => [ :edit, :toggle_check, :toggle_star, :show, :update, :destroy, :remove_predecessor]
+  append_before_filter :get_todo_from_params, :only => [ :edit, :toggle_check, :toggle_star, :show, :update, :destroy, :remove_predecessor, :show_notes]
   protect_from_forgery :except => [:auto_complete_for_predecessor]
 
   def index
@@ -736,7 +736,19 @@ class TodosController < ApplicationController
     @project.save!
     redirect_to project_url(@project)
   end
-  
+
+  def show_notes
+    @return_path=cookies[:mobile_url] ? cookies[:mobile_url] : mobile_path
+    respond_to do |format|
+      format.html {
+        redirect_to home_path, "Viewing note of todo is not implemented"
+      }
+      format.m   {
+        render:action => "mobile_show_notes"
+      }
+    end
+  end
+
   private
   
   def get_todo_from_params
diff --git a/app/views/todos/_mobile_todo.rhtml b/app/views/todos/_mobile_todo.rhtml
index 9e358ffa..39a705df 100644
--- a/app/views/todos/_mobile_todo.rhtml
+++ b/app/views/todos/_mobile_todo.rhtml
@@ -13,6 +13,7 @@ end -%>
 -%><span class="m_t">
 <%  end -%>
 <%= date_span -%> <%= link_to mobile_todo.description, todo_path(mobile_todo, :format => 'm') -%>
+<%= link_to(image_tag("mobile_notes.png", :border => "0"), mobile_todo_show_notes_path(mobile_todo, :format => 'm')) -%>
 <%  if parent_container_type == 'context' or parent_container_type == 'tag' -%>
 <%=    "<span class=\"prj\"> (" +
   link_to(mobile_todo.project.name, project_path(mobile_todo.project, :format => 'm')) + 
diff --git a/app/views/todos/mobile_show_notes.rhtml b/app/views/todos/mobile_show_notes.rhtml
new file mode 100644
index 00000000..58281343
--- /dev/null
+++ b/app/views/todos/mobile_show_notes.rhtml
@@ -0,0 +1,5 @@
+<h2>Next action description (<%= link_to "Go back", @return_path %>)</h2>
+<%= link_to @todo.description, todo_path(@todo, :format => 'm') -%></h2>
+<h2>Notes</h2>
+<%= format_note(@todo.notes)  %>
+<%= link_to "Back", @return_path %>
\ No newline at end of file
diff --git a/config/routes.rb b/config/routes.rb
index 9fe57d6b..bca2a5de 100644
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -48,6 +48,9 @@ ActionController::Routing::Routes.draw do |map|
     todos.mobile 'mobile', :action => "index", :format => 'm'
     todos.mobile_abbrev 'm', :action => "index", :format => 'm'
     todos.mobile_abbrev_new 'm/new', :action => "new", :format => 'm'
+
+    todos.mobile_todo_show_notes 'todos/notes/:id.m', :action => "show_notes", :format => 'm'
+    todos.todo_show_notes 'todos/notes/:id', :action => "show_notes"
   end
   map.root :controller => 'todos' # Make OpenID happy because it needs #root_url defined
 
diff --git a/public/images/mobile_notes.png b/public/images/mobile_notes.png
new file mode 100644
index 0000000000000000000000000000000000000000..77886b409685a5da2cd42509de284c8180b04b14
GIT binary patch
literal 3624
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
D5*y>(

literal 0
HcmV?d00001