Rejig changeset details in the style of danstowell

[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 a89ad07e5e543ee63af633c68bb5664b7b09848b..2d2560ef2ff51a5e52b584cc07962f0b8b3a034e 100644 (file)
--- a/app/views/browse/note.html.erb
+++ b/app/views/browse/note.html.erb
@@ -1,61 +1,50 @@
-<% content_for :head do %>
-<%= stylesheet_link_tag 'browse' %>
-<% end %>
-
-<% content_for :heading do %>
-  <h2>
-    <%= image_tag "#{@note.status}_note_marker.png", :alt => @note.status %>
-    <%= t "browse.note.#{@note.status}_title", :note_name => @note.id %>
-  </h2>
-<% end %>
+<h2><%= t "browse.note.#{@note.status}_title", :note_name => @note.id %></h2>
 
-<%= render :partial => "navigation" %>
-
-<%= render :partial => "map", :object => @note %>
+<% 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='column-1'>
+<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='browse-section common'>
-    <div>
-      <h4><%= t "browse.note.opened" %></h4>
-      <p><%= note_event(@note.created_at, @note.author) %></p>
+  <% 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>
-
-    <% if @note.status == "closed" %>
-      <div>
-        <h4><%= t "browse.note.closed" %></h4>
-        <p><%= note_event(@note.closed_at, @note.comments.last.author) %></p>
-      </div>  
-    <% elsif @note.comments.length > 1 %>
-      <div>
-        <h4><%= t "browse.note.last_modified" %></h4>
-        <p><%= note_event(@note.updated_at, @note.comments.last.author) %></p>
-      </div>  
-    <% end %>
-
-    <div>
-      <h4><%= t "browse.note.description" %></h4>
-      <p><%= h(@note.comments.first.body) %></p>
+  <% 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>
+  <% end %>
 
-    <div>
-      <h4><%= t "browse.node_details.coordinates" %></h4>
-      <p><div 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"} %></div></p>
-    </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.length > 1 %>
-    <div class='browse-section clearfix'>
-      <h4><%= t "browse.note.comments" %></h4>
-      <ul>
-        <% @note.comments[1..-1].each do |comment| %>
-          <li>
-            <%= comment.body.to_html %>
-            <small class="deemphasize"><%= note_event(comment.created_at, comment.author) %></small>
-          </li>
-        <% end %>
-      </ul>
-    </div>
-  <% 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 @note.comments.length > 1 %>
+  <div class='browse-section clearfix'>
+    <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 %>