Use bootstrap utility class instead of custom css

[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 c72730a762b21fca08f1cae0904b378f4176d76f..f94fda12ab26e3ecf7b6fcf94b35584b6a1ac1d5 100644 (file)
--- a/app/views/browse/note.html.erb
+++ b/app/views/browse/note.html.erb
@@ -1,9 +1,6 @@
 <% set_title(t(".title", :id => @note.id)) %>
 
 <% set_title(t(".title", :id => @note.id)) %>
 

-<h2>
-  <a class="geolink" href="<%= root_path %>"><span class="icon close"></span></a>
-  <%= t ".#{@note.status}_title", :note_name => @note.id %>
-</h2>
+<%= render "sidebar_header", :title => t(".#{@note.status}_title", :note_name => @note.id) %>

 
 <div class="browse-section">
   <h4><%= t(".description") %></h4>
 
 <div class="browse-section">
   <h4><%= t(".description") %></h4>


@@ -19,7 +16,10 @@
       <% end %>
       <li>
         <%= t "browse.location" %>
       <% end %>
       <li>
         <%= t "browse.location" %>

-        <%= link_to(tag.span(number_with_delimiter(@note.lat), :class => "latitude") + ", " + tag.span(number_with_delimiter(@note.lon), :class => "longitude"), root_path(:anchor => "map=18/#{@note.lat}/#{@note.lon}")) %>
+        <%= link_to(t(".coordinates_html",
+                      :latitude => tag.span(number_with_delimiter(@note.lat), :class => "latitude"),
+                      :longitude => tag.span(number_with_delimiter(@note.lon), :class => "longitude")),
+                    root_path(:anchor => "map=18/#{@note.lat}/#{@note.lon}")) %>

       </li>
     </ul>
   </div>
       </li>
     </ul>
   </div>


@@ -35,7 +35,7 @@
   <% if @note_comments.length > 1 %>
     <div class='note-comments'>
       <ul class="list-unstyled">
   <% if @note_comments.length > 1 %>
     <div class='note-comments'>
       <ul class="list-unstyled">

-        <% @note_comments[1..-1].each do |comment| %>
+        <% @note_comments[1..].each do |comment| %>

           <li id="c<%= comment.id %>">
             <small class='text-muted'><%= note_event(comment.event, comment.created_at, comment.author) %></small>
             <%= comment.body.to_html %>
           <li id="c<%= comment.id %>">
             <small class='text-muted'><%= note_event(comment.event, comment.created_at, comment.author) %></small>
             <%= comment.body.to_html %>


@@ -47,7 +47,7 @@
 
   <% if @note.status == "open" %>
     <% if current_user -%>
 
   <% if @note.status == "open" %>
     <% if current_user -%>

-      <form action="#">
+      <form action="#" class="standard-form">

         <textarea class="comment" name="text" cols="40" rows="5" maxlength="2000"></textarea>
         <div class="buttons clearfix">
           <% if current_user.moderator? -%>
         <textarea class="comment" name="text" cols="40" rows="5" maxlength="2000"></textarea>
         <div class="buttons clearfix">
           <% if current_user.moderator? -%>


@@ -59,7 +59,7 @@
       </form>
     <% end -%>
   <% else %>
       </form>
     <% end -%>
   <% else %>

-    <form action="#">
+    <form action="#" class="standard-form">

       <input type="hidden" name="text" value="">
       <div class="buttons clearfix">
         <% if current_user and current_user.moderator? -%>
       <input type="hidden" name="text" value="">
       <div class="buttons clearfix">
         <% if current_user and current_user.moderator? -%>