diff --git a/app/helpers/todos_helper.rb b/app/helpers/todos_helper.rb index 994fb305..b8ea341e 100644 --- a/app/helpers/todos_helper.rb +++ b/app/helpers/todos_helper.rb @@ -119,10 +119,8 @@ module TodosHelper def grip_span unless @todo.completed? image_tag('grip.png', :width => '7', :height => '16', :border => '0', - :title => 'Drag onto another action to make it depend on that action', - :class => 'grip') + - image_tag('blank.png', :width => 16, :height => 16, :border => 0, - :title => "Drop an action to make it depend on this action", :class => 'successor_target drop_target') + :title => 'Drag onto another action to make it depend on that action', + :class => 'grip') end end diff --git a/artwork/add_successor_on.svg b/artwork/add_successor_on.svg deleted file mode 100644 index b7b3165c..00000000 --- a/artwork/add_successor_on.svg +++ /dev/null @@ -1,179 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - image/svg+xml - - - - - - - - - - - diff --git a/artwork/predecessor.svg b/artwork/predecessor.svg deleted file mode 100644 index 75e1ea1a..00000000 --- a/artwork/predecessor.svg +++ /dev/null @@ -1,175 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - image/svg+xml - - - - - - - - - - - diff --git a/public/images/add_successor_off.png b/public/images/add_successor_off.png deleted file mode 100644 index 183f1326..00000000 Binary files a/public/images/add_successor_off.png and /dev/null differ diff --git a/public/images/add_successor_on.png b/public/images/add_successor_on.png deleted file mode 100644 index d9e6eff9..00000000 Binary files a/public/images/add_successor_on.png and /dev/null differ diff --git a/public/javascripts/application.js b/public/javascripts/application.js index cfe11d2e..4b025f51 100644 --- a/public/javascripts/application.js +++ b/public/javascripts/application.js @@ -229,7 +229,7 @@ function enable_rich_interaction(){ /* Drag & Drop for successor/predecessor */ function drop_todo(evt, ui) { dragged_todo = ui.draggable[0].id.split('_')[2]; - dropped_todo = $(this).parents('.item-show').get(0).id.split('_')[2]; + dropped_todo = this.id.split('_')[2]; ui.draggable.remove(); $(this).block({message: null}); $.post(relative_to_root('todos/add_predecessor'), @@ -247,7 +247,7 @@ function enable_rich_interaction(){ start: drag_todo, stop: function() {$('.drop_target').hide();}}); - $('.successor_target').droppable({drop: drop_todo, + $('.item-show').droppable({drop: drop_todo, tolerance: 'pointer', hoverClass: 'hover'}); diff --git a/public/stylesheets/standard.css b/public/stylesheets/standard.css index d214f861..7d2963cc 100644 --- a/public/stylesheets/standard.css +++ b/public/stylesheets/standard.css @@ -943,16 +943,9 @@ div.message { display:none; } -.successor_target { - background-image:url("../images/add_successor_off.png"); - background-repeat: no-repeat; - background-position: center right; -} - -.successor_target.hover { - background-image:url("../images/add_successor_on.png"); - background-repeat: no-repeat; - background-position: center right; +.hover { + background: #EAEAEA; + font-weight: bold; } .context_target {