From: Andy Allan Date: Wed, 15 Jul 2020 17:09:46 +0000 (+0200) Subject: Convert warnings to use bootstrap alerts X-Git-Tag: live~2186^2~2 X-Git-Url: https://git.openstreetmap.org/rails.git/commitdiff_plain/30122011609aa02c32cfef6a31d3f28c1d0207e4?hp=06023cde279f07c39edebf3480d45ade33a763e4 Convert warnings to use bootstrap alerts The new note is guidance, rather than a warning, so it gets the info background --- diff --git a/app/views/browse/new_note.html.erb b/app/views/browse/new_note.html.erb index 2929e610e..51633ffca 100644 --- a/app/views/browse/new_note.html.erb +++ b/app/views/browse/new_note.html.erb @@ -6,7 +6,7 @@
-

<%= t("javascripts.notes.new.intro") %>

+

<%= t("javascripts.notes.new.intro") %>

diff --git a/app/views/browse/note.html.erb b/app/views/browse/note.html.erb index 0b91ca126..74d1223c7 100644 --- a/app/views/browse/note.html.erb +++ b/app/views/browse/note.html.erb @@ -12,15 +12,14 @@
- <%= note_event("opened", @note.created_at, @note.author) %> +

<%= note_event("opened", @note.created_at, @note.author) %>

<% if @note.status == "closed" %> -
- <%= note_event(@note.status, @note.closed_at, @note.all_comments.last.author) %> +

<%= note_event(@note.status, @note.closed_at, @note.all_comments.last.author) %>

<% end %>
<% if @note_comments.find { |comment| comment.author.nil? } -%> -

<%= t "javascripts.notes.show.anonymous_warning" %>

+

<%= t "javascripts.notes.show.anonymous_warning" %>

<% end -%> <% if current_user && current_user != @note.author %> diff --git a/app/views/site/export.html.erb b/app/views/site/export.html.erb index f1eed33cf..2eb23f755 100644 --- a/app/views/site/export.html.erb +++ b/app/views/site/export.html.erb @@ -24,7 +24,7 @@

<%= t ".export_details_html" %>

-

+

<%= t ".too_large.body" %>