X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/2e2f2124728ca755b2db8f83f022eaea24b647f0..0e7324839b2f1cd6a2d07be073ae14dfbf611beb:/app/views/browse/_navigation.html.erb?ds=sidebyside

diff --git a/app/views/browse/_navigation.html.erb b/app/views/browse/_navigation.html.erb
index 57e724d42..54e792a9f 100644
--- a/app/views/browse/_navigation.html.erb
+++ b/app/views/browse/_navigation.html.erb
@@ -1,13 +1,42 @@
-<div style="float:right; text-align:center; width: 250px;">
-  <% if @prev %>
-    &lt;
-    <%= link_to @prev.id.to_s, :id => @prev.id %>
-  <% end %>
-  <% if @prev and @next %>
-    | 
-  <% end %>
-  <% if @next %>
-    <%= link_to @next.id.to_s, :id => @next.id %>
-    &gt;
+<% type = (@next || @prev).class.name.downcase %>
+<% margin = @next_by_user || @prev_by_user ? 9 : 18 %>
+<div id="browse_navigation" style="margin-top: <%= margin %>px">
+  <% if @next_by_user or @prev_by_user %>
+    <span class="nowrap">
+      <% if @prev_by_user %>
+        <%= link_to t('browse.navigation.paging.user.prev', :id => @prev_by_user.id.to_s),
+                    { :id => @prev_by_user.id },
+                    { :title => t("browse.navigation.user.prev_#{type}_tooltip", :user => @prev_by_user.user.display_name) } %>
+        |
+      <% end %>
+      <%=
+      user = (@prev_by_user || @next_by_user).user.display_name
+      link_to h(user),
+              { :controller => "changeset", :action => "list", :display_name => user },
+              { :title => t("browse.navigation.user.name_#{type}_tooltip", :user => h(user)) }
+      %>
+      <% if @next_by_user %>
+        |
+        <%= link_to t('browse.navigation.paging.user.next', :id => @next_by_user.id.to_s),
+                    { :id => @next_by_user.id },
+                    { :title => t("browse.navigation.user.next_#{type}_tooltip", :user => @next_by_user.user.display_name) } %>
+      <% end %>
+    </span>
+    <br/>
   <% end %>
+  <span class="nowrap">
+    <% if @prev %>
+      <%= link_to t('browse.navigation.paging.all.prev', :id => @prev.id.to_s),
+                  { :id => @prev.id },
+                  { :title => t("browse.navigation.all.prev_#{type}_tooltip") } %>
+    <% end %>
+    <% if @prev and @next %>
+      | 
+    <% end %>
+    <% if @next %>
+      <%= link_to t('browse.navigation.paging.all.next', :id => @next.id.to_s),
+                  { :id => @next.id },
+                  { :title => t("browse.navigation.all.next_#{type}_tooltip") } %>
+    <% end %>
+  </span>
 </div>