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 3e4871ec069ef8daff3fb0f3655f2d2306d5be34..4bccbe516ad929778959046921577b47b9fdeada 100644 (file)
--- a/app/views/changeset/_changeset.html.erb
+++ b/app/views/changeset/_changeset.html.erb
@@ -12,39 +12,33 @@
    end
 %>
 
    end
 %>
 

-<%= content_tag "ul", :class => 'changeset_item', :id => "changeset_#{changeset.id}", :data => {:changeset => changeset_data} do %>
-  <li>
-
-    <span class="changeset_id">
-      <%=
-        link_to(changeset.id,
-          {:controller => 'browse', :action => 'changeset', :id => changeset.id},
-          {:title => t('changeset.changeset.view_changeset_details')})
-      %>
-    </span>
-
-    <span class='date'>
-      <% if changeset.closed_at > DateTime.now %> <%= t'changeset.changeset.still_editing' %>
-      <% else %><%= l changeset.closed_at, :format => :long %><% end %>
-    </span>
-
-    <%if showusername %>
-      <span class="user">
-        <% if changeset.user.data_public? %>
-          <%= link_to h(changeset.user.display_name), :controller => "changeset", :action => "list", :display_name => changeset.user.display_name %>
+<%= content_tag "li", :id => "changeset_#{changeset.id}", :data => {:changeset => changeset_data} do %>
+  <p class="comment">
+      <a class="changeset_id" href="<%= changeset_path(changeset.id) %>">
+        <% if changeset.tags['comment'].to_s != '' %>
+          <%= linkify(h(changeset.tags['comment'])) %>

         <% else %>
         <% else %>

-          <i><%= t'changeset.changeset.anonymous' %></i>
+          <%= t 'changeset.changeset.no_comment' %>

         <% end %>
         <% end %>

-      </span>
-    <% end %>
-  </li>
+      </a>
+  </p>

 
 

-  <li class="comment deemphasize">
-    <% if changeset.tags['comment'].to_s != '' %>
-      <%= linkify(h(changeset.tags['comment'])) %>
+  <span class='date'>
+    <% if changeset.closed_at > DateTime.now %>
+      <%= t 'changeset.changeset.still_editing' %>

     <% else %>
     <% else %>

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

     <% end %>
     <% end %>

-  </li>
+  </span>

 
 

+  <% unless params.key?(:display_name) %>
+    <span class="user"> by 
+      <% if changeset.user.data_public? %>
+        <%= link_to changeset.user.display_name, user_path(changeset.user.display_name) %>
+      <% else %>
+        <i><%= t 'changeset.changeset.anonymous' %></i>
+      <% end %>
+    </span>
+  <% end %>

 <% end %>
 <% end %>