Merge remote-tracking branch 'osmlab/id-editor-embed'

[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 a80a8ff4cc3a90c9784e864d256aea8a990fc540..0856044c8087599ef6ae1b902832e5d463bca04c 100644 (file)
--- a/app/views/browse/_navigation.html.erb
+++ b/app/views/browse/_navigation.html.erb
@@ -1,41 +1,43 @@
-<% margin = @next_by_user || @prev_by_user ? 9 : 18 %>
-<div id="browse_navigation" style="margin-top: <%= margin %>px">
+<% type = (@next || @prev).class.name.downcase %>
+  <ul class='secondary-actions clearfix pager'>
+    <% if @prev %>
+    <li>
+      <%= link_to t('browse.navigation.paging.all.prev', :id => @prev.id.to_s),
+                  { :id => @prev.id },
+                  { :title => t("browse.navigation.all.prev_#{type}_tooltip") } %>
+    </li>
+    <% end %>
+    <% if @next %>
+      <li>
+        <%= link_to t('browse.navigation.paging.all.next', :id => @next.id.to_s),
+                    { :id => @next.id },
+                    { :title => t("browse.navigation.all.next_#{type}_tooltip") } %>
+      </li>
+    <% end %>
+  </ul>

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

-    <span class="nowrap">
+    <ul class='secondary-actions pager clearfix'>

       <% if @prev_by_user %>
       <% 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) } %>
-        |
+        <li>
+            <%= 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) } %>
+        </li>

       <% end %>
       <% 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)) }
-      %>
+        <li>
+          <%=
+          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)) }
+          %>
+        </li>

       <% if @next_by_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) } %>
+        <li>
+          <%= 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) } %>
+        </li>

       <% end %>
       <% end %>

-    </span>
-    <br/>
+    </ul>

   <% end %>
   <% 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>