Merge branch 'master' into redesign

[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 061a86b067c220ac2a3dffa37396fdc98c42db94..90d34b5742dbbd8ea6a3c5f2e735efc132327faa 100644 (file)
--- a/app/views/browse/note.html.erb
+++ b/app/views/browse/note.html.erb
@@ -1,65 +1,57 @@
-<h2><%= t "browse.note.#{@note.status}_title", :note_name => @note.id %>
+<% set_title("#{t('browse.note.title')} | #{@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">
-  <span>
-    <%= t "browse.note.opened" %>: 
-    <abbr><%= note_event(@note.created_at, @note.author) %></abbr> by 
-    <% if @note.author.nil? %>
-      <%= t "browse.note.anonymous" %>
-    <% else %>
-      <%= note_author(@note.author) %>
-    <% end %>
+  <h4><%= t('browse.note.mine.description') %></h4>
+  <div class="note-description">
+    <%= h(@note.comments.first.body.to_html) %>
+  </div>
+
+  <div class="details" data-coordinates="<%= number_with_delimiter(@note.lat) %>,<%=number_with_delimiter(@note.lon) %>" data-status="<%= @note.status %>">
+    <%= note_event('open', @note.created_at, @note.author) %>
     <% if @note.status == "closed" %>
-      </span><span>
-      <%= t "browse.note.closed" %>:
-      <abbr><%= note_event(@note.closed_at, @note.author) %></abbr> by 
-      <%= @note.comments.last.author %>
+      <br/>
+      <%= note_event(@note.status, @note.closed_at, @note.comments.last.author) %>
     <% end %>
-  </span>
-</div>
+  </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 -%>
+  <% if @note.comments.find { |comment| comment.author.nil? } -%>
+    <p class='warning'><%= t "javascripts.notes.show.anonymous_warning" %></p>
+  <% end -%>
 
-<div class='browse-section common'>
-  <% 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>
+  <% if @note.comments.length > 1 %>
+    <div class='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>
+        <% end %>
+      </ul>
     </div>
   <% end %>
 
-  <div class='browse-field' id="c<%= @note.comments.first.id %>">
-    <h4><%= t "browse.note.description" %></h4>
-    <%= h(@note.comments.first.body.to_html) %>
-    <!-- this provides it's own <p> tags -->
-  </div>
-
-  <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>
+  <% 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">
+      </div>
+    </form>
+  <% 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>
+  <% end %>
 </div>
-
-<% if @note.comments.length > 1 %>
-  <div class='browse-section clearfix note-comments'>
-    <h4><%= t "browse.note.comments" %></h4>
-    <ul>
-      <% @note.comments[1..-1].each do |comment| %>
-        <li id="c<%= comment.id %>">
-          <%= comment.body.to_html %>
-          <small class='deemphasize'><%= note_event(comment.created_at, comment.author) %></small>
-        </li>
-      <% end %>
-    </ul>
-  </div>
-<% end %>