Drop with_format and user the new :formats render option instead

[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 5c42fddd632730b3f65240ac3a912b5efac400a0..59c96c4aa2bc78c791c0ec5e8e347c43ca20f483 100644 (file)
--- a/app/views/browse/note.html.erb
+++ b/app/views/browse/note.html.erb
@@ -1,83 +1,58 @@
-<table width="100%">
+<%= render :partial => "navigation" %>
+
+<h2>
+  <%= image_tag "#{@note.status}_note_marker.png", :alt => @note.status %>
+  <%= t "browse.note.#{@note.status}_title", :note_name => @note.id %>
+</h2>
+
+<%= render :partial => "map", :object => @note %>
+
+<table class="browse_details">
+

   <tr>
   <tr>

-    <td width="100%">
-      <h2>
-        <% if @note.status == "closed" %>
-          <%= image_tag("closed_note_marker.png", :alt => 'closed') %>
-          <%= t 'browse.note.closed_title', :note_name => @note.id %>
-        <% else %>
-          <%= image_tag("open_note_marker.png", :alt => 'open') %>
-          <%= t 'browse.note.open_title', :note_name => @note.id %>
-        <% end %>
-      </h2>
-    </td>
-    <td>
-      <%= render :partial => "navigation" %>
-    </td>
-  </tr>
-  <tr valign="top">
-    <td>
-      <table>
-        <tr>
-          <th><%= t 'browse.note.created_at' %></th>
-          <td><%= l @note.created_at %></td>
-        </tr>  
-       <tr>
-         <th><%= t 'browse.note.edited_at' %></th>
-         <td><%= l @note.updated_at %></td>
-       </tr>
-       <% if @note.status == "closed" %>
-         <tr>
-           <th><%= t 'browse.note.closed_at' %></th>
-           <td><%= l @note.closed_at %></td>
-         </tr>
-       <% end %>
-       <tr>
-         <th><%= t 'browse.note.opened_by' %></th>
-         <% if @note.author.nil? %>
-           <td> <%= @note.author_name %> </td>
-         <% else %>
-           <td><%= link_to h(@note.author_name), :controller => "user", :action => "view", :display_name => @note.author_name %></td>
-         <% end %>
-       </tr>
-       <tr>
-         <th><%= t 'browse.note.description' %></th>
-         <td><%= h(@note.comments.first.body) %></td>
-       </tr>
-       <tr>
-         <th><%= t 'browse.node_details.coordinates' %></th>
-         <td><div class="geo"><%= link_to ("<span class='latitude'>#{number_with_delimiter(@note.lat)}</span>, <span class='longitude'>#{number_with_delimiter(@note.lon)}</span>"), {:controller => 'site', :action => 'index', :lat => h(@note.lat), :lon => h(@note.lon), :zoom => "18"} %></div></td>
-       </tr>
-    </table>
+    <th><%= t "browse.note.opened" %></th>
+    <td><%= t "browse.note.at_by", :when => friendly_date(@note.created_at), :user => note_author(@note) %></td>
+  </tr>  

 
 

-    <br />
+  <% if @note.status == "closed" %>
+    <tr>
+      <th><%= t "browse.note.closed" %></th>
+      <td><%= t "browse.note.at_by", :when => friendly_date(@note.closed_at), :user => note_author(@note.comments.last) %></td>
+    </tr>  
+  <% elsif @note.comments.length > 1 %>
+    <tr>
+      <th><%= t "browse.note.last_modified" %></th>
+      <td><%= t "browse.note.at_by", :when => friendly_date(@note.updated_at), :user => note_author(@note.comments.last) %></td>
+    </tr>  
+  <% end %>

 
 

-    <% if @note.comments.length > 1 %>
-      <table>
-        <tr>
-          <th width="20%"> <%= t 'browse.note.comment_by' %></th>
-          <th width="60%"> <%= t 'browse.note.comment' %></th>
-          <th width="20%"> <%= t 'browse.note.date' %></th> 
-        </tr>
-        <% @note.comments[1..-1].each do |comment| %>
-          <tr>
-            <td>
-              <% if comment.author.nil? %>
-                <%= comment.author_name %>
-              <% else %>
-                <%= link_to h(comment.author.display_name), :controller => "user", :action => "view", :display_name => comment.author.display_name %>                                  
-              <% end %>
-            </td>
-            <td> <%= h(comment.body) %> </td>
-            <td> <%= l comment.created_at %> </td>
-          </tr>
-        <% end %>
-      </table>
-    <% end %>
-       
-    <hr />
-    </td>
+  <tr>
+    <th><%= t "browse.note.description" %></th>
+    <td><%= h(@note.comments.first.body) %></td>
+  </tr>

 
 

-    <%= render :partial => "map", :object => @note %>
+  <tr>
+    <th><%= t "browse.node_details.coordinates" %></th>
+    <td><div class="geo"><%= link_to ("<span class='latitude'>#{number_with_delimiter(@note.lat)}</span>, <span class='longitude'>#{number_with_delimiter(@note.lon)}</span>"), {:controller => 'site', :action => 'index', :lat => h(@note.lat), :lon => h(@note.lon), :zoom => "18"} %></div></td>

   </tr>
   </tr>

+
+  <% if @note.comments.length > 1 %>
+    <tr valign="top">
+      <th><%= t "browse.note.comments" %></th>
+      <td class="browse_comments">
+        <table>
+          <% @note.comments[1..-1].each do |comment| %>
+            <tr>
+              <td>
+                <%= h(comment.body) %>
+                <br />
+                <span class="by"><%= t "browse.note.at_by", :when => friendly_date(comment.created_at), :user => note_author(comment) %></span>
+              </td>
+            </tr>
+          <% end %>
+        </table>
+      </td>
+    </tr>
+  <% end %>
+

 </table>
 </table>