X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/5966acc207874f3196a43700cb9306411c77fe47..e3c919275818d46a515c183cf373d7a53bc6942a:/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 6803c761e..15be9e964 100644
--- a/app/views/diary_entries/index.html.erb
+++ b/app/views/diary_entries/index.html.erb
@@ -1,26 +1,42 @@
-<% content_for :head, tag(:meta, :name => :robots, :content => :noindex) %>
+<% content_for :head, tag.meta(:name => :robots, :content => :noindex) %>
 <% content_for :heading do %>
-  <div <% if @user %> id="userinformation"<% end %>>
+  <div class="row">
     <% if @user %>
-      <%= user_image @user %>
+        <div class="col-auto">
+          <%= user_image @user %>
+        </div>
     <% end %>
-    <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>
+    <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>
+          <% @languages&.each do |language| %>
+            <li><%= link_to t(".in_language_title", :language => language.name), :action => "index", :language => language.code %></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>
+
+          <% if @user && @user == current_user || !@user && current_user %>
+            <li>
+              <%= link_to new_diary_entry_path, :class => "icon-link", :title => t(".new_title") do %>
+                <svg width="16" height="16">
+                  <path d="M2 0 a2 2 0 0 0 -2 2 v12 a2 2 0 0 0 2 2 h12 a2 2 0 0 0 2 -2 v-12 a2 2 0 0 0 -2 -2 z M4 7 h3 v-3 h2 v3 h3 v2 h-3 v3 h-2 v-3 h-3 z" fill="currentColor" />
+                </svg>
+                <%= t(".new") %>
+              <% end %>
+            </li>
+          <% end %>
+        </ul>
+      </nav>
+    </div>
   </div>
 <% end %>
 
@@ -31,29 +47,11 @@
 
   <%= 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">
-          <span class="page-link"><%= t(".older_entries") %></span>
-        </li>
-      <% end -%>
-
-      <% 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>
+  <%= 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] -%>