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

app/controllers/search_controller.rb

@@ -1,27 +1,30 @@
-class SearchController < ApplicationController
-
-  helper :todos, :application, :notes, :projects  
-  
-  def results
-    @source_view = params['_source_view'] || 'search'
-    @page_title = "TRACKS::Search Results for #{params[:search]}"
-    terms = '%' + params[:search] + '%'
-    @found_todos = current_user.todos.find(:all, :conditions => ["todos.description LIKE ? OR todos.notes LIKE ?", terms, terms], :include => [:tags, :project, :context])
-    @found_projects = current_user.projects.find(:all, :conditions => ["name LIKE ? or description LIKE ?", terms, terms])
-    @found_notes = current_user.notes.find(:all, :conditions => ["body LIKE ?", terms])
- 
-    @count = @found_todos.size  + @found_projects.size + @found_notes.size
-   
-    init_not_done_counts(['project'])
-    init_project_hidden_todo_counts(['project'])
-  end
-
-  def index
-    @page_title = "TRACKS::Search"    
-  end
-  
-  def init
-    @source_view = params['_source_view'] || 'search'
-  end
-
-end
+class SearchController < ApplicationController
+
+  helper :todos, :application, :notes, :projects  
+  
+  def results
+    @source_view = params['_source_view'] || 'search'
+    @page_title = "TRACKS::Search Results for #{params[:search]}"
+    terms = '%' + params[:search] + '%'
+    @found_todos = current_user.todos.find(:all, :conditions => ["todos.description LIKE ? OR todos.notes LIKE ?", terms, terms], :include => [:tags, :project, :context])
+    @found_projects = current_user.projects.find(:all, :conditions => ["name LIKE ? OR description LIKE ?", terms, terms])
+    @found_notes = current_user.notes.find(:all, :conditions => ["body LIKE ?", terms])
+    @found_contexts = current_user.contexts.find(:all, :conditions => ["name LIKE ?", terms])
+    # TODO: limit search to tags on todos
+    @found_tags = current_user.tags.find(:all, :conditions => ["name LIKE ?", terms])
+ 
+    @count = @found_todos.size  + @found_projects.size + @found_notes.size + @found_contexts.size + @found_tags.size
+   
+    init_not_done_counts
+    init_project_hidden_todo_counts
+  end
+
+  def index
+    @page_title = "TRACKS::Search"    
+  end
+  
+  def init
+    @source_view = params['_source_view'] || 'search'
+  end
+
+end

app/helpers/todos_helper.rb

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

app/models/user.rb

@@ -124,7 +124,7 @@ class User < ActiveRecord::Base
 
   #for will_paginate plugin
   cattr_accessor :per_page
-  @@per_page = 1
+  @@per_page = 5
   
   def validate
     unless Tracks::Config.auth_schemes.include?(auth_type)

app/views/contexts/_context_listing.rhtml

@@ -1,9 +1,14 @@
-<%  context = context_listing %>
+<%  context = context_listing 
+    suppress_drag_handle ||= false
+    suppress_edit_button ||= false
+%>
 <div id="<%= dom_id(context, "container") %>" class="list">
   <div id="<%= dom_id(context) %>" class="context sortable_row" style="display:'';">
-    <div class="position">
-      <span class="handle">DRAG</span>
-    </div>
+    <% unless suppress_drag_handle -%>
+      <div class="position">
+        <span class="handle">DRAG</span>
+      </div>
+    <% end -%>
     <div class="data">
       <%= link_to_context( context ) %> <%= " (" + count_undone_todos_phrase(context,"actions") + ")" %>
     </div>
@@ -32,5 +37,5 @@
       -%>
     </div>
   </div>
-  <%= render :partial => 'context_form', :object => context %>
+  <%= render :partial => 'contexts/context_form', :object => context %>
 </div>

app/views/contexts/_mobile_context.rhtml

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

app/views/layouts/mobile.m.erb

@@ -2,35 +2,40 @@
     new_todo_params = {}
     new_todo_params[:from_project] = @mobile_from_project if @mobile_from_project
     new_todo_params[:from_context] = @mobile_from_context if @mobile_from_context
--%><!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+-%><?xml version="1.0"?>
+<!DOCTYPE html PUBLIC "-//WAPFORUM//DTD XHTML Mobile 1.0//EN" "http://www.wapforum.org/DTD/xhtml-mobile10.dtd">
 <html xmlns="http://www.w3.org/1999/xhtml">
 <head>
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
 <meta name="viewport" content="initial-scale = 1.0" />
-<%= stylesheet_link_tag "mobile"%>
+<%= stylesheet_link_tag "mobile", :media => 'handheld,all' %>
 <title><%= @page_title %></title>
 </head><body>
 <% if !(@new_mobile || @edit_mobile)
       if !@prefs.nil? -%>
 <h1><span class="count"><%= @down_count %></span> <%= 
         user_time.strftime(@prefs.title_date_format) -%></h1>
-<%=     (link_to("0-Add new action", formatted_new_todo_path(:m, new_todo_params))+" | ") unless @new_mobile -%>
+<div class="nav">
+<%=     (link_to("0-New action", formatted_new_todo_path(:m, new_todo_params))+" | ") unless @new_mobile -%>
 <%=     (link_to("1-Home", formatted_todos_path(:m))+" | ") unless @home -%>
 <%=     (link_to("2-Contexts", formatted_contexts_path(:m))+" | ") -%>
 <%=     (link_to("3-Projects", formatted_projects_path(:m))+" | ") -%>
 <%=     (link_to("4-Starred", {:action => "tag", :controller => "todos", :id => "starred.m"})) -%>
 <%    end
   end -%><%= render_flash -%>
-<hr/><%=  yield -%>
+</div>
+<%=  yield -%>
 <hr/><% if !@prefs.nil? -%>
+<div class="nav">
 <%= (link_to("Logout", formatted_logout_path(:format => 'm')) +" | ") -%>
-<%= (link_to("0-Add new action", formatted_new_todo_path(:m), {:accesskey => "0"})+" | ") unless @new_mobile -%>
+<%= (link_to("0-New action", formatted_new_todo_path(:m), {:accesskey => "0"})+" | ") unless @new_mobile -%>
 <%= (link_to("1-Home", formatted_todos_path(:m), {:accesskey => "1"})+" | ") unless @home -%>
 <%= (link_to("2-Contexts", formatted_contexts_path(:m), {:accesskey => "2"})+" | ") -%>
 <%= (link_to("3-Projects", formatted_projects_path(:m), {:accesskey => "3"})+" | ") -%>
 <%= (link_to("4-Starred", {:action => "tag", :controller => "todos", :id => "starred.m"}, {:accesskey => "4"})+" | ") -%> 
 <%= (link_to("Tickler", {:action => "index", :controller => "tickler.m"})+" | ") -%>
 <%= (link_to("Feeds", {:action => "index", :controller => "feeds.m"})) -%>
+</div>
 <% end -%>
 <%= render :partial => "shared/mobile_footer" -%>  
 </body></html>

app/views/login/login.html.erb

@@ -14,19 +14,19 @@
       <% form_tag :action=> 'login' do %>
         <table>
           <tr>
-            <td width="100px"><label for="user_login">Login:</label></td>
-            <td width="100px"><input type="text" name="user_login" id="user_login" value="" class="login_text" /></td>
+            <td><label for="user_login">Login:</label></td>
+            <td><input type="text" name="user_login" id="user_login" value="" class="login_text" /></td>
           </tr>
           <tr> 
-            <td width="100px"><label for="user_password">Password:</label></td>
-            <td width="100px"><input type="password" name="user_password" id="user_password" class="login_text" /></td>
+            <td><label for="user_password">Password:</label></td>
+            <td><input type="password" name="user_password" id="user_password" class="login_text" /></td>
           </tr>
          <tr> 
-            <td width="100px"><label for="user_noexpiry">Stay logged in:</label></td>
-            <td width="100px"><input type="checkbox" name="user_noexpiry" id="user_noexpiry" checked  /></td>
+            <td><label for="user_noexpiry">Stay logged in:</label></td>
+            <td><input type="checkbox" name="user_noexpiry" id="user_noexpiry" checked  /></td>
           </tr>
           <tr> 
-            <td width="100px"></td>
+            <td></td>
             <td><input type="submit" name="login" value="Sign In &#187;" class="primary" /></td>
           </tr>
         </table>
@@ -39,15 +39,15 @@
     <% form_tag :action=> 'login', :action => 'begin' do %>
       <table>
         <tr>
-          <td width="100px"><label for="openid_url">Identity URL:</label></td>
-          <td width="100px"><input type="text" name="openid_url" id="openid_url" value="<%= @openid_url %>" class="login_text open_id" /></td>
+          <td><label for="openid_url">Identity URL:</label></td>
+          <td><input type="text" name="openid_url" id="openid_url" value="<%= @openid_url %>" class="login_text open_id" /></td>
         </tr>
        <tr> 
-          <td width="100px"><label for="user_noexpiry">Stay logged in:</label></td>
-          <td width="100px"><input type="checkbox" name="user_noexpiry" id="user_noexpiry" checked  /></td>
+          <td><label for="user_noexpiry">Stay logged in:</label></td>
+          <td><input type="checkbox" name="user_noexpiry" id="user_noexpiry" checked  /></td>
         </tr>
         <tr> 
-          <td width="100px"></td>
+          <td></td>
           <td><input type="submit" name="login" value="Sign In &#187;" class="primary" /></td>
         </tr>
       </table>

app/views/login/login_mobile.html.erb

@@ -14,19 +14,19 @@
       <% form_tag formatted_login_path(:format => 'm') do %>
         <table>
           <tr>
-            <td width="100px"><label for="user_login">Login:</label></td>
-            <td width="100px"><input type="text" name="user_login" id="user_login" value="" class="login_text" /></td>
+            <td><label for="user_login">Login:</label></td>
+            <td><input type="text" name="user_login" id="user_login" value="" class="login_text" /></td>
           </tr>
           <tr> 
-            <td width="100px"><label for="user_password">Password:</label></td>
-            <td width="100px"><input type="password" name="user_password" id="user_password" class="login_text" /></td>
+            <td><label for="user_password">Password:</label></td>
+            <td><input type="password" name="user_password" id="user_password" class="login_text" /></td>
           </tr>
          <tr> 
-            <td width="100px"><label for="user_noexpiry">Stay logged in:</label></td>
-            <td width="100px"><input type="checkbox" name="user_noexpiry" id="user_noexpiry" checked  /></td>
+            <td><label for="user_noexpiry">Stay logged in:</label></td>
+            <td><input type="checkbox" name="user_noexpiry" id="user_noexpiry" checked="checked" /></td>
           </tr>
           <tr> 
-            <td width="100px"></td>
+            <td>&nbsp;</td>
             <td><input type="submit" name="login" value="Sign In &#187;" class="primary" /></td>
           </tr>
         </table>

app/views/search/index.rhtml

@@ -1,6 +1,9 @@
-<div id="display_box_search">
-  <% form_tag(:action => :results) do %>
-    <%= text_field_tag(:search, params[:search]) %>
-    <%= submit_tag "Search" %>   
-  <% end %>
-</div>
+<div id="display_box_search">
+  <% form_tag({:action => :results}, :id => 'search-form') do %>
+    <%= text_field_tag(:search, params[:search]) %>
+    <%= submit_tag "Search" %>
+  <% end %>
+</div>
+<script type="text/javascript">
+  Form.focusFirstElement('search-form')
+</script>

app/views/search/results.rhtml

@@ -1,32 +1,48 @@
-<div id="display_box_results">
-  <% if @count == 0 -%>
-    <div class="message"><p>Your search yielded no results.</p></div>
-  <% else -%>
-    <% source_view_is = :search %>
-    <% parent_container_type = 'search' %>
-    <% if not @found_todos.empty? -%>
-      <div id="found-todos-container" class="container">
-        <h2><span id="found-todos-count" class="badge"><%= @found_todos.size %></span>Todos matching query</h2>
-        <%= render :partial => "todos/todo", :collection => @found_todos, :locals => { :parent_container_type => 'search', :suppress_context => false, :suppress_project => false, :suppress_edit_button => true } %>	
-      </div>
-    <% end -%>
-  
-    <% if not @found_projects.empty? -%>
-      <div id="found-projects-container" class="container">
-        <h2><span id="found-projects-count" class="badge"><%= @found_projects.size %></span>Projects matching query</h2>
-        <%= render :partial => "projects/project_listing", :collection => @found_projects, :locals => { :suppress_drag_handle => true, :suppress_edit_button => true } %>
-      </div>	
-    <% end -%>
-  
-    <% if not @found_notes.empty? -%>
-      <div id="found-notes-container" class="container">
-        <h2><span id="found-notes-count" class="badge"><%= @found_notes.size %></span>Notes matching query</h2>
-        <% for notes in @found_notes -%>
-          <div class="container" id="note-<%= notes.id %>-wrapper">
-            <%= render :partial => "notes/notes_summary", :object => notes %>
-          </div>
-        <% end -%>
-      </div>
-    <% end -%>
-  <% end -%>
-</div>
+<div id="display_box_results">
+<% if @count == 0 -%>
+  <div class="message"><p>Your search yielded no results.</p></div>
+<% else -%>
+  <% unless @found_todos.empty? -%>
+    <div id="found-todos-container" class="container">
+      <h2><span id="found-todos-count" class="badge"><%= @found_todos.size %></span>Todos matching query</h2>
+      <%= render :partial => "todos/todo", :collection => @found_todos, :locals => { :parent_container_type => 'search', :suppress_context => false, :suppress_project => false, :suppress_edit_button => true } %>
+    </div>
+  <% end -%>
+
+  <% unless @found_projects.empty? -%>
+    <div id="found-projects-container" class="container">
+      <h2><span id="found-projects-count" class="badge"><%= @found_projects.size %></span>Projects matching query</h2>
+      <%= render :partial => "projects/project_listing", :collection => @found_projects, :locals => { :suppress_drag_handle => true, :suppress_edit_button => true } %>
+    </div>
+  <% end -%>
+
+  <% unless @found_notes.empty? -%>
+    <div id="found-notes-container" class="container">
+      <h2><span id="found-notes-count" class="badge"><%= @found_notes.size %></span>Notes matching query</h2>
+      <% for notes in @found_notes -%>
+        <div class="container" id="note-<%= notes.id %>-wrapper">
+          <%= render :partial => "notes/notes_summary", :object => notes %>
+        </div>
+      <% end -%>
+    </div>
+  <% end -%>
+
+  <% unless @found_contexts.empty? -%>
+    <div id="found-contexts-container" class="container">
+      <h2><span id="found-contexts-count" class="badge"><%= @found_contexts.size %></span>Contexts matching query</h2>
+      <%= render :partial => "contexts/context_listing", :collection => @found_contexts, :locals => { :suppress_drag_handle => true, :suppress_edit_button => true } %>
+    </div>
+  <% end -%>
+
+  <% unless @found_tags.empty? -%>
+    <div id="found-tags-container" class="container">
+    <h2><span id="found-tags-count" class="badge"><%= @found_tags.size %></span>Tags matching query</h2>
+    <span class="tags"><%  @found_tags.each do |tag| -%>
+        <span class="tag"><%= link_to tag.name, {:controller => "todos", :action => "tag", :id => tag.name} -%></span>
+      <% end %>
+    </span>
+    <br/>
+    </div>
+  <% end %>
+<% end -%>
+</div>

app/views/todos/_edit_mobile.rhtml

@@ -10,7 +10,7 @@ if parent_container_type == 'show_mobile' -%>
 <h2><label for="todo_description">Description</label></h2>
 <%= text_field( "todo", "description", "tabindex" => 2) %>
 <h2><label for="todo_notes">Notes</label></h2>
-<%= text_area( "todo", "notes", "cols" => 30, "rows" => 5, "tabindex" => 3) %>
+<%= text_area( "todo", "notes", "cols" => 30, "rows" => 2, "tabindex" => 3) %>
 <h2><label for="todo_context_id">Context</label></h2>
 <%= unless @mobile_from_context
   collection_select( "todo", "context_id", @contexts, "id", "name", {}, {"tabindex" => 4} ) 
@@ -22,7 +22,7 @@ end %>
 <h2><label for="todo_project_id">Project</label></h2>
 <%= unless @mobile_from_project
   collection_select( "todo", "project_id", @projects, "id", "name",
-                          {:include_blank => true}, {"tabindex" => 5} )
+                          {:include_blank => '--No project--'}, {"tabindex" => 5} )
 else
   # manually add blank option since :include_blank does not work 
   # with options_from_collection_for_select
@@ -34,7 +34,7 @@ end %>
 <%= text_field_tag "tag_list", @tag_list_text, :size => 30, :tabindex => 6 %> 
 <h2><label for="todo_due">Due</label></h2>
 <%= date_select("todo", "due", {:order => [:day, :month, :year],
-                    :start_year => this_year, :include_blank => true}, :tabindex => 7) %>
+                    :start_year => this_year, :include_blank => '--'}, :tabindex => 7) %>
 <h2><label for="todo_show_from">Show from</label></h2>
 <%= date_select("todo", "show_from", {:order => [:day, :month, :year], 
                     :start_year => this_year, :include_blank => true}, :tabindex => 8) %>

app/views/todos/_mobile_todo.rhtml

@@ -1,10 +1,10 @@
 <% @todo = mobile_todo
 if mobile_todo.starred?
-  bullet = "<span class=star>"+image_tag("menustar_small.gif")+"</span>"
+  li_class = " class=\"star\""
 else
-  bullet = "<span class=r>&raquo;&nbsp;</span>"
+  li_class = ""
 end -%>
-<tr class="t" id="<%= dom_id(mobile_todo) %>" valign="top"><td><%= bullet %></td><td><% 
+<li id="<%= dom_id(mobile_todo) %>" <%= li_class %>><% 
     if mobile_todo.completed?  
 -%><span class="m_t_d">
 <%  else 
@@ -22,4 +22,4 @@ end -%>
        ")</span>" -%>
 <%  end -%>
  <%= tag_list_mobile -%>
-</span></td></tr>
+</span></li>

public/.htaccess

@@ -39,4 +39,4 @@ RewriteRule ^(.*)$ dispatch.fcgi [QSA,L]
 # Example:
 #   ErrorDocument 500 /500.html
 
-ErrorDocument 500 "<h2>Application error</h2>Rails application failed to start properly"
+ErrorDocument 500 "<h2>Application error</h2>Rails application failed to start properly"

public/stylesheets/mobile.css

@@ -29,15 +29,18 @@ div.footer a {
 }
 
 h1 {
-    color: #f00;
-    font-size: small;
+  color: #f00;
+  font-size: small;
+  margin-top:.3em;
+  margin-bottom:.3em;
 }
 
 h2 {
-    background-color: #cccccc;
-    font-size : small;
-    margin-top: 10px;
-    margin-bottom: 0;
+  background-color: #aaaaaa;
+  font-size : small;
+  margin: .3em 0;
+  padding: .3em 0 .1em .3em;
+  border-top: 1px solid #777777;
 }
 
 h4.alert  {
@@ -61,7 +64,7 @@ h4.notice {
 }
 
 span.tag {
-  font-size: XX-small;
+  font-size: x-small;
   background-color: #CCE7FF;
   color: #000;
   padding: 1px;
@@ -82,47 +85,78 @@ span.prj, span.ctx{
       color: #fff;
       background: #f00;
       padding: 1px;
-      font-size: 10px;
+      font-size: 1em;
 }
       
 .amber {
       color: #fff;
       background: #ff6600;
       padding: 1px;
-      font-size: 10px;
+      font-size: 1em;
 }
          
 .orange {
       color: #fff;
       background: #FFA500;
       padding: 1px;
-      font-size: 10px;
+      font-size: 1em;
 }
 
 .green {
       color: #fff;
       background: #33cc00;
       padding: 1px;
-      font-size: 10px;
+      font-size: 1em;
 }
       
 .grey {
       color: #fff;
       background: #999;
       padding: 1px;
-      font-size: 10px;
+      font-size: 1em;
 }
       
 .count {
       color: #fff;
       background: #000;
-      font-size: medium;     
+      font-size: medium;
 }
 
 .errors {
       background: #FFC2C2;
 }
 
+ul.c li.star {
+  list-style-image:url(../images/menustar_small.gif)
+}
+
+ul.c {
+  padding: 0;
+  margin: 0;
+  padding-left: 1.1em;
+}
+
+ul.c li {
+  padding: 0; 
+  margin: 0;
+}
+
+ul.c li span.r {
+  display: none;
+}
+
+span.r {
+  display:none;
+}
+
+.nav {
+  font-size: x-small;
+}
+
+#database_auth_form table td {
+  width:7em;
+}
+
 table.c {
       margin-left: 5px;
 }

test/selenium/project_detail/changing_project_name_should_change_default_project.rsel

@@ -0,0 +1,13 @@
+setup :fixtures => :all
+login :as => 'admin'
+open "/projects/1"
+
+# change project name
+click "project_name_in_place_editor"
+wait_for_element_present "css=#project_name_in_place_editor-inplaceeditor input.editor_field"
+type "css=#project_name_in_place_editor-inplaceeditor input.editor_field", "Test Foo"
+click "css=#project_name_in_place_editor-inplaceeditor input.editor_ok_button"
+wait_for_text "project_name_in_place_editor", "Test Foo"
+
+# check that the default project name is changed too
+assert_value "todo_project_name", "Test Foo"

test/selenium/tags/change_context_in_tag_view.rsel

@@ -0,0 +1,17 @@
+setup :fixtures => :all
+login :as => 'admin'
+open "/todos/tag/foo"
+wait_for_element_present "xpath=//div[@id='c1'] //h2"
+
+# change context name
+click "edit_icon_todo_1"
+wait_for_element_present "submit_todo_1"
+type "//input[@name='context_name']", "call"
+click "//button[@id='submit_todo_1']"
+wait_for_visible "flash"
+
+# check context agenda is gone
+wait_for_not_visible "c1"
+verify_text_present "Call Bill Gates to find out how much he makes per day"
+
+

test/selenium/users/delete_user.rsel

@@ -0,0 +1,7 @@
+setup :fixtures => :all
+login :as => 'admin'
+open '/users'
+assert_text_present "John Deere"
+click "//tr[@id='user-3']//img"
+assert_confirmation "Warning: this will delete user 'john', all their actions, contexts, project and notes. Are you sure that you want to continue?"
+wait_for_text_not_present "John Deere"