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

Conflicts:

	app/helpers/todos_helper.rb
	app/views/contexts/_mobile_context.rhtml
	app/views/todos/_mobile_todo.rhtml
	public/stylesheets/mobile.css

app/controllers/application.rb

@@ -32,13 +32,13 @@ class ApplicationController < ActionController::Base
   before_filter :set_time_zone
   prepend_before_filter :login_required
   prepend_before_filter :enable_mobile_content_negotiation
-  after_filter :restore_content_type_for_mobile
   after_filter :set_charset
   
 
 
   include ActionView::Helpers::TextHelper
   include ActionView::Helpers::SanitizeHelper
+  extend ActionView::Helpers::SanitizeHelper::ClassMethods
   helper_method :format_date, :markdown
 
   # By default, sets the charset to UTF-8 if it isn't already set
@@ -148,21 +148,15 @@ class ApplicationController < ActionController::Base
   # during the processing and then setting it to 'text/html' in an
   # 'after_filter' -LKM 2007-04-01
   def mobile?
-    return params[:format] == 'm' || response.content_type == MOBILE_CONTENT_TYPE
+    return params[:format] == 'm'
   end
 
   def enable_mobile_content_negotiation
     if mobile?
-      request.accepts.unshift(Mime::Type::lookup(MOBILE_CONTENT_TYPE))
+      request.format = :m
     end
   end
 
-  def restore_content_type_for_mobile
-    if mobile?
-      response.content_type = 'text/html'
-    end
-  end
-  
   def create_todo_from_recurring_todo(rt, date=nil)
     # create todo and initialize with data from recurring_todo rt
     todo = current_user.todos.build( { :description => rt.description, :notes => rt.notes, :project_id => rt.project_id, :context_id => rt.context_id})

app/controllers/todos_controller.rb

@@ -76,7 +76,7 @@ class TodosController < ApplicationController
       format.m do
         @return_path=cookies[:mobile_url]
         # todo: use function for this fixed path
-        @return_path='/mobile' if @return_path.nil?
+        @return_path='/m' if @return_path.nil?
         if @saved
           redirect_to @return_path
         else

app/helpers/notes_helper.rb

@@ -1,5 +1,5 @@
 module NotesHelper
   def truncated_note(note, characters = 50)
-    sanitize(textilize_without_paragraph(truncate(note.body, characters, "...")))
+    sanitize(textilize_without_paragraph(truncate(note.body, :length => characters, :omission => "...")))
   end
 end

app/helpers/projects_helper.rb

@@ -20,12 +20,12 @@ module ProjectsHelper
   def project_next_prev
     html = ''
     unless @previous_project.nil?
-      project_name = truncate(@previous_project.name, 40, "...")
+      project_name = truncate(@previous_project.name, :length => 40, :omission => "...")
       html << link_to_project(@previous_project, "&laquo; #{project_name}")
     end
     html << ' | ' if @previous_project && @next_project
     unless @next_project.nil?
-      project_name = truncate(@next_project.name, 40, "...")
+      project_name = truncate(@next_project.name, :length => 40, :omission => "...")
       html << link_to_project(@next_project, "#{project_name} &raquo;")
     end
     html
@@ -34,12 +34,12 @@ module ProjectsHelper
   def project_next_prev_mobile
     html = ''
     unless @previous_project.nil?
-      project_name = truncate(@previous_project.name, 40, "...")
+      project_name = truncate(@previous_project.name, :length => 40, :omission => "...")
       html << link_to_project_mobile(@previous_project, "5", "&laquo; 5-#{project_name}")
     end
     html << ' | ' if @previous_project && @next_project
     unless @next_project.nil?
-      project_name = truncate(@next_project.name, 40, "...")
+      project_name = truncate(@next_project.name, :length => 40, :omission => "...")
       html << link_to_project_mobile(@next_project, "6", "6-#{project_name} &raquo;")
     end
     html

app/helpers/todos_helper.rb

@@ -117,7 +117,11 @@ module TodosHelper
       "<span class=\"tag\">" + 
         link_to(t.name, {:action => "tag", :controller => "todos", :id => t.name+".m"}) + 
       "</span>"}.join('')
+<<<<<<< HEAD/app/helpers/todos_helper.rb
     if tag_list.empty? then "" else "<span class=\"tags\">#{tag_list}</span>" end
+=======
+    if not tag_list.empty? then "<span class=\"tags\">#{tag_list}</span>" end
+>>>>>>> f3d7fac2a4e602c21c754770903217c0a5035629/app/helpers/todos_helper.rb
   end
   
   def deferred_due_date

app/models/message_gateway.rb

@@ -1,5 +1,7 @@
 class MessageGateway < ActionMailer::Base
   include ActionView::Helpers::SanitizeHelper
+  extend ActionView::Helpers::SanitizeHelper::ClassMethods
+  
   def receive(email)
     user = User.find(:first, :include => [:preference], :conditions => ["preferences.sms_email = ?", email.from[0].strip])
     if user.nil?

app/models/user.rb

@@ -188,7 +188,7 @@ class User < ActiveRecord::Base
   end
   
   def at_midnight(date)
-    return TimeZone[prefs.time_zone].local(date.year, date.month, date.day, 0, 0, 0)
+    return ActiveSupport::TimeZone[prefs.time_zone].local(date.year, date.month, date.day, 0, 0, 0)
   end
   
   def generate_token

app/views/contexts/_mobile_context.rhtml

@@ -6,9 +6,17 @@ if not @not_done.empty?
   # only show a context when there are actions in it
   -%>
 <h2><%=mobile_context.name%></h2>
+<<<<<<< HEAD/app/views/contexts/_mobile_context.rhtml
 <ul class="c">
+=======
+<table cellpadding="0" cellspacing="0" border="0" class="c">
+>>>>>>> f3d7fac2a4e602c21c754770903217c0a5035629/app/views/contexts/_mobile_context.rhtml
 <%= render :partial => "todos/mobile_todo", 
            :collection => @not_done, 
            :locals => { :parent_container_type => "context" }-%>
+<<<<<<< HEAD/app/views/contexts/_mobile_context.rhtml
 </ul>
-<% end -%>
+<% end -%>=======
+</table>
+<% end -%>
+>>>>>>> f3d7fac2a4e602c21c754770903217c0a5035629/app/views/contexts/_mobile_context.rhtml

app/views/contexts/show.html.erb

@@ -8,5 +8,5 @@
 
 <div id="input_box">
   <%= render :partial => "shared/add_new_item_form" %>
-<%= render "sidebar/sidebar" %>
+  <%= render :template => "sidebar/sidebar" %>
 </div><!-- End of input box -->

app/views/feedlist/index.html.erb

@@ -123,7 +123,7 @@
 </div><!-- End of display_box -->
 
 <div id="input_box">
-  <%= render "sidebar/sidebar" %>
+  <%= render :template => "sidebar/sidebar" %>
 </div><!-- End of input box -->
 
 <script type="text/javascript">

app/views/layouts/standard.html.erb

@@ -5,9 +5,16 @@
     <% if @prefs.refresh != 0 -%>
       <meta http-equiv="Refresh" content="<%= @prefs["refresh"].to_i*60 %>;url=<%= request.request_uri %>">
     <% end -%>
-  <%= javascript_include_merged :tracks %>
+  <% bundle do %>
+    <%= javascript_include_tag *%w[
+                                    prototype effects dragdrop controls application
+                                    calendar calendar-en calendar-setup
+                                    accesskey-hints todo-items niftycube
+                                    protoload flashobject lowpro
+                                  ] %>
+    <%= stylesheet_link_tag *%w[ standard calendar-system niftyCorners] %>
+  <% end %>
   <%= javascript_include_tag :unobtrusive %>
-  <%= stylesheet_link_merged :tracks %>
   <%= stylesheet_link_tag "print", :media => "print" %>
   
   <link rel="shortcut icon" href="<%= url_for(:controller => 'favicon.ico') %>" />

app/views/projects/show.html.erb

@@ -74,5 +74,5 @@
 
 <div id="input_box">
   <%= render :partial => "shared/add_new_item_form" %>
-  <%= render "sidebar/sidebar" %>
+  <%= render :template => "sidebar/sidebar" %>
 </div><!-- End of input box -->

app/views/recurring_todos/create.js.rjs

@@ -13,7 +13,7 @@ if @recurring_saved
   page.hide 'recurring-todos-empty-nd'
   page.insert_html :bottom, 
     'recurring_todos_container', 
-    :partial => 'recurring_todos/recurring_todo'
+    :partial => 'recurring_todos/recurring_todo', :locals => { :recurring_todo => @recurring_todo}
   page.visual_effect :highlight, dom_id(@recurring_todo), :duration => 3
   # update badge count
   page['badge_count'].replace_html @count

app/views/recurring_todos/toggle_check.js.rjs

@@ -4,7 +4,7 @@ if @saved
 
   if @recurring_todo.completed?
     # show completed recurring todo
-    page.insert_html :top, "completed_recurring_todos_container", :partial => 'recurring_todos/recurring_todo'
+    page.insert_html :top, "completed_recurring_todos_container", :partial => 'recurring_todos/recurring_todo', :locals => { :recurring_todo => @recurring_todo }
     page.visual_effect :highlight, dom_id(@recurring_todo), :duration => 3
     
     # set empty messages
@@ -14,7 +14,7 @@ if @saved
     # recurring_todo is activated
 
     # show completed recurring todo
-    page.insert_html :top, "recurring_todos_container", :partial => 'recurring_todos/recurring_todo'
+    page.insert_html :top, "recurring_todos_container", :partial => 'recurring_todos/recurring_todo', :locals => { :recurring_todo => @recurring_todo }
     page.visual_effect :highlight, dom_id(@recurring_todo), :duration => 3
 
     # inform user if a new todo has been created because of the activation

app/views/recurring_todos/update.js.rjs

@@ -13,7 +13,7 @@ if @saved
   page << "projectAutoCompleter.options.array = #{project_names_for_autocomplete}; projectAutoCompleter.changed = true" if @new_project_created
 
   # replace old recurring todo with updated todo
-  page.replace dom_id(@recurring_todo), :partial => 'recurring_todos/recurring_todo'
+  page.replace dom_id(@recurring_todo), :partial => 'recurring_todos/recurring_todo', :locals => { :recurring_todo => @recurring_todo }
   page.visual_effect :highlight, dom_id(@recurring_todo), :duration => 3
 
 else

app/views/stats/context_running_actions_data.html.erb

@@ -8,9 +8,9 @@ end
 -%><%=@actions_per_context[@actions_per_context.size()-1]['total'].to_i*100/@sum%>& 
 &pie_labels=<%
 0.upto @actions_per_context.size()-2 do | i |
-    %><%=truncate(@actions_per_context[i]['name'],@truncate_chars, '...')%>,<%
+    %><%=truncate(@actions_per_context[i]['name'], :length => @truncate_chars, :omission => '...')%>,<%
 end
--%><%=truncate(@actions_per_context[@actions_per_context.size()-1]['name'],@truncate_chars,'...') %>& 
+-%><%=truncate(@actions_per_context[@actions_per_context.size()-1]['name'], :legnth => @truncate_chars, :omission => '...') %>&
 &links=<%
 0.upto @actions_per_context.size()-2 do | i |
     %><%=url_for :controller => "contexts", :action => "show", :id=>@actions_per_context[i]['id']%>,<%

app/views/stats/context_total_actions_data.html.erb

@@ -8,9 +8,9 @@ end
 -%><%=@actions_per_context[@actions_per_context.size()-1]['total'].to_i*100/@sum%>& 
 &pie_labels=<%
 0.upto @actions_per_context.size()-2 do | i |
-    %><%=truncate(@actions_per_context[i]['name'], @truncate_chars, '...') %>,<%
+    %><%=truncate(@actions_per_context[i]['name'], :length => @truncate_chars, :omission => '...') %>,<%
 end
--%><%=truncate(@actions_per_context[@actions_per_context.size()-1]['name'], @truncate_chars, '...') %>& 
+-%><%=truncate(@actions_per_context[@actions_per_context.size()-1]['name'], :length => @truncate_chars, :omission => '...') %>&
 &links=<%
 0.upto @actions_per_context.size()-2 do | i |
     %><%=url_for :controller => "contexts", :action => "show", :id=>@actions_per_context[i]['id']%>,<%

app/views/todos/_mobile_todo.rhtml

@@ -6,7 +6,11 @@ else
   bullet = "<span class=\"r\">&raquo;&nbsp;</span>"
   li_class = ""
 end -%>
+<<<<<<< HEAD/app/views/todos/_mobile_todo.rhtml
 <li id="<%= dom_id(mobile_todo) %>" <%= li_class %>><%= bullet %><% 
+=======
+<tr class="t" id="<%= dom_id(mobile_todo) %>" valign="top"><td><%= bullet %></td><td><% 
+>>>>>>> f3d7fac2a4e602c21c754770903217c0a5035629/app/views/todos/_mobile_todo.rhtml
     if mobile_todo.completed?  
 -%><span class="m_t_d">
 <%  else 
@@ -24,4 +28,7 @@ end -%>
        ")</span>" -%>
 <%  end -%>
  <%= tag_list_mobile -%>
-</span></li>
+<<<<<<< HEAD/app/views/todos/_mobile_todo.rhtml
+</span></li>=======
+</span></td></tr>
+>>>>>>> f3d7fac2a4e602c21c754770903217c0a5035629/app/views/todos/_mobile_todo.rhtml

app/views/todos/index.html.erb

@@ -10,5 +10,5 @@
 
 <div id="input_box">
   <%= render :partial => "shared/add_new_item_form" %>
-  <%= render "sidebar/sidebar" %>
+  <%= render :template => "sidebar/sidebar" %>
 </div><!-- End of input box -->

app/views/todos/list_deferred.html.erb

@@ -11,5 +11,5 @@
 
 <div id="input_box">
   <%= render :partial => "shared/add_new_item_form" %>
-  <%= render "sidebar/sidebar" %>
+  <%= render :template => "sidebar/sidebar" %>
 </div><!-- End of input box -->

app/views/todos/tag.html.erb

@@ -23,5 +23,5 @@
 
 <div id="input_box">
   <%= render :partial => "shared/add_new_item_form" %>
-  <%= render "sidebar/sidebar" %>
+  <%= render :template => "sidebar/sidebar" %>
 </div><!-- End of input box -->

app/views/todos/toggle_check.js.rjs

@@ -5,7 +5,7 @@ if @saved
 
     # completed todos move from their context to the completed container
     unless @prefs.hide_completed_actions?
-      page.insert_html :top, "completed_containeritems", :partial => 'todos/todo', :locals => { :parent_container_type => "completed" }
+      page.insert_html :top, "completed_containeritems", :partial => 'todos/todo', :locals => { :todo => @todo, :parent_container_type => "completed" }
       page.visual_effect :highlight, dom_id(@todo, 'line'), {'startcolor' => "'#99ff99'"}
       page[empty_container_msg_div_id].show if @down_count == 0 && !empty_container_msg_div_id.nil?
       page.show 'tickler-empty-nd' if source_view_is(:project) && @deferred_count == 0
@@ -33,7 +33,7 @@ if @saved
   else
     # todo is activated from completed container
     page.call "todoItems.ensureVisibleWithEffectAppear", item_container_id(@todo)
-    page.insert_html :bottom, item_container_id(@todo), :partial => 'todos/todo', :locals => { :parent_container_type => parent_container_type }
+    page.insert_html :bottom, item_container_id(@todo), :partial => 'todos/todo', :locals => { :todo => @todo, :parent_container_type => parent_container_type }
     page.visual_effect :highlight, dom_id(@todo, 'line'), {'startcolor' => "'#99ff99'"}
     page.show "empty-d" if @completed_count == 0
     page[empty_container_msg_div_id].hide unless empty_container_msg_div_id.nil? # If we've checked something as undone, incomplete items can't be empty

app/views/todos/update.js.rjs

@@ -36,7 +36,7 @@ if @saved
         page.call "todoItems.expandNextActionListingByContext", "c#{@todo.context_id}items", true
         page[empty_container_msg_div_id].hide unless empty_container_msg_div_id.nil?
         # show all todos in context
-        page.insert_html :bottom, "c#{@todo.context_id}items", :partial => 'todos/todo', :locals => { :parent_container_type => parent_container_type }
+        page.insert_html :bottom, "c#{@todo.context_id}items", :partial => 'todos/todo', :locals => { :todo => @todo, :parent_container_type => parent_container_type }
       end
       
       # update badge count
@@ -52,7 +52,7 @@ if @saved
         end
       end
     else
-      page.replace dom_id(@todo), :partial => 'todos/todo', :locals => { :parent_container_type => parent_container_type }
+      page.replace dom_id(@todo), :partial => 'todos/todo', :locals => { :todo => @todo, :parent_container_type => parent_container_type }
       page.visual_effect :highlight, dom_id(@todo), :duration => 3
     end    
   elsif source_view_is :project
@@ -63,17 +63,17 @@ if @saved
     elsif @todo.deferred? 
       page[@todo].remove
       page.show("p#{@original_item_project_id}empty-nd") if (@remaining_undone_in_project == 0)
-      page.insert_html :bottom, "tickler", :partial => 'todos/todo', :locals => { :parent_container_type => parent_container_type }
+      page.insert_html :bottom, "tickler", :partial => 'todos/todo', :locals => { :todo => @todo, :parent_container_type => parent_container_type }
       page['tickler-empty-nd'].hide
       page.replace_html "badge_count", @down_count
     elsif @todo_was_activated_from_deferred_state
       page[@todo].remove
       page['tickler-empty-nd'].show if (@deferred_count == 0)
-      page.insert_html :bottom, "p#{@todo.project_id}", :partial => 'todos/todo', :locals => { :parent_container_type => parent_container_type }
+      page.insert_html :bottom, "p#{@todo.project_id}", :partial => 'todos/todo', :locals => { :todo => @todo, :parent_container_type => parent_container_type }
       page["p#{@todo.project_id}empty-nd"].hide
       page.replace_html "badge_count", @down_count
     else
-      page.replace dom_id(@todo), :partial => 'todos/todo', :locals => { :parent_container_type => parent_container_type }
+      page.replace dom_id(@todo), :partial => 'todos/todo', :locals => { :todo => @todo, :parent_container_type => parent_container_type }
       page.visual_effect :highlight, dom_id(@todo), :duration => 3
     end
   elsif source_view_is :deferred
@@ -87,7 +87,7 @@ if @saved
       page.call "todoItems.ensureVisibleWithEffectAppear", "c#{@todo.context_id}"
       page.call "todoItems.expandNextActionListingByContext", "c#{@todo.context_id}items", true
       page[empty_container_msg_div_id].hide unless empty_container_msg_div_id.nil?
-      page.insert_html :bottom, "c#{@todo.context_id}items", :partial => 'todos/todo', :locals => { :parent_container_type => parent_container_type }
+      page.insert_html :bottom, "c#{@todo.context_id}items", :partial => 'todos/todo', :locals => { :todo => @todo, :parent_container_type => parent_container_type }
       page.replace_html("badge_count", @down_count)
       page.delay(0.5) do
         page.call "todoItems.ensureContainerHeight", "c#{@original_item_context_id}items"
@@ -95,18 +95,18 @@ if @saved
         page.visual_effect :highlight, dom_id(@todo), :duration => 3
       end
     else
-      page.replace dom_id(@todo), :partial => 'todos/todo', :locals => { :parent_container_type => parent_container_type }
+      page.replace dom_id(@todo), :partial => 'todos/todo', :locals => { :todo => @todo, :parent_container_type => parent_container_type }
       page.visual_effect :highlight, dom_id(@todo), :duration => 3
     end
   elsif source_view_is :stats
-    page.replace dom_id(@todo), :partial => 'todos/todo', :locals => { :parent_container_type => parent_container_type }
+    page.replace dom_id(@todo), :partial => 'todos/todo', :locals => { :todo => @todo, :parent_container_type => parent_container_type }
     page.visual_effect :highlight, dom_id(@todo), :duration => 3    
   elsif source_view_is :calendar
     if @due_date_changed
       page[@todo].remove
       page.show "empty_"+@original_item_due_id if @old_due_empty
       page.hide "empty_"+@new_due_id
-      page.insert_html :bottom, @new_due_id, :partial => 'todos/todo'
+      page.insert_html :bottom, @new_due_id, :partial => 'todos/todo', :locals => {:todo => @todo}
       page.visual_effect :highlight, dom_id(@todo), :duration => 3
     else
       if @todo.due.nil?
@@ -114,7 +114,7 @@ if @saved
         page[@todo].remove
         page.show "empty_"+@original_item_due_id if @old_due_empty
       else
-        page.replace dom_id(@todo), :partial => 'todos/todo', :locals => { :parent_container_type => parent_container_type }
+        page.replace dom_id(@todo), :partial => 'todos/todo', :locals => { :todo => @todo, :parent_container_type => parent_container_type }
         page.visual_effect :highlight, dom_id(@todo), :duration => 3
       end
     end