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

[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..e464b99b4829d40758fcd7912d1b805c8393de64 100644 (file)
--- a/app/views/diary_entries/index.html.erb
+++ b/app/views/diary_entries/index.html.erb
@@ -1,23 +1,31 @@
+<% content_for :head, tag.meta(:name => :robots, :content => :noindex) %>

 <% content_for :heading do %>
 <% content_for :heading do %>

-  <div <% if @user %> id="userinformation"<% end %>>
+  <div class="row">

     <% if @user %>
     <% if @user %>

-      <%= user_image @user %>
+        <div class="col-auto">
+          <%= user_image @user %>
+        </div>

     <% end %>
     <% end %>

-    <h1><%= @title %></h1>

 
 

-    <ul class='secondary-actions clearfix'>
-      <% unless params[:friends] or params[:nearby] -%>
-        <li><%= rss_link_to :action => "rss", :language => params[:language] %></li>
-      <% end -%>
-
-      <% if @user && @user == current_user || !@user && current_user %>
-        <li><%= link_to image_tag("new.png", :class => "small_icon") + t(".new"), new_diary_entry_path, :title => t(".new_title") %></li>
-      <% end %>
-
-      <% if !@user && current_user %>
-        <li><%= link_to t(".my_diary"), :controller => "diary_entries", :action => "index", :display_name => current_user.display_name %></li>
-      <% end %>
-    </ul>
+    <div class="col">
+      <h1><%= @title %></h1>
+
+      <nav class="secondary-actions">
+        <ul class="clearfix">
+          <% unless params[:friends] or params[:nearby] -%>
+            <li><%= rss_link_to :action => "rss", :language => params[:language] %></li>
+            <% end -%>
+
+            <% if @user && @user == current_user || !@user && current_user %>
+              <li><%= link_to image_tag("new.png", :class => "small_icon") + t(".new"), new_diary_entry_path, :title => t(".new_title") %></li>
+            <% end %>
+
+            <% if !@user && current_user %>
+              <li><%= link_to t(".my_diary"), :controller => "diary_entries", :action => "index", :display_name => current_user.display_name %></li>
+            <% end %>
+        </ul>
+      </nav>
+    </div>

   </div>
 <% end %>
 
   </div>
 <% end %>
 


@@ -28,29 +36,11 @@
 
   <%= render @entries %>
 
 
   <%= render @entries %>
 

-  <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'>
-          <%= link_to t('.older_entries'), '#', :class => 'page-link', :tabindex => '-1', :'aria-disabled' => true %>
-        </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>
-      <% else -%>
-        <li class='page-item disabled'>
-          <%= link_to t('.newer_entries'), '#', :class => 'page-link', :tabindex => '-1', :'aria-disabled' => true %>
-        </li>
-      <% end -%>
-    </ul>
-  </nav>
+  <%= render "shared/pagination",
+             :newer_key => "diary_entries.index.newer_entries",
+             :older_key => "diary_entries.index.older_entries",
+             :newer_id => @newer_entries_id,
+             :older_id => @older_entries_id %>

 <% end %>
 
 <% unless params[:friends] or params[:nearby] -%>
 <% end %>
 
 <% unless params[:friends] or params[:nearby] -%>