Fix feedback loop between L.hash and popstate

[rails.git] / app / views / changeset / _changeset.html.erb

diff --git a/app/views/changeset/_changeset.html.erb b/app/views/changeset/_changeset.html.erb
index a63792968ec8873484d190b27808ed1b999c1cd0..4bccbe516ad929778959046921577b47b9fdeada 100644 (file)
--- a/app/views/changeset/_changeset.html.erb
+++ b/app/views/changeset/_changeset.html.erb
@@ -13,18 +13,27 @@
 %>
 
 <%= content_tag "li", :id => "changeset_#{changeset.id}", :data => {:changeset => changeset_data} do %>
 %>
 
 <%= content_tag "li", :id => "changeset_#{changeset.id}", :data => {:changeset => changeset_data} do %>

-  <%= link_to(changeset.id, changeset_path(changeset.id), :class => :changeset_id) %>
+  <p class="comment">
+      <a class="changeset_id" href="<%= changeset_path(changeset.id) %>">
+        <% if changeset.tags['comment'].to_s != '' %>
+          <%= linkify(h(changeset.tags['comment'])) %>
+        <% else %>
+          <%= t 'changeset.changeset.no_comment' %>
+        <% end %>
+      </a>
+  </p>

 
   <span class='date'>
     <% if changeset.closed_at > DateTime.now %>
       <%= t 'changeset.changeset.still_editing' %>
     <% else %>
 
   <span class='date'>
     <% if changeset.closed_at > DateTime.now %>
       <%= t 'changeset.changeset.still_editing' %>
     <% else %>

-      <%= l changeset.closed_at, :format => :long %>
+      <% closed_at = l changeset.closed_at, :format => :long %>
+      <abbr title='<%= closed_at %>'><%= distance_of_time_in_words_to_now(closed_at) %></abbr>

     <% end %>
   </span>
 
   <% unless params.key?(:display_name) %>
     <% end %>
   </span>
 
   <% unless params.key?(:display_name) %>

-    <span class="user">
+    <span class="user"> by 

       <% if changeset.user.data_public? %>
         <%= link_to changeset.user.display_name, user_path(changeset.user.display_name) %>
       <% else %>
       <% if changeset.user.data_public? %>
         <%= link_to changeset.user.display_name, user_path(changeset.user.display_name) %>
       <% else %>


@@ -32,12 +41,4 @@
       <% end %>
     </span>
   <% end %>
       <% end %>
     </span>
   <% end %>

-
-  <p class="comment deemphasize">
-    <% if changeset.tags['comment'].to_s != '' %>
-      <%= linkify(h(changeset.tags['comment'])) %>
-    <% else %>
-      <%= t 'changeset.changeset.no_comment' %>
-    <% end %>
-  </p>

 <% end %>
 <% end %>