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 b125ac75fceb92a6e2414ed832cb155c66147a83..ed483d8ec48aeba3a7997fb62725758cb354a828 100644 (file)
--- a/app/views/browse/_navigation.html.erb
+++ b/app/views/browse/_navigation.html.erb
@@ -1,36 +1,40 @@
-<div style="float:right; text-align:center; width: 250px;">
+<div style="float:right; text-align:center; width: 100%;">

   <% if @next_by_user or @prev_by_user %>
   <% if @next_by_user or @prev_by_user %>

-    <% if @prev_by_user %>
-       <%= link_to t('browse.changeset_navigation.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) } %>
-    |
-    <% end %>
-    <%=
-    user = (@prev_by_user || @next_by_user).user.display_name
-    link_to(t('browse.changeset_navigation.user.name', :user => h(user)),
-            { :controller => "changeset", :action => "list", :display_name => user },
-            { :title => t('browse.changeset_navigation.user.name_tooltip', :user => h(user)) })
-    %>
-    <% if @next_by_user %>
-    |
-      <%= link_to t('browse.changeset_navigation.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) } %>
-    <% end %>
+    <span class="nowrap">
+      <% if @prev_by_user %>
+        <%= link_to t('browse.changeset_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) } %>
+        |
+      <% 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)) }
+      %>
+      <% if @next_by_user %>
+        |
+        <%= link_to t('browse.changeset_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) } %>
+      <% end %>
+    </span>

     <br/>
   <% end %>
     <br/>
   <% end %>

-  <% if @prev %>
-    <%= link_to t('browse.changeset_navigation.all.prev', :id => @prev.id.to_s),
-                { :id => @prev.id },
-                { :title => t('browse.changeset_navigation.all.prev_tooltip') } %>
-  <% end %>
-  <% if @prev and @next %>
-    | 
-  <% end %>
-  <% if @next %>
-    <%= link_to t('browse.changeset_navigation.all.next', :id => @next.id.to_s),
-                { :id => @next.id },
-                { :title => t('browse.changeset_navigation.all.next_tooltip') } %>
-  <% end %>
+  <span class="nowrap">
+    <% if @prev %>
+      <%= link_to t('browse.changeset_navigation.paging.all.prev', :id => @prev.id.to_s),
+                  { :id => @prev.id },
+                  { :title => t('browse.changeset_navigation.all.prev_tooltip') } %>
+    <% end %>
+    <% if @prev and @next %>
+      | 
+    <% end %>
+    <% if @next %>
+      <%= link_to t('browse.changeset_navigation.paging.all.next', :id => @next.id.to_s),
+                  { :id => @next.id },
+                  { :title => t('browse.changeset_navigation.all.next_tooltip') } %>
+    <% end %>
+  </span>

 </div>
 </div>