Whitespace fixes for user_blocks erb files

diff --git a/app/views/user_blocks/_block.html.erb b/app/views/user_blocks/_block.html.erb
index b8a753e0412bde9d7da9ae392e812fd0dea3f3fc..1614a4dc45fe617a81364d460c60a5f518d49858 100644 (file)
--- a/app/views/user_blocks/_block.html.erb
+++ b/app/views/user_blocks/_block.html.erb
@@ -7,8 +7,8 @@
   <% if show_creator_name %>
   <td class="<%= c1 %>"><%= link_to h(block.creator.display_name), user_path(block.creator) %></td>
   <% end %>
   <% 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') %>
   <td class="<%= c1 %>">
     <% if block.revoker_id.nil? %>
       <%= t('.not_revoked') %>

diff --git a/app/views/user_blocks/_blocks.html.erb b/app/views/user_blocks/_blocks.html.erb
index 01e54de21cca256ff8892f14a6d4fc5390619d5e..db6eea2a818391d18368d4fa23b90f71fc5baeba 100644 (file)
--- a/app/views/user_blocks/_blocks.html.erb
+++ b/app/views/user_blocks/_blocks.html.erb
@@ -15,7 +15,7 @@
     <th></th>
     <% end %>
   </tr>
     <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'>
 </table>
 
 <ul class='secondary-actions'>

diff --git a/app/views/user_blocks/new.html.erb b/app/views/user_blocks/new.html.erb
index bd941babcc10f98cf9bba79217653ba97d519b2c..2967ecaf0dd110370452326c65407dad143b1713 100644 (file)
--- a/app/views/user_blocks/new.html.erb
+++ b/app/views/user_blocks/new.html.erb
@@ -1,8 +1,7 @@
 <% @title = t '.title', :name => h(@user.display_name) %>
 <% content_for :heading do %>
   <h1><%= raw t('.heading',
 <% @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| %>
                                  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 />
   </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 %>
   </p>
   <p>
     <%= f.check_box :needs_view %>

diff --git a/app/views/user_blocks/not_found.html.erb b/app/views/user_blocks/not_found.html.erb
index 6aad7eef3dc847dd014c38c1874127042406e717..d5846cc11d8a27f976846eb6c4a3a245a47e0092 100644 (file)
--- a/app/views/user_blocks/not_found.html.erb
+++ b/app/views/user_blocks/not_found.html.erb
@@ -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 %>
 
 <%= link_to t('.back'), user_blocks_path %>

diff --git a/app/views/user_blocks/revoke.html.erb b/app/views/user_blocks/revoke.html.erb
index c7eee67038a4292b21705e801bbdd7a6d32c0f52..d4786b2e5d2c2c0a4373a1f3f5741fde09fbe229 100644 (file)
--- a/app/views/user_blocks/revoke.html.erb
+++ b/app/views/user_blocks/revoke.html.erb
@@ -4,11 +4,9 @@
 
 <% content_for :heading do %>
   <h1><%= raw t('.heading',
 
 <% 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)),
                                      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 %>
 
                                      user_path(@user_block.creator))) %></h1>
 <% end %>
 

diff --git a/app/views/user_blocks/show.html.erb b/app/views/user_blocks/show.html.erb
index 4dc03f4e487ec6645c48bc1e73c5a452cf3a6262..1e935c92b04d0023f51485d933e1c27cc52fd574 100644 (file)
--- a/app/views/user_blocks/show.html.erb
+++ b/app/views/user_blocks/show.html.erb
@@ -4,11 +4,9 @@
 
 <% content_for :heading do %>
   <h1><%= raw t('.heading',
 
 <% 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)),
                                      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 %>
                                      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('.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>
     <% end %>
   <% end %>
   <li><%= link_to t('.back'), user_blocks_path %></li>


@@ -25,14 +23,14 @@
 
 <% if @user_block.revoker %>
 <p>
 
 <% 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 %>
 
   <%= 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>
 <div class="richtext"><%= @user_block.reason.to_html %></div>