From 5d4e8ffe3c7a8b1a041c1e97cb67349d83cadf7a Mon Sep 17 00:00:00 2001
From: lrbalt <lrbalt@a4c988fc-2ded-0310-b66e-134b36920a42>
Date: Mon, 1 Oct 2007 19:55:36 +0000
Subject: [PATCH] solved conflict of using class=notes for both notes
 controller and notes of actions. Solves #574

git-svn-id: http://www.rousette.org.uk/svn/tracks-repos/trunk@605 a4c988fc-2ded-0310-b66e-134b36920a42
---
 tracks/app/views/layouts/standard.rhtml    | 4 ++--
 tracks/app/views/todos/_toggle_notes.rhtml | 4 ++--
 tracks/public/stylesheets/standard.css     | 8 ++++----
 3 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/tracks/app/views/layouts/standard.rhtml b/tracks/app/views/layouts/standard.rhtml
index 84cc58e3..c09951c6 100644
--- a/tracks/app/views/layouts/standard.rhtml
+++ b/tracks/app/views/layouts/standard.rhtml
@@ -35,10 +35,10 @@ window.onload=function(){
 </div>
 <div id="minilinks">
 	<%= 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 }
+		  page.select('body .todo_notes').each { |e| e.toggle }
 		end
 	-%>&nbsp;|&nbsp;
-    <%= link_to "Logout (#{current_user.display_name}) »", logout_path %>
+    <%= link_to "Logout (#{current_user.display_name}) »", logout_path %>
 </div>
 
 <div id="navcontainer">
diff --git a/tracks/app/views/todos/_toggle_notes.rhtml b/tracks/app/views/todos/_toggle_notes.rhtml
index 6ccab15d..435d57b5 100644
--- a/tracks/app/views/todos/_toggle_notes.rhtml
+++ b/tracks/app/views/todos/_toggle_notes.rhtml
@@ -1,8 +1,8 @@
 <%= link_to(image_tag( 'blank.png', :width=>'16', :height=>'16', :border=>'0' ), nil, {:class => 'show_notes', :title => 'Show notes'}) %>
 <% apply_behavior 'a.show_notes:click', :prevent_default => true do |page, element|
-     element.next('.notes').toggle
+     element.next('.todo_notes').toggle
    end
 -%>
-      <div class="notes" id="<%= dom_id(item, 'notes') %>" style="display:none">
+      <div class="todo_notes" id="<%= dom_id(item, 'notes') %>" style="display:none">
         <%= markdown( item.notes ) %>
       </div>
\ No newline at end of file
diff --git a/tracks/public/stylesheets/standard.css b/tracks/public/stylesheets/standard.css
index 34c2a9f7..49f18bc2 100644
--- a/tracks/public/stylesheets/standard.css
+++ b/tracks/public/stylesheets/standard.css
@@ -317,7 +317,7 @@ input.item-checkbox {
       }
       
 /* The notes which may be attached to an item */      
-.notes {
+.todo_notes {
       margin: 5px;
       padding: 3px;
       border: 1px solid #F5ED59;
@@ -325,18 +325,18 @@ input.item-checkbox {
       color: #666666;
       }
       
-.notes p, .notes li {
+.todo_notes p, .todo_notes li {
       padding: 1px;
       margin: 0px;
       font-size: 12px;
       }
       
-.notes ul, .note_wrapper ul {
+.todo_notes ul, .note_wrapper ul {
       list-style-type: disc;
       margin-left:20px;
 }
 
-.notes ol {
+.todo_notes ol {
       list-style-type: decimal;
       margin-left:20px;
 }