From: Tom Hughes <tom@compton.nu>
Date: Tue, 21 Jul 2009 11:14:50 +0000 (+0000)
Subject: Prevent browser navigation control from wrapping.
X-Git-Tag: live~6773
X-Git-Url: https://git.openstreetmap.org/rails.git/commitdiff_plain/88af5aad215de1cad6e47cbea59f80fb3d7c4fce?ds=sidebyside

Prevent browser navigation control from wrapping.
---

diff --git a/app/views/browse/_navigation.html.erb b/app/views/browse/_navigation.html.erb
index 88812c2bb..c410909e0 100644
--- a/app/views/browse/_navigation.html.erb
+++ b/app/views/browse/_navigation.html.erb
@@ -1,40 +1,44 @@
 <div style="float:right; text-align:center; width: 250px;">
   <% if @next_by_user or @prev_by_user %>
-    <% if @prev_by_user %>
+    <span class="nowrap">
+      <% if @prev_by_user %>
+        &lt;
+        <%= link_to @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 @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) } %>
+        &gt;
+      <% end %>
+    </span>
+    <br/>
+  <% end %>
+  <span class="nowrap">
+    <% if @prev %>
       &lt;
-      <%= link_to @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) } %>
-      |
+      <%= link_to @prev.id.to_s,
+                  { :id => @prev.id },
+                  { :title => t('browse.changeset_navigation.all.prev_tooltip') } %>
     <% 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 @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) } %>
+    <% if @prev and @next %>
+      | 
+    <% end %>
+    <% if @next %>
+      <%= link_to @next.id.to_s,
+                  { :id => @next.id },
+                  { :title => t('browse.changeset_navigation.all.next_tooltip') } %>
       &gt;
     <% end %>
-    <br/>
-  <% end %>
-  <% if @prev %>
-    &lt;
-    <%= link_to @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 @next.id.to_s,
-                { :id => @next.id },
-                { :title => t('browse.changeset_navigation.all.next_tooltip') } %>
-    &gt;
-  <% end %>
+  </span>
 </div>