decidim-elections 0.26.8 → 0.27.0.rc1

data/app/views/decidim/elections/admin/steps/_create_election.html.erb

@@ -14,23 +14,10 @@
       <% end %>
     </ul>
 
-    <% if form.needs_census? %>
-      <h4><%= t(".census") %></h4>
-      <ul class="no-bullet-indented">
-        <% form.census_messages.each do |key, value| %>
-          <% if form.errors.include?(key) %>
-            <li><%= icon "x", class: "text-alert", role: "img", "aria-hidden": true %>&nbsp;<%= form.errors.messages[key][0].html_safe %></li>
-          <% else %>
-            <li><%= icon "check", class: "text-success", role: "img", "aria-hidden": true %>&nbsp;<%= value.html_safe %></li>
-          <% end %>
-        <% end %>
-      </ul>
-    <% end %>
-
     <h4><%= t(".trustees") %></h4>
     <ul class="no-bullet-indented">
       <% if form.participatory_space_trustees.none? %>
-        <li><%= icon "x", class: "text-alert", role: "img", "aria-hidden": true %>&nbsp;<%= t(".no_trustees") %></li>
+        <li><%= t(".no_trustees") %></li>
       <% end %>
 
       <% form.participatory_space_trustees.map {|trustee| [trustee, form.trustees.none? || form.trustees.include?(trustee)] }

data/app/views/decidim/elections/admin/steps/{_tally.html.erb → _tally_started.html.erb}

@@ -61,7 +61,7 @@
 </div>
 
 <div class="button--double form-general-submit">
-  <%= link_to t("steps.tally.continue", scope: "decidim.elections.admin"), election_steps_path(election), class: "button disabled js-continue-link" %>
+  <%= link_to t("steps.tally_started.continue", scope: "decidim.elections.admin"), election_steps_path(election), class: "button disabled js-continue-link" %>
 </div>
 
 <%= javascript_pack_tag "decidim_elections_admin_trustees_process" %>

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

@@ -43,5 +43,3 @@
     <%= render partial: current_step.to_s %>
   </div>
 <% end %>
-
-<%= render "decidim/elections/shared/broken_promises_modal" %>

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

@@ -1,4 +1,3 @@
-<% add_decidim_page_title(t(".title")) %>
 <div class="card" id="trustees">
   <div class="card-divider">
     <h2 class="card-title">

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

@@ -1,4 +1,3 @@
-<% add_decidim_page_title(t(".title")) %>
 <%= decidim_form_for(@form, url: trustees_path, html: { class: "form new_trustee" }) do |f| %>
   <%= render partial: "form", object: f, locals: { title: t(".title") } %>
 

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

@@ -4,7 +4,7 @@
   <div class="filters__section">
     <div class="filters__search">
       <div class="input-group">
-        <%= form.search_field :search_text,
+        <%= form.search_field :search_text_cont,
                               label: false,
                               class: "input-group-field",
                               placeholder: t(".search"),
@@ -20,6 +20,6 @@
     </div>
   </div>
 
-  <%= form.check_boxes_tree :state, state_filter_values, legend_title: t(".state") %>
+  <%= form.check_boxes_tree :with_any_date, date_filter_values, legend_title: t(".date") %>
   <%= hidden_field_tag :order, order, id: nil, class: "order_filter" %>
 <% end %>

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

@@ -179,4 +179,6 @@
   </div>
 </div>
 
-<%= javascript_pack_tag "decidim_elections_election_log" %>
+<% content_for :js_content do %>
+  <%= javascript_pack_tag "decidim_elections_election_log" %>
+<% end %>

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

@@ -45,7 +45,7 @@ edit_link(
   <% end %>
   <div class="columns medium-8 mediumlarge-7">
     <div class="section">
-      <p><%= decidim_sanitize_editor_admin(translated_attribute(election.description)) %></p>
+      <p><%= decidim_sanitize_editor(simple_format(translated_attribute(election.description)), strip_tags: true) %></p>
 
       <%= cell("decidim/elections/election_vote_cta", election) %>
 

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

@@ -18,8 +18,7 @@
     <%= render("#{current_step}_steps") %>
   </div>
 
-  <%= render "decidim/elections/shared/broken_promises_modal" %>
-
-  <%= javascript_pack_tag "decidim_elections_trustee_#{current_step}" %>
-
+  <% content_for :js_content do %>
+    <%= javascript_pack_tag "decidim_elections_trustee_#{current_step}" %>
+  <% end %>
 <% end %>

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

@@ -99,4 +99,6 @@
   <% end %>
 </div>
 
-<%= javascript_pack_tag "decidim_elections_trustee_trustee_zone" %>
+<% content_for :js_content do %>
+  <%= javascript_pack_tag "decidim_elections_trustee_trustee_zone" %>
+<% end %>

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

@@ -20,4 +20,6 @@
   </div>
 </div>
 
-<%= javascript_pack_tag "decidim_elections_onboarding" %>
+<% content_for :js_content do %>
+  <%= javascript_pack_tag "decidim_elections_onboarding" %>
+<% end %>

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

@@ -22,6 +22,6 @@
   <%= form_tag election_vote_path(election, id: vote.encrypted_vote_hash), method: :patch, class: "update_vote_status" %>
 </div>
 
-<%= render "decidim/elections/shared/broken_promises_modal" %>
-
-<%= javascript_pack_tag "decidim_elections_voter_casting_vote" %>
+<% content_for :js_content do %>
+  <%= javascript_pack_tag "decidim_elections_voter_casting_vote" %>
+<% end %>

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

@@ -59,12 +59,15 @@
   </div>
 </div>
 
-<%= render "decidim/elections/shared/broken_promises_modal" %>
+<%= render "server_error_modal" %>
 
-<% if preview_mode? %>
-  <%= javascript_pack_tag "decidim_elections_voter_setup_preview" %>
-<% else %>
-  <%= javascript_pack_tag "decidim_elections_voter_setup_vote" %>
-<% end %>
+<% content_for :js_content do %>
+
+  <% if preview_mode? %>
+    <%= javascript_pack_tag "decidim_elections_voter_setup_preview" %>
+  <% else %>
+    <%= javascript_pack_tag "decidim_elections_voter_setup_vote" %>
+  <% end %>
 
-<%= javascript_pack_tag "decidim_elections_voter_new_vote" %>
+  <%= javascript_pack_tag "decidim_elections_voter_new_vote" %>
+<% end %>

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

@@ -54,6 +54,7 @@
 
             <input type="text" class="vote-identifier" name="vote-identifier" value="<%= params[:vote_id].gsub("_","") %>">
           </label>
+          <p class="help-text"><%= t("decidim.elections.votes.verify.form.vote_identifier_help") %></p>
           <div>
             <%= link_to(
               "#",
@@ -72,4 +73,6 @@
 
 </div>
 
-<%= javascript_pack_tag "decidim_elections_voter_verify_vote" %>
+<% content_for :js_content do %>
+  <%= javascript_pack_tag "decidim_elections_voter_verify_vote" %>
+<% end %>

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

@@ -1,4 +1,3 @@
-<% add_decidim_page_title(t(".title")) %>
 <%= 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") } %>
 

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

@@ -1,4 +1,3 @@
-<% add_decidim_page_title(t(".title")) %>
 <div class="callout warning">
   <%= icon "info" %>
   <span class="callout-text"><%= t("explanation_callout", scope: "decidim.votings.admin.ballot_styles.index") %></span>

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

@@ -1,4 +1,3 @@
-<% add_decidim_page_title(t(".title")) %>
 <%= decidim_form_for([current_participatory_space, @form], html: { class: "form new_ballot_style" }) do |f| %>
   <%= render partial: "form", object: f, locals: { title: t(".title") } %>
 

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

@@ -11,7 +11,7 @@
     </div>
 
     <div class="row column">
-      <%= form.translated :editor, :description %>
+      <%= form.translated :editor, :description, toolbar: :full, lines: 25 %>
     </div>
 
     <div class="row">
@@ -44,6 +44,15 @@
       </div>
     </div>
 
+    <div class="row">
+      <div class="columns xlarge-6 show_check_census">
+        <%= form.check_box :show_check_census %>
+        <p class="help-text">
+          <%== t(".show_check_census_help") %>
+        </p>
+      </div>
+    </div>
+
     <div class="row">
       <div class="columns xlarge-6 census_contact_information">
         <%= form.text_field :census_contact_information, label: t(".census_contact_information") %>

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

@@ -1,4 +1,3 @@
-<% add_decidim_page_title(t("votings.edit.update", scope: "decidim.votings.admin")) %>
 <%= decidim_form_for @form,
                      method: :patch,
                      url: voting_path(@current_voting),

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

@@ -1,4 +1,3 @@
-<% add_decidim_page_title(t("decidim.votings.admin.titles.votings")) %>
 <div class="card with-overflow" id="votings">
   <div class="card-divider">
     <h2 class="card-title">

data/app/views/decidim/votings/admin/votings/new.html.erb

@@ -1,4 +1,5 @@
 <% add_decidim_page_title(t("votings.new.title", scope: "decidim.votings.admin")) %>
+
 <h2 class="voting-title-summary">
   <%= t("votings.new.title", scope: "decidim.votings.admin") %>
 </h2>

data/app/views/decidim/votings/census/admin/census/show.html.erb

@@ -1,4 +1,3 @@
-<% add_decidim_page_title(t("show.heading", scope: "decidim.votings.census.admin.census")) %>
 <div class="card">
   <div class="card-divider">
     <h2 class="card-title">

data/app/views/decidim/votings/polling_officer_zone/closures/_certify_form.html.erb

@@ -6,7 +6,9 @@
     <fieldset>
       <legend><%= t("form_legend", scope: "decidim.votings.polling_officer_zone.closures.certify") %></legend>
       <div class="row column">
-        <%= form.file_field :add_photos, multiple: true, label: t("add_images", scope: "decidim.votings.polling_officer_zone.closures.certify") %>
+        <%= form.attachment :photos,
+          multiple: true,
+          label: t("add_images", scope: "decidim.votings.polling_officer_zone.closures.certify") %>
       </div>
     </fieldset>
   </div>

data/app/views/decidim/votings/polling_officer_zone/closures/_sign_form.html.erb

@@ -53,4 +53,6 @@
   </div>
 <% end %>
 
-<%= javascript_pack_tag "decidim_votings_voting_polling_officer_zone_sign_closure" %>
+<% content_for :js_content do %>
+  <%= javascript_pack_tag "decidim_votings_voting_polling_officer_zone_sign_closure" %>
+<% end %>

data/app/views/decidim/votings/polling_officer_zone/closures/edit.html.erb

@@ -45,4 +45,6 @@
 
 <%= render "modal_ballots_results_count_error" %>
 
-<%= javascript_pack_tag "decidim_votings_voting_polling_officer_zone_edit_closure" %>
+<% content_for :js_content do %>
+  <%= javascript_pack_tag "decidim_votings_voting_polling_officer_zone_edit_closure" %>
+<% end %>

data/app/views/decidim/votings/polling_officer_zone/closures/new.html.erb

@@ -59,4 +59,6 @@
   </div>
 </div>
 
-<%= javascript_pack_tag "decidim_votings_voting_polling_officer_zone_new_closure" %>
+<% content_for :js_content do %>
+  <%= javascript_pack_tag "decidim_votings_voting_polling_officer_zone_new_closure" %>
+<% end %>

data/app/views/decidim/votings/polling_officer_zone/in_person_votes/_complete_voting.html.erb

@@ -2,7 +2,11 @@
   <div class="columns">
     <% if vote_check.allowed? %>
       <div class="callout success mt-s">
-        <h5><%= t(".census_verified") %></h5>
+        <% if voted_online? %>
+          <h5><%= t(".census_verified_with_online_vote") %></h5>
+        <% else %>
+          <h5><%= t(".census_verified") %></h5>
+        <% end %>
       </div>
       <div class="row mt-sm">
         <div class="columns large-7">
@@ -56,4 +60,6 @@
   </div>
 </div>
 
-<%= javascript_pack_tag "decidim_votings_voting_polling_officer_zone_in_person_vote" %>
+<% content_for :js_content do %>
+  <%= javascript_pack_tag "decidim_votings_voting_polling_officer_zone_in_person_vote" %>
+<% end %>

data/app/views/decidim/votings/polling_officer_zone/in_person_votes/new.html.erb

@@ -18,6 +18,6 @@
   <% end %>
 </div>
 
-<%= render "decidim/elections/shared/broken_promises_modal" %>
-
-<%= javascript_pack_tag "decidim_votings_in_person_vote" %>
+<% content_for :js_content do %>
+  <%= javascript_pack_tag "decidim_votings_in_person_vote" %>
+<% end %>

data/app/views/decidim/votings/polling_officer_zone/in_person_votes/show.html.erb

@@ -22,6 +22,6 @@
   <%= form_tag polling_officer_election_in_person_vote_path(polling_officer, election, in_person_vote), method: :patch, class: "update_vote_status" %>
 </div>
 
-<%= render "decidim/elections/shared/broken_promises_modal" %>
-
-<%= javascript_pack_tag "decidim_votings_in_person_vote" %>
+<% content_for :js_content do %>
+  <%= javascript_pack_tag "decidim_votings_in_person_vote" %>
+<% end %>

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

@@ -4,7 +4,7 @@
   <div class="filters__section">
     <div class="filters__search">
       <div class="input-group">
-        <%= form.search_field :search_text,
+        <%= form.search_field :search_text_cont,
                               label: false,
                               class: "input-group-field",
                               placeholder: t(".search"),
@@ -20,7 +20,6 @@
     </div>
   </div>
 
-  <%= form.check_boxes_tree :state, filter_states_values, legend_title: t(".state") %>
-
+  <%= form.check_boxes_tree :with_any_date, date_filter_values, legend_title: t(".date") %>
   <%= hidden_field_tag :order, order, id: nil, class: "order_filter" %>
 <% end %>

data/app/views/decidim/votings/votings/_promoted_voting.html.erb

@@ -13,7 +13,7 @@
     </div>
     <div class="columns mediumlarge-8 large-6 card--process__column">
       <div class="card--full__image"
-           style="background-image:url('<%= promoted_voting.attached_uploader(:banner_image).path %>')">
+           style="background-image:url(<%= promoted_voting.attached_uploader(:banner_image).path %>)">
         <div class="card__content row collapse">
           <div class="large-6 large-offset-6 columns">
             <%= link_to voting_path(promoted_voting), class: "button expanded button--sc" do %>

data/app/views/layouts/decidim/election_votes.html.erb

@@ -18,8 +18,10 @@
   <body>
     <main class="focus">
       <%= render partial: "layouts/decidim/election_votes_header" %>
+
       <%= yield %>
-      <%= render partial: "layouts/decidim/js_configuration" %>
     </main>
+
+    <%= render partial: "layouts/decidim/decidim_javascript" %>
   </body>
 </html>

data/config/assets.rb

@@ -11,7 +11,7 @@ Decidim::Webpacker.register_entrypoints(
   decidim_elections_admin_trustees_process: "#{base_path}/app/packs/entrypoints/decidim_elections_admin_trustees_process.js",
   decidim_elections_admin_vote_statistics: "#{base_path}/app/packs/entrypoints/decidim_elections_admin_vote_statistics.js",
   decidim_elections_trustee_key_ceremony: "#{base_path}/app/packs/entrypoints/decidim_elections_trustee_key_ceremony.js",
-  decidim_elections_trustee_tally: "#{base_path}/app/packs/entrypoints/decidim_elections_trustee_tally.js",
+  decidim_elections_trustee_tally_started: "#{base_path}/app/packs/entrypoints/decidim_elections_trustee_tally_started.js",
   decidim_elections_trustee_zone: "#{base_path}/app/packs/entrypoints/decidim_elections_trustee_zone.js",
   decidim_elections_trustee_trustee_zone: "#{base_path}/app/packs/entrypoints/decidim_elections_trustee_trustee_zone.js",
   decidim_elections_voter_casting_vote: "#{base_path}/app/packs/entrypoints/decidim_elections_voter_casting-vote.js",

data/config/locales/am-ET.yml

@@ -1 +1,2 @@
+---
 am:

data/config/locales/ar.yml

@@ -1,3 +1,4 @@
+---
 ar:
   activemodel:
     attributes:
@@ -5,23 +6,11 @@ ar:
         description: الوصف
       election:
         description: الوصف
-      monitoring_committee_member:
-        name: الاسم
-      polling_officer:
-        name: الاسم
   decidim:
-    components:
-      elections:
-        name: الانتخابات
     elections:
       admin:
-        models:
-          answer:
-            name: الإجابة
-          question:
-            name: سؤال
         steps:
-          tally:
+          tally_started:
             invalid: كانت هناك مشكلة في الإبلاغ عن الأمين المفقود
             mark_as_missing: وضع علامة مفقود
             mark_as_missing_description: يجب أن يشارك جميع الأمناء في هذه العملية، ولكن إذا لم يتمكن الأمين من المشاركة في العملية، يمكنك وضع علامة على أنها مفقودة.
@@ -33,33 +22,16 @@ ar:
           results_title: النتائج
         results:
           percentage: "%{count}%"
-      models:
-        trustees_participatory_space:
-          fields:
-            name: الاسم
       trustee_zone:
         trustees:
           show:
             identification_keys:
               cancel: إلغاء
-      votes:
-        confirm:
-          answer: الإجابة
     votings:
       admin:
-        models:
-          monitoring_committee_member:
-            fields:
-              name: الاسم
-          polling_officer:
-            fields:
-              name: الاسم
         monitoring_committee_election_results:
           actions:
             title: الإجراءات
-      monitoring_committee_members:
-        actions:
-          destroy: حذف
       polling_officer_zone:
         closures:
           edit:
@@ -67,16 +39,3 @@ ar:
               close_modal: غلق
           sign:
             cancel: إلغاء
-        in_person_votes:
-          verify_document:
-            name: الاسم
-        polling_officers:
-          index:
-            polling_station:
-              name: الاسم
-      polling_officers:
-        actions:
-          destroy: حذف
-      polling_stations:
-        actions:
-          destroy: حذف

data/config/locales/bg.yml

@@ -1,3 +1,4 @@
+---
 bg:
   activemodel:
     attributes: