consul/grecia
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Use double quotes in app/views/legislation

Browse Source
This commit is contained in:
Julian Herrero
2019-03-14 17:12:56 +01:00
parent 25ed245689
commit 2b83be1c7c
39 changed files with 179 additions and 179 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
app/views/legislation/annotations/_comments.html.erb
View File

@@ -9,19 +9,19 @@
<% if comment.body.length > 250 %> <% if comment.body.length > 250 %>
<div class="comment-expand"> <div class="comment-expand">
<%= link_to legislation_process_draft_version_annotation_path(annotation.draft_version.process, annotation.draft_version, annotation) do %> <%= link_to legislation_process_draft_version_annotation_path(annotation.draft_version.process, annotation.draft_version, annotation) do %>
<%= t('legislation.annotations.comments.see_complete') %> <%= t("legislation.annotations.comments.see_complete") %>
<% end %> <% end %>
</div> </div>
<% end %> <% end %>
<div class="comment-replies" id="annotation-<%= annotation.id %>-comments"> <div class="comment-replies" id="annotation-<%= annotation.id %>-comments">
<%= link_to legislation_process_draft_version_annotation_path(annotation.draft_version.process, annotation.draft_version, annotation, anchor: "comment_#{comment.id}") do %> <%= link_to legislation_process_draft_version_annotation_path(annotation.draft_version.process, annotation.draft_version, annotation, anchor: "comment_#{comment.id}") do %>
<%= t('legislation.annotations.comments.replies_count', count: comment.children.size) %> <%= t("legislation.annotations.comments.replies_count", count: comment.children.size) %>
<% end %> <% end %>
</div> </div>
</div> </div>
<div class="comment-votes"> <div class="comment-votes">
<div id="<%= dom_id(comment) %>_votes" class="comment-votes float-right"> <div id="<%= dom_id(comment) %>_votes" class="comment-votes float-right">
<%= render 'comments/votes', comment: comment %> <%= render "comments/votes", comment: comment %>
</div> </div>
</div> </div>
</div> </div>

4
app/views/legislation/annotations/_comments_box.html.erb
View File

@@ -11,12 +11,12 @@
<div class="comment-footer"> <div class="comment-footer">
<% if annotation.comments.roots.count > Legislation::Annotation::COMMENTS_PAGE_SIZE %> <% if annotation.comments.roots.count > Legislation::Annotation::COMMENTS_PAGE_SIZE %>
<%= link_to legislation_process_draft_version_annotation_path(annotation.draft_version.process, annotation.draft_version, annotation), class: "button" do %> <%= link_to legislation_process_draft_version_annotation_path(annotation.draft_version.process, annotation.draft_version, annotation), class: "button" do %>
<strong><%= t('legislation.annotations.comments.see_all') %></strong> <strong><%= t("legislation.annotations.comments.see_all") %></strong>
<% end %> <% end %>
<% end %> <% end %>
<% if @process.allegations_phase.open? %> <% if @process.allegations_phase.open? %>
<a class="button publish-comment" href="#"><strong><%= t('legislation.annotations.comments.publish_comment') %></strong></a> <a class="button publish-comment" href="#"><strong><%= t("legislation.annotations.comments.publish_comment") %></strong></a>
&nbsp; &nbsp;
<% end %> <% end %>

14
app/views/legislation/annotations/_comments_box_form.js.erb
View File

@@ -1,15 +1,15 @@
$('#comments-box-<%= annotation.id %> a.publish-comment').on({ $("#comments-box-<%= annotation.id %> a.publish-comment").on({
click: function(e) { click: function(e) {
e.preventDefault(); e.preventDefault();
$('a.publish-comment').hide(); $("a.publish-comment").hide();
$('#js-comment-form-annotation-<%= annotation.id %>').toggle(); $("#js-comment-form-annotation-<%= annotation.id %>").toggle();
$('#js-comment-form-annotation-<%= annotation.id %> textarea').focus(); $("#js-comment-form-annotation-<%= annotation.id %> textarea").focus();
return; return;
} }
}); });
<% if comment.errors.any? %> <% if comment.errors.any? %>
$('#comments-box-<%= @annotation.id %> a.publish-comment').hide(); $("#comments-box-<%= @annotation.id %> a.publish-comment").hide();
$('#js-comment-form-annotation-<%= annotation.id %>').toggle(); $("#js-comment-form-annotation-<%= annotation.id %>").toggle();
$('#js-comment-form-annotation-<%= annotation.id %> textarea').focus(); $("#js-comment-form-annotation-<%= annotation.id %> textarea").focus();
<% end %> <% end %>

6
app/views/legislation/annotations/_form.html.erb
View File

@@ -1,7 +1,7 @@
<div class="comment-box"> <div class="comment-box">
<div class="comment-header"> <div class="comment-header">
<span class="icon-comment" aria-hidden="true"></span> <span class="icon-comment" aria-hidden="true"></span>
<div class="comment-number"><%= t('legislation.annotations.comments.comments_count', count: 0) %></div> <div class="comment-number"><%= t("legislation.annotations.comments.comments_count", count: 0) %></div>
</div> </div>
<div class="comments-wrapper"> <div class="comments-wrapper">
@@ -15,8 +15,8 @@
<%= f.text_area :text %> <%= f.text_area :text %>
<div class="comment-actions"> <div class="comment-actions">
<a class="cancel-comment" href="#" data-cancel-annotation><%= t('legislation.annotations.comments.cancel') %></a> <a class="cancel-comment" href="#" data-cancel-annotation><%= t("legislation.annotations.comments.cancel") %></a>
<%= f.submit value: t('legislation.annotations.comments.publish_comment'), class: 'button publish-comment' %> <%= f.submit value: t("legislation.annotations.comments.publish_comment"), class: "button publish-comment" %>
</div> </div>
<%= f.hidden_field :quote %> <%= f.hidden_field :quote %>

18
app/views/legislation/annotations/_slim_version_chooser.html.erb
View File

@@ -1,25 +1,25 @@
<div class="row draft-chooser"> <div class="row draft-chooser">
<div class="small-12 medium-6 column"> <div class="small-12 medium-6 column">
<h3><%= t('legislation.annotations.version_chooser.seeing_version') %></h3> <h3><%= t("legislation.annotations.version_chooser.seeing_version") %></h3>
<div class="select-box"> <div class="select-box">
<%= form_tag go_to_version_legislation_process_draft_versions_path(process), method: :get, id: "draft_version_go_to_version" do %> <%= form_tag go_to_version_legislation_process_draft_versions_path(process), method: :get, id: "draft_version_go_to_version" do %>
<%= select_tag "draft_version_id", options_from_collection_for_select(process.draft_versions.published, 'id', 'display_title', draft_version.id), "aria-label": t('legislation.draft_versions.show.select_draft_version') %> <%= select_tag "draft_version_id", options_from_collection_for_select(process.draft_versions.published, "id", "display_title", draft_version.id), "aria-label": t("legislation.draft_versions.show.select_draft_version") %>
<%= hidden_field_tag "redirect_action", "annotations" %> <%= hidden_field_tag "redirect_action", "annotations" %>
<%= submit_tag t('legislation.draft_versions.show.select_version_submit'), class: "button" %> <%= submit_tag t("legislation.draft_versions.show.select_version_submit"), class: "button" %>
<% end %> <% end %>
</div> </div>
<span><%= t('legislation.draft_versions.show.updated_at', date: format_date(@draft_version.updated_at)) %></span> <span><%= t("legislation.draft_versions.show.updated_at", date: format_date(@draft_version.updated_at)) %></span>
</div> </div>
<div class="small-12 medium-3 column"> <div class="small-12 medium-3 column">
<%= link_to legislation_process_draft_version_path(process, draft_version), title: t('legislation.annotations.version_chooser.see_text'), class: "button" do %> <%= link_to legislation_process_draft_version_path(process, draft_version), title: t("legislation.annotations.version_chooser.see_text"), class: "button" do %>
<strong><%= t('legislation.annotations.version_chooser.see_text') %></strong> <strong><%= t("legislation.annotations.version_chooser.see_text") %></strong>
<% end %> <% end %>
</div> </div>
<aside class="small-12 medium-3 column"> <aside class="small-12 medium-3 column">
<div class="sidebar-divider"></div> <div class="sidebar-divider"></div>
<h2><%= t('legislation.shared.share') %></h2> <h2><%= t("legislation.shared.share") %></h2>
<%= render '/shared/social_share', <%= render "/shared/social_share",
title: t('legislation.shared.share_comment', version_name: @draft_version.title.downcase, process_name: @process.title), title: t("legislation.shared.share_comment", version_name: @draft_version.title.downcase, process_name: @process.title),
url: legislation_process_draft_version_path(process, draft_version) url: legislation_process_draft_version_path(process, draft_version)
%> %>
</aside> </aside>

12
app/views/legislation/annotations/_version_chooser.html.erb
View File

@@ -1,18 +1,18 @@
<div class="row draft-chooser"> <div class="row draft-chooser">
<div class="small-12 medium-9 column"> <div class="small-12 medium-9 column">
<h3><%= t('.seeing_version') %></h3> <h3><%= t(".seeing_version") %></h3>
<div class="select-box"> <div class="select-box">
<%= form_tag go_to_version_legislation_process_draft_versions_path(process), method: :get, id: "draft_version_go_to_version" do %> <%= form_tag go_to_version_legislation_process_draft_versions_path(process), method: :get, id: "draft_version_go_to_version" do %>
<%= select_tag "draft_version_id", options_from_collection_for_select(process.draft_versions.published, 'id', 'display_title', draft_version.id), "aria-label": t('legislation.draft_versions.show.select_draft_version') %> <%= select_tag "draft_version_id", options_from_collection_for_select(process.draft_versions.published, "id", "display_title", draft_version.id), "aria-label": t("legislation.draft_versions.show.select_draft_version") %>
<%= hidden_field_tag "redirect_action", "annotations" %> <%= hidden_field_tag "redirect_action", "annotations" %>
<%= submit_tag t('legislation.draft_versions.show.select_version_submit'), class: "button" %> <%= submit_tag t("legislation.draft_versions.show.select_version_submit"), class: "button" %>
<% end %> <% end %>
</div> </div>
<span><%= t('legislation.draft_versions.show.updated_at', date: format_date(@draft_version.updated_at)) %></span> <span><%= t("legislation.draft_versions.show.updated_at", date: format_date(@draft_version.updated_at)) %></span>
</div> </div>
<div class="small-12 medium-3 column"> <div class="small-12 medium-3 column">
<%= link_to legislation_process_draft_version_path(process, draft_version), title: t('.see_text'), class: "button" do %> <%= link_to legislation_process_draft_version_path(process, draft_version), title: t(".see_text"), class: "button" do %>
<%= t('.see_text') %> <%= t(".see_text") %>
<% end %> <% end %>
</div> </div>
</div> </div>

4
app/views/legislation/annotations/comments.js.erb
View File

@@ -4,7 +4,7 @@ if ($(".comment").length == 0) {
$("#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 current_annotation_link = $("#annotation-link a").attr("href")
var sub_annotation_ids = current_annotation_link.split('=')[1]; var sub_annotation_ids = current_annotation_link.split("=")[1];
if (sub_annotation_ids.length == 0) { if (sub_annotation_ids.length == 0) {
var new_annotation_link = current_annotation_link + <%= "#{@annotation.id}" %> var new_annotation_link = current_annotation_link + <%= "#{@annotation.id}" %>
} }
@@ -21,4 +21,4 @@ if ($(".comment").length == 0) {
$(".comment-number").text(new_comment_count_text) $(".comment-number").text(new_comment_count_text)
} }
<%= render 'comments_box_form', comment: @comment, annotation: @annotation %> <%= render "comments_box_form", comment: @comment, annotation: @annotation %>

14
app/views/legislation/annotations/index.html.erb
View File

@@ -1,31 +1,31 @@
<% provide :title do %><%= "#{t('.title')} - #{@draft_version.title} - #{@process.title}" %><% end %> <% provide :title do %><%= "#{t('.title')} - #{@draft_version.title} - #{@process.title}" %><% end %>
<%= render 'legislation/processes/header', process: @process, header: :small %> <%= render "legislation/processes/header", process: @process, header: :small %>
<%= render 'legislation/processes/key_dates', process: @process, phase: :allegations_phase %> <%= render "legislation/processes/key_dates", process: @process, phase: :allegations_phase %>
<div class="column row"> <div class="column row">
<div class="draft-panels small-12 column row"> <div class="draft-panels small-12 column row">
<%= render 'slim_version_chooser', process: @process, draft_version: @draft_version %> <%= render "slim_version_chooser", process: @process, draft_version: @draft_version %>
</div> </div>
<%= render 'legislation/processes/help_gif' %> <%= render "legislation/processes/help_gif" %>
<div class="small-12 medium-8 column row legislation-comments end"> <div class="small-12 medium-8 column row legislation-comments end">
<% @annotations.each do |annotation| %> <% @annotations.each do |annotation| %>
<div class="comment"> <div class="comment">
<strong><%= t('.comments_about') %></strong> <strong><%= t(".comments_about") %></strong>
<span class="float-right"> <span class="float-right">
<%= link_to legislation_process_draft_version_path(@process, @draft_version, anchor: "annotation-id-#{annotation.id}") do %> <%= link_to legislation_process_draft_version_path(@process, @draft_version, anchor: "annotation-id-#{annotation.id}") do %>
<span><%= t('.see_in_context') %></span> <span class="icon-expand" aria-hidden="true"></span> <span><%= t(".see_in_context") %></span> <span class="icon-expand" aria-hidden="true"></span>
<% end %> <% end %>
</span> </span>
<div class="comment-section"> <div class="comment-section">
<%= annotation.context.try(:html_safe).presence || annotation.quote %> <%= annotation.context.try(:html_safe).presence || annotation.quote %>
</div> </div>
<%= link_to legislation_process_draft_version_annotation_path(@process, @draft_version, annotation) do %> <%= link_to legislation_process_draft_version_annotation_path(@process, @draft_version, annotation) do %>
<span class="icon-comments" aria-hidden="true"></span> <span><%= t('.comments_count', count: annotation.comments_count) %></span></a> <span class="icon-comments" aria-hidden="true"></span> <span><%= t(".comments_count", count: annotation.comments_count) %></span></a>
<% end %> <% end %>
</div> </div>
<% end %> <% end %>

4
app/views/legislation/annotations/new_comment.js.erb
View File

@@ -1,3 +1,3 @@
$("#comments-box-<%= @annotation.id %>").replaceWith("<%= j render('comments_box', annotation: @annotation) %>").show(); $("#comments-box-<%= @annotation.id %>").replaceWith("<%= j render("comments_box", annotation: @annotation) %>").show();
<%= render 'comments_box_form', comment: @comment, annotation: @annotation %> <%= render "comments_box_form", comment: @comment, annotation: @annotation %>

20
app/views/legislation/annotations/show.html.erb
View File

@@ -1,20 +1,20 @@
<% provide :title do %><%= "#{t('.title')} - #{@draft_version.title} - #{@process.title}" %><% end %> <% provide :title do %><%= "#{t('.title')} - #{@draft_version.title} - #{@process.title}" %><% end %>
<%= render 'legislation/processes/header', process: @process, header: :small %> <%= render "legislation/processes/header", process: @process, header: :small %>
<%= render 'legislation/processes/key_dates', process: @process, phase: :allegations_phase %> <%= render "legislation/processes/key_dates", process: @process, phase: :allegations_phase %>
<div class="column row"> <div class="column row">
<div class="draft-panels small-12 column row"> <div class="draft-panels small-12 column row">
<%= render 'version_chooser', process: @process, draft_version: @draft_version %> <%= render "version_chooser", process: @process, draft_version: @draft_version %>
<%= render 'legislation/processes/help_gif' %> <%= render "legislation/processes/help_gif" %>
<div class="legislation-comment"> <div class="legislation-comment">
<div class="annotation-comment"> <div class="annotation-comment">
<div class="row annotation-share-comment"> <div class="row annotation-share-comment">
<div class="small-12 medium-9 column"> <div class="small-12 medium-9 column">
<strong><%= t('legislation.annotations.index.comments_about') %></strong> <strong><%= t("legislation.annotations.index.comments_about") %></strong>
<div class="comment-section"> <div class="comment-section">
<div class="row"> <div class="row">
@@ -24,7 +24,7 @@
<div class="small-12 medium-3 column legislation-comment"> <div class="small-12 medium-3 column legislation-comment">
<span class="float-right"> <span class="float-right">
<%= link_to legislation_process_draft_version_path(@process, @draft_version, anchor: "annotation-id-#{@annotation.id}") do %> <%= link_to legislation_process_draft_version_path(@process, @draft_version, anchor: "annotation-id-#{@annotation.id}") do %>
<span><%= t('legislation.annotations.index.see_in_context') %></span> <span class="icon-expand" aria-hidden="true"></span> <span><%= t("legislation.annotations.index.see_in_context") %></span> <span class="icon-expand" aria-hidden="true"></span>
<% end %> <% end %>
</span> </span>
</div> </div>
@@ -34,15 +34,15 @@
<aside class="small-12 medium-3 column"> <aside class="small-12 medium-3 column">
<div class="sidebar-divider"></div> <div class="sidebar-divider"></div>
<h2><%= t('legislation.shared.share') %></h2> <h2><%= t("legislation.shared.share") %></h2>
<%= render '/shared/social_share', <%= render "/shared/social_share",
title: t('legislation.shared.share_comment', version_name: @draft_version.title.downcase, process_name: @process.title), title: t("legislation.shared.share_comment", version_name: @draft_version.title.downcase, process_name: @process.title),
url: legislation_process_draft_version_annotations_path(@process, @draft_version) url: legislation_process_draft_version_annotations_path(@process, @draft_version)
%> %>
</aside> </aside>
</div> </div>
<%= render partial: '/comments/comment_tree', locals: { comment_tree: @comment_tree, <%= render partial: "/comments/comment_tree", locals: { comment_tree: @comment_tree,
comment_flags: @comment_flags, comment_flags: @comment_flags,
display_comments_count: true } %> display_comments_count: true } %>
</div> </div>

6
app/views/legislation/draft_versions/_comments_panel.html.erb
View File

@@ -1,19 +1,19 @@
<div class="small-12 calc-comments end column js-toggle-allegations"> <div class="small-12 calc-comments end column js-toggle-allegations">
<div class="draft-panel"> <div class="draft-panel">
<div> <div>
<span class="icon-comments" aria-hidden="true"></span> <span class="panel-title"><%= t('legislation.draft_versions.show.text_comments') %></span> <span class="icon-comments" aria-hidden="true"></span> <span class="panel-title"><%= t("legislation.draft_versions.show.text_comments") %></span>
</div> </div>
</div> </div>
<div class="draft-comments-rotated text-center"> <div class="draft-comments-rotated text-center">
<span class="panel-title"><%= t('legislation.draft_versions.show.text_comments') %></span> <span class="panel-title"><%= t("legislation.draft_versions.show.text_comments") %></span>
</div> </div>
<div id="comments-box" class="comments-box-container" style="display: none;"> <div id="comments-box" class="comments-box-container" style="display: none;">
<div class="comment-box"> <div class="comment-box">
<div class="comment-header"> <div class="comment-header">
<span class="icon-comment" aria-hidden="true"></span> <span class="icon-comment" aria-hidden="true"></span>
<div class="comment-number"><%= t('legislation.draft_versions.show.loading_comments') %></div> <div class="comment-number"><%= t("legislation.draft_versions.show.loading_comments") %></div>
</div> </div>
</div> </div>
</div> </div>

20
app/views/legislation/draft_versions/changes.html.erb
View File

@@ -1,33 +1,33 @@
<% provide :title do %><%= "#{@draft_version.title} - #{t('.title')} - #{@process.title}" %><% end %> <% provide :title do %><%= "#{@draft_version.title} - #{t('.title')} - #{@process.title}" %><% end %>
<%= render 'legislation/processes/header', process: @process, header: :small %> <%= render "legislation/processes/header", process: @process, header: :small %>
<%= render 'documents/additional_documents', documents: @process.documents %> <%= render "documents/additional_documents", documents: @process.documents %>
<%= render 'legislation/processes/key_dates', process: @process, phase: :allegations_phase %> <%= render "legislation/processes/key_dates", process: @process, phase: :allegations_phase %>
<div class="column row"> <div class="column row">
<div class="draft-panels small-12 column row"> <div class="draft-panels small-12 column row">
<div class="row draft-chooser"> <div class="row draft-chooser">
<div class="small-12 medium-9 column"> <div class="small-12 medium-9 column">
<h3><%= t('.seeing_changelog_version') %></h3> <h3><%= t(".seeing_changelog_version") %></h3>
<div class="select-box"> <div class="select-box">
<%= form_tag go_to_version_legislation_process_draft_versions_path(@process), method: :get, id: "draft_version_go_to_version" do %> <%= form_tag go_to_version_legislation_process_draft_versions_path(@process), method: :get, id: "draft_version_go_to_version" do %>
<%= select_tag "draft_version_id", options_from_collection_for_select(@draft_versions_list, 'id', 'display_title', @draft_version.id), "aria-label": t('legislation.draft_versions.show.select_draft_version') %> <%= select_tag "draft_version_id", options_from_collection_for_select(@draft_versions_list, "id", "display_title", @draft_version.id), "aria-label": t("legislation.draft_versions.show.select_draft_version") %>
<%= hidden_field_tag "redirect_action", "changes" %> <%= hidden_field_tag "redirect_action", "changes" %>
<%= submit_tag t('legislation.draft_versions.show.select_version_submit'), class: "button" %> <%= submit_tag t("legislation.draft_versions.show.select_version_submit"), class: "button" %>
<% end %> <% end %>
</div> </div>
<span><%= t('legislation.draft_versions.show.updated_at', date: format_date(@draft_version.updated_at)) %></span> <span><%= t("legislation.draft_versions.show.updated_at", date: format_date(@draft_version.updated_at)) %></span>
</div> </div>
<div class="small-12 medium-3 column"> <div class="small-12 medium-3 column">
<%= link_to legislation_process_draft_version_path(@process, @draft_version), title: t('.see_text'), class: "button" do %> <%= link_to legislation_process_draft_version_path(@process, @draft_version), title: t(".see_text"), class: "button" do %>
<strong><%= t('.see_text') %></strong> <strong><%= t(".see_text") %></strong>
<% end %> <% end %>
</div> </div>
</div> </div>
<%= render 'legislation/processes/help_gif' %> <%= render "legislation/processes/help_gif" %>
<div class="row"> <div class="row">
<div class="small-12 medium-8 column legislation-changes"> <div class="small-12 medium-8 column legislation-changes">

30
app/views/legislation/draft_versions/show.html.erb
View File

@@ -1,50 +1,50 @@
<% provide :title do %><%= "#{@draft_version.title} - #{@process.title}" %><% end %> <% provide :title do %><%= "#{@draft_version.title} - #{@process.title}" %><% end %>
<%= render 'legislation/processes/header', process: @process, header: :small %> <%= render "legislation/processes/header", process: @process, header: :small %>
<%= render 'documents/additional_documents', documents: @process.documents %> <%= render "documents/additional_documents", documents: @process.documents %>
<%= render 'legislation/processes/key_dates', process: @process, phase: :allegations_phase %> <%= render "legislation/processes/key_dates", process: @process, phase: :allegations_phase %>
<div class="column row"> <div class="column row">
<div class="draft-panels small-12 column row"> <div class="draft-panels small-12 column row">
<div class="row draft-chooser"> <div class="row draft-chooser">
<div class="small-12 medium-9 column"> <div class="small-12 medium-9 column">
<h3><%= t('.seeing_version') %></h3> <h3><%= t(".seeing_version") %></h3>
<div class="select-box"> <div class="select-box">
<%= form_tag go_to_version_legislation_process_draft_versions_path(@process), method: :get, id: "draft_version_go_to_version" do %> <%= form_tag go_to_version_legislation_process_draft_versions_path(@process), method: :get, id: "draft_version_go_to_version" do %>
<%= select_tag "draft_version_id", options_from_collection_for_select(@draft_versions_list, 'id', 'display_title', @draft_version.id), "aria-label": t('.select_draft_version') %> <%= select_tag "draft_version_id", options_from_collection_for_select(@draft_versions_list, "id", "display_title", @draft_version.id), "aria-label": t(".select_draft_version") %>
<%= submit_tag t('.select_version_submit'), class: "button" %> <%= submit_tag t(".select_version_submit"), class: "button" %>
<% end %> <% end %>
<% if @draft_version.changelog.present? %> <% if @draft_version.changelog.present? %>
<span><%= link_to t('.see_changes'), legislation_process_draft_version_changes_path(@process, @draft_version), class: "see-changes" %></span> <span><%= link_to t(".see_changes"), legislation_process_draft_version_changes_path(@process, @draft_version), class: "see-changes" %></span>
<% end %> <% end %>
</div> </div>
<span><%= t('.updated_at', date: format_date(@draft_version.updated_at)) %></span> <span><%= t(".updated_at", date: format_date(@draft_version.updated_at)) %></span>
</div> </div>
<% unless @draft_version.final_version? %> <% unless @draft_version.final_version? %>
<div class="small-12 medium-3 column"> <div class="small-12 medium-3 column">
<%= link_to legislation_process_draft_version_annotations_path(@process, @draft_version), title: t('.see_comments'), class: "button expanded" do %> <%= link_to legislation_process_draft_version_annotations_path(@process, @draft_version), title: t(".see_comments"), class: "button expanded" do %>
<strong><%= t('.see_comments') %></strong> <strong><%= t(".see_comments") %></strong>
<% end %> <% end %>
</div> </div>
<% end %> <% end %>
</div> </div>
<%= render 'legislation/processes/help_gif' %> <%= render "legislation/processes/help_gif" %>
<div class="row draft-allegation medium-collapse comments-on"> <div class="row draft-allegation medium-collapse comments-on">
<div class="small-12 calc-index column <%= "js-toggle-allegations" unless @draft_version.final_version? %>"> <div class="small-12 calc-index column <%= "js-toggle-allegations" unless @draft_version.final_version? %>">
<div class="draft-panel"> <div class="draft-panel">
<div> <div>
<span class="icon-banner" aria-hidden="true"></span> <span class="panel-title"><%= t('.text_toc') %></span> <span class="icon-banner" aria-hidden="true"></span> <span class="panel-title"><%= t(".text_toc") %></span>
</div> </div>
</div> </div>
<div class="draft-index-rotated text-center"> <div class="draft-index-rotated text-center">
<span class="panel-title"><%= t('.text_toc') %></span> <span class="panel-title"><%= t(".text_toc") %></span>
</div> </div>
<div data-sticky-container> <div data-sticky-container>
@@ -55,7 +55,7 @@
</div> </div>
<div class="small-12 calc-text column border-right border-left"> <div class="small-12 calc-text column border-right border-left">
<div class="draft-panel"> <div class="draft-panel">
<div><span class="panel-title"><%= t('.text_body') %></span></div> <div><span class="panel-title"><%= t(".text_body") %></span></div>
</div> </div>
<div id="sticky-panel" class="draft-text"> <div id="sticky-panel" class="draft-text">
<% if @draft_version.final_version? %> <% if @draft_version.final_version? %>
@@ -75,7 +75,7 @@
<% if @draft_version.final_version? %> <% if @draft_version.final_version? %>
<div class="small-12 calc-comments end column"></div> <div class="small-12 calc-comments end column"></div>
<% else %> <% else %>
<%= render 'comments_panel', draft_version: @draft_version %> <%= render "comments_panel", draft_version: @draft_version %>
<% end %> <% end %>
</div> </div>

6
app/views/legislation/processes/_header.html.erb
View File

@@ -31,12 +31,12 @@
<%= t("legislation.processes.header.more_info") %> <%= t("legislation.processes.header.more_info") %>
</a> </a>
<% else %> <% else %>
<%= render 'legislation/processes/header_full', process: @process %> <%= render "legislation/processes/header_full", process: @process %>
<% end %> <% end %>
</div> </div>
<aside class="small-12 medium-3 column"> <aside class="small-12 medium-3 column">
<%= render partial: 'shared/social_share', locals: { <%= render partial: "shared/social_share", locals: {
share_title: t("proposals.show.share"), share_title: t("proposals.show.share"),
title: @process.title, title: @process.title,
url: legislation_process_url(@process), url: legislation_process_url(@process),
@@ -46,7 +46,7 @@
<% if @process.image.present? %> <% if @process.image.present? %>
<hr> <hr>
<%= image_tag(@process.image_url(:large), alt: @process.title, id:'image') %> <%= image_tag(@process.image_url(:large), alt: @process.title, id: "image") %>
<% end %> <% end %>
<% if process.draft_publication.enabled? %> <% if process.draft_publication.enabled? %>

8
app/views/legislation/processes/_key_dates.html.erb
View File

@@ -7,7 +7,7 @@
<ul class="key-dates"> <ul class="key-dates">
<% if process.homepage_enabled? && process.homepage.present? %> <% if process.homepage_enabled? && process.homepage.present? %>
<li <%= 'class=is-active' if phase.to_sym == :homepage %>> <li <%= "class=is-active" if phase.to_sym == :homepage %>>
<%= link_to legislation_process_path(process) do %> <%= link_to legislation_process_path(process) do %>
<h4><%= t("legislation.processes.shared.homepage") %></h4> <h4><%= t("legislation.processes.shared.homepage") %></h4>
<br> <br>
@@ -16,7 +16,7 @@
<% end %> <% end %>
<% if process.debate_phase.enabled? %> <% if process.debate_phase.enabled? %>
<li <%= 'class=is-active' if phase.to_sym == :debate_phase %>> <li <%= "class=is-active" if phase.to_sym == :debate_phase %>>
<%= link_to debate_legislation_process_path(process) do %> <%= link_to debate_legislation_process_path(process) do %>
<h4><%= t("legislation.processes.shared.debate_dates") %></h4> <h4><%= t("legislation.processes.shared.debate_dates") %></h4>
<span><%= format_date(process.debate_start_date) %> - <%= format_date(process.debate_end_date) %></span> <span><%= format_date(process.debate_start_date) %> - <%= format_date(process.debate_end_date) %></span>
@@ -25,7 +25,7 @@
<% end %> <% end %>
<% if process.proposals_phase.enabled? %> <% if process.proposals_phase.enabled? %>
<li <%= 'class=is-active' if phase.to_sym == :proposals %>> <li <%= "class=is-active" if phase.to_sym == :proposals %>>
<%= link_to proposals_legislation_process_path(process) do %> <%= link_to proposals_legislation_process_path(process) do %>
<h4><%= t("legislation.processes.shared.proposals_dates") %></h4> <h4><%= t("legislation.processes.shared.proposals_dates") %></h4>
<span><%= format_date(process.proposals_phase_start_date) %> - <%= format_date(process.proposals_phase_end_date) %></span> <span><%= format_date(process.proposals_phase_start_date) %> - <%= format_date(process.proposals_phase_end_date) %></span>
@@ -34,7 +34,7 @@
<% end %> <% end %>
<% if process.allegations_phase.enabled? %> <% if process.allegations_phase.enabled? %>
<li <%= 'class=is-active' if phase.to_sym == :allegations_phase %>> <li <%= "class=is-active" if phase.to_sym == :allegations_phase %>>
<%= link_to allegations_legislation_process_path(process) do %> <%= link_to allegations_legislation_process_path(process) do %>
<h4><%= t("legislation.processes.shared.allegations_dates") %></h4> <h4><%= t("legislation.processes.shared.allegations_dates") %></h4>
<span><%= format_date(process.allegations_start_date) %> - <%= format_date(process.allegations_end_date) %></span> <span><%= format_date(process.allegations_start_date) %> - <%= format_date(process.allegations_end_date) %></span>

8
app/views/legislation/processes/_proposals_content.html.erb
View File

@@ -3,7 +3,7 @@
<div class="row"> <div class="row">
<div class="small-12 medium-9 column"> <div class="small-12 medium-9 column">
<div class="legislation-proposals"> <div class="legislation-proposals">
<%= render 'shared/filter_subnav', i18n_namespace: "legislation.processes.proposals" %> <%= render "shared/filter_subnav", i18n_namespace: "legislation.processes.proposals" %>
<% if proposals.empty? %> <% if proposals.empty? %>
<div class="callout primary"> <div class="callout primary">
<p><%= t("legislation.processes.proposals.empty_proposals") %></p> <p><%= t("legislation.processes.proposals.empty_proposals") %></p>
@@ -19,10 +19,10 @@
<% if process.proposals_phase.open? %> <% if process.proposals_phase.open? %>
<p><%= link_to new_legislation_proposal_link_text(process), <p><%= link_to new_legislation_proposal_link_text(process),
new_legislation_process_proposal_path(process), new_legislation_process_proposal_path(process),
class: 'button expanded', class: "button expanded",
id: 'create-new-proposal' %></p> id: "create-new-proposal" %></p>
<% end %> <% end %>
<%= render 'legislation/proposals/categories', taggable: process %> <%= render "legislation/proposals/categories", taggable: process %>
</div> </div>
</div> </div>
</div> </div>

6
app/views/legislation/processes/debate.html.erb
View File

@@ -1,10 +1,10 @@
<% provide :title do %><%= @process.title %><% end %> <% provide :title do %><%= @process.title %><% end %>
<%= render 'legislation/processes/header', process: @process, header: :full %> <%= render "legislation/processes/header", process: @process, header: :full %>
<%= render 'documents/additional_documents', documents: @process.documents %> <%= render "documents/additional_documents", documents: @process.documents %>
<%= render 'key_dates', process: @process, phase: :debate_phase %> <%= render "key_dates", process: @process, phase: :debate_phase %>
<div class="row"> <div class="row">
<div class="debate-chooser"> <div class="debate-chooser">

2
app/views/legislation/processes/index.html.erb
View File

@@ -7,7 +7,7 @@
<div class="row"> <div class="row">
<div id="legislation" class="legislation-list small-12 medium-9 column"> <div id="legislation" class="legislation-list small-12 medium-9 column">
<%= render 'shared/filter_subnav', i18n_namespace: "legislation.processes.index" %> <%= render "shared/filter_subnav", i18n_namespace: "legislation.processes.index" %>
<div id="legislation-list"> <div id="legislation-list">
<% if @processes.any? %> <% if @processes.any? %>

6
app/views/legislation/processes/phase_empty.html.erb
View File

@@ -1,10 +1,10 @@
<% provide :title do %><%= @process.title %><% end %> <% provide :title do %><%= @process.title %><% end %>
<%= render 'legislation/processes/header', process: @process, header: :full %> <%= render "legislation/processes/header", process: @process, header: :full %>
<%= render 'documents/additional_documents', documents: @process.documents %> <%= render "documents/additional_documents", documents: @process.documents %>
<%= render 'legislation/processes/key_dates', process: @process, phase: @phase %> <%= render "legislation/processes/key_dates", process: @process, phase: @phase %>
<div class="debate-chooser"> <div class="debate-chooser">
<div class="row"> <div class="row">

8
app/views/legislation/processes/phase_not_open.html.erb
View File

@@ -1,16 +1,16 @@
<% provide :title do %><%= @process.title %><% end %> <% provide :title do %><%= @process.title %><% end %>
<%= render 'legislation/processes/header', process: @process, header: :full %> <%= render "legislation/processes/header", process: @process, header: :full %>
<%= render 'documents/additional_documents', documents: @process.documents %> <%= render "documents/additional_documents", documents: @process.documents %>
<%= render 'legislation/processes/key_dates', process: @process, phase: @phase %> <%= render "legislation/processes/key_dates", process: @process, phase: @phase %>
<div class="debate-chooser"> <div class="debate-chooser">
<div class="row"> <div class="row">
<div class="small-12 column"> <div class="small-12 column">
<div class="callout primary"> <div class="callout primary">
<p><%= t('.not_open') %></p> <p><%= t(".not_open") %></p>
</div> </div>
</div> </div>
</div> </div>

8
app/views/legislation/processes/proposals.html.erb
View File

@@ -1,9 +1,9 @@
<% provide :title do %><%= @process.title %><% end %> <% provide :title do %><%= @process.title %><% end %>
<%= render 'legislation/processes/header', process: @process, header: :full %> <%= render "legislation/processes/header", process: @process, header: :full %>
<%= render 'documents/additional_documents', documents: @process.documents %> <%= render "documents/additional_documents", documents: @process.documents %>
<%= render 'key_dates', process: @process, phase: :proposals %> <%= render "key_dates", process: @process, phase: :proposals %>
<%= render 'proposals_content', process: @process, proposals: @proposals %> <%= render "proposals_content", process: @process, proposals: @proposals %>

6
app/views/legislation/processes/show.html.erb
View File

@@ -1,10 +1,10 @@
<% provide :title do %><%= @process.title %><% end %> <% provide :title do %><%= @process.title %><% end %>
<%= render 'legislation/processes/header', process: @process, header: :full %> <%= render "legislation/processes/header", process: @process, header: :full %>
<%= render 'documents/additional_documents', documents: @process.documents %> <%= render "documents/additional_documents", documents: @process.documents %>
<%= render 'key_dates', process: @process, phase: :homepage %> <%= render "key_dates", process: @process, phase: :homepage %>
<div class="row margin-top"> <div class="row margin-top">
<div class="small-12 medium-9 column"> <div class="small-12 medium-9 column">

4
app/views/legislation/proposals/_actions.html.erb
View File

@@ -1,10 +1,10 @@
<% if can? :hide, proposal %> <% if can? :hide, proposal %>
<%= link_to t("admin.actions.hide").capitalize, hide_moderation_proposal_path(proposal), <%= link_to t("admin.actions.hide").capitalize, hide_moderation_proposal_path(proposal),
method: :put, remote: true, data: { confirm: t('admin.actions.confirm') } %> method: :put, remote: true, data: { confirm: t("admin.actions.confirm") } %>
<% end %> <% end %>
<% if can? :hide, proposal.author %> <% if can? :hide, proposal.author %>
&nbsp;|&nbsp; &nbsp;|&nbsp;
<%= link_to t("admin.actions.hide_author").capitalize, hide_moderation_user_path(proposal.author_id), <%= link_to t("admin.actions.hide_author").capitalize, hide_moderation_user_path(proposal.author_id),
method: :put, data: { confirm: t('admin.actions.confirm') } %> method: :put, data: { confirm: t("admin.actions.confirm") } %>
<% end %> <% end %>

2
app/views/legislation/proposals/_categories.html.erb
View File

@@ -5,7 +5,7 @@
<ul id="categories" class="no-bullet categories"> <ul id="categories" class="no-bullet categories">
<% @process.tag_list_on(:customs).each do |tag| %> <% @process.tag_list_on(:customs).each do |tag| %>
<li class="inline-block"> <li class="inline-block">
<% css_class = { class: 'is-active' } if params[:search] == tag %> <% css_class = { class: "is-active" } if params[:search] == tag %>
<%= link_to tag, <%= link_to tag,
legislation_process_proposals_path(process_id: @process, search: tag), legislation_process_proposals_path(process_id: @process, search: tag),
css_class || {} %> css_class || {} %>

6
app/views/legislation/proposals/_comments.html.erb
View File

@@ -1,10 +1,10 @@
<% cache [locale_and_user_status, @current_order, commentable_cache_key(@proposal), @comment_tree.comments, @comment_tree.comment_authors, @proposal.comments_count, @comment_flags] do %> <% cache [locale_and_user_status, @current_order, commentable_cache_key(@proposal), @comment_tree.comments, @comment_tree.comment_authors, @proposal.comments_count, @comment_flags] do %>
<div class="row comments"> <div class="row comments">
<div id="comments" class="small-12 column"> <div id="comments" class="small-12 column">
<%= render 'shared/wide_order_selector', i18n_namespace: "comments" %> <%= render "shared/wide_order_selector", i18n_namespace: "comments" %>
<% if user_signed_in? %> <% if user_signed_in? %>
<%= render 'comments/form', {commentable: @proposal, parent_id: nil, toggeable: false} %> <%= render "comments/form", {commentable: @proposal, parent_id: nil, toggeable: false} %>
<% else %> <% else %>
<br> <br>
@@ -16,7 +16,7 @@
<% end %> <% end %>
<% @comment_tree.root_comments.each do |comment| %> <% @comment_tree.root_comments.each do |comment| %>
<%= render 'comments/comment', comment: comment %> <%= render "comments/comment", comment: comment %>
<% end %> <% end %>
<%= paginate @comment_tree.root_comments %> <%= paginate @comment_tree.root_comments %>
</div> </div>

2
app/views/legislation/proposals/_featured_proposal.html.erb
View File

@@ -22,6 +22,6 @@
</div> </div>
<div id="<%= dom_id(proposal) %>_votes" class="small-12 medium-3 column"> <div id="<%= dom_id(proposal) %>_votes" class="small-12 medium-3 column">
<%= render 'featured_votes', proposal: proposal %> <%= render "featured_votes", proposal: proposal %>
</div> </div>
</div> </div>

14
app/views/legislation/proposals/_featured_votes.html.erb
View File

@@ -5,29 +5,29 @@
<%= t("proposals.proposal.already_supported") %> <%= t("proposals.proposal.already_supported") %>
</div> </div>
<% else %> <% else %>
<%= link_to vote_featured_proposal_path(proposal, value: 'yes'), <%= link_to vote_featured_proposal_path(proposal, value: "yes"),
class: "button button-support small expanded", class: "button button-support small expanded",
title: t('proposals.proposal.support_title'), method: "post", remote: true do %> title: t("proposals.proposal.support_title"), method: "post", remote: true do %>
<%= t("proposals.proposal.support") %> <%= t("proposals.proposal.support") %>
<% end %> <% end %>
<% end %> <% end %>
</div> </div>
<% if user_signed_in? && current_user.organization? %> <% if user_signed_in? && current_user.organization? %>
<div class="participation-not-allowed" style='display:none' aria-hidden="false"> <div class="participation-not-allowed" style="display:none" aria-hidden="false">
<p> <p>
<%= t("votes.organizations") %> <%= t("votes.organizations") %>
</p> </p>
</div> </div>
<% elsif user_signed_in? && !proposal.votable_by?(current_user)%> <% elsif user_signed_in? && !proposal.votable_by?(current_user)%>
<div class="participation-not-allowed" style='display:none' aria-hidden="false"> <div class="participation-not-allowed" style="display:none" aria-hidden="false">
<p> <p>
<%= t("votes.verified_only", <%= t("votes.verified_only",
verify_account: link_to(t("votes.verify_account"), verification_path )).html_safe %> verify_account: link_to(t("votes.verify_account"), verification_path )).html_safe %>
</p> </p>
</div> </div>
<% elsif !user_signed_in? %> <% elsif !user_signed_in? %>
<div class="participation-not-allowed" style='display:none' aria-hidden="false"> <div class="participation-not-allowed" style="display:none" aria-hidden="false">
<%= t("votes.unauthenticated", <%= t("votes.unauthenticated",
signin: link_to(t("votes.signin"), new_user_session_path), signin: link_to(t("votes.signin"), new_user_session_path),
signup: link_to(t("votes.signup"), new_user_registration_path)).html_safe %> signup: link_to(t("votes.signup"), new_user_registration_path)).html_safe %>
@@ -35,9 +35,9 @@
<% end %> <% end %>
<% if voted_for?(@featured_proposals_votes, proposal) %> <% if voted_for?(@featured_proposals_votes, proposal) %>
<% if setting['twitter_handle'] %> <% if setting["twitter_handle"] %>
<div class="share-supported"> <div class="share-supported">
<%= render partial: 'shared/social_share', locals: { <%= render partial: "shared/social_share", locals: {
title: proposal.title, title: proposal.title,
url: proposal_url(proposal), url: proposal_url(proposal),
description: proposal.summary, description: proposal.summary,

4
app/views/legislation/proposals/_flag_actions.html.erb
View File

@@ -5,7 +5,7 @@
<span class="icon-flag flag-disable"></span> <span class="icon-flag flag-disable"></span>
</a> </a>
<span class="dropdown-pane" id="flag-drop-proposal-<%= proposal.id %>" data-dropdown data-auto-focus="true"> <span class="dropdown-pane" id="flag-drop-proposal-<%= proposal.id %>" data-dropdown data-auto-focus="true">
<%= link_to t('shared.flag'), flag_proposal_path(proposal), method: :put, remote: true, id: "flag-proposal-#{ proposal.id }" %> <%= link_to t("shared.flag"), flag_proposal_path(proposal), method: :put, remote: true, id: "flag-proposal-#{ proposal.id }" %>
</span> </span>
<% end %> <% end %>
@@ -14,7 +14,7 @@
<span class="icon-flag flag-active"></span> <span class="icon-flag flag-active"></span>
</a> </a>
<span class="dropdown-pane" id="unflag-drop-proposal-<%= proposal.id %>" data-dropdown data-auto-focus="true"> <span class="dropdown-pane" id="unflag-drop-proposal-<%= proposal.id %>" data-dropdown data-auto-focus="true">
<%= link_to t('shared.unflag'), unflag_proposal_path(proposal), method: :put, remote: true, id: "unflag-proposal-#{ proposal.id }" %> <%= link_to t("shared.unflag"), unflag_proposal_path(proposal), method: :put, remote: true, id: "unflag-proposal-#{ proposal.id }" %>
</span> </span>
<% end %> <% end %>
</span> </span>

12
app/views/legislation/proposals/_form.html.erb
View File

@@ -1,5 +1,5 @@
<%= form_for(@proposal, url: form_url) do |f| %> <%= form_for(@proposal, url: form_url) do |f| %>
<%= render 'shared/errors', resource: @proposal %> <%= render "shared/errors", resource: @proposal %>
<%= f.hidden_field(:legislation_process_id, :value => params[:process_id]) %> <%= f.hidden_field(:legislation_process_id, :value => params[:process_id]) %>
@@ -15,7 +15,7 @@
<%= f.label :summary, t("proposals.form.proposal_summary") %> <%= f.label :summary, t("proposals.form.proposal_summary") %>
<p class="help-text" id="summary-help-text"><%= t("proposals.form.proposal_summary_note") %></p> <p class="help-text" id="summary-help-text"><%= t("proposals.form.proposal_summary_note") %></p>
<%= f.text_area :summary, rows: 4, maxlength: 200, label: false, <%= f.text_area :summary, rows: 4, maxlength: 200, label: false,
placeholder: t('proposals.form.proposal_summary'), placeholder: t("proposals.form.proposal_summary"),
aria: {describedby: "summary-help-text"} %> aria: {describedby: "summary-help-text"} %>
</div> </div>
@@ -33,12 +33,12 @@
<% if feature?(:allow_images) %> <% if feature?(:allow_images) %>
<div class="images small-12 column"> <div class="images small-12 column">
<%= render 'images/nested_image', imageable: @proposal, f: f %> <%= render "images/nested_image", imageable: @proposal, f: f %>
</div> </div>
<% end %> <% end %>
<div class="documents small-12 column" data-max-documents="<%= Legislation::Proposal.max_documents_allowed %>"> <div class="documents small-12 column" data-max-documents="<%= Legislation::Proposal.max_documents_allowed %>">
<%= render 'documents/nested_documents', documentable: @proposal, f: f %> <%= render "documents/nested_documents", documentable: @proposal, f: f %>
</div> </div>
<div class="small-12 medium-6 column"> <div class="small-12 medium-6 column">
@@ -60,14 +60,14 @@
<%= f.text_field :tag_list, value: @proposal.tag_list.to_s, <%= f.text_field :tag_list, value: @proposal.tag_list.to_s,
label: false, label: false,
placeholder: t("proposals.form.tags_placeholder"), placeholder: t("proposals.form.tags_placeholder"),
class: 'js-tag-list', class: "js-tag-list",
aria: {describedby: "tag-list-help-text"} %> aria: {describedby: "tag-list-help-text"} %>
</div> </div>
<div class="small-12 column"> <div class="small-12 column">
<% if @proposal.new_record? %> <% if @proposal.new_record? %>
<%= f.label :terms_of_service do %> <%= f.label :terms_of_service do %>
<%= f.check_box :terms_of_service, title: t('form.accept_terms_title'), label: false %> <%= f.check_box :terms_of_service, title: t("form.accept_terms_title"), label: false %>
<span class="checkbox"> <span class="checkbox">
<%= t("form.accept_terms", <%= t("form.accept_terms",
policy: link_to(t("form.policy"), "/privacy", target: "blank"), policy: link_to(t("form.policy"), "/privacy", target: "blank"),

2
app/views/legislation/proposals/_geozones.html.erb
View File

@@ -1,6 +1,6 @@
<div class="sidebar-divider"></div> <div class="sidebar-divider"></div>
<h2 class="sidebar-title"><%= t("shared.tags_cloud.districts") %></h2> <h2 class="sidebar-title"><%= t("shared.tags_cloud.districts") %></h2>
<br> <br>
<%= link_to map_proposals_path, id: 'map', title: t("shared.tags_cloud.districts_list") do %> <%= link_to map_proposals_path, id: "map", title: t("shared.tags_cloud.districts_list") do %>
<%= image_tag("map.jpg", alt: t("shared.tags_cloud.districts_list")) %> <%= image_tag("map.jpg", alt: t("shared.tags_cloud.districts_list")) %>
<% end %> <% end %>

2
app/views/legislation/proposals/_notifications.html.erb
View File

@@ -3,7 +3,7 @@
<div class="small-12 column"> <div class="small-12 column">
<% if @notifications.blank? %> <% if @notifications.blank? %>
<div class="callout primary text-center"> <div class="callout primary text-center">
<%= t('proposals.show.no_notifications') %> <%= t("proposals.show.no_notifications") %>
</div> </div>
<% end %> <% end %>

6
app/views/legislation/proposals/_proposal.html.erb
View File

@@ -16,7 +16,7 @@
<div class="small-12 medium-9 column"> <div class="small-12 medium-9 column">
<% end %> <% end %>
<div class="proposal-content"> <div class="proposal-content">
<% cache [locale_and_user_status(proposal), 'index', proposal, proposal.author] do %> <% cache [locale_and_user_status(proposal), "index", proposal, proposal.author] do %>
<h3><%= link_to proposal.title, legislation_process_proposal_path(proposal.legislation_process_id, proposal) %></h3> <h3><%= link_to proposal.title, legislation_process_proposal_path(proposal.legislation_process_id, proposal) %></h3>
<p class="proposal-info"> <p class="proposal-info">
<span class="icon-comments"></span>&nbsp; <span class="icon-comments"></span>&nbsp;
@@ -60,8 +60,8 @@
</div> </div>
<div id="<%= dom_id(proposal) %>_votes" class="small-12 medium-3 column"> <div id="<%= dom_id(proposal) %>_votes" class="small-12 medium-3 column">
<%= render 'legislation/proposals/votes', <%= render "legislation/proposals/votes",
{ proposal: proposal, vote_url: vote_legislation_process_proposal_path(proposal.legislation_process_id, proposal, value: 'yes') } %> { proposal: proposal, vote_url: vote_legislation_process_proposal_path(proposal.legislation_process_id, proposal, value: "yes") } %>
</div> </div>
</div> </div>
</div> </div>

32
app/views/legislation/proposals/_votes.html.erb
View File

@@ -3,19 +3,19 @@
<% if @process.proposals_phase.open? %> <% if @process.proposals_phase.open? %>
<div class="in-favor inline-block"> <div class="in-favor inline-block">
<% if user_signed_in? %> <% if user_signed_in? %>
<%= link_to vote_legislation_process_proposal_path(process_id: proposal.process, id: proposal, value: 'yes'), <%= link_to vote_legislation_process_proposal_path(process_id: proposal.process, id: proposal, value: "yes"),
class: "like #{voted_classes[:in_favor]}", title: t('votes.agree'), method: "post", remote: true do %> class: "like #{voted_classes[:in_favor]}", title: t("votes.agree"), method: "post", remote: true do %>
<span class="icon-like"> <span class="icon-like">
<span class="show-for-sr"><%= t('votes.agree') %></span> <span class="show-for-sr"><%= t("votes.agree") %></span>
</span> </span>
<span class="percentage"><%= votes_percentage('likes', proposal) %></span> <span class="percentage"><%= votes_percentage("likes", proposal) %></span>
<% end %> <% end %>
<% else %> <% else %>
<div class="like"> <div class="like">
<span class="icon-like"> <span class="icon-like">
<span class="show-for-sr"><%= t('votes.agree') %></span> <span class="show-for-sr"><%= t("votes.agree") %></span>
</span> </span>
<span class="percentage"><%= votes_percentage('likes', proposal) %></span> <span class="percentage"><%= votes_percentage("likes", proposal) %></span>
</div> </div>
<% end %> <% end %>
</div> </div>
@@ -24,18 +24,18 @@
<div class="against inline-block"> <div class="against inline-block">
<% if user_signed_in? %> <% if user_signed_in? %>
<%= link_to vote_legislation_process_proposal_path(process_id: proposal.process, id: proposal, value: 'no'), class: "unlike #{voted_classes[:against]}", title: t('votes.disagree'), method: "post", remote: true do %> <%= link_to vote_legislation_process_proposal_path(process_id: proposal.process, id: proposal, value: "no"), class: "unlike #{voted_classes[:against]}", title: t("votes.disagree"), method: "post", remote: true do %>
<span class="icon-unlike"> <span class="icon-unlike">
<span class="show-for-sr"><%= t('votes.disagree') %></span> <span class="show-for-sr"><%= t("votes.disagree") %></span>
</span> </span>
<span class="percentage"><%= votes_percentage('dislikes', proposal) %></span> <span class="percentage"><%= votes_percentage("dislikes", proposal) %></span>
<% end %> <% end %>
<% else %> <% else %>
<div class="unlike"> <div class="unlike">
<span class="icon-unlike"> <span class="icon-unlike">
<span class="show-for-sr"><%= t('votes.disagree') %></span> <span class="show-for-sr"><%= t("votes.disagree") %></span>
</span> </span>
<span class="percentage"><%= votes_percentage('dislikes', proposal) %></span> <span class="percentage"><%= votes_percentage("dislikes", proposal) %></span>
</div> </div>
<% end %> <% end %>
</div> </div>
@@ -46,13 +46,13 @@
</span> </span>
<% if user_signed_in? && current_user.organization? %> <% if user_signed_in? && current_user.organization? %>
<div class="participation-not-allowed" style='display:none' aria-hidden="false"> <div class="participation-not-allowed" style="display:none" aria-hidden="false">
<p> <p>
<%= t("votes.organizations") %> <%= t("votes.organizations") %>
</p> </p>
</div> </div>
<% elsif user_signed_in? && !proposal.votable_by?(current_user) %> <% elsif user_signed_in? && !proposal.votable_by?(current_user) %>
<div class="participation-not-allowed" style='display:none' aria-hidden="false"> <div class="participation-not-allowed" style="display:none" aria-hidden="false">
<p> <p>
<%= t("legislation.proposals.not_verified", <%= t("legislation.proposals.not_verified",
verify_account: link_to(t("votes.verify_account"), verification_path )).html_safe %> verify_account: link_to(t("votes.verify_account"), verification_path )).html_safe %>
@@ -60,7 +60,7 @@
</div> </div>
<% elsif !user_signed_in? %> <% elsif !user_signed_in? %>
<div tabindex="0"> <div tabindex="0">
<div class="participation-not-allowed" style='display:none' aria-hidden="false"> <div class="participation-not-allowed" style="display:none" aria-hidden="false">
<%= t("votes.unauthenticated", <%= t("votes.unauthenticated",
signin: link_to(t("votes.signin"), new_user_session_path), signin: link_to(t("votes.signin"), new_user_session_path),
signup: link_to(t("votes.signup"), new_user_registration_path)).html_safe %> signup: link_to(t("votes.signup"), new_user_registration_path)).html_safe %>
@@ -68,9 +68,9 @@
</div> </div>
<% end %> <% end %>
<% if voted_for?(@legislation_proposal_votes, proposal) && setting['twitter_handle'] %> <% if voted_for?(@legislation_proposal_votes, proposal) && setting["twitter_handle"] %>
<div class="share-supported"> <div class="share-supported">
<%= render partial: 'shared/social_share', locals: { <%= render partial: "shared/social_share", locals: {
title: proposal.title, title: proposal.title,
url: proposal_url(proposal), url: proposal_url(proposal),
description: proposal.summary, description: proposal.summary,

2
app/views/legislation/proposals/map.html.erb
View File

@@ -1 +1 @@
<%= render 'shared/map', new_url_path: new_proposal_path %> <%= render "shared/map", new_url_path: new_proposal_path %>

22
app/views/legislation/proposals/show.html.erb
View File

@@ -24,7 +24,7 @@
<% end %> <% end %>
<div class="proposal-info"> <div class="proposal-info">
<%= render '/shared/author_info', resource: @proposal %> <%= render "/shared/author_info", resource: @proposal %>
<span class="bullet">&nbsp;&bull;&nbsp;</span> <span class="bullet">&nbsp;&bull;&nbsp;</span>
<%= l @proposal.created_at.to_date %> <%= l @proposal.created_at.to_date %>
@@ -34,7 +34,7 @@
<% if current_user %> <% if current_user %>
<span class="bullet">&nbsp;&bull;&nbsp;</span> <span class="bullet">&nbsp;&bull;&nbsp;</span>
<%= render 'proposals/flag_actions', proposal: @proposal %> <%= render "proposals/flag_actions", proposal: @proposal %>
<% end %> <% end %>
</div> </div>
@@ -63,7 +63,7 @@
<div class="document-link"> <div class="document-link">
<p> <p>
<span class="icon-document"></span>&nbsp; <span class="icon-document"></span>&nbsp;
<strong><%= t('proposals.show.title_external_url') %></strong> <strong><%= t("proposals.show.title_external_url") %></strong>
</p> </p>
<%= text_with_links @proposal.external_url %> <%= text_with_links @proposal.external_url %>
</div> </div>
@@ -73,7 +73,7 @@
<div class="video-link"> <div class="video-link">
<p> <p>
<span class="icon-video"></span>&nbsp; <span class="icon-video"></span>&nbsp;
<strong><%= t('proposals.show.title_video_url') %></strong> <strong><%= t("proposals.show.title_video_url") %></strong>
</p> </p>
<%= text_with_links @proposal.video_url %> <%= text_with_links @proposal.video_url %>
</div> </div>
@@ -83,17 +83,17 @@
<h4><%= @proposal.question %></h4> <h4><%= @proposal.question %></h4>
<% if feature?(:allow_attached_documents) %> <% if feature?(:allow_attached_documents) %>
<%= render 'documents/documents', <%= render "documents/documents",
documents: @proposal.documents, documents: @proposal.documents,
max_documents_allowed: Proposal.max_documents_allowed %> max_documents_allowed: Proposal.max_documents_allowed %>
<% end %> <% end %>
<%= render 'shared/tags', taggable: @proposal %> <%= render "shared/tags", taggable: @proposal %>
<%= render 'shared/geozone', geozonable: @proposal %> <%= render "shared/geozone", geozonable: @proposal %>
<div class="js-moderator-proposal-actions margin"> <div class="js-moderator-proposal-actions margin">
<%= render 'proposals/actions', proposal: @proposal %> <%= render "proposals/actions", proposal: @proposal %>
</div> </div>
</div> </div>
@@ -101,10 +101,10 @@
<div class="sidebar-divider"></div> <div class="sidebar-divider"></div>
<h2><%= t("votes.supports") %></h2> <h2><%= t("votes.supports") %></h2>
<div id="<%= dom_id(@proposal) %>_votes"> <div id="<%= dom_id(@proposal) %>_votes">
<%= render 'votes', <%= render "votes",
{ proposal: @proposal, vote_url: vote_legislation_process_proposal_path(@proposal.legislation_process_id, @proposal, value: 'yes') } %> { proposal: @proposal, vote_url: vote_legislation_process_proposal_path(@proposal.legislation_process_id, @proposal, value: "yes") } %>
</div> </div>
<%= render partial: 'shared/social_share', locals: { <%= render partial: "shared/social_share", locals: {
share_title: t("proposals.show.share"), share_title: t("proposals.show.share"),
title: @proposal.title, title: @proposal.title,
url: legislation_process_proposal_url(process_id: @process), url: legislation_process_proposal_url(process_id: @process),

2
app/views/legislation/questions/_answer_form.html.erb
View File

@@ -9,7 +9,7 @@
<%= question_option.value %> <%= question_option.value %>
</label> </label>
<% end %> <% end %>
<%= f.submit t('legislation.questions.show.answer_question'), class: "button" %> <%= f.submit t("legislation.questions.show.answer_question"), class: "button" %>
<% end %> <% end %>
<% else %> <% else %>

8
app/views/legislation/questions/_participation_not_allowed.html.erb
View File

@@ -1,24 +1,24 @@
<% if user_signed_in? && current_user.organization? %> <% if user_signed_in? && current_user.organization? %>
<div class="participation-not-allowed" style='display:none' aria-hidden="false"> <div class="participation-not-allowed" style="display:none" aria-hidden="false">
<p> <p>
<%= t("legislation.questions.participation.organizations") %> <%= t("legislation.questions.participation.organizations") %>
</p> </p>
</div> </div>
<% elsif user_signed_in? && current_user.unverified? %> <% elsif user_signed_in? && current_user.unverified? %>
<div class="participation-not-allowed" style='display:none' aria-hidden="false"> <div class="participation-not-allowed" style="display:none" aria-hidden="false">
<p> <p>
<%= t("legislation.questions.participation.verified_only", <%= t("legislation.questions.participation.verified_only",
verify_account: link_to(t("legislation.questions.participation.verify_account"), verification_path )).html_safe %> verify_account: link_to(t("legislation.questions.participation.verify_account"), verification_path )).html_safe %>
</p> </p>
</div> </div>
<% elsif !user_signed_in? %> <% elsif !user_signed_in? %>
<div class="participation-not-allowed" style='display:none' aria-hidden="false"> <div class="participation-not-allowed" style="display:none" aria-hidden="false">
<%= t("legislation.questions.participation.unauthenticated", <%= t("legislation.questions.participation.unauthenticated",
signin: link_to(t("legislation.questions.participation.signin"), new_user_session_path), signin: link_to(t("legislation.questions.participation.signin"), new_user_session_path),
signup: link_to(t("legislation.questions.participation.signup"), new_user_registration_path)).html_safe %> signup: link_to(t("legislation.questions.participation.signup"), new_user_registration_path)).html_safe %>
</div> </div>
<% elsif !@process.debate_phase.open? %> <% elsif !@process.debate_phase.open? %>
<div class="participation-not-allowed" style='display:none' aria-hidden="false"> <div class="participation-not-allowed" style="display:none" aria-hidden="false">
<%= t("legislation.questions.participation.debate_phase_not_open") %> <%= t("legislation.questions.participation.debate_phase_not_open") %>
</div> </div>
<% end %> <% end %>

4
app/views/legislation/questions/_question.html.erb
View File

@@ -1,11 +1,11 @@
<div class="debate-block"> <div class="debate-block">
<div class="debate-type"> <div class="debate-type">
<%= t('.debate') %> <span class="icon-debates" aria-hidden="true"></span> <%= t(".debate") %> <span class="icon-debates" aria-hidden="true"></span>
</div> </div>
<div class="debate-title"> <div class="debate-title">
<h4><%= link_to question.title, legislation_process_question_path(question.process, question) %></h4> <h4><%= link_to question.title, legislation_process_question_path(question.process, question) %></h4>
</div> </div>
<div class="debate-meta"> <div class="debate-meta">
<span class="icon-comments" aria-hidden="true"></span> <span class="debate-comments"><%= link_to t('.comments', count: question.comments.count), legislation_process_question_path(question.process, question) %></span> · <span class="debate-date"><%= format_date question.created_at %></span> <span class="icon-comments" aria-hidden="true"></span> <span class="debate-comments"><%= link_to t(".comments", count: question.comments.count), legislation_process_question_path(question.process, question) %></span> · <span class="debate-date"><%= format_date question.created_at %></span>
</div> </div>
</div> </div>

16
app/views/legislation/questions/show.html.erb
View File

@@ -4,7 +4,7 @@
<div class="quiz-header row small-collapse"> <div class="quiz-header row small-collapse">
<div class="small-12 medium-9 column"> <div class="small-12 medium-9 column">
<div class="quiz-title"> <div class="quiz-title">
<p class="quiz-header-title"><%= t('.title') %></p> <p class="quiz-header-title"><%= t(".title") %></p>
<h4><%= link_to @process.title, @process %></h4> <h4><%= link_to @process.title, @process %></h4>
</div> </div>
</div> </div>
@@ -12,14 +12,14 @@
<% if @question.next_question_id %> <% if @question.next_question_id %>
<%= link_to legislation_process_question_path(@process, @question.next_question_id), class: "quiz-next-link" do %> <%= link_to legislation_process_question_path(@process, @question.next_question_id), class: "quiz-next-link" do %>
<%= content_tag :div, class: "quiz-next" do %> <%= content_tag :div, class: "quiz-next" do %>
<%= t('.next_question') %> <%= t(".next_question") %>
<span class="icon-angle-right" aria-hidden="true"> <span class="icon-angle-right" aria-hidden="true">
<% end %> <% end %>
<% end %> <% end %>
<% elsif @question.first_question_id %> <% elsif @question.first_question_id %>
<%= link_to legislation_process_question_path(@process, @question.first_question_id), class: "quiz-next-link" do %> <%= link_to legislation_process_question_path(@process, @question.first_question_id), class: "quiz-next-link" do %>
<%= content_tag :div, class: "quiz-next" do %> <%= content_tag :div, class: "quiz-next" do %>
<%= t('.first_question') %> <%= t(".first_question") %>
<span class="icon-angle-right" aria-hidden="true"> <span class="icon-angle-right" aria-hidden="true">
<% end %> <% end %>
<% end %> <% end %>
@@ -30,19 +30,19 @@
<div class="small-12 medium-9 column"> <div class="small-12 medium-9 column">
<h3 class="quiz-question"><%= @question.title %></h3> <h3 class="quiz-question"><%= @question.title %></h3>
<div class="debate-questions" id="legislation-answer-form"> <div class="debate-questions" id="legislation-answer-form">
<%= render 'answer_form', process: @process, question: @question, answer: @answer %> <%= render "answer_form", process: @process, question: @question, answer: @answer %>
<%= render 'participation_not_allowed' %> <%= render "participation_not_allowed" %>
</div> </div>
</div> </div>
<aside class="small-12 medium-3 column"> <aside class="small-12 medium-3 column">
<div id="social-share" class="sidebar-divider"></div> <div id="social-share" class="sidebar-divider"></div>
<h3><%= t('.share') %></h3> <h3><%= t(".share") %></h3>
<%= render '/shared/social_share', title: @question.title, url: legislation_process_question_url(@question.process, @question) %> <%= render "/shared/social_share", title: @question.title, url: legislation_process_question_url(@question.process, @question) %>
</aside> </aside>
</div> </div>
<%= render partial: '/comments/comment_tree', locals: { comment_tree: @comment_tree, <%= render partial: "/comments/comment_tree", locals: { comment_tree: @comment_tree,
comment_flags: @comment_flags, comment_flags: @comment_flags,
display_comments_count: true } %> display_comments_count: true } %>
</section> </section>