Fixed 2 bugs in 1.02:

* Added the border=0 back to the images for edit and delete actions, which I had accidentally removed at some point (fixed ticket:11)
  * Removed Redcloth requiring code in config/environment.rb, as Rails now requires Redcloth itself (fixed ticket:10)


git-svn-id: http://www.rousette.org.uk/svn/tracks-repos/trunk@45 a4c988fc-2ded-0310-b66e-134b36920a42

tracks/app/controllers/application.rb

@@ -4,8 +4,6 @@
 require_dependency "login_system"
 require 'date'
 
-$delete_img = "<img src=\"/images/delete.png\" width=\"10\" height=\"10\" border=\"0\" />"
-$edit_img = "<img src=\"/images/edit.png\" width=\"10\" height=\"10\" border=\"0\" />"
 $notes_img = "<img src=\"/images/notes.png\" width=\"10\" height=\"10\" border=\"0\" />"
 $done_img = "<img src=\"/images/done.png\" width=\"16\" height=\"16\" border=\"0\" />"
 

tracks/app/views/context/_not_done.rhtml

@@ -2,7 +2,7 @@
 <tr>
 	<td valign="top">
 	  <%= check_box( "item", "done", "onclick" => "document.location.href='/todo/toggle_check/#{@item.id}'" ) %></td>
-	<td valign="top" width="30"><%= link_to( $edit_img, { :controller => "todo", :action => "edit", :id => @item.id }, :title => "Edit item" ) + " " + link_to($delete_img, { :controller => "todo", :action => "destroy", :id => @item.id }, :title => "Delete item", :confirm => "Are you sure you want to delete this entry: #{@item.description}" ) + " " %></td>
+	<td valign="top" width="30"><%= link_image_to( "edit", { :controller => "todo", :action => "edit", :id => @item.id }, :title => "Edit item", :size => "10x10", :border => "0" ) + " " + link_image_to( "delete", { :controller => "todo", :action => "destroy", :id => @item.id }, :title => "Delete item", :size => "10x10", :border => "0", :confirm => "Are you sure you want to delete this entry: #{@item.description}" ) + " " %></td>
 	<td valign="top"><%= due_date( @item.due ) %> 
 	<%= @item.description %>
 	<% if @item.project_id %>

tracks/app/views/context/list.rhtml

@@ -17,7 +17,7 @@
 		    shown
 		  <% end %>
 		  </td>
-		<td width="40"><%= link_image_to("edit", { :action => "edit", :id => @context.id }, :title => "Edit item", :size => "10x10") + " " + link_image_to("delete", { :action => "destroy", :id => @context.id }, :title => "Delete item", :size => "10x10", :confirm => "Are you sure you want to delete the context \"#{@context.name}?\" Any todos in this context will be deleted.") + " " %></td>
+		<td width="40"><%= link_image_to("edit", { :action => "edit", :id => @context.id }, :title => "Edit item", :size => "10x10", :border => "0" ) + " " + link_image_to("delete", { :action => "destroy", :id => @context.id }, :title => "Delete item", :size => "10x10", :border => "0", :confirm => "Are you sure you want to delete the context \"#{@context.name}?\" Any todos in this context will be deleted.") + " " %></td>
 </tr>
 <% row += 1 %>
 <% end %>

tracks/app/views/project/_not_done.rhtml

@@ -1,7 +1,7 @@
 <% @item = not_done %>
 <tr>
 	<td valign="top"><%= check_box( "item", "done", "onclick" => "document.location.href='/todo/toggle_check/#{@item.id}'" ) %></td>
-	<td valign="top" width="30"><%= link_image_to( "edit", { :controller => "todo", :action => "edit", :id => @item.id }, :title => "Edit item", :size => "10x10" ) + " " + link_image_to( "delete", { :controller => "todo", :action => "destroy", :id => @item.id }, :title => "Delete item", :size => "10x10", :confirm => "Are you sure you want to delete this entry: #{@item.description}" ) + " " %></td>
+	<td valign="top" width="30"><%= link_image_to( "edit", { :controller => "todo", :action => "edit", :id => @item.id }, :title => "Edit item", :size => "10x10", :border => "0" ) + " " + link_image_to( "delete", { :controller => "todo", :action => "destroy", :id => @item.id }, :title => "Delete item", :size => "10x10", :border => "0", :confirm => "Are you sure you want to delete this entry: #{@item.description}" ) + " " %></td>
 	<td valign="top"><%= due_date( @item.due ) %> 
 	<%= @item.description %>
 	<% if @item.project_id %>

tracks/app/views/project/list.rhtml

@@ -10,7 +10,7 @@
   <% end %>
     <td align="right" width="20"><%= @project.id.to_s %></td>
 		<td width="390"><%= link_to ( "#{@project.name}", :action => "show", :id => @project.id ) %></td>
-		<td width="40"><%= link_image_to( "edit", { :action => "edit", :id => @project.id }, :title => "Edit item", :size => "10x10" ) + " " + link_image_to( "delete", { :action => "destroy", :id => @project.id }, :title => "Delete item", :size => "10x10", :confirm => "Are you sure you want to delete the project \"#{@project.name}?\" Any todos in this project will be deleted." ) + " " %></td>
+		<td width="40"><%= link_image_to( "edit", { :action => "edit", :id => @project.id }, :title => "Edit item", :size => "10x10", :border => "0" ) + " " + link_image_to( "delete", { :action => "destroy", :id => @project.id }, :title => "Delete item", :size => "10x10", :border => "0", :confirm => "Are you sure you want to delete the project \"#{@project.name}?\" Any todos in this project will be deleted." ) + " " %></td>
 </tr>
 <% row += 1 %>
 <% end %>

tracks/app/views/todo/_not_done.rhtml

@@ -3,7 +3,7 @@
 <!-- <%= '<tr id="' + @notdone_item.id.to_s + '">' %> -->
 	<td valign="top">
 	  <%= check_box( "item", "done", "onclick" => "document.location.href='/todo/toggle_check/#{@notdone_item.id}'" ) %></td>
-	<td valign="top" width="30"><%= link_to( $edit_img, { :action => "edit", :id => @notdone_item.id }, :title => "Edit item" ) + " " + link_to($delete_img, { :action => "destroy", :id => @notdone_item.id }, :title => "Delete item", :confirm => "Are you sure you want to delete the action \"#{@notdone_item.description}?\"" ) + " " %></td>
+	<td valign="top" width="30"><%= link_image_to( "edit", { :action => "edit", :id => @notdone_item.id }, :title => "Edit item", :size => "10x10", :border => "0" ) + " " + link_image_to( "delete", { :controller => "todo", :action => "destroy", :id => @notdone_item.id }, :title => "Delete item", :size => "10x10", :border => "0", :confirm => "Are you sure you want to delete this entry: #{@notdone_item.description}" ) + " " %></td>
 	<td valign="top"><%= due_date( @notdone_item.due ) %> 
 	<%= @notdone_item.description %>
 	<% if @notdone_item.project_id %>

tracks/config/environment.rb

@@ -35,14 +35,6 @@ require_gem 'actionmailer'
 require_gem 'actionwebservice'
 require_gem 'rails'
 
-# Try loading gem Redcloth first, but if that fails
-# fall back on lib version
-begin
-  require_gem 'redcloth', '>= 3.0.3'
-rescue LoadError
-  require_or_load( "redcloth" )
-end
-
 # Environment-specific configuration.
 require_dependency "environments/#{RAILS_ENV}"
 ActiveRecord::Base.configurations = YAML::load(File.open("#{RAILS_ROOT}/config/database.yml"))

tracks/doc/CHANGENOTES.txt

@@ -10,6 +10,11 @@
 Main project site: <http://www.rousette.org.uk/projects/>
 Project wiki: <http://www.rousette.org.uk/projects/wiki/>
 
+## Version 1.021
+
+1. Added back border="0" to images which I had mistakenly taken out (thanks, Adam Hughes)
+2. Removed the section in config/environment.rb which requires Redcloth. This was causing errors because Rails now requires Redcloth itself. This means that you now need to have Redcloth installed as a gem (gem install redcloth).
+
 ## Version 1.02
 
 1. Uses Rails 0.10.0