cst1/openstreetmap-website
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Move browse#note to notes#show

Browse source 
This allows a more resourceful routing approach.
This commit is contained in:
Andy Allan 2023-01-25 21:46:35 +00:00
parent b5046fdcd0
commit 9748ce301c
22 changed files with 175 additions and 138 deletions
Download patch file Download diff file Expand all files Collapse all files

91
app/views/browse/note.html.erb
View file

@ -1,91 +0,0 @@
<% set_title(t(".title", :id => @note.id)) %>
<%= render "sidebar_header", :title => t(".#{@note.status}_title", :note_name => @note.id) %>
<div>
<h4><%= t(".description") %></h4>
<div class="note-description">
<%= h(@note_comments.first.body.to_html) %>
</div>
<div class="details" data-coordinates="<%= @note.lat %>,<%= @note.lon %>" data-status="<%= @note.status %>">
<ul class="list-unstyled">
<li><%= note_event("opened", @note.created_at, @note.author) %></li>
<% if @note.status == "closed" %>
<li><%= note_event(@note.status, @note.closed_at, @note.all_comments.last.author) %></li>
<% end %>
<li>
<%= t "browse.location" %>
<%= link_to(t(".coordinates_html",
:latitude => tag.span(number_with_delimiter(@note.lat), :class => "latitude"),
:longitude => tag.span(number_with_delimiter(@note.lon), :class => "longitude")),
root_path(:anchor => "map=18/#{@note.lat}/#{@note.lon}")) %>
</li>
</ul>
</div>
<% if @note_comments.find { |comment| comment.author.nil? } -%>
<p class='alert alert-warning'><%= t "javascripts.notes.show.anonymous_warning" %></p>
<% end -%>
<% if @note_comments.length > 1 %>
<div class='note-comments'>
<ul class="list-unstyled">
<% @note_comments.drop(1).each do |comment| %>
<li id="c<%= comment.id %>">
<small class='text-muted'><%= note_event(comment.event, comment.created_at, comment.author) %></small>
<%= comment.body.to_html %>
</li>
<% end %>
</ul>
</div>
<% end %>
<% if @note.status == "open" %>
<% if current_user -%>
<form class="mb-3" action="#">
<div class="mb-3">
<textarea class="form-control" name="text" cols="40" rows="5" maxlength="2000"></textarea>
</div>
<div class="btn-wrapper">
<% if current_user.moderator? -%>
<input type="submit" name="hide" value="<%= t("javascripts.notes.show.hide") %>" class="btn btn-light" data-method="DELETE" data-url="<%= api_note_url(@note, "json") %>">
<% end -%>
<input type="submit" name="close" value="<%= t("javascripts.notes.show.resolve") %>" class="btn btn-primary" data-method="POST" data-url="<%= close_api_note_url(@note, "json") %>">
<input type="submit" name="comment" value="<%= t("javascripts.notes.show.comment") %>" class="btn btn-primary" data-method="POST" data-url="<%= comment_api_note_url(@note, "json") %>" disabled="1">
</div>
</form>
<% end -%>
<% else %>
<form class="mb-3" action="#">
<input type="hidden" name="text" value="" autocomplete="off">
<div class="btn-wrapper">
<% if @note.status != "hidden" and current_user and current_user.moderator? -%>
<input type="submit" name="hide" value="<%= t("javascripts.notes.show.hide") %>" class="btn btn-light" data-method="DELETE" data-url="<%= api_note_url(@note, "json") %>">
<% end -%>
<% if current_user -%>
<input type="submit" name="reopen" value="<%= t("javascripts.notes.show.reactivate") %>" class="btn btn-primary" data-method="POST" data-url="<%= reopen_api_note_url(@note, "json") %>">
<% end -%>
</div>
</form>
<% end %>
<% if current_user && current_user != @note.author %>
<p>
<small class="text-muted">
<%= t "javascripts.notes.show.report_link_html", :link => report_link(t(".report"), @note) %>
<% if @note.status == "open" %>
<%= t "javascripts.notes.show.other_problems_resolve", :link => report_link(t(".report"), @note) %>
<% elsif @note.status == "closed" %>
<%= t "javascripts.notes.show.other_problems_resolved" %>
<% end %>
</small>
</p>
<% end %>
<% if @note.freshly_closed? %>
<small class="text-muted">
<%= t "javascripts.notes.show.disappear_date_html", :disappear_in => disappear_in(@note) %>
</small>
<% end %>
</div>