Move element title to changeset/relation list item

diff --git a/app/helpers/browse_helper.rb b/app/helpers/browse_helper.rb
index 29f243cf4635c356529bc9c4e3d0aa09e83db4d4..3c9d4d09239ca9eb9ee0f0bdeaa788e9686f5df9 100644 (file)
--- a/app/helpers/browse_helper.rb
+++ b/app/helpers/browse_helper.rb
@@ -1,6 +1,6 @@
 module BrowseHelper
   def element_single_current_link(type, object, url)
 module BrowseHelper
   def element_single_current_link(type, object, url)

-    link_to url, { :class => element_class(type, object), :title => link_title(object), :rel => (link_follow(object) if type == "node") } do
+    link_to url, { :class => element_class(type, object), :title => element_title(object), :rel => (link_follow(object) if type == "node") } do

       element_strikethrough object do
         printable_name object
       end
       element_strikethrough object do
         printable_name object
       end


@@ -8,7 +8,7 @@ module BrowseHelper
   end
 
   def element_list_item(type, object, &block)
   end
 
   def element_list_item(type, object, &block)

-    tag.li :class => element_class(type, object) do
+    tag.li :class => element_class(type, object), :title => element_title(object) do

       element_strikethrough object, &block
     end
   end
       element_strikethrough object, &block
     end
   end


@@ -55,7 +55,7 @@ module BrowseHelper
     classes.join(" ")
   end
 
     classes.join(" ")
   end
 

-  def link_title(object)
+  def element_title(object)

     if object.redacted?
       ""
     else
     if object.redacted?
       ""
     else

diff --git a/app/views/browse/_relation_member.html.erb b/app/views/browse/_relation_member.html.erb
index 93c33b8a7e1e81f6a188cda68b3c5531ef91708f..56b8f154fd3e3b0431f56570359ca3350cb873b0 100644 (file)
--- a/app/views/browse/_relation_member.html.erb
+++ b/app/views/browse/_relation_member.html.erb
@@ -1,4 +1,4 @@
-<% linked_name = link_to printable_name(relation_member.member), { :controller => :browse, :action => relation_member.member_type.downcase, :id => relation_member.member_id.to_s }, { :title => link_title(relation_member.member), :rel => link_follow(relation_member.member) }
+<% linked_name = link_to printable_name(relation_member.member), { :controller => :browse, :action => relation_member.member_type.downcase, :id => relation_member.member_id.to_s }, { :rel => link_follow(relation_member.member) }

    type_str = t ".type.#{relation_member.member_type.downcase}" %>
 <%= element_list_item relation_member.member_type.downcase, relation_member.member do %>
   <%= if relation_member.member_role.blank?
    type_str = t ".type.#{relation_member.member_type.downcase}" %>
 <%= element_list_item relation_member.member_type.downcase, relation_member.member do %>
   <%= if relation_member.member_role.blank?

diff --git a/app/views/browse/changeset.html.erb b/app/views/browse/changeset.html.erb
index eac8bd47240083ffe2836940bfb898fc67c41635..d2ccff44d2222eed590414caa53e61ab17255b53 100644 (file)
--- a/app/views/browse/changeset.html.erb
+++ b/app/views/browse/changeset.html.erb
@@ -94,7 +94,7 @@
     <ul class="list-unstyled">
       <% @ways.each do |way| %>
         <%= element_list_item "way", way do %>
     <ul class="list-unstyled">
       <% @ways.each do |way| %>
         <%= element_list_item "way", way do %>

-          <%= link_to printable_name(way, :version => true), { :action => "way", :id => way.way_id.to_s }, { :title => link_title(way) } %>
+          <%= link_to printable_name(way, :version => true), { :action => "way", :id => way.way_id.to_s } %>

         <% end %>
       <% end %>
     </ul>
         <% end %>
       <% end %>
     </ul>


@@ -105,7 +105,7 @@
     <ul class="list-unstyled">
       <% @relations.each do |relation| %>
         <%= element_list_item "relation", relation do %>
     <ul class="list-unstyled">
       <% @relations.each do |relation| %>
         <%= element_list_item "relation", relation do %>

-          <%= link_to printable_name(relation, :version => true), { :action => "relation", :id => relation.relation_id.to_s }, { :title => link_title(relation) } %>
+          <%= link_to printable_name(relation, :version => true), { :action => "relation", :id => relation.relation_id.to_s } %>

         <% end %>
       <% end %>
     </ul>
         <% end %>
       <% end %>
     </ul>


@@ -116,7 +116,7 @@
     <ul class="list-unstyled">
       <% @nodes.each do |node| %>
         <%= element_list_item "node", node do %>
     <ul class="list-unstyled">
       <% @nodes.each do |node| %>
         <%= element_list_item "node", node do %>

-          <%= link_to printable_name(node, :version => true), { :action => "node", :id => node.node_id.to_s }, { :title => link_title(node), :rel => link_follow(node) } %>
+          <%= link_to printable_name(node, :version => true), { :action => "node", :id => node.node_id.to_s }, { :rel => link_follow(node) } %>

         <% end %>
       <% end %>
     </ul>
         <% end %>
       <% end %>
     </ul>

diff --git a/test/helpers/browse_helper_test.rb b/test/helpers/browse_helper_test.rb
index e26d0f4077a47a698d99b464c7a19b6b473dded0..06d5f3d531c5e00b3fa12129f9b8e48b8c3e0ee1 100644 (file)
--- a/test/helpers/browse_helper_test.rb
+++ b/test/helpers/browse_helper_test.rb
@@ -92,7 +92,7 @@ class BrowseHelperTest < ActionView::TestCase
     assert_equal "node", element_class("node", node_v1)
   end
 
     assert_equal "node", element_class("node", node_v1)
   end
 

-  def test_link_title
+  def test_element_title

     node = create(:node, :with_history, :version => 2)
     node_v1 = node.old_nodes.find_by(:version => 1)
     node_v2 = node.old_nodes.find_by(:version => 2)
     node = create(:node, :with_history, :version => 2)
     node_v1 = node.old_nodes.find_by(:version => 1)
     node_v2 = node.old_nodes.find_by(:version => 2)


@@ -102,12 +102,12 @@ class BrowseHelperTest < ActionView::TestCase
     add_old_tags_selection(node_v2)
     add_old_tags_selection(node_v1)
 
     add_old_tags_selection(node_v2)
     add_old_tags_selection(node_v1)
 

-    assert_equal "", link_title(create(:node))
-    assert_equal "", link_title(create(:node, :deleted))
+    assert_equal "", element_title(create(:node))
+    assert_equal "", element_title(create(:node, :deleted))

 
 

-    assert_equal "building=yes, shop=gift, and tourism=museum", link_title(node)
-    assert_equal "building=yes, shop=gift, and tourism=museum", link_title(node_v2)
-    assert_equal "", link_title(node_v1)
+    assert_equal "building=yes, shop=gift, and tourism=museum", element_title(node)
+    assert_equal "building=yes, shop=gift, and tourism=museum", element_title(node_v2)
+    assert_equal "", element_title(node_v1)

   end
 
   def test_icon_tags
   end
 
   def test_icon_tags