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

diff --combined app/views/diary_entries/index.html.erb
index 17ddba62e6ffa335f771a71d4f57d4aee2f045f8,cb3f7f832c0d362ece103cf5e0a59e99f857bab2..80561cbbfb3dae15379ca8f747f407ea4eff6fcd
--- 1/app/views/diary_entries/index.html.erb
--- 2/app/views/diary_entries/index.html.erb
+++ b/app/views/diary_entries/index.html.erb
@@@ -1,3 -1,4 +1,4 @@@
+ <% content_for :head, tag(:meta, :name => :robots, :content => :noindex) %>
  <% content_for :heading do %>
    <div <% if @user %> id="userinformation"<% end %>>
      <% if @user %>
@@@ -5,7 -6,7 +6,7 @@@
      <% 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 -%>
@@@ -28,29 -29,21 +29,29 @@@
  
    <%= render @entries %>
  
 -  <div class="pagination">
 -    <% if @entries.size < @page_size -%>
 -      <%= t(".older_entries") %>
 -    <% else -%>
 -      <%= link_to t(".older_entries"), @params.merge(:page => @page + 1) %>
 -    <% end -%>
 -
 -    |
 +  <nav>
 +    <ul class="pagination">
 +      <% if @entries.size >= @page_size -%>
 +        <li class="page-item">
 +          <%= link_to t(".older_entries"), @params.merge(:page => @page + 1), :class => "page-link" %>
 +        </li>
 +      <% else -%>
 +        <li class="page-item disabled">
 +          <span class="page-link"><%= t(".older_entries") %></span>
 +        </li>
 +      <% end -%>
  
 -    <% if @page > 1 -%>
 -      <%= link_to t(".newer_entries"), @params.merge(:page => @page - 1) %>
 -    <% else -%>
 -      <%= t(".newer_entries") %>
 -    <% end -%>
 -  </div>
 +      <% if @page > 1 -%>
 +        <li class="page-item">
 +          <%= link_to t(".newer_entries"), @params.merge(:page => @page - 1), :class => "page-link" %>
 +        </li>
 +      <% else -%>
 +        <li class="page-item disabled">
 +          <span class="page-link"><%= t(".newer_entries") %></span>
 +        </li>
 +      <% end -%>
 +    </ul>
 +  </nav>
  <% end %>
  
  <% unless params[:friends] or params[:nearby] -%>