Merge remote-tracking branch 'upstream/pull/3120'

[rails.git] / app / views / diary_entries / index.html.erb

diff --git a/app/views/diary_entries/index.html.erb b/app/views/diary_entries/index.html.erb
index 28cb69b24b3aa916aa53792fac8e031f3e96695e..17ddba62e6ffa335f771a71d4f57d4aee2f045f8 100644 (file)
--- a/app/views/diary_entries/index.html.erb
+++ b/app/views/diary_entries/index.html.erb
@@ -5,7 +5,7 @@
     <% end %>
     <h1><%= @title %></h1>
 
     <% end %>
     <h1><%= @title %></h1>
 

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

       <% unless params[:friends] or params[:nearby] -%>
         <li><%= rss_link_to :action => "rss", :language => params[:language] %></li>
       <% end -%>
       <% unless params[:friends] or params[:nearby] -%>
         <li><%= rss_link_to :action => "rss", :language => params[:language] %></li>
       <% end -%>


@@ -29,24 +29,24 @@
   <%= render @entries %>
 
   <nav>
   <%= render @entries %>
 
   <nav>

-    <ul class='pagination'>
+    <ul class="pagination">

       <% if @entries.size >= @page_size -%>
       <% if @entries.size >= @page_size -%>

-        <li class='page-item'>
-          <%= link_to t('.older_entries'), @params.merge(:page => @page + 1), :class => 'page-link' %>
+        <li class="page-item">
+          <%= link_to t(".older_entries"), @params.merge(:page => @page + 1), :class => "page-link" %>

         </li>
       <% else -%>
         </li>
       <% else -%>

-        <li class='page-item disabled'>
-          <%= link_to t('.older_entries'), '#', :class => 'page-link', :tabindex => '-1', :'aria-disabled' => true %>
+        <li class="page-item disabled">
+          <span class="page-link"><%= t(".older_entries") %></span>

         </li>
       <% end -%>
 
       <% if @page > 1 -%>
         </li>
       <% end -%>
 
       <% if @page > 1 -%>

-        <li class='page-item'>
-          <%= link_to_if @page > 1, t(".newer_entries"), @params.merge(:page => @page - 1), :class => 'page-link' %>
+        <li class="page-item">
+          <%= link_to t(".newer_entries"), @params.merge(:page => @page - 1), :class => "page-link" %>

         </li>
       <% else -%>
         </li>
       <% else -%>

-        <li class='page-item disabled'>
-          <%= link_to t('.newer_entries'), '#', :class => 'page-link', :tabindex => '-1', :'aria-disabled' => true %>
+        <li class="page-item disabled">
+          <span class="page-link"><%= t(".newer_entries") %></span>

         </li>
       <% end -%>
     </ul>
         </li>
       <% end -%>
     </ul>