Enable line breaks in performatted text within rich text

[rails.git] / app / views / browse / note.html.erb

diff --git a/app/views/browse/note.html.erb b/app/views/browse/note.html.erb
index 90c1f358d9af784a993d7afe1805d2867d054313..53ea0759e9f79866bbbfc97dfe416e0b0a1d0e8d 100644 (file)
--- a/app/views/browse/note.html.erb
+++ b/app/views/browse/note.html.erb
@@ -1,59 +1,69 @@
-<% content_for :head do %>
-  <%= stylesheet_link_tag 'browse' %>
-  <%= javascript_include_tag 'index' %>
-<% end %>
+<% set_title(t('.title', :id => @note.id)) %>
 
-<% content_for :sidebar do %>
-  <h2><%= t "browse.note.#{@note.status}_title", :note_name => @note.id %></h2>
+<h2>
+  <a class="geolink" href="<%= root_path %>"><span class="icon close"></span></a>
+  <%= t ".#{@note.status}_title", :note_name => @note.id %>
+</h2>
 
-  <% if @note.comments.find { |comment| comment.author.nil? } -%>
-  <div class='browse-section common'>
-    <p class="warning"><%= t "javascripts.notes.show.anonymous_warning" %></p>
+<div class="browse-section">
+  <h4><%= t('.description') %></h4>
+  <div class="note-description">
+    <%= h(@note_comments.first.body.to_html) %>
   </div>
-  <% end -%>
-
-  <div class='browse-section common'>
-    <div class='browse-field'>
-      <h4><%= t "browse.note.opened" %></h4>
-      <p><%= note_event(@note.created_at, @note.author) %></p>
-    </div>
 
+  <div class="details" data-coordinates="<%= @note.lat %>,<%= @note.lon %>" data-status="<%= @note.status %>">
+    <%= note_event('open', @note.created_at, @note.author) %>
     <% if @note.status == "closed" %>
-      <div class='browse-field'>
-        <h4><%= t "browse.note.closed" %></h4>
-        <p><%= note_event(@note.closed_at, @note.comments.last.author) %></p>
-      </div>
-    <% elsif @note.comments.length > 1 %>
-      <div class='browse-field'>
-        <h4><%= t "browse.note.last_modified" %></h4>
-        <p><%= note_event(@note.updated_at, @note.comments.last.author) %></p>
-      </div>
+      <br/>
+      <%= note_event(@note.status, @note.closed_at, @note_comments.last.author) %>
     <% end %>
+  </div>
 
-    <div class='browse-field' id="c<%= @note.comments.first.id %>">
-      <h4><%= t "browse.note.description" %></h4>
-      <p><%= h(@note.comments.first.body.to_html) %></p>
-    </div>
+  <% if @note_comments.find { |comment| comment.author.nil? } -%>
+    <p class='warning'><%= t "javascripts.notes.show.anonymous_warning" %></p>
+  <% end -%>
 
-    <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>
-  </div>
+  <% if current_user && current_user != @note.author %>
+    <p class="deemphasize"><%= report_link(t(".report"), @note) %></p>
+  <% end %>
 
-  <% if @note.comments.length > 1 %>
-    <div class='browse-section clearfix'>
-      <h4><%= t "browse.note.comments" %></h4>
+  <% if @note_comments.length > 1 %>
+    <div class='note-comments'>
       <ul>
-        <% @note.comments[1..-1].each do |comment| %>
+        <% @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 %>
-            <small class="deemphasize"><%= note_event(comment.created_at, comment.author) %></small>
           </li>
         <% end %>
       </ul>
     </div>
   <% end %>
-<% end %>
 
-<%= render :template => 'layouts/map' %>
+  <% if @note.status == "open" %>
+    <form action="#">
+      <textarea class="comment" name="text" cols="40" rows="5"></textarea>
+      <div class="buttons clearfix">
+        <% if current_user and current_user.moderator? -%>
+          <input type="submit" name="hide" value="<%= t('javascripts.notes.show.hide') %>" class="deemphasize" data-note-id="<%= @note.id %>" data-method="DELETE" data-url="<%= note_url(@note, 'json') %>">
+        <% end -%>
+        <% if current_user -%>
+          <input type="submit" name="close" value="<%= t('javascripts.notes.show.resolve') %>" data-note-id="<%= @note.id %>" data-method="POST" data-url="<%= close_note_url(@note, 'json') %>">
+        <% end -%>
+        <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">
+      </div>
+    </form>
+  <% else %>
+    <form action="#">
+      <input type="hidden" name="text" value="">
+      <div class="buttons clearfix">
+        <% if current_user and current_user.moderator? -%>
+          <input type="submit" name="hide" value="<%= t('javascripts.notes.show.hide') %>" class="deemphasize" 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') %>" data-note-id="<%= @note.id %>" data-method="POST" data-url="<%= reopen_note_url(@note, 'json') %>">
+        <% end -%>
+      </div>
+    </form>
+  <% end %>
+</div>