Update to latest osm-community-index

[rails.git] / app / views / users / show.html.erb

diff --git a/app/views/users/show.html.erb b/app/views/users/show.html.erb
index 302ec5bd3935db3d9a65dd8dd3beb39a02fa8e68..caa7730cb16fe4809b8452c3b461c659c5081430 100644 (file)
--- a/app/views/users/show.html.erb
+++ b/app/views/users/show.html.erb
@@ -4,7 +4,7 @@
     <div class='userinformation-inner'>
       <h1><%= @user.display_name %> <%= role_icons(@user) %></h1>
       <% if current_user and @user.id == current_user.id %>
     <div class='userinformation-inner'>
       <h1><%= @user.display_name %> <%= role_icons(@user) %></h1>
       <% if current_user and @user.id == current_user.id %>

-        <!-- Displaying user's own profile page to themself -->
+        <!-- Displaying user's own profile page -->

         <ul class='secondary-actions clearfix'>
           <li>
             <%= link_to t(".my edits"), :controller => "changesets", :action => "index", :display_name => current_user.display_name %>
         <ul class='secondary-actions clearfix'>
           <li>
             <%= link_to t(".my edits"), :controller => "changesets", :action => "index", :display_name => current_user.display_name %>


@@ -22,22 +22,22 @@
             <span class='count-number'><%= number_with_delimiter(current_user.diary_entries.size) %></span>
           </li>
           <li>
             <span class='count-number'><%= number_with_delimiter(current_user.diary_entries.size) %></span>
           </li>
           <li>

-            <%= link_to t(".my comments"), :controller => "diary_entries", :action => "comments", :display_name => current_user.display_name %>
+            <%= link_to t(".my comments"), diary_comments_path(current_user) %>

           </li>
           <li>
           </li>
           <li>

-            <%= link_to t(".my settings"), :controller => "users", :action => "account", :display_name => current_user.display_name %>
+            <%= link_to t(".my settings"), user_account_path(current_user) %>

           </li>
 
           <% if current_user.blocks.exists? %>
             <li>
           </li>
 
           <% if current_user.blocks.exists? %>
             <li>

-              <%= link_to t(".blocks on me"), :controller => "user_blocks", :action => "blocks_on", :display_name => current_user.display_name %>
+              <%= link_to t(".blocks on me"), user_blocks_on_path(current_user) %>

               <span class='count-number'><%= number_with_delimiter(current_user.blocks.active.size) %></span>
             </li>
           <% end %>
 
           <% if can?(:create, UserBlock) and current_user.blocks_created.exists? %>
             <li>
               <span class='count-number'><%= number_with_delimiter(current_user.blocks.active.size) %></span>
             </li>
           <% end %>
 
           <% if can?(:create, UserBlock) and current_user.blocks_created.exists? %>
             <li>

-              <%= link_to t(".blocks by me"), :controller => "user_blocks", :action => "blocks_by", :display_name => current_user.display_name %>
+              <%= link_to t(".blocks by me"), user_blocks_by_path(current_user) %>

               <span class='count-number'><%= number_with_delimiter(current_user.blocks_created.active.size) %></span>
             </li>
           <% end %>
               <span class='count-number'><%= number_with_delimiter(current_user.blocks_created.active.size) %></span>
             </li>
           <% end %>


@@ -70,7 +70,7 @@
             <span class='count-number'><%= number_with_delimiter(@user.diary_entries.size) %></span>
           </li>
           <li>
             <span class='count-number'><%= number_with_delimiter(@user.diary_entries.size) %></span>
           </li>
           <li>

-            <%= link_to t(".comments"), :controller => "diary_entries", :action => "comments", :display_name => @user.display_name %>
+            <%= link_to t(".comments"), diary_comments_path(@user) %>

           </li>
           <li>
             <% if current_user and current_user.is_friends_with?(@user) %>
           </li>
           <li>
             <% if current_user and current_user.is_friends_with?(@user) %>


@@ -84,21 +84,21 @@
 
           <% if @user.blocks.exists? %>
             <li>
 
           <% if @user.blocks.exists? %>
             <li>

-              <%= link_to t(".block_history"), :controller => "user_blocks", :action => "blocks_on", :display_name => @user.display_name %>
+              <%= link_to t(".block_history"), user_blocks_on_path(@user) %>

               <span class='count-number'><%= number_with_delimiter(@user.blocks.active.size) %></span>
             </li>
           <% end %>
 
           <% if @user.moderator? and @user.blocks_created.exists? %>
             <li>
               <span class='count-number'><%= number_with_delimiter(@user.blocks.active.size) %></span>
             </li>
           <% end %>
 
           <% if @user.moderator? and @user.blocks_created.exists? %>
             <li>

-              <%= link_to t(".moderator_history"), :controller => "user_blocks", :action => "blocks_by", :display_name => @user.display_name %>
+              <%= link_to t(".moderator_history"), user_blocks_by_path(@user) %>

               <span class='count-number'><%= number_with_delimiter(@user.blocks_created.active.size) %></span>
             </li>
           <% end %>
 
           <% if can?(:create, UserBlock) %>
             <li>
               <span class='count-number'><%= number_with_delimiter(@user.blocks_created.active.size) %></span>
             </li>
           <% end %>
 
           <% if can?(:create, UserBlock) %>
             <li>

-            <%= link_to t(".create_block"), :controller => "user_blocks", :action => "new", :display_name => @user.display_name %>
+            <%= link_to t(".create_block"), new_user_block_path(@user) %>

             </li>
           <% end %>
 
             </li>
           <% end %>
 


@@ -165,6 +165,12 @@
 
     <div class="user-description richtext text-break"><%= @user.description.to_html %></div>
 
 
     <div class="user-description richtext text-break"><%= @user.description.to_html %></div>
 

+    <% if current_user and @user.id == current_user.id %>
+      <div class="my-3">
+        <%= link_to t(".edit_profile"), edit_profile_path, :class => "btn btn-outline-primary" %>
+      </div>
+    <% end %>
+

   </div>
 
   <% if current_user and current_user.administrator? -%>
   </div>
 
   <% if current_user and current_user.administrator? -%>


@@ -185,7 +191,7 @@
     <div class="col-md order-md-last">
       <% if @user.home_lat.nil? or @user.home_lon.nil? %>
         <div id="map" class="content_map">
     <div class="col-md order-md-last">
       <% if @user.home_lat.nil? or @user.home_lon.nil? %>
         <div id="map" class="content_map">

-          <p id="no_home_location"><%= t(".if_set_location_html", :settings_link => (link_to t(".settings_link_text"), :controller => "users", :action => "account", :display_name => current_user.display_name)) %></p>
+          <p id="no_home_location"><%= t(".no_home_location_html", :edit_profile_link => link_to(t(".edit_your_profile"), edit_profile_path)) %></p>

         </div>
       <% else %>
         <% content_for :head do %>
         </div>
       <% else %>
         <% content_for :head do %>