From ee8426c5b5b81206c91d3eecc8608657562ef83f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Javi=20Mart=C3=ADn?= Date: Sat, 22 Jun 2019 16:16:37 +0200 Subject: [PATCH] Indent with spaces instead of tabs --- .erb-lint.yml | 2 + .../questions/answers/images/new.html.erb | 14 +++---- .../investments/_content_blocks.html.erb | 2 +- app/views/devise/shared/_links.html.erb | 38 +++++++++---------- app/views/polls/index.html.erb | 4 +- 5 files changed, 31 insertions(+), 29 deletions(-) diff --git a/.erb-lint.yml b/.erb-lint.yml index 85585e4ab..5c2007e61 100644 --- a/.erb-lint.yml +++ b/.erb-lint.yml @@ -6,6 +6,8 @@ linters: enabled: false SpaceAroundErbTag: enabled: true + SpaceIndentation: + enabled: true SpaceInHtmlTag: enabled: true TrailingWhitespace: diff --git a/app/views/admin/poll/questions/answers/images/new.html.erb b/app/views/admin/poll/questions/answers/images/new.html.erb index dfd4b8cfb..a6e401047 100644 --- a/app/views/admin/poll/questions/answers/images/new.html.erb +++ b/app/views/admin/poll/questions/answers/images/new.html.erb @@ -1,13 +1,13 @@
<%= form_for(Poll::Question::Answer.new, - url: admin_answer_images_path(@answer), - method: :post) do |f| %> - <%= render "shared/errors", resource: @answer %> + url: admin_answer_images_path(@answer), + method: :post) do |f| %> + <%= render "shared/errors", resource: @answer %> -
- <%= render "images/nested_image", imageable: @answer, f: f, image_fields: :images %> -
+
+ <%= render "images/nested_image", imageable: @answer, f: f, image_fields: :images %> +
- <%= f.submit t("admin.questions.answers.images.save_image"), class: "button success" %> + <%= f.submit t("admin.questions.answers.images.save_image"), class: "button success" %> <% end %>
diff --git a/app/views/budgets/investments/_content_blocks.html.erb b/app/views/budgets/investments/_content_blocks.html.erb index 30f938a94..53df67d34 100644 --- a/app/views/budgets/investments/_content_blocks.html.erb +++ b/app/views/budgets/investments/_content_blocks.html.erb @@ -1,7 +1,7 @@ <% if @heading.allow_custom_content %> <% end %> diff --git a/app/views/devise/shared/_links.html.erb b/app/views/devise/shared/_links.html.erb index 56b993266..ed8b13915 100644 --- a/app/views/devise/shared/_links.html.erb +++ b/app/views/devise/shared/_links.html.erb @@ -1,34 +1,34 @@
- <%- if controller_name != "sessions" %> - <%= link_to t("devise_views.shared.links.login"), new_session_path(resource_name) %>
- <% end -%> + <%- if controller_name != "sessions" %> + <%= link_to t("devise_views.shared.links.login"), new_session_path(resource_name) %>
+ <% end -%> <%#- if devise_mapping.registerable? && controller_name != "registrations" || controller_path != "users/registrations" %> - <%#= link_to t("devise_views.shared.links.signup"), new_user_registration_path %> - <%# end -%> + <%#= link_to t("devise_views.shared.links.signup"), new_user_registration_path %> + <%# end -%> <%#- if devise_mapping.registerable? && controller_name == "registrations" && controller_path != "organizations/registrations" %> <%#= link_to t("devise_views.shared.links.organization_signup"), new_organization_registration_path %> <%# end -%> - <%#- if devise_mapping.recoverable? && controller_name != "passwords" && controller_name != "registrations" %> - <%#= link_to t("devise_views.shared.links.new_password"), new_password_path(resource_name) %> - <%# end -%> + <%#- if devise_mapping.recoverable? && controller_name != "passwords" && controller_name != "registrations" %> + <%#= link_to t("devise_views.shared.links.new_password"), new_password_path(resource_name) %> + <%# end -%> - <%- if devise_mapping.confirmable? && controller_name != "confirmations" %> - <%= link_to t("devise_views.shared.links.new_confirmation"), new_confirmation_path(resource_name) %>
- <% end -%> + <%- if devise_mapping.confirmable? && controller_name != "confirmations" %> + <%= link_to t("devise_views.shared.links.new_confirmation"), new_confirmation_path(resource_name) %>
+ <% end -%> - <%- if devise_mapping.lockable? && resource_class.unlock_strategy_enabled?(:email) && controller_name != "unlocks" %> - <%= link_to t("devise_views.shared.links.new_unlock"), new_unlock_path(resource_name) %>
- <% end -%> + <%- if devise_mapping.lockable? && resource_class.unlock_strategy_enabled?(:email) && controller_name != "unlocks" %> + <%= link_to t("devise_views.shared.links.new_unlock"), new_unlock_path(resource_name) %>
+ <% end -%> - <%- if devise_mapping.omniauthable? && devise_mapping.name == "user" %> - <%- resource_class.omniauth_providers.each do |provider| %> - <%= link_to t("devise_views.shared.links.signin_with_provider", provider: provider.to_s.titleize), omniauth_authorize_path(resource_name, provider) %>
- <% end -%> - <% end -%> + <%- if devise_mapping.omniauthable? && devise_mapping.name == "user" %> + <%- resource_class.omniauth_providers.each do |provider| %> + <%= link_to t("devise_views.shared.links.signin_with_provider", provider: provider.to_s.titleize), omniauth_authorize_path(resource_name, provider) %>
+ <% end -%> + <% end -%>
diff --git a/app/views/polls/index.html.erb b/app/views/polls/index.html.erb index fb847eb67..f9d863800 100644 --- a/app/views/polls/index.html.erb +++ b/app/views/polls/index.html.erb @@ -13,10 +13,10 @@
<% if show_polls_description? %> -
+
<%= safe_html_with_links WYSIWYGSanitizer.new.sanitize(@active_poll.description) %>
- <% end %> + <% end %> <%= render "shared/filter_subnav", i18n_namespace: "polls.index" %>