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

Whitespace fixes for user_blocks erb files

Browse source
This commit is contained in:
Andy Allan 2019-03-06 10:42:25 +01:00 • committed by Tom Hughes
parent 68a5aa5ed8
commit aa9e9a5eb1
6 changed files with 15 additions and 20 deletions
Download patch file Download diff file Expand all files Collapse all files

4
app/views/user_blocks/_block.html.erb
View file

@ -7,8 +7,8 @@
<% if show_creator_name %>
<td class="<%= c1 %>"><%= link_to h(block.creator.display_name), user_path(block.creator) %></td>
<% end %>
<td class="<%= c1 %>"><%=h truncate(block.reason) %></td>
<td class="<%= c1 %>"><%=h block_status(block) %></td>
<td class="<%= c1 %>"><%= h truncate(block.reason) %></td>
<td class="<%= c1 %>"><%= h block_status(block) %></td>
<td class="<%= c1 %>">
<% if block.revoker_id.nil? %>
<%= t('.not_revoked') %>

2
app/views/user_blocks/_blocks.html.erb
View file

@ -15,7 +15,7 @@
<th></th>
<% end %>
</tr>
<%= render :partial => 'block', :locals => {:show_revoke_link => show_revoke_link, :show_user_name => show_user_name, :show_creator_name => show_creator_name }, :collection => @user_blocks %>
<%= render :partial => 'block', :locals => { :show_revoke_link => show_revoke_link, :show_user_name => show_user_name, :show_creator_name => show_creator_name }, :collection => @user_blocks %>
</table>
<ul class='secondary-actions'>

5
app/views/user_blocks/new.html.erb
View file

@ -1,8 +1,7 @@
<% @title = t '.title', :name => h(@user.display_name) %>
<% content_for :heading do %>
<h1><%= raw t('.heading',
:name => link_to(
h(@user.display_name),
:name => link_to(h(@user.display_name),
user_path(@user))) %></h1>
<% end %>
<%= form_for(@user_block) do |f| %>
@ -14,7 +13,7 @@
</p>
<p>
<%= label_tag 'user_block_period', t('.period') %><br />
<%= select_tag('user_block_period', options_for_select(UserBlock::PERIODS.collect { |h| [t('user_blocks.period', :count => h), h.to_s] }, params[:user_block_period] )) %>
<%= select_tag('user_block_period', options_for_select(UserBlock::PERIODS.collect { |h| [t('user_blocks.period', :count => h), h.to_s] }, params[:user_block_period])) %>
</p>
<p>
<%= f.check_box :needs_view %>

2
app/views/user_blocks/not_found.html.erb
View file

@ -1,3 +1,3 @@
<p><%= t'.sorry', :id => params[:id] %></p>
<p><%= t '.sorry', :id => params[:id] %></p>
<%= link_to t('.back'), user_blocks_path %>

6
app/views/user_blocks/revoke.html.erb
View file

@ -4,11 +4,9 @@
<% content_for :heading do %>
<h1><%= raw t('.heading',
:block_on => link_to(
h(@user_block.user.display_name),
:block_on => link_to(h(@user_block.user.display_name),
user_path(@user_block.user)),
:block_by => link_to(
h(@user_block.creator.display_name),
:block_by => link_to(h(@user_block.creator.display_name),
user_path(@user_block.creator))) %></h1>
<% end %>

16
app/views/user_blocks/show.html.erb
View file

@ -4,11 +4,9 @@
<% content_for :heading do %>
<h1><%= raw t('.heading',
:block_on => link_to(
h(@user_block.user.display_name),
:block_on => link_to(h(@user_block.user.display_name),
user_path(@user_block.user)),
:block_by => link_to(
h(@user_block.creator.display_name),
:block_by => link_to(h(@user_block.creator.display_name),
user_path(@user_block.creator))) %></h1>
<ul class='secondary-actions clearfix'>
<% if @user_block.ends_at > Time.now.getutc %>
@ -16,7 +14,7 @@
<li><%= link_to t('.edit'), edit_user_block_path(@user_block) %></li>
<% end %>
<% if current_user and current_user.moderator? %>
<li><%= link_to(t('.revoke'),{:controller => 'user_blocks', :action => 'revoke', :id => @user_block.id}) %></li>
<li><%= link_to(t('.revoke'), { :controller => 'user_blocks', :action => 'revoke', :id => @user_block.id }) %></li>
<% end %>
<% end %>
<li><%= link_to t('.back'), user_blocks_path %></li>
@ -25,14 +23,14 @@
<% if @user_block.revoker %>
<p>
<b><%= t'.revoker' %></b>
<b><%= t '.revoker' %></b>
<%= link_to h(@user_block.revoker.display_name), user_path(@user_block.revoker) %>
</p>
<% end %>
<p><b><%= t'.created' %></b>: <%= raw t'.ago', :time => friendly_date(@user_block.created_at) %></p>
<p><b><%= t '.created' %></b>: <%= raw t '.ago', :time => friendly_date(@user_block.created_at) %></p>
<p><b><%= t'.status' %></b>: <%= block_status(@user_block) %></p>
<p><b><%= t '.status' %></b>: <%= block_status(@user_block) %></p>
<p><b><%= t'.reason' %></b></p>
<p><b><%= t '.reason' %></b></p>
<div class="richtext"><%= @user_block.reason.to_html %></div>