From: Tom Hughes Date: Thu, 11 Apr 2024 17:18:22 +0000 (+0100) Subject: Merge remote-tracking branch 'upstream/pull/4678' X-Git-Tag: live~1137 X-Git-Url: https://git.openstreetmap.org/rails.git/commitdiff_plain/dd7034b055b70a496d2576539a4c85e16255ebee?hp=17f1be13fbdf64f748842c9f867c5a7ee315f34d Merge remote-tracking branch 'upstream/pull/4678' --- diff --git a/app/views/issues/show.html.erb b/app/views/issues/show.html.erb index 8b5f7f42d..ad463c259 100644 --- a/app/views/issues/show.html.erb +++ b/app/views/issues/show.html.erb @@ -45,7 +45,7 @@

<%= t ".reports_of_this_issue" %>

<% if @read_reports.present? %> -
+

<%= t ".read_reports" %>

<%= render "reports", :reports => @read_reports %>
diff --git a/app/views/shared/_richtext_field.html.erb b/app/views/shared/_richtext_field.html.erb index 22b3db542..f471cbbbf 100644 --- a/app/views/shared/_richtext_field.html.erb +++ b/app/views/shared/_richtext_field.html.erb @@ -4,7 +4,7 @@
-
+
<%= render :partial => "shared/#{type}_help" %> <%= submit_tag t(".edit"), :id => "#{id}_doedit", :class => "richtext_doedit btn btn-primary", :disabled => true %>