From 13732088beca88641a18736105f86e265df74da7 Mon Sep 17 00:00:00 2001
From: lukemelia <lukemelia@a4c988fc-2ded-0310-b66e-134b36920a42>
Date: Sat, 22 Sep 2007 23:18:54 +0000
Subject: [PATCH] Apply Jacqui's patch, so that "The "Toggle Notes" link in the
 navigation at the top should toggle the display of notes on items in a page,
 not the entire page.". Fixes #563.

Thanks, Jacqui!


git-svn-id: http://www.rousette.org.uk/svn/tracks-repos/trunk@596 a4c988fc-2ded-0310-b66e-134b36920a42
---
 tracks/app/views/layouts/standard.rhtml               | 4 ++--
 tracks/test/selenium/notes/toggle_notes.rsel          | 5 +++++
 tracks/test/selenium/project_detail/toggle_notes.rsel | 5 +++++
 3 files changed, 12 insertions(+), 2 deletions(-)
 create mode 100644 tracks/test/selenium/notes/toggle_notes.rsel
 create mode 100644 tracks/test/selenium/project_detail/toggle_notes.rsel

diff --git a/tracks/app/views/layouts/standard.rhtml b/tracks/app/views/layouts/standard.rhtml
index 2c888602..84cc58e3 100644
--- a/tracks/app/views/layouts/standard.rhtml
+++ b/tracks/app/views/layouts/standard.rhtml
@@ -34,8 +34,8 @@ window.onload=function(){
   </h1>
 </div>
 <div id="minilinks">
-	<%= link_to_function("Toggle notes", nil, {:accesskey => "S", :title => "Toggle all notes"}) do |page|
-		  page.select('.notes').each { |e| e.toggle }
+	<%= link_to_function("Toggle notes", nil, {:accesskey => "S", :title => "Toggle all notes", :id => "toggle-notes-nav"}) do |page|
+		  page.select('body .notes').each { |e| e.toggle }
 		end
 	-%>&nbsp;|&nbsp;
     <%= link_to "Logout (#{current_user.display_name}) »", logout_path %>
diff --git a/tracks/test/selenium/notes/toggle_notes.rsel b/tracks/test/selenium/notes/toggle_notes.rsel
new file mode 100644
index 00000000..337ebb06
--- /dev/null
+++ b/tracks/test/selenium/notes/toggle_notes.rsel
@@ -0,0 +1,5 @@
+setup :fixtures => :all
+login :as => 'admin'
+open "/notes"
+click_and_wait "css=#toggle-notes-nav"
+assert_element_present "body#notes"
diff --git a/tracks/test/selenium/project_detail/toggle_notes.rsel b/tracks/test/selenium/project_detail/toggle_notes.rsel
new file mode 100644
index 00000000..25898731
--- /dev/null
+++ b/tracks/test/selenium/project_detail/toggle_notes.rsel
@@ -0,0 +1,5 @@
+setup :fixtures => :all
+login :as => 'admin'
+open "/projects/1"
+click_and_wait "css=#toggle-notes-nav"
+assert_element_present "notes_todo_6"