Merge branch 'master' into openstreetbugs

[rails.git] / app / views / browse / _navigation.html.erb

diff --git a/app/views/browse/_navigation.html.erb b/app/views/browse/_navigation.html.erb
index ed483d8ec48aeba3a7997fb62725758cb354a828..54e792a9fdc9ff63a0fe5038ab8b1b75574012e9 100644 (file)
--- a/app/views/browse/_navigation.html.erb
+++ b/app/views/browse/_navigation.html.erb
@@ -1,40 +1,42 @@
-<div style="float:right; text-align:center; width: 100%;">
+<% 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.changeset_navigation.paging.user.prev', :id => @prev_by_user.id.to_s),
+        <%= link_to t('browse.navigation.paging.user.prev', :id => @prev_by_user.id.to_s),
                     { :id => @prev_by_user.id },
-                    { :title => t('browse.changeset_navigation.user.prev_tooltip', :user => @prev_by_user.user.display_name) } %>
+                    { :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.changeset_navigation.user.name_tooltip', :user => h(user)) }
+              { :title => t("browse.navigation.user.name_#{type}_tooltip", :user => h(user)) }
       %>
       <% if @next_by_user %>
         |
-        <%= link_to t('browse.changeset_navigation.paging.user.next', :id => @next_by_user.id.to_s),
+        <%= link_to t('browse.navigation.paging.user.next', :id => @next_by_user.id.to_s),
                     { :id => @next_by_user.id },
-                    { :title => t('browse.changeset_navigation.user.next_tooltip', :user => @next_by_user.user.display_name) } %>
+                    { :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.changeset_navigation.paging.all.prev', :id => @prev.id.to_s),
+      <%= link_to t('browse.navigation.paging.all.prev', :id => @prev.id.to_s),
                   { :id => @prev.id },
-                  { :title => t('browse.changeset_navigation.all.prev_tooltip') } %>
+                  { :title => t("browse.navigation.all.prev_#{type}_tooltip") } %>
     <% end %>
     <% if @prev and @next %>
       | 
     <% end %>
     <% if @next %>
-      <%= link_to t('browse.changeset_navigation.paging.all.next', :id => @next.id.to_s),
+      <%= link_to t('browse.navigation.paging.all.next', :id => @next.id.to_s),
                   { :id => @next.id },
-                  { :title => t('browse.changeset_navigation.all.next_tooltip') } %>
+                  { :title => t("browse.navigation.all.next_#{type}_tooltip") } %>
     <% end %>
   </span>
 </div>