Andreas/tracks
1
0
Fork 0
mirror of https://github.com/TracksApp/tracks.git synced 2026-01-02 07:18:49 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

solved conflict of using class=notes for both notes controller and notes of actions. Solves #574

Browse source 
git-svn-id: http://www.rousette.org.uk/svn/tracks-repos/trunk@605 a4c988fc-2ded-0310-b66e-134b36920a42
This commit is contained in:
lrbalt 2007-10-01 19:55:36 +00:00
parent 7d40e48230
commit 5d4e8ffe3c
3 changed files with 8 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

4
tracks/app/views/layouts/standard.rhtml
View file

@ -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">

4
tracks/app/views/todos/_toggle_notes.rhtml
View file

@ -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>

8
tracks/public/stylesheets/standard.css
View file

@ -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;
}