Simplify geolink-related code

[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 31fd00f014255e8bbcc53af55e2d940037e4ac5f..8ccd525a3d4c1fbfab599a5aa8bbfa235febc922 100644 (file)
--- a/app/views/browse/note.html.erb
+++ b/app/views/browse/note.html.erb
@@ -1,19 +1,9 @@
 <% content_for :head do %>
 <% content_for :head do %>

-<%= stylesheet_link_tag 'browse' %>
+  <%= stylesheet_link_tag 'browse' %>

 <% end %>
 
 <% 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 %>
-
-<%= render :partial => "navigation" %>
-
-<%= render :partial => "map", :object => @note %>
-
-<div class='column-1'>
+<% content_for :sidebar do %>
+  <h2><%= t "browse.note.#{@note.status}_title", :note_name => @note.id %></h2>

 
   <% if @note.comments.find { |comment| comment.author.nil? } -%>
   <div class='browse-section common'>
 
   <% if @note.comments.find { |comment| comment.author.nil? } -%>
   <div class='browse-section common'>


@@ -22,29 +12,29 @@
   <% end -%>
 
   <div class='browse-section common'>
   <% end -%>
 
   <div class='browse-section common'>

-    <div>
+    <div class='browse-field'>

       <h4><%= t "browse.note.opened" %></h4>
       <p><%= note_event(@note.created_at, @note.author) %></p>
     </div>
 
     <% if @note.status == "closed" %>
       <h4><%= t "browse.note.opened" %></h4>
       <p><%= note_event(@note.created_at, @note.author) %></p>
     </div>
 
     <% if @note.status == "closed" %>

-      <div>
+      <div class='browse-field'>

         <h4><%= t "browse.note.closed" %></h4>
         <p><%= note_event(@note.closed_at, @note.comments.last.author) %></p>
         <h4><%= t "browse.note.closed" %></h4>
         <p><%= note_event(@note.closed_at, @note.comments.last.author) %></p>

-      </div>  
+      </div>

     <% elsif @note.comments.length > 1 %>
     <% elsif @note.comments.length > 1 %>

-      <div>
+      <div class='browse-field'>

         <h4><%= t "browse.note.last_modified" %></h4>
         <p><%= note_event(@note.updated_at, @note.comments.last.author) %></p>
         <h4><%= t "browse.note.last_modified" %></h4>
         <p><%= note_event(@note.updated_at, @note.comments.last.author) %></p>

-      </div>  
+      </div>

     <% end %>
 
     <% end %>
 

-    <div id="c<%= @note.comments.first.id %>">
+    <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>
 
       <h4><%= t "browse.note.description" %></h4>
       <p><%= h(@note.comments.first.body.to_html) %></p>
     </div>
 

-    <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>
       <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>


@@ -63,5 +53,6 @@
       </ul>
     </div>
   <% end %>
       </ul>
     </div>
   <% end %>

+<% end %>

 
 

-</div>
+<%= render :template => 'layouts/map' %>