decidim-elections 0.24.3 → 0.25.0.rc1

data/app/views/decidim/elections/admin/trustees_participatory_spaces/index.html.erb

@@ -23,7 +23,11 @@
           <% trustees.each do |trustee| %>
             <tr>
               <td>
-                <%= trustee.user.name %>
+                <% if trustee.name.present? %>
+                  <%= trustee.name %>
+                <% else %>
+                  <%= trustee.user.name %>
+                <% end %>
               </td>
               <td>
                 <%= trustee.user.email %>
@@ -45,13 +49,13 @@
                 <% if allowed_to?(:update, :trustee_participatory_space, trustee_participatory_space: trustee_current_participatory_space(trustee)) %>
                   <%= icon_link_to considered_icon_action_for(trustee), edit_trustee_path(trustee_current_participatory_space(trustee)), considered_label_action_for(trustee), class: "action-icon--edit" %>
                 <% else %>
-                  <%= icon considered_icon_action_for(trustee), class: "action-icon action-icon--disabled", role: "img" %>
+                  <%= icon considered_icon_action_for(trustee), class: "action-icon action-icon--disabled", role: "img", aria_label: considered_label_action_for(trustee) %>
                 <% end %>
 
                 <% if allowed_to?(:delete, :trustee_participatory_space, trustee_participatory_space: trustee_current_participatory_space(trustee)) %>
                   <%= icon_link_to "circle-x", trustee_path(trustee_current_participatory_space(trustee)), t("actions.destroy", scope: "decidim.elections"), method: :delete, class: "action-icon--remove", data: { confirm: t("actions.confirm_destroy", scope: "decidim.elections") } %>
                 <% else %>
-                  <%= icon "circle-x", class: "action-icon action-icon--disabled", role: "img" %>
+                  <%= icon "circle-x", class: "action-icon action-icon--disabled", role: "img", aria_label: t("actions.destroy", scope: "decidim.elections") %>
                 <% end %>
               </td>
             </tr>

data/app/views/decidim/elections/elections/_filters.html.erb

@@ -9,6 +9,7 @@
                               class: "input-group-field",
                               placeholder: t(".search"),
                               title: t(".search"),
+                              "aria-label": t(".search"),
                               data: { disable_dynamic_change: true } %>
         <div class="input-group-button">
           <button type="submit" class="button" aria-controls="elections">

data/app/views/decidim/elections/elections/election_log.html.erb

@@ -0,0 +1,182 @@
+<%= render partial: "decidim/shared/component_announcement" %>
+
+<div class="row section election-log"
+  data-election-id="<%= election.id %>"
+  data-api-endpoint-url="<%= bulletin_board_server %>"
+  data-authority-slug="<%= authority_slug %>"
+  data-authority-public-key="<%= authority_public_key %>">
+  <div class="columns large-8">
+    <h1 class="heading3"><%= t(".title") %></h1>
+    <p><%= t(".description") %></p>
+    <div class="mt-sm">
+      <!-- CREATE ELECTION STEP -->
+      <div class="card" id="create-election-step">
+        <div class="card__content">
+          <div class="card__header">
+            <span class="text-small time"></span>
+            <h5 class="card__title"><%= t(".creation_title") %></h5>
+          </div>
+          <div class="card__text">
+            <span class="no-election-created">
+              <span class="card__text--status text-muted"><%= t(".not_created") %></span>
+              <%= t(".creation_description.not_created") %>
+            </span>
+            <span>
+            <span class="election-created hide">
+              <span class="card__text--status success"><%= t(".complete") %></span>
+              <%= t(".creation_description.complete") %>
+            </span>
+          </div>
+          <div class="card__footer--transparent text-small hide">
+            <strong><%= t(".chained_hash") %></strong>: <span class="chained-hash"></span>
+          </div>
+        </div>
+      </div>
+      <!-- KEY CEREMONY STEP -->
+      <div class="card" id="key-ceremony-step">
+        <div class="card__content">
+          <div class="card__header">
+            <span class="text-small time"></span>
+            <h5 class="card__title"><%= t(".key_ceremony_title") %></h5>
+          </div>
+          <div class="card__text">
+            <span class="key-ceremony-not-started">
+              <span class="card__text--status text-muted"><%= t(".not_started") %></span>
+              <%= t(".key_ceremony_description.not_started") %>
+            </span>
+            <span class="key-ceremony-started hide">
+              <span class="card__text--status warning"><%= t(".started") %></span>
+              <%= t(".key_ceremony_description.started") %>
+            </span>
+            <span class="key-ceremony-completed hide">
+              <span class="card__text--status success"><%= t(".complete") %></span>
+              <%= t(".key_ceremony_description.complete") %>
+            </span>
+          </div>
+          <div class="card__footer--transparent text-small hide">
+            <strong><%= t(".chained_hash") %></strong>: <span class="chained-hash"></span>
+          </div>
+        </div>
+      </div>
+      <!-- VOTE STEP -->
+      <div class="card" id="vote-step">
+        <div class="card__content">
+          <div class="card__header">
+            <span class="text-small time"></span>
+            <h5 class="card__title"><%= t(".vote_title") %></h5>
+          </div>
+          <div class="card__text">
+            <span class="vote-not-started">
+              <span class="card__text--status text-muted"><%= t(".not_started") %></span>
+              <%= t(".vote_description.not_started") %>
+            </span>
+            <span class="vote-started hide">
+              <span class="card__text--status success"><%= t(".started") %></span>
+              <%= t(".vote_description.started") %>
+            </span>
+            <span class="vote-completed hide">
+              <span class="card__text--status success"><%= t(".complete") %></span>
+              <%= t(".vote_description.finished") %>
+            </span>
+          </div>
+          <div class="card__footer--transparent text-small hide">
+            <strong><%= t(".chained_hash") %></strong>: <span class="chained-hash"></span>
+          </div>
+        </div>
+      </div>
+      <!-- TALLY STEP -->
+      <div class="card" id="tally-step">
+        <div class="card__content">
+          <div class="card__header">
+            <span class="text-small time"></span>
+            <h5 class="card__title"><%= t(".tally_title") %></h5>
+          </div>
+          <div class="card__text">
+            <span class="tally-not-started">
+              <span class="card__text--status text-muted"><%= t(".not_started") %></span>
+              <%= t(".tally_description.not_started") %>
+            </span>
+            <span class="tally-started hide">
+              <span class="card__text--status success"><%= t(".started") %></span>
+              <%= t(".tally_description.started") %>
+            </span>
+            <span class="tally-completed hide">
+              <span class="card__text--status success"><%= t(".complete") %></span>
+              <%= t(".tally_description.finished") %>
+            </span>
+          </div>
+          <div class="card__footer--transparent text-small hide">
+            <strong><%= t(".chained_hash") %></strong>: <span class="chained-hash"></span>
+          </div>
+        </div>
+      </div>
+      <!-- PUBLISHED RESULTS STEP -->
+      <div class="card" id="results-step">
+        <div class="card__content">
+          <div class="card__header">
+            <span class="text-small time"></span>
+            <h5 class="card__title"><%= t(".results_title") %></h5>
+          </div>
+          <div class="card__text">
+            <span class="results-not-published">
+              <span class="card__text--status text-muted"><%= t(".not_published") %></span>
+              <%= t(".results_description.not_published") %>
+            </span>
+            <span class="results-published hide">
+              <span class="card__text--status success"><%= t(".published") %></span>
+              <%= t(".results_description.published") %>
+            </span>
+          </div>
+          <div class="card__footer--transparent text-small hide">
+            <strong><%= t(".chained_hash") %></strong>: <span class="chained-hash"></span>
+          </div>
+        </div>
+      </div>
+
+      <!-- VERIFIABLE RESULTS STEP -->
+      <div class="card" id="verifiable-results-step">
+        <div class="card__content">
+          <div class="card__header">
+            <h5 class="card__title"><%= t(".verifiable_results.title") %></h5>
+          </div>
+          <div class="card__text">
+            <% if election.results_published? %>
+              <span class="card__text--status success"><%= t(".verify") %></span>
+              <%= content_tag :p, sanitize(t(".verifiable_results.description.ready")) %>
+              <pre class="code-block">sha256sum &lt;verifiable_election_file_path&gt;</pre>
+              <%= content_tag :p, sanitize(t(".verifiable_results.how_to_verify")) %>
+              <pre class="code-block">bin/verify &lt;verifiable_election_file_path&gt;</pre>
+            <% else %>
+              <span class="card__text--status text-muted"><%= t(".not_ready") %></span>
+              <%= t(".verifiable_results.description.not_ready") %>
+            <% end %>
+          </div>
+          <% if election.results_published? %>
+            <div class="card__footer">
+              <div class="card__support">
+                <span class="card--process__small"><strong><%= t(".verifiable_results.verifiable_file") %></strong></span>
+                <% if election.verifiable_results_file_url.present? %>
+                  <%= link_to t(".download"), election.verifiable_results_file_url, class: "card__button button small" %>
+                <% else %>
+                  <span class="card--process__small">
+                    <%= t(".not_available") %>
+                  </span>
+                <% end %>
+                <span class="card--process__small"><strong><%= t(".verifiable_results.checksum") %></strong></span>
+                <% if election.verifiable_results_file_hash.present? %>
+                  <%= election.verifiable_results_file_hash %>
+                <% else %>
+                  <span class="card--process__small">
+                    <%= t(".not_available") %>
+                  </span>
+                <% end %>
+              </div>
+            </div>
+          <% end %>
+        </div>
+      </div>
+    </div>
+  </div>
+</div>
+
+<%= javascript_pack_tag "decidim_elections_election_log", integrity: true %>

data/app/views/decidim/elections/elections/index.html.erb

@@ -21,5 +21,3 @@
     </div>
   </div>
 </section>
-
-<%= javascript_include_tag("decidim/filters") %>

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

@@ -27,6 +27,9 @@ edit_link(
     <h1 class="heading3">
       <%== present(election).title %>
     </h1>
+    <div class="card__callout">
+      <%= cell "decidim/elections/remaining_time_callout", election %>
+    </div>
     <p>
       <%= t(".voting_period_status.#{election.voting_period_status}",
             start_time: "<strong>#{l election.start_time, format: :long}</strong>",
@@ -35,7 +38,7 @@ edit_link(
   </div>
 </div>
 <div class="row section">
-  <% if election.attachments.first.present? && election.attachments.first.file.content_type.start_with?("image") %>
+  <% if election.attachments.first.present? && election.attachments.first.image? %>
     <div class="columns medium-4 mediumlarge-5">
       <img src="<%= election.attachments.first.url %>" alt="">
     </div>
@@ -43,47 +46,18 @@ edit_link(
   <div class="columns medium-8 mediumlarge-7">
     <div class="section">
       <p><%= decidim_sanitize(simple_format(translated_attribute(election.description)), strip_tags: true) %></p>
-      <% if election.ongoing? && already_voted? %>
-        <div class="callout warning">
-          <span class="callout-text"><%= callout_text %></span>
-        </div>
-      <% end %>
 
-      <div>
-        <% if election.ongoing? %>
-          <%= action_authorized_link_to :vote, new_election_vote_path(election), resource: election, class: "button" do %>
-            <%= vote_action_button %>
-          <% end %>
-        <% else %>
-          <span class="button disabled"><%= t(".action-button.vote") %></span>
-        <% end %>
-        <% if allowed_to? :preview, :election, election: election %>
-          <%= link_to new_election_vote_path(election), class: "button" do %>
-            <%= t(".preview") %>
-          <% end %>
-        <% end %>
-      </div>
+      <%= cell("decidim/elections/election_vote_cta", election) %>
 
-      <% if election.started? %>
-        <p class="text-sm">
-          <%= t(".verify.already-voted") %>
-          <%= link_to verify_election_vote_path(election) do %>
-            <%= t(".verify.verify-here") %>
-          <% end %>
-        </p>
-      <% else %>
-        <span class="disabled text-sm"><%= t(".verify.will-verify") %></span>
-      <% end %>
+      <%= link_to(t(".election_log"), election_log_election_path(election), class:"text-sm") %>
     </div>
   </div>
 </div>
 
-<!-- Election questions preview -->
-<% unless election.finished? %>
-  <%= render partial: "preview", election: election %>
+<% if onboarding %>
+  <%= render partial: "decidim/elections/votes/onboarding_modal" %>
 <% end %>
 
-<!-- Election results -->
-<% if election.results_published? %>
-  <%= render partial: "results", election: election %>
-<% end %>
+<%= cell("decidim/elections/election_preview", election) %>
+
+<%= cell("decidim/elections/election_results", election) %>

data/app/views/decidim/elections/trustee_zone/elections/_key_ceremony_steps.html.erb

@@ -1,44 +1,46 @@
-<h2><%= t(".title", election: translated_attribute(election.title)) %></h2>
-<p><%= t(".description") %></p>
-<div class="callout alert">
-  <p><%= t(".process_warning") %></p>
-</div>
+<div class="election-key-generation">
+  <h2><%= t(".title", election: translated_attribute(election.title)) %></h2>
+  <p><%= t(".description") %></p>
+  <div class="callout alert">
+    <p><%= t(".process_warning") %></p>
+  </div>
 
-<div class="table-scroll">
-  <table class="table-list">
-    <thead>
-      <tr>
-        <th><%= t(".list.task") %></th>
-        <th><%= t(".list.status") %></th>
-      </tr>
-    </thead>
-    <tbody>
-      <% %w(create_election key_ceremony.step_1 key_ceremony.joint_election_key).each do |step| %>
-      <tr>
-        <td><%= t(".keys.#{step}") %></td>
-        <td id="<%= step.gsub(".", "-") %>" class="step_status" data-step-status="pending">
-          <span class="pending"><%= t(".status.pending") %></span>
-          <span class="processing"><%= t(".status.processing") %></span>
-          <span class="completed"><%= t(".status.completed") %></span>
-        </td>
-      </tr>
-      <% end %>
-    </tbody>
-  </table>
-  <%= render("backup_modal") %>
-  <%= render("restore_modal") %>
-</div>
+  <div class="table-scroll">
+    <table class="table-list">
+      <thead>
+        <tr>
+          <th><%= t(".list.task") %></th>
+          <th><%= t(".list.status") %></th>
+        </tr>
+      </thead>
+      <tbody>
+        <% %w(create_election key_ceremony.step_1 key_ceremony.joint_election_key).each do |step| %>
+        <tr>
+          <td><%= t(".keys.#{step}") %></td>
+          <td id="<%= step.gsub(".", "-") %>" class="step_status" data-step-status="pending">
+            <span class="pending"><%= t(".status.pending") %></span>
+            <span class="processing"><%= t(".status.processing") %></span>
+            <span class="completed"><%= t(".status.completed") %></span>
+          </td>
+        </tr>
+        <% end %>
+      </tbody>
+    </table>
+    <%= render("backup_modal") %>
+    <%= render("restore_modal") %>
+  </div>
 
-<button class="button start" disabled>
-  <%= icon "power-standby", class: "icon", role: "img", aria_label: t(".start_icon") %>
-  <span><%= t(".start") %></span>
-</button>
+  <button class="button start" disabled>
+    <%= icon "power-standby", class: "icon", role: "img", aria_label: t(".start_icon") %>
+    <span><%= t(".start") %></span>
+  </button>
 
-<%= link_to trustee_path, class: "back button hide" do %>
-  <%= icon "chevron-left", class: "icon--small", role: "img", "aria-hidden": true %>
-  <%= t(".back") %>
-<% end %>
+  <%= link_to trustee_path, class: "back button hide" do %>
+    <%= icon "chevron-left", class: "icon--small", role: "img", "aria-hidden": true %>
+    <%= t(".back") %>
+  <% end %>
 
-<div class="election-status">
-  <%= link_to "", trustee_election_elections_path(election), method: :put, class: "hide" %>
+  <div class="election-status">
+    <%= link_to "", trustee_election_elections_path(election), method: :put, class: "hide" %>
+  </div>
 </div>

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

@@ -1,38 +1,22 @@
-<%= stylesheet_link_tag "decidim/elections/trustee_zone", media: "all" %>
+<%= stylesheet_pack_tag "decidim_elections_trustee_zone", media: "all" %>
 
-<% if election.bb_key_ceremony? %>
-  <div class="key-ceremony"
+<% if current_step %>
+  <div class="trustee-step"
     data-election-id="<%= election.id %>"
     data-trustee-public-key="<%= trustee.public_key %>"
-    data-trustee-unique-id="<%= trustee.unique_id %>"
-    data-api-endpoint-url="<%= Rails.application.secrets.bulletin_board[:server] %>"
-    data-authority-unique-id="<%= Rails.application.secrets.bulletin_board[:authority_name].parameterize %>"
+    data-trustee-slug="<%= trustee.slug %>"
+    data-api-endpoint-url="<%= bulletin_board_server %>"
+    data-authority-slug="<%= authority_slug %>"
+    data-authority-public-key="<%= authority_public_key %>"
     data-update-election-status-url="<%= trustee_election_elections_path(election) %>"
+    data-scheme-name="<%= scheme_name %>"
     data-backup="false">
 
-    <div class="key-ceremony-result">
+    <div class="js-step-result">
     </div>
 
-    <div class="election-key-generation">
-      <%= render("key_ceremony_steps") %>
-    </div>
-  </div>
-
-  <%= javascript_include_tag "decidim/elections/trustee_zone/key_ceremony", integrity: true %>
-<% elsif election.bb_tally? %>
-  <div class="tally"
-    data-election-id="<%= election.id %>"
-    data-trustee-public-key="<%= trustee.public_key %>"
-    data-trustee-unique-id="<%= trustee.unique_id %>"
-    data-api-endpoint-url="<%= Rails.application.secrets.bulletin_board[:server] %>"
-    data-authority-unique-id="<%= Rails.application.secrets.bulletin_board[:authority_name].parameterize %>"
-    data-update-election-status-url="<%= trustee_election_elections_path(election) %>">
-
-    <div class="tally-result">
-    </div>
-
-    <%= render("tally_steps") %>
+    <%= render("#{current_step}_steps") %>
   </div>
 
-  <%= javascript_include_tag "decidim/elections/trustee_zone/tally", integrity: true %>
+  <%= javascript_pack_tag "decidim_elections_trustee_#{current_step}", integrity: true %>
 <% end %>

data/app/views/decidim/elections/trustee_zone/elections/update.js.erb

@@ -1,4 +1,4 @@
-$(".key-ceremony-result").html(
+$(".js-step-result").html(
   `<div class="callout success">
     <%= j(I18n.t("elections.update.success", scope: "decidim.elections.trustee_zone", status: election.bb_status)) %>
   </div>`

data/app/views/decidim/elections/trustee_zone/trustees/show.html.erb

@@ -1,4 +1,4 @@
-<%= stylesheet_link_tag "decidim/elections/trustee_zone", media: "all" %>
+<%= stylesheet_pack_tag "decidim_elections_trustee_zone", media: "all" %>
 
 <div id="not_supported_browser" class="callout alert">
   <p><strong><%= t(".not_supported_browser_title") %></strong></p>
@@ -7,7 +7,7 @@
 
 <div class="trustee_zone">
   <%= decidim_form_for(trustee, html: { class: "form edit_trustee" }) do |f| %>
-    <%= f.hidden_field :unique_id %>
+    <%= f.hidden_field :slug %>
     <%= f.hidden_field :name %>
     <%= f.hidden_field :public_key %>
     <%= f.submit "", id: "submit_identification_public_key", class: "hide" %>
@@ -35,10 +35,10 @@
             <div class="card__support">
               <div>
                 <button class="card__button button small hollow" type="button">
-                  <%= icon "x", role: "img" %> <%= t(".identification_keys.cancel") %>
+                  <%= icon "x", role: "img", "aria-hidden": true %> <%= t(".identification_keys.cancel") %>
                 </button>
                 <label class="card__button button small" for="submit_identification_public_key">
-                  <%= icon "check", role: "img" %> <%= t(".identification_keys.submit") %>
+                  <%= icon "check", role: "img", "aria-hidden": true %> <%= t(".identification_keys.submit") %>
                 </label>
               </div>
             </div>
@@ -47,7 +47,7 @@
     </div>
     <div id="generate_identification_keys" data-error="<%= t(".identification_keys.generate_error") %>">
       <button class="button">
-        <%= icon "key", role: "img" %> <%= t(".identification_keys.generate") %>
+        <%= icon "key", role: "img", "aria-hidden": true %> <%= t(".identification_keys.generate") %>
       </button>
     </div>
   <% else %>
@@ -56,7 +56,7 @@
       <h2><%= t(".identification_keys.title") %></h2>
       <p><%= t(".identification_keys.upload_legend") %></p>
       <button class="button" type="button">
-        <%= icon "data-transfer-upload", role: "img" %> <%= t(".identification_keys.upload") %>
+        <%= icon "data-transfer-upload", role: "img", "aria-hidden": true %> <%= t(".identification_keys.upload") %>
       </button>
     </div>
 
@@ -99,4 +99,4 @@
   <% end %>
 </div>
 
-<%= javascript_include_tag "decidim/elections/trustee_zone", integrity: true %>
+<%= javascript_pack_tag "decidim_elections_trustee_trustee_zone", integrity: true %>