Convert warnings to use bootstrap alerts
The new note is guidance, rather than a warning, so it gets the info background
This commit is contained in:
parent
06023cde27
commit
3012201160
3 changed files with 5 additions and 6 deletions
|
@ -6,7 +6,7 @@
|
||||||
</h2>
|
</h2>
|
||||||
|
|
||||||
<div class="note browse-section">
|
<div class="note browse-section">
|
||||||
<p class="warning"><%= t("javascripts.notes.new.intro") %></p>
|
<p class="alert alert-info"><%= t("javascripts.notes.new.intro") %></p>
|
||||||
<form action="#">
|
<form action="#">
|
||||||
<input type="hidden" name="lon">
|
<input type="hidden" name="lon">
|
||||||
<input type="hidden" name="lat">
|
<input type="hidden" name="lat">
|
||||||
|
|
|
@ -12,15 +12,14 @@
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
<div class="details" data-coordinates="<%= @note.lat %>,<%= @note.lon %>" data-status="<%= @note.status %>">
|
<div class="details" data-coordinates="<%= @note.lat %>,<%= @note.lon %>" data-status="<%= @note.status %>">
|
||||||
<%= note_event("opened", @note.created_at, @note.author) %>
|
<p><%= note_event("opened", @note.created_at, @note.author) %></p>
|
||||||
<% if @note.status == "closed" %>
|
<% if @note.status == "closed" %>
|
||||||
<br />
|
<p><%= note_event(@note.status, @note.closed_at, @note.all_comments.last.author) %></p>
|
||||||
<%= note_event(@note.status, @note.closed_at, @note.all_comments.last.author) %>
|
|
||||||
<% end %>
|
<% end %>
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
<% if @note_comments.find { |comment| comment.author.nil? } -%>
|
<% if @note_comments.find { |comment| comment.author.nil? } -%>
|
||||||
<p class='warning'><%= t "javascripts.notes.show.anonymous_warning" %></p>
|
<p class='alert alert-warning'><%= t "javascripts.notes.show.anonymous_warning" %></p>
|
||||||
<% end -%>
|
<% end -%>
|
||||||
|
|
||||||
<% if current_user && current_user != @note.author %>
|
<% if current_user && current_user != @note.author %>
|
||||||
|
|
|
@ -24,7 +24,7 @@
|
||||||
<p><%= t ".export_details_html" %></p>
|
<p><%= t ".export_details_html" %></p>
|
||||||
|
|
||||||
<div id="export_osm_too_large">
|
<div id="export_osm_too_large">
|
||||||
<p class="warning">
|
<p class="alert alert-warning">
|
||||||
<%= t ".too_large.body" %>
|
<%= t ".too_large.body" %>
|
||||||
</p>
|
</p>
|
||||||
</div>
|
</div>
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue