Separate element strikethrough from classes

diff --git a/app/assets/stylesheets/browse.scss b/app/assets/stylesheets/browse.scss
index 7c6f4b36507dbf0eb7e4dca1c44592d2a3a74738..fe398bc5abf1d8c883811c6ff5bb78ca91e7de37 100644 (file)
--- a/app/assets/stylesheets/browse.scss
+++ b/app/assets/stylesheets/browse.scss
@@ -14,10 +14,6 @@
     margin-left: 25px;
   }
 
-  /* Deleted objects */
-
-  .deleted { text-decoration: line-through; }
-
   /* Nodes (and ways as areas) */
 
   .aeroway.aerodrome::before { content: image-url('browse/aerodrome.p.16.png'); }

diff --git a/app/helpers/browse_helper.rb b/app/helpers/browse_helper.rb
index 990921f42fbc2f1f1cc9bbfaabfbda6121265dc6..07fa48daf87fa1596e3408f523b25351c9c36399 100644 (file)
--- a/app/helpers/browse_helper.rb
+++ b/app/helpers/browse_helper.rb
@@ -1,4 +1,12 @@
 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
+      element_strikethrough object do
+        printable_name object
+      end
+    end
+  end
+
   def printable_name(object, version: false)
     id = if object.id.is_a?(Array)
            object.id[0]
@@ -27,16 +35,17 @@ module BrowseHelper
     name
   end
 
-  def element_class(type, object)
-    classes = [type]
-
-    if object.redacted?
-      classes << "deleted"
+  def element_strikethrough(object, &block)
+    if object.redacted? || !object.visible?
+      tag.s(&block)
     else
-      classes += icon_tags(object).flatten.map { |t| h(t) }
-      classes << "deleted" unless object.visible?
+      yield
     end
+  end
 
+  def element_class(type, object)
+    classes = [type]
+    classes += icon_tags(object).flatten.map { |t| h(t) } unless object.redacted?
     classes.join(" ")
   end
 

diff --git a/app/views/browse/_node.html.erb b/app/views/browse/_node.html.erb
index 3fd30a94c21f4f47c1e029f84cf8631e66970dff..6c6c1fdf32a32b12bd09ebfade54e2524b8e708e 100644 (file)
--- a/app/views/browse/_node.html.erb
+++ b/app/views/browse/_node.html.erb
@@ -17,7 +17,7 @@
           <summary><%= t "browse.part_of_ways", :count => node.ways.uniq.count %></summary>
           <ul class="list-unstyled">
             <% node.ways.uniq.each do |way| %>
-              <li><%= link_to printable_name(way), way_path(way), { :class => element_class("way", way), :title => link_title(way) } %></li>
+              <li><%= element_single_current_link "way", way, way_path(way) %></li>
             <% end %>
           </ul>
         </details>

diff --git a/app/views/browse/_relation_member.html.erb b/app/views/browse/_relation_member.html.erb
index ed2e56e016b6953d4a61817f786b2e13e1c39019..504b945aafbf5f1a26de1725f3d6b097ed52ca02 100644 (file)
--- a/app/views/browse/_relation_member.html.erb
+++ b/app/views/browse/_relation_member.html.erb
@@ -2,9 +2,11 @@
    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) }
    type_str = t ".type.#{relation_member.member_type.downcase}" %>
 <li class="<%= member_class %>">
-  <%= if relation_member.member_role.blank?
-        t ".entry_html", :type => type_str, :name => linked_name
-      else
-        t ".entry_role_html", :type => type_str, :name => linked_name, :role => relation_member.member_role
-      end %>
+  <%= element_strikethrough relation_member.member do %>
+    <%= if relation_member.member_role.blank?
+          t ".entry_html", :type => type_str, :name => linked_name
+        else
+          t ".entry_role_html", :type => type_str, :name => linked_name, :role => relation_member.member_role
+        end %>
+  <% end %>
 </li>

diff --git a/app/views/browse/_way.html.erb b/app/views/browse/_way.html.erb
index 0a3c86719fa4ac8e182f91b31b724f46c350d1ba..7197298aca6a5501acd0644d429b020eab4f8169 100644 (file)
--- a/app/views/browse/_way.html.erb
+++ b/app/views/browse/_way.html.erb
@@ -27,10 +27,12 @@
         <ul class="list-unstyled">
           <% way.way_nodes.each do |wn| %>
             <li>
-              <%= link_to printable_name(wn.node), node_path(wn.node), { :class => element_class("node", wn.node), :title => link_title(wn.node), :rel => link_follow(wn.node) } %>
+              <%= element_single_current_link "node", wn.node, node_path(wn.node) %>
               <% related_ways = wn.node.ways.reject { |w| w.id == wn.way_id } %>
               <% if related_ways.size > 0 then %>
-                (<%= t ".also_part_of_html", :count => related_ways.size, :related_ways => to_sentence(related_ways.map { |w| link_to(printable_name(w), way_path(w), { :class => element_class("way", w), :title => link_title(w) }) }) %>)
+                (<%= t ".also_part_of_html",
+                       :count => related_ways.size,
+                       :related_ways => to_sentence(related_ways.map { |w| element_single_current_link "way", w, way_path(w) }) %>)
               <% end %>
             </li>
           <% end %>

diff --git a/app/views/browse/changeset.html.erb b/app/views/browse/changeset.html.erb
index f01d5fb3e7c8da8528791162f9d47a952ceea58d..fcdc8f1553a0eb2a4be53d1d0df5f8475988e545 100644 (file)
--- a/app/views/browse/changeset.html.erb
+++ b/app/views/browse/changeset.html.erb
@@ -94,7 +94,9 @@
     <ul class="list-unstyled">
       <% @ways.each do |way| %>
         <li class="<%= element_class("way", way) %>">
-          <%= link_to printable_name(way, :version => true), { :action => "way", :id => way.way_id.to_s }, { :title => link_title(way) } %>
+          <%= element_strikethrough way do %>
+            <%= link_to printable_name(way, :version => true), { :action => "way", :id => way.way_id.to_s }, { :title => link_title(way) } %>
+          <% end %>
         </li>
       <% end %>
     </ul>
@@ -105,7 +107,9 @@
     <ul class="list-unstyled">
       <% @relations.each do |relation| %>
         <li class="<%= element_class("relation", relation) %>">
-          <%= link_to printable_name(relation, :version => true), { :action => "relation", :id => relation.relation_id.to_s }, { :title => link_title(relation) } %>
+          <%= element_strikethrough relation do %>
+            <%= link_to printable_name(relation, :version => true), { :action => "relation", :id => relation.relation_id.to_s }, { :title => link_title(relation) } %>
+          <% end %>
         </li>
       <% end %>
     </ul>
@@ -116,7 +120,9 @@
     <ul class="list-unstyled">
       <% @nodes.each do |node| %>
         <li class="<%= element_class("node", node) %>">
-          <%= link_to printable_name(node, :version => true), { :action => "node", :id => node.node_id.to_s }, { :title => link_title(node), :rel => link_follow(node) } %>
+          <%= element_strikethrough 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) } %>
+          <% end %>
         </li>
       <% end %>
     </ul>

diff --git a/test/helpers/browse_helper_test.rb b/test/helpers/browse_helper_test.rb
index fff9cc3258897ebdce20f68da3f1d825af6442ef..e26d0f4077a47a698d99b464c7a19b6b473dded0 100644 (file)
--- a/test/helpers/browse_helper_test.rb
+++ b/test/helpers/browse_helper_test.rb
@@ -58,6 +58,22 @@ class BrowseHelperTest < ActionView::TestCase
     end
   end
 
+  def test_element_strikethrough
+    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_v1.redact!(create(:redaction))
+
+    normal_output = element_strikethrough(node_v2) { "test" }
+    assert_equal "test", normal_output
+
+    redacted_output = element_strikethrough(node_v1) { "test" }
+    assert_equal "<s>test</s>", redacted_output
+
+    deleted_output = element_strikethrough(create(:node, :deleted)) { "test" }
+    assert_equal "<s>test</s>", deleted_output
+  end
+
   def test_element_class
     node = create(:node, :with_history, :version => 2)
     node_v1 = node.old_nodes.find_by(:version => 1)
@@ -69,11 +85,11 @@ class BrowseHelperTest < ActionView::TestCase
     add_old_tags_selection(node_v1)
 
     assert_equal "node", element_class("node", create(:node))
-    assert_equal "node deleted", element_class("node", create(:node, :deleted))
+    assert_equal "node", element_class("node", create(:node, :deleted))
 
     assert_equal "node building yes shop gift tourism museum", element_class("node", node)
     assert_equal "node building yes shop gift tourism museum", element_class("node", node_v2)
-    assert_equal "node deleted", element_class("node", node_v1)
+    assert_equal "node", element_class("node", node_v1)
   end
 
   def test_link_title