cst1/openstreetmap-website
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fix erblint complaints

Browse source
This commit is contained in:
Michal Migurski 2021-02-27 08:13:10 -08:00 • committed by Andy Allan
parent f4e998804d
commit 21eafac304
1 changed files with 10 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

20
app/views/traces/index.html.erb
View file

@ -4,7 +4,7 @@
<p>
<%= t(".description") %>
<% if params[:tag] %>
<%= link_to t(".remove_tag_filter", :tag => params[:tag]), {:controller => "traces", :action => "index", :display_name => nil, :tag => nil, :page => nil}, {:class => "border-left ml-2 pl-2"} %>
<%= link_to t(".remove_tag_filter", :tag => params[:tag]), { :controller => "traces", :action => "index", :display_name => nil, :tag => nil, :page => nil }, { :class => "border-left ml-2 pl-2" } %>
<% end %>
</p>
<ul class="nav nav-tabs">
@ -13,40 +13,40 @@
<!-- public traces -->
<% if current_user %>
<li class="nav-item">
<%= link_to t(".see_my_traces"), {:action => "mine", :page => nil}, {:class => "nav-link"} %>
<%= link_to t(".see_my_traces"), { :action => "mine", :page => nil }, { :class => "nav-link" } %>
</li>
<% end %>
<li class="nav-item">
<%= link_to t(".see_all_traces"), {:controller => "traces", :action => "index", :display_name => nil, :page => nil}, {:class => "nav-link active"} %>
<%= link_to t(".see_all_traces"), { :controller => "traces", :action => "index", :display_name => nil, :page => nil }, { :class => "nav-link active" } %>
</li>
<% elsif current_user && current_user == @target_user %>
<!-- my traces -->
<li class="nav-item">
<%= link_to t(".see_my_traces"), {:action => "mine", :page => nil}, {:class => "nav-link active"} %>
<%= link_to t(".see_my_traces"), { :action => "mine", :page => nil }, { :class => "nav-link active" } %>
</li>
<li class="nav-item">
<%= link_to t(".see_all_traces"), {:controller => "traces", :action => "index", :display_name => nil, :page => nil}, {:class => "nav-link"} %>
<%= link_to t(".see_all_traces"), { :controller => "traces", :action => "index", :display_name => nil, :page => nil }, { :class => "nav-link" } %>
</li>
<% else %>
<!-- public_traces_from @target_user -->
<li class="nav-item">
<%= link_to t(".see_public_traces_from", :user => @target_user&.display_name), {:action => "mine", :page => nil}, {:class => "nav-link active"} %>
<%= link_to t(".see_public_traces_from", :user => @target_user&.display_name), { :action => "mine", :page => nil }, { :class => "nav-link active" } %>
</li>
<% if current_user && current_user != @target_user %>
<li class="nav-item">
<%= link_to t(".see_my_traces"), {:action => "mine", :page => nil}, {:class => "nav-link"} %>
<%= link_to t(".see_my_traces"), { :action => "mine", :page => nil }, { :class => "nav-link" } %>
</li>
<% end %>
<li class="nav-item">
<%= link_to t(".see_all_traces"), {:controller => "traces", :action => "index", :display_name => nil, :page => nil}, {:class => "nav-link"} %>
<%= link_to t(".see_all_traces"), { :controller => "traces", :action => "index", :display_name => nil, :page => nil }, { :class => "nav-link" } %>
</li>
<% end %>
</li>
<li class="nav-item ml-auto pt-1">
<%= link_to({:action => :georss, :display_name => @target_user&.display_name, :tag => params[:tag]}, {:class => "btn btn-secondary btn-sm px-1 py-0"}) do %>
<%= link_to({ :action => :georss, :display_name => @target_user&.display_name, :tag => params[:tag] }, { :class => "btn btn-secondary btn-sm px-1 py-0" }) do %>
<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" fill="white" viewBox="0 0 16 16">
<path d="M5.5 12a1.5 1.5 0 1 1-3 0 1.5 1.5 0 0 1 3 0zm-3-8.5a1 1 0 0 1 1-1c5.523 0 10 4.477 10 10a1 1 0 1 1-2 0 8 8 0 0 0-8-8 1 1 0 0 1-1-1zm0 4a1 1 0 0 1 1-1 6 6 0 0 1 6 6 1 1 0 1 1-2 0 4 4 0 0 0-4-4 1 1 0 0 1-1-1z"/>
<path d="M5.5 12a1.5 1.5 0 1 1-3 0 1.5 1.5 0 0 1 3 0zm-3-8.5a1 1 0 0 1 1-1c5.523 0 10 4.477 10 10a1 1 0 1 1-2 0 8 8 0 0 0-8-8 1 1 0 0 1-1-1zm0 4a1 1 0 0 1 1-1 6 6 0 0 1 6 6 1 1 0 1 1-2 0 4 4 0 0 0-4-4 1 1 0 0 1-1-1z" />
</svg>
<% end -%>
<%= link_to t(".upload_trace"), new_trace_path, :class => "btn btn-secondary btn-sm px-1 py-0" %>