decidim-elections 0.24.3 → 0.25.0.rc1

data/app/views/decidim/elections/vote_accepted_mailer/notification.html.erb

@@ -0,0 +1,3 @@
+<h2><%= t("votes.accepted_votes.email_subject", scope: "decidim.events.elections", resource_name: @election_title) %></h2>
+<p><%= raw t("votes.accepted_votes.email_intro", scope: "decidim.events.elections", encrypted_vote_hash: @vote.encrypted_vote_hash, verify_url: @verify_url) %></p>
+<p><%= t("votes.accepted_votes.email_outro", scope: "decidim.events.elections", resource_name: @election_title) %></p>

data/app/views/decidim/elections/votes/_new_ballot_decision_step.html.erb

@@ -0,0 +1,30 @@
+<%= render("focus_header", header_title: t("decidim.elections.votes.header.ballot_decision")) %>
+
+<div class="focus__content evote ballot_decision">
+  <div class="row">
+    <h1 class="heading2">
+      <%= t("decidim.elections.votes.ballot_decision.header") %>
+    </h1>
+
+    <div class="evote__content">
+      <p><%= t("decidim.elections.votes.ballot_decision.description") %></p>
+      <p>
+        <%= t("decidim.elections.votes.ballot_decision.ballot_hash") %>
+        <strong class="ballot-hash"></strong>
+        <a class="audit_ballot"><%= t("decidim.elections.votes.ballot_decision.audit") %></a>
+      </p>
+    </div>
+
+    <%= decidim_form_for(@form, url: election_votes_path(election), html: { autocomplete: "off" }) do |f| %>
+      <%= f.hidden_field :encrypted_data %>
+      <%= f.hidden_field :encrypted_data_hash %>
+      <%= f.hidden_field :voter_token %>
+      <%= f.hidden_field :voter_id %>
+      <%= f.submit t("decidim.elections.votes.ballot_decision.cast"), class: "button cast_ballot" %>
+    <% end %>
+
+    <%= link_to election_path(election), class: "button back hide" do %>
+      <%= t("decidim.elections.votes.ballot_decision.back") %>
+    <% end %>
+  </div>
+</div>

data/app/views/decidim/elections/votes/{_election_votes_confirm.html.erb → _new_confirm_step.html.erb}

@@ -1,4 +1,4 @@
-<%= render("election_votes_header", header_title: t("decidim.elections.votes.header.confirm")) %>
+<%= render("focus_header", header_title: t("decidim.elections.votes.header.confirm")) %>
 
 <div class="focus__content evote">
   <div class="row">
@@ -33,12 +33,12 @@
             </strong>
             <ul>
               <% question.answers.each do |answer| %>
-                <li class="confirmed_answer hide" id="<%= answer.id %>">
+                <li class="confirmed_answer hide" id="<%= answer.slug %>">
                   <%= translated_attribute(answer.title) %>
                 </li>
               <% end %>
-              <% if question.min_selections == 0 %>
-                <li class="<%= "hide nota_input_#{question.id}" %>">
+              <% if question.nota_option? %>
+                <li class="<%= "hide nota_input_question-#{question.id}" %>">
                   <%= t("decidim.elections.votes.confirm.nota_option") %>
                 </li>
               <% end %>
@@ -50,4 +50,4 @@
   </div>
 </div>
 
-<%= render("election_votes_confirm_footer") %>
+<%= render("new_confirm_step_footer") %>

data/app/views/decidim/elections/votes/{_election_votes_confirm_footer.html.erb → _new_confirm_step_footer.html.erb}

@@ -1,7 +1,7 @@
 <div class="focus__footer">
   <div class="row">
     <%= link_to(
-      icon("chevron-left", class: "icon", role: "img") + " " + t("decidim.elections.votes.voting_step.back"),
+      icon("chevron-left", class: "icon", role: "img", "aria-hidden": true) + " " + t("decidim.elections.votes.voting_step.back"),
       "#",
       class: "focus__back",
       data: {
@@ -13,12 +13,11 @@
       "#",
       class: "button focus__next confirm",
       data: {
-        booth_mode: booth_mode,
         toggle: ["encrypting", "step-#{questions_count}"].join(" ")
       }
     ) do %>
       <%= t("decidim.elections.votes.confirm.confirm") %>
-      <%= icon("chevron-right", class: "icon", role: "img") %>
+      <%= icon("chevron-right", class: "icon", role: "img", "aria-hidden": true) %>
     <% end %>
   </div>
 </div>

data/app/views/decidim/elections/votes/{_election_votes_encrypting.html.erb → _new_encrypting_step.html.erb}

@@ -1,4 +1,4 @@
-<%= render("election_votes_header", header_title: t("decidim.elections.votes.header.encrypting")) %>
+<%= render("focus_header", header_title: t("decidim.elections.votes.header.encrypting")) %>
 <div class="focus__content evote">
   <div class="row">
     <h1 class="heading2">

data/app/views/decidim/elections/votes/{_election_votes_question.html.erb → _new_question.html.erb}

@@ -7,16 +7,16 @@
   <% ordered_answers(question).each do |answer| %>
     <%= label_tag nil, data: { "disabled-by": "#check-nota" }, class: "evote__check evote__card" do %>
       <% if question.max_selections == 1 %>
-        <%= radio_button_tag "#{question.id}", answer.id, false, class: "answer_input" %>
+        <%= radio_button_tag question.slug, answer.slug, false, class: "answer_input" %>
       <% else %>
-        <%= check_box_tag "#{question.id}", answer.id, false, class: "answer_input" %>
+        <%= check_box_tag question.slug, answer.slug, false, class: "answer_input" %>
       <% end %>
 
       <span class="evote__check-label">
         <%= translated_attribute(answer.title) %>
         <% if more_information?(answer) %>
           <span class="evote__check-extra">
-            <button type="button" class="link" data-toggle="show-focus-modal-<%= answer.id %>">
+            <button type="button" class="link" data-toggle="show-focus-modal-<%= answer.slug %>">
               <%= t("decidim.elections.votes.new.more_information") %>
             </button>
           </span>
@@ -24,15 +24,15 @@
       </span>
     <% end %>
 
-    <%= render("election_votes_modal", answer: answer) if more_information?(answer) %>
+    <%= render("new_question_modal", answer: answer) if more_information?(answer) %>
   <% end %>
 
-  <% if question.min_selections == 0 %>
+  <% if question.nota_option? %>
     <%= label_tag nil, nil, class: "evote__check evote__card" do %>
       <% if question.max_selections == 1 %>
-        <%= radio_button_tag "#{question.id}", "nota_input_#{question.id}", false, class: "nota_input" %>
+        <%= radio_button_tag question.slug, "nota_input_#{question.slug}", false, class: "nota_input" %>
       <% else %>
-        <%= check_box_tag "#{question.id}", "nota_input_#{question.id}", false, { class: "nota_input", id: "check-nota", data: { "disable-check": "" } } %>
+        <%= check_box_tag question.slug, "nota_input_#{question.slug}", false, { class: "nota_input", id: "check-nota", data: { "disable-check": "" } } %>
       <% end %>
 
       <span class="evote__check-label" id="nota_input">

data/app/views/decidim/elections/votes/{_election_votes_modal.html.erb → _new_question_modal.html.erb}

@@ -1,4 +1,4 @@
-<div class="reveal" id="show-focus-modal-<%= answer.id %>" data-reveal>
+<div class="reveal" id="show-focus-modal-<%= answer.slug %>" data-reveal>
   <div class="reveal__header">
     <h3 class="reveal__title"><%= translated_attribute(answer.title) %></h3>
     <button class="close-button" data-close aria-label="Close modal"

data/app/views/decidim/elections/votes/_onboarding_modal.html.erb

@@ -0,0 +1,23 @@
+<div class="reveal" data-reveal id="onboarding-modal">
+  <div class="reveal__header">
+    <h3 class="reveal__title"><%= t("decidim.elections.votes.onboarding_modal.title") %></h3>
+    <button class="close-button" data-close aria-label="<%= t("decidim.elections.votes.onboarding_modal.close") %>">
+      <span aria-hidden="true">&times;</span>
+    </button>
+  </div>
+  <p>
+    <%= t("decidim.elections.votes.onboarding_modal.description") %>
+  </p>
+  <div class="row mt-sm">
+    <div class="columns medium-8 medium-offset-2">
+      <%= link_to decidim.new_user_registration_path, class: "button button--sc expanded" do %>
+        <%= t("decidim.elections.votes.onboarding_modal.create_account") %>
+      <% end %>
+      <div class="text-center">
+        <button class="link" data-close type="button"><%= t("decidim.elections.votes.onboarding_modal.no_account") %></button>
+      </div>
+    </div>
+  </div>
+</div>
+
+<%= javascript_pack_tag "decidim_elections_onboarding", integrity: true %>

data/app/views/decidim/elections/votes/_show_casted.html.erb

@@ -0,0 +1,36 @@
+<%= render("focus_header", header_title: t("decidim.elections.votes.header.confirmed")) %>
+
+<div class="focus__content evote ballot_confirmed">
+  <div class="row">
+    <h1 class="heading2">
+      <%= t("decidim.elections.votes.confirmed.header") %>
+    </h1>
+
+    <h2 class="h4"><%= t("decidim.elections.votes.confirmed.lead") %></h2>
+    <div class="evote__content">
+      <%= t("decidim.elections.votes.confirmed.text", e_vote_poll_id: params[:id]).html_safe %>
+      <p>
+        <%= t("decidim.elections.votes.confirmed.verify_link", link: election_vote_verify_path(election, vote_id: params[:id])).html_safe %>
+      </p>
+    </div>
+
+    <% if params[:token] && valid_questionnaire? %>
+      <div>
+        <p class="text-small">
+          <%= t("decidim.elections.votes.confirmed.experience") %>
+        </p>
+      </div>
+      <div class="button">
+        <%= link_to t("decidim.elections.votes.confirmed.feedback"), election_feedback_path(election, hash: params[:id], token: params[:token]) %>
+      </div>
+    <% end %>
+
+    <% if !valid_questionnaire? && current_user.nil? %>
+      <%= render partial: "decidim/elections/votes/onboarding_modal" %>
+    <% end %>
+
+    <%= link_to :elections, class: valid_questionnaire? ? "" : "button" do %>
+      <%= t("decidim.elections.votes.confirmed.back") %>
+    <% end %>
+  </div>
+</div>

data/app/views/decidim/elections/votes/_show_casting.html.erb

@@ -0,0 +1,25 @@
+<%= render("focus_header", header_title: t("decidim.elections.votes.header.casting")) %>
+<div class="focus__content evote casting-vote-wrapper"
+  data-api-endpoint-url="<%= bulletin_board_server %>"
+  data-message-id="<%= vote.message_id %>">
+  <div class="row">
+    <h1 class="heading2">
+      <%= t("decidim.elections.votes.casting.header") %>
+    </h1>
+    <div class="evote__casting" aria-hidden="true">
+      <div class="evote__dot"></div>
+      <div class="evote__dot"></div>
+      <div class="evote__dot"></div>
+      <div class="evote__dot"></div>
+      <div class="evote__dot"></div>
+      <div class="evote__dot"></div>
+      <div class="evote__dot"></div>
+    </div>
+    <p>
+      <%= t("decidim.elections.votes.casting.text") %>
+    </p>
+  </div>
+  <%= form_tag election_vote_path(election, id: vote.encrypted_vote_hash), method: :patch, class: "update_vote_status" %>
+</div>
+
+<%= javascript_pack_tag "decidim_elections_voter_casting_vote", integrity: true %>

data/app/views/decidim/elections/votes/{_election_votes_failed.html.erb → _show_failed.html.erb}

@@ -1,4 +1,4 @@
-<%= render("election_votes_header", header_title: t("decidim.elections.votes.header.confirmed")) %>
+<%= render("focus_header", header_title: t("decidim.elections.votes.header.failed")) %>
 
 <div class="focus__content evote">
   <div class="row">
@@ -6,16 +6,18 @@
       <%= t("decidim.elections.votes.failed.header") %>
     </h1>
     <h2 class="h4"><%= t("decidim.elections.votes.failed.lead") %></h2>
+
     <div class="evote__content">
       <%= t("decidim.elections.votes.failed.text") %>
     </div>
 
-    <%= link_to :elections, class: "button" do %>
-      <%= t("decidim.elections.votes.confirmed.back") %>
+    <%= link_to new_election_vote_path(election), class: "button" do %>
+      <%= t("decidim.elections.votes.failed.try_again") %>
     <% end %>
+
     <div>
       <%= t("decidim.elections.votes.confirmed.experience") %>
-      <%= link_to t("decidim.elections.votes.confirmed.feedback"), election_feedback_path(election) %>
+      <%= link_to t("decidim.elections.votes.confirmed.feedback"), election_feedback_path(election, hash: vote.encrypted_vote_hash, token: params[:token]) %>
     </div>
   </div>
 </div>

data/app/views/decidim/elections/votes/new.html.erb

@@ -1,25 +1,32 @@
 <div class="vote-wrapper"
   data-election-id="<%= election.id %>"
-  data-api-endpoint-url="<%= Rails.application.secrets.bulletin_board[:server] %>"
-  data-election-unique-id="<%= @form.election_unique_id %>"
-  data-voter-id="<%= @form.voter_id %>"
-  data-cast-vote-url="<%= cast_election_vote_url(election) %>"
-  data-update-vote-status-url="<%= election_vote_url(election) %>"
-  data-booth-mode="<%= booth_mode %>">
+  data-api-endpoint-url="<%= bulletin_board_server %>"
+  data-authority-public-key="<%= authority_public_key %>"
+  data-election-unique-id="<%= election_unique_id %>"
+  data-voter-id="<%= voter_id %>"
+  <%= ballot_style_id.present? ? "data-ballot-style-id=\"#{ballot_style_id}\"" : nil %>
+  data-scheme-name="<%= scheme_name %>">
 
   <% questions.each_with_index do |step_question, step_index| %>
     <div id="step-<%= step_index %>" class="focus__step <%= "hide" if step_index.positive? %>"
     data-toggler=".hide">
-      <%= render(
-        "election_votes_steps_header",
-        step: step_index,
-        questions_count: questions_count
-        ) %>
+      <div class="focus__header">
+        <div class="row">
+          <div class="focus__steps">
+            <strong>
+              <%= t("decidim.elections.votes.new.question_steps", current_step: step_index + 1, total_steps: questions_count) %>
+            </strong>
+          </div>
+          <div class="heading5 focus__header-title">
+            <%= translated_attribute(election.title) %>
+          </div>
+        </div>
+      </div>
 
       <div class="focus__content evote">
         <div class="row">
           <%= render(
-            "election_votes_question",
+            "new_question",
             question: step_question
           ) %>
         </div>
@@ -36,17 +43,23 @@
 
   <div id="step-<%= questions_count %>" class="hide focus__step" data-toggler=".hide">
     <%= render(
-      "election_votes_confirm",
+      "new_confirm_step",
       questions: questions
     ) %>
   </div>
 
   <div id="encrypting" class="hide focus__step" data-toggler=".hide">
-    <%= render("election_votes_encrypting") %>
+    <%= render("new_encrypting_step") %>
   </div>
 
-  <div id="confirmed_page" class="hide focus__step" data-redirect_url=".hide">
+  <div id="ballot_decision" class="hide focus__step" data-redirect_url=".hide">
+    <%= render("new_ballot_decision_step") %>
   </div>
 </div>
 
-<%= javascript_include_tag "decidim/elections/vote", integrity: true %>
+<% if preview_mode? %>
+  <%= javascript_pack_tag "decidim_elections_voter_setup_preview", integrity: true %>
+<% else %>
+  <%= javascript_pack_tag "decidim_elections_voter_setup_vote", integrity: true %>
+<% end %>
+<%= javascript_pack_tag "decidim_elections_voter_new_vote", integrity: true %>

data/app/views/decidim/elections/votes/show.html.erb

@@ -0,0 +1,11 @@
+<div class="vote-wrapper">
+  <div class="focus__step">
+    <% if vote&.pending? %>
+      <%= render("show_casting") %>
+    <% elsif vote&.accepted? || preview_mode? %>
+      <%= render("show_casted") %>
+    <% else %>
+      <%= render("show_failed") %>
+    <% end %>
+  </div>
+</div>

data/app/views/decidim/elections/votes/verify.html.erb

@@ -1,7 +1,7 @@
-<div class="vote-verify-wrapper"
+<div class="verify-vote-wrapper"
   data-election-id="<%= election.id %>"
-  data-api-endpoint-url="<%= Rails.application.secrets.bulletin_board[:server] %>"
-  data-election-unique-id="<%= @form.election_unique_id %>">
+  data-api-endpoint-url="<%= bulletin_board_server %>"
+  data-election-unique-id="<%= election_unique_id %>">
 
   <div class="focus__header">
     <div class="row">
@@ -52,15 +52,12 @@
           <label>
             <%= t("decidim.elections.votes.verify.form.vote_identifier") %>
 
-            <input type="text" class="vote-identifier" name="vote-identifier" data-value="qw12Sf35vVb556Hfvh7qw12Sf35vVb556Hfvh7">
+            <input type="text" class="vote-identifier" name="vote-identifier" value="<%= params[:vote_id].gsub("_","") %>">
           </label>
           <div>
             <%= link_to(
               "#",
-              class: "button focus__next confirm",
-              data: {
-                booth_mode: booth_mode
-              }
+              class: "button focus__next confirm"
             ) do %>
 
               <%= t("decidim.elections.votes.verify.form.submit") %>
@@ -75,4 +72,4 @@
 
 </div>
 
-<%= javascript_include_tag "decidim/elections/vote_verify", integrity: true %>
+<%= javascript_pack_tag "decidim_elections_voter_verify_vote", integrity: true %>

data/app/views/decidim/votings/access_code_mailer/send_access_code.html.erb

@@ -0,0 +1,5 @@
+<p class="email-greeting"><%= t("devise.mailer.invitation_instructions.hello", email: @datum.full_name) %></p>
+
+<p class="email-instructions">
+  <%= t("send_access_code.instruction", scope: "decidim.events.votings", access_code: @access_code, voting: @voting) %>
+</p>

data/app/views/decidim/votings/admin/ballot_styles/_form.html.erb

@@ -0,0 +1,24 @@
+<div class="card">
+  <div class="card-divider">
+    <h2 class="card-title"><%= title %></h2>
+  </div>
+  <div class="card-section">
+    <div class="row column">
+      <%= form.text_field :code, autofocus: true %>
+    <p class="help-text"><%= t(".code_help") %></p>
+    </div>
+
+    <%= form.label :question_ids, t(".questions") %>
+    <p class="help-text"><%= t(".questions_help") %></p>
+
+    <% voting_elections.each do |election| %>
+      <div class="row column">
+        <%= "#{t(".election")}: #{translated_attribute(election.title)}" %>
+
+        <% election.questions.each do |question| %>
+          <%= form.check_box :question_ids, { multiple: true, label: translated_attribute(question.title), label_options: { for: nil } }, question.id, nil %>
+        <% end %>
+      </div>
+    <% end %>
+  </div>
+</div>

data/app/views/decidim/votings/admin/ballot_styles/edit.html.erb

@@ -0,0 +1,7 @@
+<%= decidim_form_for([current_voting, @form], url: { action: "update" }, html: { class: "form edit_ballot_style" })  do |f| %>
+  <%= render partial: "form", object: f, locals: { title: t(".title") } %>
+
+  <div class="button--double form-general-submit">
+    <%= f.submit t(".update") %>
+  </div>
+<% end %>

data/app/views/decidim/votings/admin/ballot_styles/index.html.erb

@@ -0,0 +1,68 @@
+<div class="callout warning">
+  <%= icon "info" %>
+  <span class="callout-text"><%= t("explanation_callout", scope: "decidim.votings.admin.ballot_styles.index") %></span>
+</div>
+<div class="card" id="ballot_styles">
+  <div class="card-divider">
+    <h2 class="card-title">
+      <%= t(".title") %>
+      <%= link_to t("actions.new", scope: "decidim.votings.admin.ballot_styles.index", name: t("models.ballot_style.name", scope: "decidim.votings.admin")), new_voting_ballot_style_path(current_voting), class: "button tiny button--title" if allowed_to? :create, :ballot_style, voting: current_voting %>
+    </h2>
+  </div>
+  <div class="card-section">
+    <div class="table-scroll">
+      <table class="table-list">
+        <thead>
+          <tr>
+            <th rowspan="2"><%= t("code", scope: "decidim.votings.admin.models.ballot_style.fields") %></th>
+            <% voting_elections.each do |election| %>
+              <th colspan="<%= election.questions.count %>"><%= translated_attribute(election.title) %></th>
+            <% end %>
+            <th rowspan="2"><%= t("associated_census_data", scope: "decidim.votings.admin.ballot_styles.index") %></th>
+            <th rowspan="2" class="actions"><%= t("actions.title", scope: "decidim.votings.admin.ballot_styles.index") %></th>
+          </tr>
+          <tr>
+            <% voting_elections.each do |election| %>
+              <% election.questions.each do |question| %>
+                <th data-tooltip class="ballot-style__question-header" title="<%= translated_attribute(question.title) %>"><%= translated_attribute(question.title) %></th>
+              <% end %>
+            <% end %>
+          </tr>
+        </thead>
+        <tbody>
+          <% ballot_styles.each do |ballot_style| %>
+            <tr data-id="<%= ballot_style.id %>">
+              <td>
+                <%= ballot_style.code %>
+              </td>
+              <% voting_elections.each do |election| %>
+                <% election.questions.each do |question| %>
+                  <% icon_name, icon_style = ballot_style.questions.include?(question) ? ["check", "ballot-style__question--checked"] : ["x", "ballot-style__question--unchecked"] %>
+                  <td> <%= icon icon_name, class: icon_style %> </td>
+                <% end %>
+              <% end %>
+              <td>
+                <%= ballot_style.census_data.count %>
+              </td>
+              <td class="table-list__actions">
+              <% if allowed_to? :update, :ballot_style, ballot_style: ballot_style, voting: current_voting %>
+                  <%= icon_link_to "pencil", edit_voting_ballot_style_path(current_voting, ballot_style), t("actions.edit", scope: "decidim.votings.admin.ballot_styles.index"), class: "action-icon--edit" %>
+                <% else %>
+                  <%= icon "pencil", class: "action-icon action-icon--disabled", role: "img", aria_label: t("actions.edit", scope: "decidim.votings.admin.ballot_styles.index") %>
+                <% end %>
+
+                <% if allowed_to? :delete, :ballot_style, ballot_style: ballot_style, voting: current_voting %>
+                  <%= icon_link_to "trash", voting_ballot_style_path(current_voting, ballot_style), t("actions.destroy", scope: "decidim.votings.admin.ballot_styles.index"), method: :delete, class: "action-icon--remove", data: { confirm: t("actions.confirm_destroy", scope: "decidim.votings.admin.ballot_styles.index") } %>
+                <% else %>
+                  <%= icon "trash", class: "action-icon action-icon--disabled", role: "img", aria_label: t("actions.destroy", scope: "decidim.votings.admin.ballot_styles.index") %>
+                <% end %>
+              </td>
+            </tr>
+          <% end %>
+        </tbody>
+      </table>
+    </div>
+  </div>
+</div>
+
+<%= stylesheet_pack_tag "decidim_votings_admin_votings", media: "all" %>