-<% set_title("#{t('browse.note.title')} | #{@note.id}") %>
+<% set_title(t(".title", :id => @note.id)) %>
-<h2>
- <a class="geolink" href="<%= root_path %>"><span class="icon close"></span></a>
- <%= t "browse.note.#{@note.status}_title", :note_name => @note.id %>
-</h2>
-<div class="browse-section">
- <h4>
- <%= note_event('open', @note.created_at, @note.author) %>
- <% if @note.status == "closed" %>
- <br/>
- <%= note_event(@note.status, @note.closed_at, @note.comments.last.author) %>
- <% end %>
- </h4>
-</div>
-
-<% if @note.comments.find { |comment| comment.author.nil? } -%>
-<div class='browse-section common'>
- <p class='warning'><%= t "javascripts.notes.show.anonymous_warning" %></p>
-</div>
-<% end -%>
-
-<div class='browse-section common'>
- <div class='browse-field' id="c<%= @note.comments.first.id %>">
- <h4><%= t "browse.note.description" %></h4>
- <%= h(@note.comments.first.body.to_html) %>
- </div>
+<%= render "sidebar_header", :title => t(".#{@note.status}_title", :note_name => @note.id) %>
- <div class='browse-field'>
- <h4><%= t "browse.node_details.coordinates" %></h4>
- <p class='geo'><%= link_to ("<span class='latitude'>#{number_with_delimiter(@note.lat)}</span>, <span class='longitude'>#{number_with_delimiter(@note.lon)}</span>".html_safe), {:controller => 'site', :action => 'index', :lat => h(@note.lat), :lon => h(@note.lon), :zoom => "18"} %></p>
+<div>
+ <h4><%= t(".description") %></h4>
+ <div class="note-description">
+ <%= h(@note_comments.first.body.to_html) %>
</div>
-</div>
-<% if @note.comments.length > 1 %>
- <div class='browse-section clearfix note-comments'>
- <ul>
- <% @note.comments[1..-1].each do |comment| %>
- <li id="c<%= comment.id %>">
- <small class='deemphasize'><%= note_event(comment.event, comment.created_at, comment.author) %></small>
- <%= comment.body.to_html %>
- </li>
+ <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>
-<% end %>
-<div class="browse-section">
- <% if @note.status == "open" %>
- <form action="#">
- <textarea class="comment" name="text" cols="40" rows="5"></textarea>
- <div class="buttons clearfix">
- <input type="submit" name="hide" value="<%= t('javascripts.notes.show.hide') %>" class="hide_unless_moderator deemphasize" data-note-id="<%= @note.id %>" data-method="DELETE" data-url="<%= note_url(@note, 'json') %>">
- <input type="submit" name="close" value="<%= t('javascripts.notes.show.resolve') %>" class="hide_unless_logged_in" data-note-id="<%= @note.id %>" data-method="POST" data-url="<%= close_note_url(@note, 'json') %>">
- <input type="submit" name="comment" value="<%= t('javascripts.notes.show.comment') %>" data-note-id="<%= @note.id %>" data-method="POST" data-url="<%= comment_note_url(@note, 'json') %>" disabled="1">
+
+ <% 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>
- </form>
+ <% 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-note-id="<%= @note.id %>" data-method="DELETE" data-url="<%= note_url(@note, "json") %>">
+ <% end -%>
+ <input type="submit" name="close" value="<%= t("javascripts.notes.show.resolve") %>" class="btn btn-primary" data-note-id="<%= @note.id %>" data-method="POST" data-url="<%= close_note_url(@note, "json") %>">
+ <input type="submit" name="comment" value="<%= t("javascripts.notes.show.comment") %>" class="btn btn-primary" data-note-id="<%= @note.id %>" data-method="POST" data-url="<%= comment_note_url(@note, "json") %>" disabled="1">
+ </div>
+ </form>
+ <% end -%>
<% else %>
- <form action="#">
- <input type="hidden" name="text" value="">
- <div class="buttons clearfix">
- <input type="submit" name="hide" value="<%= t('javascripts.notes.show.hide') %>" class="hide_unless_moderator deemphasize" data-note-id="<%= @note.id %>" data-method="DELETE" data-url="<%= note_url(@note, 'json') %>">
- <input type="submit" name="reopen" value="<%= t('javascripts.notes.show.reactivate') %>" class="hide_unless_logged_in" data-note-id="<%= @note.id %>" data-method="POST" data-url="<%= reopen_note_url(@note, 'json') %>">
- </div>
- </form>
+ <form class="mb-3" action="#">
+ <input type="hidden" name="text" value="" autocomplete="off">
+ <div class="btn-wrapper">
+ <% if current_user and current_user.moderator? -%>
+ <input type="submit" name="hide" value="<%= t("javascripts.notes.show.hide") %>" class="btn btn-light" data-note-id="<%= @note.id %>" data-method="DELETE" data-url="<%= note_url(@note, "json") %>">
+ <% end -%>
+ <% if current_user -%>
+ <input type="submit" name="reopen" value="<%= t("javascripts.notes.show.reactivate") %>" class="btn btn-primary" data-note-id="<%= @note.id %>" data-method="POST" data-url="<%= reopen_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) %></small></p>
<% end %>
</div>
projects / rails.git / blobdiff