diff --git a/app/views/admin/budget_investments/index.js.erb b/app/views/admin/budget_investments/index.js.erb index dc3a8d67a..c1569cc59 100644 --- a/app/views/admin/budget_investments/index.js.erb +++ b/app/views/admin/budget_investments/index.js.erb @@ -1 +1 @@ -$("#investments").html('<%= j render("admin/budget_investments/investments") %>'); +$("#investments").html("<%= j render("admin/budget_investments/investments") %>"); diff --git a/app/views/admin/budget_investments/toggle_selection.js.erb b/app/views/admin/budget_investments/toggle_selection.js.erb index 3074847d6..6ba72db2a 100644 --- a/app/views/admin/budget_investments/toggle_selection.js.erb +++ b/app/views/admin/budget_investments/toggle_selection.js.erb @@ -1 +1 @@ -$("#<%= dom_id(@investment) %>").html('<%= j render("select_investment", investment: @investment) %>'); +$("#<%= dom_id(@investment) %>").html("<%= j render("select_investment", investment: @investment) %>"); diff --git a/app/views/admin/budgets/_form.html.erb b/app/views/admin/budgets/_form.html.erb index d5aaa02b2..e570da1bd 100644 --- a/app/views/admin/budgets/_form.html.erb +++ b/app/views/admin/budgets/_form.html.erb @@ -52,7 +52,7 @@ <% end %> - + "> <%= link_to t("admin.budgets.edit.edit_phase"), diff --git a/app/views/admin/legislation/proposals/toggle_selection.js.erb b/app/views/admin/legislation/proposals/toggle_selection.js.erb index 093afa904..d38292e9d 100644 --- a/app/views/admin/legislation/proposals/toggle_selection.js.erb +++ b/app/views/admin/legislation/proposals/toggle_selection.js.erb @@ -1 +1 @@ -$("#<%= dom_id(@proposal) %> .select").html('<%= j render("select_proposal", proposal: @proposal) %>'); +$("#<%= dom_id(@proposal) %> .select").html("<%= j render("select_proposal", proposal: @proposal) %>"); diff --git a/app/views/admin/poll/booth_assignments/create.js.erb b/app/views/admin/poll/booth_assignments/create.js.erb index 8b278f7b3..7e50ea1bd 100644 --- a/app/views/admin/poll/booth_assignments/create.js.erb +++ b/app/views/admin/poll/booth_assignments/create.js.erb @@ -1 +1 @@ -$("#<%= dom_id(@booth) %>").html('<%= j render("booth_assignment", booth: @booth, booth_assignment: @booth.assignment_on_poll(@poll)) %>'); +$("#<%= dom_id(@booth) %>").html("<%= j render("booth_assignment", booth: @booth, booth_assignment: @booth.assignment_on_poll(@poll)) %>"); diff --git a/app/views/admin/poll/booth_assignments/destroy.js.erb b/app/views/admin/poll/booth_assignments/destroy.js.erb index 8b278f7b3..7e50ea1bd 100644 --- a/app/views/admin/poll/booth_assignments/destroy.js.erb +++ b/app/views/admin/poll/booth_assignments/destroy.js.erb @@ -1 +1 @@ -$("#<%= dom_id(@booth) %>").html('<%= j render("booth_assignment", booth: @booth, booth_assignment: @booth.assignment_on_poll(@poll)) %>'); +$("#<%= dom_id(@booth) %>").html("<%= j render("booth_assignment", booth: @booth, booth_assignment: @booth.assignment_on_poll(@poll)) %>"); diff --git a/app/views/admin/poll/booth_assignments/search_booths.js.erb b/app/views/admin/poll/booth_assignments/search_booths.js.erb index 72fd96f68..c773ce518 100644 --- a/app/views/admin/poll/booth_assignments/search_booths.js.erb +++ b/app/views/admin/poll/booth_assignments/search_booths.js.erb @@ -1 +1 @@ -$("#search-booths-results").html("<%= j render 'search_booths_results' %>"); \ No newline at end of file +$("#search-booths-results").html("<%= j render "search_booths_results" %>"); \ No newline at end of file diff --git a/app/views/admin/poll/booth_assignments/show.html.erb b/app/views/admin/poll/booth_assignments/show.html.erb index 5eb28ec7f..a19fb81a5 100644 --- a/app/views/admin/poll/booth_assignments/show.html.erb +++ b/app/views/admin/poll/booth_assignments/show.html.erb @@ -83,7 +83,7 @@ <% (@poll.starts_at.to_date..@poll.ends_at.to_date).each do |voting_date| %> <% system_count = @voters_by_date[voting_date].present? ? @voters_by_date[voting_date].size : 0 %> - + "> <%= l voting_date %> <%= system_count %> diff --git a/app/views/admin/poll/officer_assignments/search_officers.js.erb b/app/views/admin/poll/officer_assignments/search_officers.js.erb index ba621d8f7..9a97db091 100644 --- a/app/views/admin/poll/officer_assignments/search_officers.js.erb +++ b/app/views/admin/poll/officer_assignments/search_officers.js.erb @@ -1 +1 @@ -$("#search-officers-results").html("<%= j render 'search_officers_results' %>"); \ No newline at end of file +$("#search-officers-results").html("<%= j render "search_officers_results" %>"); \ No newline at end of file diff --git a/app/views/admin/poll/officers/search.js.erb b/app/views/admin/poll/officers/search.js.erb index bd259f7fb..3ade51dfa 100644 --- a/app/views/admin/poll/officers/search.js.erb +++ b/app/views/admin/poll/officers/search.js.erb @@ -1 +1 @@ -$("#search-result").html("<%= j render 'officer', officer: @officer %>"); +$("#search-result").html("<%= j render "officer", officer: @officer %>"); diff --git a/app/views/admin/poll/officers/user_not_found.js.erb b/app/views/admin/poll/officers/user_not_found.js.erb index a6444dc61..4ba37aa47 100644 --- a/app/views/admin/poll/officers/user_not_found.js.erb +++ b/app/views/admin/poll/officers/user_not_found.js.erb @@ -1 +1 @@ -$("#search-result").html("
<%= j t('admin.poll_officers.search.user_not_found') %>
"); +$("#search-result").html("
<%= j t("admin.poll_officers.search.user_not_found") %>
"); diff --git a/app/views/admin/poll/polls/_form.html.erb b/app/views/admin/poll/polls/_form.html.erb index f0fc03a5b..98c1d8d2f 100644 --- a/app/views/admin/poll/polls/_form.html.erb +++ b/app/views/admin/poll/polls/_form.html.erb @@ -42,7 +42,7 @@ -
+
">
<%= f.collection_check_boxes(:geozone_ids, @geozones, :id, :name) do |b| %>
diff --git a/app/views/admin/poll/recounts/index.html.erb b/app/views/admin/poll/recounts/index.html.erb index 5b73f9c34..692078340 100644 --- a/app/views/admin/poll/recounts/index.html.erb +++ b/app/views/admin/poll/recounts/index.html.erb @@ -43,7 +43,7 @@ <%= link_to booth_assignment.booth.name, admin_poll_booth_assignment_path(@poll, booth_assignment, anchor: "tab-recounts") %> - + "> <% if total_recounts.present? %> <%= total_recounts %> <% else %> diff --git a/app/views/admin/poll/shifts/search_officers.js.erb b/app/views/admin/poll/shifts/search_officers.js.erb index ba621d8f7..9a97db091 100644 --- a/app/views/admin/poll/shifts/search_officers.js.erb +++ b/app/views/admin/poll/shifts/search_officers.js.erb @@ -1 +1 @@ -$("#search-officers-results").html("<%= j render 'search_officers_results' %>"); \ No newline at end of file +$("#search-officers-results").html("<%= j render "search_officers_results" %>"); \ No newline at end of file diff --git a/app/views/admin/spending_proposals/_summary_table.html.erb b/app/views/admin/spending_proposals/_summary_table.html.erb index c0c127ee7..066febe07 100644 --- a/app/views/admin/spending_proposals/_summary_table.html.erb +++ b/app/views/admin/spending_proposals/_summary_table.html.erb @@ -8,7 +8,7 @@ <%= t("admin.spending_proposals.summary.cost_for_geozone") %> <% spending_proposals.each do |geozone, price| %> - + "> <%= geozone.present? ? geozone.name : t("geozones.none") %> diff --git a/app/views/admin/spending_proposals/index.html.erb b/app/views/admin/spending_proposals/index.html.erb index 281e0131c..8f2711c29 100644 --- a/app/views/admin/spending_proposals/index.html.erb +++ b/app/views/admin/spending_proposals/index.html.erb @@ -59,7 +59,7 @@ <% if spending_proposal.administrator.present? %> - <%= spending_proposal.administrator.name %> + "><%= spending_proposal.administrator.name %> <% else %> <%= t("admin.spending_proposals.index.no_admin_assigned") %> <% end %> diff --git a/app/views/admin/users/index.js.erb b/app/views/admin/users/index.js.erb index 021407a23..c984d0f5a 100644 --- a/app/views/admin/users/index.js.erb +++ b/app/views/admin/users/index.js.erb @@ -1 +1 @@ -$("#users").html("<%= j render 'users' %>"); +$("#users").html("<%= j render "users" %>"); diff --git a/app/views/budgets/_phases.html.erb b/app/views/budgets/_phases.html.erb index a5461b6be..61dd1904c 100644 --- a/app/views/budgets/_phases.html.erb +++ b/app/views/budgets/_phases.html.erb @@ -1,6 +1,6 @@
    <% current_budget.published_phases.each do |phase| %> -
  • +
  • ">

    <%= t("budgets.phase.#{phase.kind}") %>

    <%= l(phase.starts_at.to_date, format: :long) if phase.starts_at.present? %> diff --git a/app/views/budgets/ballot/lines/_refresh_ballots.js.erb b/app/views/budgets/ballot/lines/_refresh_ballots.js.erb index f81560d96..fac0f7172 100644 --- a/app/views/budgets/ballot/lines/_refresh_ballots.js.erb +++ b/app/views/budgets/ballot/lines/_refresh_ballots.js.erb @@ -1,8 +1,8 @@ <% if @investments.present? %> <% @investments.each do |investment| %> - $("#<%= dom_id(investment) %>_ballot").html('<%= j render("/budgets/investments/ballot", + $("#<%= dom_id(investment) %>_ballot").html("<%= j render("/budgets/investments/ballot", investment: investment, investment_ids: investment_ids, - ballot: ballot) %>'); + ballot: ballot) %>"); <% end %> <% end %> diff --git a/app/views/budgets/ballot/lines/create.js.erb b/app/views/budgets/ballot/lines/create.js.erb index 1528062f7..24e9a5aef 100644 --- a/app/views/budgets/ballot/lines/create.js.erb +++ b/app/views/budgets/ballot/lines/create.js.erb @@ -1,9 +1,9 @@ -$("#progress_bar").html('<%= j render("/budgets/ballot/progress_bar", ballot: @ballot) %>'); -$("#sidebar").html('<%= j render("/budgets/investments/sidebar") %>'); -$("#<%= dom_id(@investment) %>_ballot").html('<%= j render("/budgets/investments/ballot", +$("#progress_bar").html("<%= j render("/budgets/ballot/progress_bar", ballot: @ballot) %>"); +$("#sidebar").html("<%= j render("/budgets/investments/sidebar") %>"); +$("#<%= dom_id(@investment) %>_ballot").html("<%= j render("/budgets/investments/ballot", investment: @investment, investment_ids: @investment_ids, - ballot: @ballot) %>'); + ballot: @ballot) %>"); <%= render "refresh_ballots", investment: @investment, diff --git a/app/views/budgets/ballot/lines/destroy.js.erb b/app/views/budgets/ballot/lines/destroy.js.erb index e2a91ed6f..0503609e1 100644 --- a/app/views/budgets/ballot/lines/destroy.js.erb +++ b/app/views/budgets/ballot/lines/destroy.js.erb @@ -1,11 +1,11 @@ -$("#progress_bar").html('<%= j render("budgets/ballot/progress_bar", ballot: @ballot) %>'); -$("#sidebar").html('<%= j render("budgets/investments/sidebar") %>'); -$("#ballot").html('<%= j render("budgets/ballot/ballot") %>') +$("#progress_bar").html("<%= j render("budgets/ballot/progress_bar", ballot: @ballot) %>"); +$("#sidebar").html("<%= j render("budgets/investments/sidebar") %>"); +$("#ballot").html("<%= j render("budgets/ballot/ballot") %>") -$("#<%= dom_id(@investment) %>_ballot").html('<%= j render("/budgets/investments/ballot", +$("#<%= dom_id(@investment) %>_ballot").html("<%= j render("/budgets/investments/ballot", investment: @investment, investment_ids: @investment_ids, - ballot: @ballot) %>'); + ballot: @ballot) %>"); <%= render "refresh_ballots", investment: @investment, investment_ids: @investment_ids, diff --git a/app/views/budgets/ballot/lines/new.js.erb b/app/views/budgets/ballot/lines/new.js.erb index 2e8254866..6c8cecac4 100644 --- a/app/views/budgets/ballot/lines/new.js.erb +++ b/app/views/budgets/ballot/lines/new.js.erb @@ -1,2 +1,2 @@ -$("#<%= dom_id(@spending_proposal) %>_ballot").html('<%= j render("spending_proposals/ballot", spending_proposal: @spending_proposal) %>'); +$("#<%= dom_id(@spending_proposal) %>_ballot").html("<%= j render("spending_proposals/ballot", spending_proposal: @spending_proposal) %>"); $(".no-supports-allowed").show(); \ No newline at end of file diff --git a/app/views/budgets/investments/_flag_actions.html.erb b/app/views/budgets/investments/_flag_actions.html.erb index 94d47c571..400156828 100644 --- a/app/views/budgets/investments/_flag_actions.html.erb +++ b/app/views/budgets/investments/_flag_actions.html.erb @@ -1,6 +1,6 @@ <% if show_flag_action? investment %> - + "> @@ -12,7 +12,7 @@ <% end %> <% if show_unflag_action? investment %> - + "> diff --git a/app/views/budgets/investments/_investment.html.erb b/app/views/budgets/investments/_investment.html.erb index 9b63b935f..96785717e 100644 --- a/app/views/budgets/investments/_investment.html.erb +++ b/app/views/budgets/investments/_investment.html.erb @@ -1,5 +1,5 @@
    -
    +
    "> <% if feature?(:allow_images) && investment.image.present? %>
    diff --git a/app/views/budgets/investments/_votes.html.erb b/app/views/budgets/investments/_votes.html.erb index fadebbadd..8d17f696e 100644 --- a/app/views/budgets/investments/_votes.html.erb +++ b/app/views/budgets/investments/_votes.html.erb @@ -4,7 +4,7 @@
    - + "> <%= t("budgets.investments.investment.supports", count: investment.total_votes) %> diff --git a/app/views/budgets/investments/vote.js.erb b/app/views/budgets/investments/vote.js.erb index 1a770d9c1..74ce74ccf 100644 --- a/app/views/budgets/investments/vote.js.erb +++ b/app/views/budgets/investments/vote.js.erb @@ -1,4 +1,4 @@ -$("#<%= dom_id(@investment) %>_votes").html('<%= j render("/budgets/investments/votes", +$("#<%= dom_id(@investment) %>_votes").html("<%= j render("/budgets/investments/votes", investment: @investment, investment_votes: @investment_votes, - vote_url: namespaced_budget_investment_vote_path(@investment, value: "yes")) %>'); + vote_url: namespaced_budget_investment_vote_path(@investment, value: "yes")) %>"); diff --git a/app/views/budgets/results/_results_table.html.erb b/app/views/budgets/results/_results_table.html.erb index bda81e268..7420aed7e 100644 --- a/app/views/budgets/results/_results_table.html.erb +++ b/app/views/budgets/results/_results_table.html.erb @@ -1,5 +1,5 @@ -
    " + style="<%= results_type != :compatible ? "display: none" : "" %>" id="<%= results_type %>-container">

    <%= title %>

    @@ -29,8 +29,8 @@ <% amount_available = heading_price %> <% investments.each do |investment| %> + class="budget-investments <%= investment.winner? ? "success" : "js-discarded" %>" + style="<%= investment.winner? ? "" : "display: none" %>"> <% if investment.winner? %> diff --git a/app/views/comments/_flag_actions.html.erb b/app/views/comments/_flag_actions.html.erb index 1925ced08..cac924994 100644 --- a/app/views/comments/_flag_actions.html.erb +++ b/app/views/comments/_flag_actions.html.erb @@ -3,7 +3,7 @@  |  + title="<%= t("shared.flag") %>">  |  + title="<%= t("shared.unflag") %>"> diff --git a/app/views/comments/_refresh_flag_actions.js.erb b/app/views/comments/_refresh_flag_actions.js.erb index 2084ac96a..8234e696e 100644 --- a/app/views/comments/_refresh_flag_actions.js.erb +++ b/app/views/comments/_refresh_flag_actions.js.erb @@ -1 +1 @@ -$("#flag-actions-<%= dom_id(@comment) %>").html('<%= j render("comments/flag_actions", comment: @comment) %>'); +$("#flag-actions-<%= dom_id(@comment) %>").html("<%= j render("comments/flag_actions", comment: @comment) %>"); diff --git a/app/views/comments/create.js.erb b/app/views/comments/create.js.erb index ead14152e..aa2bd9b1c 100644 --- a/app/views/comments/create.js.erb +++ b/app/views/comments/create.js.erb @@ -5,7 +5,7 @@ var comment_html = "<%= j(render @comment) %>" App.Comments.reset_form(commentable_id); App.Comments.add_comment(commentable_id, comment_html); <% else -%> - var parent_id = '<%= "comment_#{@comment.parent_id}" %>'; + var parent_id = "<%= "comment_#{@comment.parent_id}" %>"; App.Comments.reset_and_hide_form(parent_id); App.Comments.add_reply(parent_id, comment_html); <% end -%> diff --git a/app/views/comments/new.js.erb b/app/views/comments/new.js.erb index 963cdf16a..ad92cb822 100644 --- a/app/views/comments/new.js.erb +++ b/app/views/comments/new.js.erb @@ -1,5 +1,5 @@ <% dom_id = parent_or_commentable_dom_id(@comment.parent_id, @commentable) %> var field_with_errors = "#js-comment-form-<%= dom_id %> #comment-body-<%= dom_id %>"; -App.Comments.display_error(field_with_errors, "<%= j render('comments/errors') %>"); +App.Comments.display_error(field_with_errors, "<%= j render("comments/errors") %>"); diff --git a/app/views/comments/vote.js.erb b/app/views/comments/vote.js.erb index 11f0ad905..e56fb3d65 100644 --- a/app/views/comments/vote.js.erb +++ b/app/views/comments/vote.js.erb @@ -1 +1 @@ -$("#<%= dom_id(@comment) %>_votes").html('<%= j render("comments/votes", comment: @comment) %>'); \ No newline at end of file +$("#<%= dom_id(@comment) %>_votes").html("<%= j render("comments/votes", comment: @comment) %>"); \ No newline at end of file diff --git a/app/views/debates/_flag_actions.html.erb b/app/views/debates/_flag_actions.html.erb index 21b5426c2..148c2cc7d 100644 --- a/app/views/debates/_flag_actions.html.erb +++ b/app/views/debates/_flag_actions.html.erb @@ -1,6 +1,6 @@ <% if show_flag_action? debate %> - + "> @@ -9,7 +9,7 @@ <% end %> <% if show_unflag_action? debate %> - + "> diff --git a/app/views/debates/_refresh_flag_actions.js.erb b/app/views/debates/_refresh_flag_actions.js.erb index f511f347f..f1ba6bc9a 100644 --- a/app/views/debates/_refresh_flag_actions.js.erb +++ b/app/views/debates/_refresh_flag_actions.js.erb @@ -1 +1 @@ -$("#<%= dom_id(@debate) %> .js-flag-actions").html('<%= j render("debates/flag_actions", debate: @debate) %>'); +$("#<%= dom_id(@debate) %> .js-flag-actions").html("<%= j render("debates/flag_actions", debate: @debate) %>"); diff --git a/app/views/debates/vote.js.erb b/app/views/debates/vote.js.erb index 5f61d3ce2..cf9a98cd6 100644 --- a/app/views/debates/vote.js.erb +++ b/app/views/debates/vote.js.erb @@ -1 +1 @@ -$("#<%= dom_id(@debate) %>_votes").html('<%= j render("debates/votes", debate: @debate) %>'); \ No newline at end of file +$("#<%= dom_id(@debate) %>_votes").html("<%= j render("debates/votes", debate: @debate) %>"); \ No newline at end of file diff --git a/app/views/follows/refresh_follow_button.js.erb b/app/views/follows/refresh_follow_button.js.erb index ad7a7d4f1..eb285d4fa 100644 --- a/app/views/follows/refresh_follow_button.js.erb +++ b/app/views/follows/refresh_follow_button.js.erb @@ -1,3 +1,3 @@ App.Followable.update("<%= dom_id(@follow.followable) %>", - "<%= j render('follow_button', follow: @follow) %>", - "<%= j render('layouts/flash') %>") + "<%= j render("follow_button", follow: @follow) %>", + "<%= j render("layouts/flash") %>") diff --git a/app/views/layouts/admin.html.erb b/app/views/layouts/admin.html.erb index 85d067fdd..4b772f614 100644 --- a/app/views/layouts/admin.html.erb +++ b/app/views/layouts/admin.html.erb @@ -6,7 +6,7 @@ <%= content_for :head %> - + ">
    diff --git a/app/views/legislation/annotations/comments.js.erb b/app/views/legislation/annotations/comments.js.erb index b526745eb..4e5a676c7 100644 --- a/app/views/legislation/annotations/comments.js.erb +++ b/app/views/legislation/annotations/comments.js.erb @@ -1,7 +1,7 @@ if ($(".comment").length == 0) { - $("#comments-box").append("<%= j render('comments_box', annotation: @annotation) %>").show(); + $("#comments-box").append("<%= j render("comments_box", annotation: @annotation) %>").show(); } else { - $("#comments-box #comments").append("<%= j render('comments', annotation: @annotation) %>"); + $("#comments-box #comments").append("<%= j render("comments", annotation: @annotation) %>"); var current_annotation_link = $("#annotation-link a").attr("href") var sub_annotation_ids = current_annotation_link.split("=")[1]; diff --git a/app/views/legislation/annotations/new.js.erb b/app/views/legislation/annotations/new.js.erb index 21bdd03b0..600860d63 100644 --- a/app/views/legislation/annotations/new.js.erb +++ b/app/views/legislation/annotations/new.js.erb @@ -1 +1 @@ -$("#comments-box").html("<%= j render('form') %>"); +$("#comments-box").html("<%= j render("form") %>"); diff --git a/app/views/legislation/answers/create.js.erb b/app/views/legislation/answers/create.js.erb index 468b2610b..548a40b5d 100644 --- a/app/views/legislation/answers/create.js.erb +++ b/app/views/legislation/answers/create.js.erb @@ -1 +1 @@ -$("#legislation-answer-form").html('<%= j render("legislation/questions/answer_form", process: @process, question: @question, answer: @answer) %>'); +$("#legislation-answer-form").html("<%= j render("legislation/questions/answer_form", process: @process, question: @question, answer: @answer) %>"); diff --git a/app/views/legislation/processes/_key_dates.html.erb b/app/views/legislation/processes/_key_dates.html.erb index 748a1a470..4e8ab85c0 100644 --- a/app/views/legislation/processes/_key_dates.html.erb +++ b/app/views/legislation/processes/_key_dates.html.erb @@ -1,4 +1,4 @@ -