Work on changeset display

diff --git a/app/assets/stylesheets/common.css.scss b/app/assets/stylesheets/common.css.scss
index 10450e7487e59ef7e7a34e50647634b7abc17a6b..fb3c997c0b2108374740372fb58095c7af5abeb4 100644 (file)
--- a/app/assets/stylesheets/common.css.scss
+++ b/app/assets/stylesheets/common.css.scss
@@ -1079,8 +1079,18 @@ nav.secondary {
   float: right;
 }
 
-/* Rules for the changeset list shown by the history tab etc */
+/* Rules for the changeset list shown by the history tab */
 
+#sidebar .changesets {
+  li {
+    padding: $lineheight;
+    border-bottom: $keyline;
+  }
+
+  p {
+    padding: 0;
+  }
+}
 
 /* Rules for the data browser */
 

diff --git a/app/views/changeset/_changeset.html.erb b/app/views/changeset/_changeset.html.erb
index 3e4871ec069ef8daff3fb0f3655f2d2306d5be34..a63792968ec8873484d190b27808ed1b999c1cd0 100644 (file)
--- a/app/views/changeset/_changeset.html.erb
+++ b/app/views/changeset/_changeset.html.erb
@@ -12,39 +12,32 @@
    end
 %>
 
-<%= content_tag "ul", :class => 'changeset_item', :id => "changeset_#{changeset.id}", :data => {:changeset => changeset_data} do %>
-  <li>
+<%= content_tag "li", :id => "changeset_#{changeset.id}", :data => {:changeset => changeset_data} do %>
+  <%= link_to(changeset.id, changeset_path(changeset.id), :class => :changeset_id) %>
 
-    <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>
 
-    <span class='date'>
-      <% if changeset.closed_at > DateTime.now %> <%= t'changeset.changeset.still_editing' %>
-      <% else %><%= l changeset.closed_at, :format => :long %><% end %>
+  <% unless params.key?(:display_name) %>
+    <span class="user">
+      <% 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 %>
 
-    <%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 %>
-        <% else %>
-          <i><%= t'changeset.changeset.anonymous' %></i>
-        <% end %>
-      </span>
-    <% end %>
-  </li>
-
-  <li class="comment deemphasize">
+  <p class="comment deemphasize">
     <% if changeset.tags['comment'].to_s != '' %>
       <%= linkify(h(changeset.tags['comment'])) %>
     <% else %>
-      <%= t'changeset.changeset.no_comment' %>
+      <%= t 'changeset.changeset.no_comment' %>
     <% end %>
-  </li>
-
+  </p>
 <% end %>

diff --git a/app/views/changeset/_changeset_paging_nav.html.erb b/app/views/changeset/_changeset_paging_nav.html.erb
deleted file mode 100644 (file)
index 46b4635..0000000
--- a/app/views/changeset/_changeset_paging_nav.html.erb
+++ /dev/null
@@ -1,15 +0,0 @@
-<ul class='secondary-actions pager clearfix'>
-  <% if @page > 1 %>
-    <li><%= link_to t('changeset.changeset_paging_nav.previous'), params.merge({ :page => @page - 1 }) %></li>
-  <% else %>
-    <li><%= t('changeset.changeset_paging_nav.previous') %></li>
-  <% end %>
-
-  <li><%= t('changeset.changeset_paging_nav.showing_page', :page => @page) %></li>
-
-  <% if @edits.size < @page_size %>
-    <li><%= t('changeset.changeset_paging_nav.next') %></li>
-  <% else %>
-    <li><%= link_to t('changeset.changeset_paging_nav.next'), params.merge({ :page => @page + 1 }) %></li>
-  <% end %>
-</ul>
\ No newline at end of file

diff --git a/app/views/changeset/_changesets.html.erb b/app/views/changeset/_changesets.html.erb
deleted file mode 100644 (file)
index fe8da2b..0000000
--- a/app/views/changeset/_changesets.html.erb
+++ /dev/null
@@ -1,4 +0,0 @@
-<% showusername = true if showusername.nil? %>
-<div id="changeset_list">
-  <%= render :partial => 'changeset', :locals => {:showusername => showusername}, :collection => @edits unless @edits.nil? %>
-</div>

diff --git a/app/views/changeset/list.html.erb b/app/views/changeset/list.html.erb
index 262cae15ff56bdc194f5e1a14edc3beb104693c4..19707cd3f24f7998c0a35087b01695d100c4225f 100644 (file)
--- a/app/views/changeset/list.html.erb
+++ b/app/views/changeset/list.html.erb
@@ -11,8 +11,17 @@
   <h2><%= @heading %></h2>
 
   <% if @edits.size > 0 %>
-    <%= render :partial => 'changesets', :locals => { :showusername => !params.has_key?(:display_name) } %>
-    <%= render :partial => 'changeset_paging_nav' %>
+    <ol class="changesets">
+      <%= render :partial => 'changeset',
+                 :collection => @edits %>
+    </ol>
+
+    <div class="search_more">
+      <div class="inner12 search_results_entry">
+        <%= link_to t('geocoder.results.more_results'), '#', :class => "button" %>
+      </div>
+      <%= image_tag "searching.gif", :class => ["search_searching", "hidden"] %>
+    </div>
   <% elsif @user and @user.display_name == params[:display_name] %>
     <h4><%= t('changeset.list.empty_user_html') %></h4>
   <% else %>

diff --git a/app/views/layouts/_header.html.erb b/app/views/layouts/_header.html.erb
index f6d5bb9b9fa49ac70811454b962fd7b0ff78a11e..7035195156c32b58d49ef67d9449b40a0bff88d9 100644 (file)
--- a/app/views/layouts/_header.html.erb
+++ b/app/views/layouts/_header.html.erb
@@ -8,7 +8,7 @@
       <li id="view_tab">
         <%= link_to t('layouts.view'), root_path, :class => 'tab geolink llz layers' %>
       </li><li id="history_tab">
-        <%= link_to t('layouts.history'), browse_changesets_path, :class => 'tab geolink bbox' %>
+        <%= link_to t('layouts.history'), browse_changesets_path, :class => 'tab geolink llz' %>
       </li><li id="export_tab">
         <%= link_to t('layouts.export'), export_path, :class => 'tab geolink llz' %>
       </li><li id="edit_tab">