From c3b245f99e08b77f311ed39731bb66fcb3891292 Mon Sep 17 00:00:00 2001 From: Anton Khorev Date: Sat, 28 Jun 2025 17:32:01 +0300 Subject: [PATCH] Move browse section wrapper out of branching in element partials --- app/views/browse/_node.html.erb | 8 +++----- app/views/browse/_relation.html.erb | 8 +++----- app/views/browse/_way.html.erb | 8 +++----- 3 files changed, 9 insertions(+), 15 deletions(-) diff --git a/app/views/browse/_node.html.erb b/app/views/browse/_node.html.erb index d9a4b1b91..3c39bfe5a 100644 --- a/app/views/browse/_node.html.erb +++ b/app/views/browse/_node.html.erb @@ -1,13 +1,11 @@ -<% if node.redacted? && !params[:show_redactions] %> -
+<%= tag.div :class => ["browse-section", { "text-body-secondary" => node.redacted? && params[:show_redactions] }] do %> + <% if node.redacted? && !params[:show_redactions] %> <%= t "browse.redacted.message_html", :type => t("browse.redacted.type.node"), :version => node.version, :redaction_link => link_to(t("browse.redacted.redaction", :id => node.redaction.id), node.redaction) %> -
-<% else %> - <%= tag.div :class => ["browse-section", { "text-body-secondary" => node.redacted? }] do %> + <% else %> <%= render :partial => "browse/common_details", :object => node %> <% unless node.ways.empty? and node.containing_relation_members.empty? %> diff --git a/app/views/browse/_relation.html.erb b/app/views/browse/_relation.html.erb index e47882007..76f3ddf45 100644 --- a/app/views/browse/_relation.html.erb +++ b/app/views/browse/_relation.html.erb @@ -1,13 +1,11 @@ -<% if relation.redacted? && !params[:show_redactions] %> -
+<%= tag.div :class => ["browse-section", { "text-body-secondary" => relation.redacted? && params[:show_redactions] }] do %> + <% if relation.redacted? && !params[:show_redactions] %> <%= t "browse.redacted.message_html", :type => t("browse.redacted.type.relation"), :version => relation.version, :redaction_link => link_to(t("browse.redacted.redaction", :id => relation.redaction.id), relation.redaction) %> -
-<% else %> - <%= tag.div :class => ["browse-section", { "text-body-secondary" => relation.redacted? }] do %> + <% else %> <%= render :partial => "browse/common_details", :object => relation %> <% unless relation.containing_relation_members.empty? %> diff --git a/app/views/browse/_way.html.erb b/app/views/browse/_way.html.erb index 21fe4e67e..aa933e6c1 100644 --- a/app/views/browse/_way.html.erb +++ b/app/views/browse/_way.html.erb @@ -1,13 +1,11 @@ -<% if way.redacted? && !params[:show_redactions] %> -
+<%= tag.div :class => ["browse-section", { "text-body-secondary" => way.redacted? && params[:show_redactions] }] do %> + <% if way.redacted? && !params[:show_redactions] %> <%= t "browse.redacted.message_html", :type => t("browse.redacted.type.way"), :version => way.version, :redaction_link => link_to(t("browse.redacted.redaction", :id => way.redaction.id), way.redaction) %> -
-<% else %> - <%= tag.div :class => ["browse-section", { "text-body-secondary" => way.redacted? }] do %> + <% else %> <%= render :partial => "browse/common_details", :object => way %> <% unless way.containing_relation_members.empty? %> -- 2.39.5