decidim-elections 0.26.9 → 0.27.0.rc1
Sign up to get free protection for your applications and to get access to all the features.
- checksums.yaml +4 -4
- data/README.md +1 -1
- data/app/cells/decidim/votings/content_blocks/highlighted_votings/show.erb +2 -2
- data/app/cells/decidim/votings/content_blocks/highlighted_votings_cell.rb +4 -5
- data/app/cells/decidim/votings/content_blocks/landing_page/description/show.erb +1 -1
- data/app/cells/decidim/votings/content_blocks/landing_page/description_cell.rb +1 -1
- data/app/cells/decidim/votings/content_blocks/landing_page/header/show.erb +2 -2
- data/app/cells/decidim/votings/content_blocks/landing_page/header_cell.rb +1 -1
- data/app/commands/decidim/elections/admin/add_user_as_trustee.rb +1 -1
- data/app/commands/decidim/elections/admin/create_answer.rb +2 -2
- data/app/commands/decidim/elections/admin/create_election.rb +1 -1
- data/app/commands/decidim/elections/admin/create_question.rb +2 -2
- data/app/commands/decidim/elections/admin/destroy_answer.rb +2 -2
- data/app/commands/decidim/elections/admin/destroy_election.rb +2 -2
- data/app/commands/decidim/elections/admin/destroy_question.rb +2 -2
- data/app/commands/decidim/elections/admin/end_vote.rb +1 -1
- data/app/commands/decidim/elections/admin/import_proposals_to_elections.rb +3 -6
- data/app/commands/decidim/elections/admin/publish_election.rb +2 -2
- data/app/commands/decidim/elections/admin/publish_results.rb +1 -1
- data/app/commands/decidim/elections/admin/remove_trustee_from_participatory_space.rb +1 -1
- data/app/commands/decidim/elections/admin/report_missing_trustee.rb +1 -1
- data/app/commands/decidim/elections/admin/setup_election.rb +1 -1
- data/app/commands/decidim/elections/admin/start_key_ceremony.rb +1 -1
- data/app/commands/decidim/elections/admin/start_tally.rb +1 -1
- data/app/commands/decidim/elections/admin/start_vote.rb +1 -1
- data/app/commands/decidim/elections/admin/unpublish_election.rb +1 -1
- data/app/commands/decidim/elections/admin/update_action_status.rb +1 -1
- data/app/commands/decidim/elections/admin/update_answer.rb +2 -2
- data/app/commands/decidim/elections/admin/update_answer_selection.rb +1 -1
- data/app/commands/decidim/elections/admin/update_election.rb +1 -1
- data/app/commands/decidim/elections/admin/update_question.rb +2 -2
- data/app/commands/decidim/elections/admin/update_trustee_participatory_space.rb +1 -1
- data/app/commands/decidim/elections/trustee_zone/update_election_bulletin_board_status.rb +1 -1
- data/app/commands/decidim/elections/trustee_zone/update_trustee.rb +1 -1
- data/app/commands/decidim/elections/voter/cast_vote.rb +1 -1
- data/app/commands/decidim/elections/voter/update_vote_status.rb +2 -2
- data/app/commands/decidim/votings/admin/create_ballot_style.rb +1 -1
- data/app/commands/decidim/votings/admin/create_monitoring_committee_member.rb +1 -1
- data/app/commands/decidim/votings/admin/create_polling_officer.rb +1 -1
- data/app/commands/decidim/votings/admin/create_voting.rb +3 -2
- data/app/commands/decidim/votings/admin/destroy_ballot_style.rb +1 -1
- data/app/commands/decidim/votings/admin/destroy_monitoring_committee_member.rb +1 -1
- data/app/commands/decidim/votings/admin/destroy_polling_officer.rb +1 -1
- data/app/commands/decidim/votings/admin/destroy_polling_station.rb +1 -1
- data/app/commands/decidim/votings/admin/manage_polling_station.rb +2 -2
- data/app/commands/decidim/votings/admin/monitoring_committee_validate_polling_station_closure.rb +1 -1
- data/app/commands/decidim/votings/admin/publish_voting.rb +1 -1
- data/app/commands/decidim/votings/admin/unpublish_voting.rb +1 -1
- data/app/commands/decidim/votings/admin/update_ballot_style.rb +1 -1
- data/app/commands/decidim/votings/admin/update_voting.rb +3 -2
- data/app/commands/decidim/votings/census/admin/create_dataset.rb +22 -19
- data/app/commands/decidim/votings/census/admin/create_datum.rb +1 -1
- data/app/commands/decidim/votings/census/admin/destroy_dataset.rb +1 -1
- data/app/commands/decidim/votings/census/admin/increment_dataset_processed_rows.rb +1 -1
- data/app/commands/decidim/votings/census/admin/launch_access_codes_export.rb +1 -1
- data/app/commands/decidim/votings/census/admin/launch_access_codes_generation.rb +1 -1
- data/app/commands/decidim/votings/census/admin/update_dataset.rb +1 -1
- data/app/commands/decidim/votings/certify_polling_station_closure.rb +1 -1
- data/app/commands/decidim/votings/check_census.rb +1 -1
- data/app/commands/decidim/votings/create_polling_station_closure.rb +1 -1
- data/app/commands/decidim/votings/create_polling_station_results.rb +1 -1
- data/app/commands/decidim/votings/send_access_code.rb +1 -1
- data/app/commands/decidim/votings/sign_polling_station_closure.rb +1 -1
- data/app/commands/decidim/votings/voter/in_person_vote.rb +1 -1
- data/app/commands/decidim/votings/voter/update_in_person_vote_status.rb +1 -1
- data/app/controllers/decidim/elections/admin/steps_controller.rb +2 -2
- data/app/controllers/decidim/elections/admin/trustees_participatory_spaces_controller.rb +1 -1
- data/app/controllers/decidim/elections/elections_controller.rb +11 -13
- data/app/controllers/decidim/elections/trustee_zone/application_controller.rb +4 -6
- data/app/controllers/decidim/elections/trustee_zone/elections_controller.rb +1 -1
- data/app/controllers/decidim/votings/admin/votings_landing_page_content_blocks_controller.rb +1 -1
- data/app/controllers/decidim/votings/admin/votings_landing_page_controller.rb +1 -1
- data/app/controllers/decidim/votings/polling_officer_zone/closures_controller.rb +1 -5
- data/app/controllers/decidim/votings/polling_officer_zone/in_person_votes_controller.rb +1 -5
- data/app/controllers/decidim/votings/votings_controller.rb +12 -15
- data/app/forms/decidim/elections/admin/setup_form.rb +3 -46
- data/app/forms/decidim/elections/admin/vote_period_form.rb +2 -2
- data/app/forms/decidim/votings/admin/ballot_style_form.rb +1 -1
- data/app/forms/decidim/votings/admin/voting_form.rb +4 -3
- data/app/forms/decidim/votings/census/admin/dataset_form.rb +2 -5
- data/app/forms/decidim/votings/census/admin/datum_form.rb +1 -1
- data/app/helpers/decidim/elections/application_helper.rb +1 -1
- data/app/helpers/decidim/votings/votings_helper.rb +1 -1
- data/app/models/decidim/elections/answer.rb +1 -6
- data/app/models/decidim/elections/election.rb +15 -4
- data/app/models/decidim/elections/question.rb +1 -6
- data/app/models/decidim/votings/polling_station.rb +2 -3
- data/app/models/decidim/votings/voting.rb +15 -0
- data/app/packs/src/decidim/elections/admin/pending_action.js +0 -2
- data/app/packs/src/decidim/elections/admin/trustees_process.js +0 -2
- data/app/packs/src/decidim/elections/trustee/key_ceremony.js +0 -3
- data/app/packs/src/decidim/elections/trustee/tally.js +1 -4
- data/app/packs/src/decidim/elections/voter/casting-vote.js +0 -3
- data/app/packs/src/decidim/elections/voter/setup-vote.js +0 -2
- data/app/packs/src/decidim/votings/in-person-vote.js +0 -3
- data/app/permissions/decidim/elections/admin/permissions.rb +7 -1
- data/app/permissions/decidim/votings/admin/permissions.rb +3 -18
- data/app/permissions/decidim/votings/permissions.rb +1 -3
- data/app/presenters/decidim/votings/voting_stats_presenter.rb +4 -1
- data/app/queries/decidim/elections/admin/pending_actions.rb +1 -1
- data/app/queries/decidim/elections/admin/votes_for_statistics.rb +1 -1
- data/app/queries/decidim/elections/elections_finished_to_end.rb +1 -1
- data/app/queries/decidim/elections/elections_ready_to_start.rb +1 -1
- data/app/queries/decidim/elections/filtered_elections.rb +1 -1
- data/app/queries/decidim/elections/trustees/by_participatory_space.rb +1 -1
- data/app/queries/decidim/elections/trustees/by_participatory_space_trustee_ids.rb +1 -1
- data/app/queries/decidim/elections/votes/last_vote_for_voter.rb +1 -1
- data/app/queries/decidim/elections/votes/pending_votes.rb +1 -1
- data/app/queries/decidim/votings/admin/admin_users.rb +1 -1
- data/app/queries/decidim/votings/admin/ballot_style_by_voting_code.rb +1 -1
- data/app/queries/decidim/votings/admin/polling_officers_join_polling_stations.rb +1 -1
- data/app/queries/decidim/votings/admin/polling_officers_join_polling_stations_and_user.rb +2 -2
- data/app/queries/decidim/votings/admin/polling_officers_join_user.rb +1 -1
- data/app/queries/decidim/votings/organization_prioritized_votings.rb +2 -2
- data/app/queries/decidim/votings/organization_promoted_votings.rb +1 -1
- data/app/queries/decidim/votings/organization_published_votings.rb +2 -2
- data/app/queries/decidim/votings/organization_votings.rb +1 -1
- data/app/queries/decidim/votings/prioritized_votings.rb +1 -1
- data/app/queries/decidim/votings/published_votings.rb +1 -1
- data/app/queries/decidim/votings/votes/in_person_vote_for_voter.rb +1 -1
- data/app/queries/decidim/votings/votes/pending_in_person_votes.rb +1 -1
- data/app/services/decidim/votings/census_vote_flow.rb +1 -3
- data/app/views/decidim/elections/admin/elections/edit.html.erb +0 -1
- data/app/views/decidim/elections/admin/elections/index.html.erb +0 -1
- data/app/views/decidim/elections/admin/elections/new.html.erb +0 -1
- data/app/views/decidim/elections/admin/steps/_create_election.html.erb +1 -14
- data/app/views/decidim/elections/admin/steps/{_tally.html.erb → _tally_started.html.erb} +1 -1
- data/app/views/decidim/elections/admin/steps/index.html.erb +0 -2
- data/app/views/decidim/elections/admin/trustees_participatory_spaces/index.html.erb +0 -1
- data/app/views/decidim/elections/admin/trustees_participatory_spaces/new.html.erb +0 -1
- data/app/views/decidim/elections/elections/_filters.html.erb +2 -2
- data/app/views/decidim/elections/elections/election_log.html.erb +3 -1
- data/app/views/decidim/elections/elections/show.html.erb +1 -1
- data/app/views/decidim/elections/trustee_zone/elections/show.html.erb +3 -4
- data/app/views/decidim/elections/trustee_zone/trustees/show.html.erb +3 -1
- data/app/views/decidim/elections/votes/_onboarding_modal.html.erb +3 -1
- data/app/views/decidim/elections/votes/_show_casting.html.erb +3 -3
- data/app/views/decidim/elections/votes/new.html.erb +10 -7
- data/app/views/decidim/elections/votes/verify.html.erb +4 -1
- data/app/views/decidim/votings/admin/ballot_styles/edit.html.erb +0 -1
- data/app/views/decidim/votings/admin/ballot_styles/index.html.erb +0 -1
- data/app/views/decidim/votings/admin/ballot_styles/new.html.erb +0 -1
- data/app/views/decidim/votings/admin/votings/_form.html.erb +10 -1
- data/app/views/decidim/votings/admin/votings/edit.html.erb +0 -1
- data/app/views/decidim/votings/admin/votings/index.html.erb +0 -1
- data/app/views/decidim/votings/admin/votings/new.html.erb +1 -0
- data/app/views/decidim/votings/census/admin/census/show.html.erb +0 -1
- data/app/views/decidim/votings/polling_officer_zone/closures/_certify_form.html.erb +3 -1
- data/app/views/decidim/votings/polling_officer_zone/closures/_sign_form.html.erb +3 -1
- data/app/views/decidim/votings/polling_officer_zone/closures/edit.html.erb +3 -1
- data/app/views/decidim/votings/polling_officer_zone/closures/new.html.erb +3 -1
- data/app/views/decidim/votings/polling_officer_zone/in_person_votes/_complete_voting.html.erb +8 -2
- data/app/views/decidim/votings/polling_officer_zone/in_person_votes/new.html.erb +3 -3
- data/app/views/decidim/votings/polling_officer_zone/in_person_votes/show.html.erb +3 -3
- data/app/views/decidim/votings/votings/_filters.html.erb +2 -3
- data/app/views/decidim/votings/votings/_promoted_voting.html.erb +1 -1
- data/app/views/layouts/decidim/election_votes.html.erb +3 -1
- data/config/assets.rb +1 -1
- data/config/locales/am-ET.yml +1 -0
- data/config/locales/ar.yml +2 -41
- data/config/locales/bg.yml +1 -0
- data/config/locales/ca.yml +49 -69
- data/config/locales/cs.yml +46 -59
- data/config/locales/da.yml +1 -0
- data/config/locales/de.yml +24 -180
- data/config/locales/el.yml +2 -1090
- data/config/locales/en.yml +37 -56
- data/config/locales/eo.yml +1 -0
- data/config/locales/es-MX.yml +48 -68
- data/config/locales/es-PY.yml +48 -68
- data/config/locales/es.yml +50 -70
- data/config/locales/et.yml +1 -0
- data/config/locales/eu.yml +85 -201
- data/config/locales/fi-plain.yml +40 -57
- data/config/locales/fi.yml +45 -62
- data/config/locales/fr-CA.yml +38 -68
- data/config/locales/fr.yml +39 -69
- data/config/locales/ga-IE.yml +2 -19
- data/config/locales/gl.yml +30 -40
- data/config/locales/hr.yml +1 -0
- data/config/locales/hu.yml +25 -38
- data/config/locales/id-ID.yml +1 -0
- data/config/locales/is-IS.yml +2 -1
- data/config/locales/it.yml +42 -36
- data/config/locales/ja.yml +57 -83
- data/config/locales/ko.yml +1 -0
- data/config/locales/lb.yml +1 -0
- data/config/locales/lt.yml +1 -1443
- data/config/locales/lv.yml +5 -3
- data/config/locales/mt.yml +1 -0
- data/config/locales/nl.yml +43 -52
- data/config/locales/no.yml +18 -61
- data/config/locales/om-ET.yml +1 -0
- data/config/locales/pl.yml +50 -49
- data/config/locales/pt-BR.yml +40 -49
- data/config/locales/pt.yml +41 -35
- data/config/locales/ro-RO.yml +22 -71
- data/config/locales/ru.yml +1 -0
- data/config/locales/si-LK.yml +1 -0
- data/config/locales/sk.yml +1 -0
- data/config/locales/sl.yml +1 -0
- data/config/locales/so-SO.yml +1 -0
- data/config/locales/sr-CS.yml +1 -0
- data/config/locales/sv.yml +18 -80
- data/config/locales/sw-KE.yml +1 -0
- data/config/locales/ti-ER.yml +1 -0
- data/config/locales/tr-TR.yml +9 -68
- data/config/locales/uk.yml +1 -0
- data/config/locales/val-ES.yml +1 -0
- data/config/locales/vi.yml +1 -0
- data/config/locales/zh-CN.yml +7 -30
- data/config/locales/zh-TW.yml +1 -1386
- data/db/migrate/20220404112802_rename_bb_status_tally_to_tally_started.rb +19 -0
- data/db/migrate/20220424121541_add_show_check_census_to_votings.rb +7 -0
- data/db/migrate/20220615102642_remove_description_from_elections_questions.rb +1 -1
- data/lib/decidim/elections/component.rb +4 -4
- data/lib/decidim/elections/test/factories.rb +4 -5
- data/lib/decidim/elections/version.rb +1 -1
- data/lib/decidim/votings/admin_engine.rb +0 -4
- data/lib/decidim/votings/participatory_space.rb +3 -3
- data/lib/decidim/votings/test/factories.rb +2 -1
- data/lib/decidim/votings/voting_serializer.rb +2 -2
- metadata +27 -41
- data/app/controllers/decidim/votings/admin/exports_controller.rb +0 -14
- data/app/controllers/decidim/votings/admin/imports_controller.rb +0 -14
- data/app/controllers/decidim/votings/admin/reminders_controller.rb +0 -14
- data/app/packs/src/decidim/elections/broken_promises_handler.js +0 -11
- data/app/services/decidim/elections/election_search.rb +0 -35
- data/app/services/decidim/votings/voting_search.rb +0 -46
- data/app/views/decidim/elections/shared/_broken_promises_modal.html.erb +0 -33
- data/config/environment.rb +0 -3
- data/config/locales/fa-IR.yml +0 -1
- data/config/locales/gn-PY.yml +0 -1
- data/config/locales/ka-GE.yml +0 -1
- data/config/locales/kaa.yml +0 -1
- data/config/locales/lo-LA.yml +0 -1
- data/config/locales/oc-FR.yml +0 -1
- data/config/locales/sq-AL.yml +0 -1
- data/config/locales/th-TH.yml +0 -1
- /data/app/packs/entrypoints/{decidim_elections_trustee_tally.js → decidim_elections_trustee_tally_started.js} +0 -0
- /data/app/views/decidim/elections/trustee_zone/elections/{_tally_steps.html.erb → _tally_started_steps.html.erb} +0 -0
@@ -14,23 +14,10 @@
|
|
14
14
|
<% end %>
|
15
15
|
</ul>
|
16
16
|
|
17
|
-
<% if form.needs_census? %>
|
18
|
-
<h4><%= t(".census") %></h4>
|
19
|
-
<ul class="no-bullet-indented">
|
20
|
-
<% form.census_messages.each do |key, value| %>
|
21
|
-
<% if form.errors.include?(key) %>
|
22
|
-
<li><%= icon "x", class: "text-alert", role: "img", "aria-hidden": true %> <%= form.errors.messages[key][0].html_safe %></li>
|
23
|
-
<% else %>
|
24
|
-
<li><%= icon "check", class: "text-success", role: "img", "aria-hidden": true %> <%= value.html_safe %></li>
|
25
|
-
<% end %>
|
26
|
-
<% end %>
|
27
|
-
</ul>
|
28
|
-
<% end %>
|
29
|
-
|
30
17
|
<h4><%= t(".trustees") %></h4>
|
31
18
|
<ul class="no-bullet-indented">
|
32
19
|
<% if form.participatory_space_trustees.none? %>
|
33
|
-
<li><%=
|
20
|
+
<li><%= t(".no_trustees") %></li>
|
34
21
|
<% end %>
|
35
22
|
|
36
23
|
<% form.participatory_space_trustees.map {|trustee| [trustee, form.trustees.none? || form.trustees.include?(trustee)] }
|
@@ -61,7 +61,7 @@
|
|
61
61
|
</div>
|
62
62
|
|
63
63
|
<div class="button--double form-general-submit">
|
64
|
-
<%= link_to t("steps.
|
64
|
+
<%= link_to t("steps.tally_started.continue", scope: "decidim.elections.admin"), election_steps_path(election), class: "button disabled js-continue-link" %>
|
65
65
|
</div>
|
66
66
|
|
67
67
|
<%= javascript_pack_tag "decidim_elections_admin_trustees_process" %>
|
@@ -4,7 +4,7 @@
|
|
4
4
|
<div class="filters__section">
|
5
5
|
<div class="filters__search">
|
6
6
|
<div class="input-group">
|
7
|
-
<%= form.search_field :
|
7
|
+
<%= form.search_field :search_text_cont,
|
8
8
|
label: false,
|
9
9
|
class: "input-group-field",
|
10
10
|
placeholder: t(".search"),
|
@@ -20,6 +20,6 @@
|
|
20
20
|
</div>
|
21
21
|
</div>
|
22
22
|
|
23
|
-
<%= form.check_boxes_tree :
|
23
|
+
<%= form.check_boxes_tree :with_any_date, date_filter_values, legend_title: t(".date") %>
|
24
24
|
<%= hidden_field_tag :order, order, id: nil, class: "order_filter" %>
|
25
25
|
<% end %>
|
@@ -45,7 +45,7 @@ edit_link(
|
|
45
45
|
<% end %>
|
46
46
|
<div class="columns medium-8 mediumlarge-7">
|
47
47
|
<div class="section">
|
48
|
-
<p><%=
|
48
|
+
<p><%= decidim_sanitize_editor(simple_format(translated_attribute(election.description)), strip_tags: true) %></p>
|
49
49
|
|
50
50
|
<%= cell("decidim/elections/election_vote_cta", election) %>
|
51
51
|
|
@@ -18,8 +18,7 @@
|
|
18
18
|
<%= render("#{current_step}_steps") %>
|
19
19
|
</div>
|
20
20
|
|
21
|
-
|
22
|
-
|
23
|
-
|
24
|
-
|
21
|
+
<% content_for :js_content do %>
|
22
|
+
<%= javascript_pack_tag "decidim_elections_trustee_#{current_step}" %>
|
23
|
+
<% end %>
|
25
24
|
<% end %>
|
@@ -22,6 +22,6 @@
|
|
22
22
|
<%= form_tag election_vote_path(election, id: vote.encrypted_vote_hash), method: :patch, class: "update_vote_status" %>
|
23
23
|
</div>
|
24
24
|
|
25
|
-
|
26
|
-
|
27
|
-
|
25
|
+
<% content_for :js_content do %>
|
26
|
+
<%= javascript_pack_tag "decidim_elections_voter_casting_vote" %>
|
27
|
+
<% end %>
|
@@ -59,12 +59,15 @@
|
|
59
59
|
</div>
|
60
60
|
</div>
|
61
61
|
|
62
|
-
<%= render "
|
62
|
+
<%= render "server_error_modal" %>
|
63
63
|
|
64
|
-
<%
|
65
|
-
|
66
|
-
<%
|
67
|
-
|
68
|
-
<%
|
64
|
+
<% content_for :js_content do %>
|
65
|
+
|
66
|
+
<% if preview_mode? %>
|
67
|
+
<%= javascript_pack_tag "decidim_elections_voter_setup_preview" %>
|
68
|
+
<% else %>
|
69
|
+
<%= javascript_pack_tag "decidim_elections_voter_setup_vote" %>
|
70
|
+
<% end %>
|
69
71
|
|
70
|
-
<%= javascript_pack_tag "decidim_elections_voter_new_vote" %>
|
72
|
+
<%= javascript_pack_tag "decidim_elections_voter_new_vote" %>
|
73
|
+
<% end %>
|
@@ -54,6 +54,7 @@
|
|
54
54
|
|
55
55
|
<input type="text" class="vote-identifier" name="vote-identifier" value="<%= params[:vote_id].gsub("_","") %>">
|
56
56
|
</label>
|
57
|
+
<p class="help-text"><%= t("decidim.elections.votes.verify.form.vote_identifier_help") %></p>
|
57
58
|
<div>
|
58
59
|
<%= link_to(
|
59
60
|
"#",
|
@@ -72,4 +73,6 @@
|
|
72
73
|
|
73
74
|
</div>
|
74
75
|
|
75
|
-
|
76
|
+
<% content_for :js_content do %>
|
77
|
+
<%= javascript_pack_tag "decidim_elections_voter_verify_vote" %>
|
78
|
+
<% end %>
|
@@ -11,7 +11,7 @@
|
|
11
11
|
</div>
|
12
12
|
|
13
13
|
<div class="row column">
|
14
|
-
<%= form.translated :editor, :description %>
|
14
|
+
<%= form.translated :editor, :description, toolbar: :full, lines: 25 %>
|
15
15
|
</div>
|
16
16
|
|
17
17
|
<div class="row">
|
@@ -44,6 +44,15 @@
|
|
44
44
|
</div>
|
45
45
|
</div>
|
46
46
|
|
47
|
+
<div class="row">
|
48
|
+
<div class="columns xlarge-6 show_check_census">
|
49
|
+
<%= form.check_box :show_check_census %>
|
50
|
+
<p class="help-text">
|
51
|
+
<%== t(".show_check_census_help") %>
|
52
|
+
</p>
|
53
|
+
</div>
|
54
|
+
</div>
|
55
|
+
|
47
56
|
<div class="row">
|
48
57
|
<div class="columns xlarge-6 census_contact_information">
|
49
58
|
<%= form.text_field :census_contact_information, label: t(".census_contact_information") %>
|
@@ -6,7 +6,9 @@
|
|
6
6
|
<fieldset>
|
7
7
|
<legend><%= t("form_legend", scope: "decidim.votings.polling_officer_zone.closures.certify") %></legend>
|
8
8
|
<div class="row column">
|
9
|
-
<%= form.
|
9
|
+
<%= form.attachment :photos,
|
10
|
+
multiple: true,
|
11
|
+
label: t("add_images", scope: "decidim.votings.polling_officer_zone.closures.certify") %>
|
10
12
|
</div>
|
11
13
|
</fieldset>
|
12
14
|
</div>
|
@@ -45,4 +45,6 @@
|
|
45
45
|
|
46
46
|
<%= render "modal_ballots_results_count_error" %>
|
47
47
|
|
48
|
-
|
48
|
+
<% content_for :js_content do %>
|
49
|
+
<%= javascript_pack_tag "decidim_votings_voting_polling_officer_zone_edit_closure" %>
|
50
|
+
<% end %>
|
data/app/views/decidim/votings/polling_officer_zone/in_person_votes/_complete_voting.html.erb
CHANGED
@@ -2,7 +2,11 @@
|
|
2
2
|
<div class="columns">
|
3
3
|
<% if vote_check.allowed? %>
|
4
4
|
<div class="callout success mt-s">
|
5
|
-
|
5
|
+
<% if voted_online? %>
|
6
|
+
<h5><%= t(".census_verified_with_online_vote") %></h5>
|
7
|
+
<% else %>
|
8
|
+
<h5><%= t(".census_verified") %></h5>
|
9
|
+
<% end %>
|
6
10
|
</div>
|
7
11
|
<div class="row mt-sm">
|
8
12
|
<div class="columns large-7">
|
@@ -56,4 +60,6 @@
|
|
56
60
|
</div>
|
57
61
|
</div>
|
58
62
|
|
59
|
-
|
63
|
+
<% content_for :js_content do %>
|
64
|
+
<%= javascript_pack_tag "decidim_votings_voting_polling_officer_zone_in_person_vote" %>
|
65
|
+
<% end %>
|
@@ -18,6 +18,6 @@
|
|
18
18
|
<% end %>
|
19
19
|
</div>
|
20
20
|
|
21
|
-
|
22
|
-
|
23
|
-
|
21
|
+
<% content_for :js_content do %>
|
22
|
+
<%= javascript_pack_tag "decidim_votings_in_person_vote" %>
|
23
|
+
<% end %>
|
@@ -22,6 +22,6 @@
|
|
22
22
|
<%= form_tag polling_officer_election_in_person_vote_path(polling_officer, election, in_person_vote), method: :patch, class: "update_vote_status" %>
|
23
23
|
</div>
|
24
24
|
|
25
|
-
|
26
|
-
|
27
|
-
|
25
|
+
<% content_for :js_content do %>
|
26
|
+
<%= javascript_pack_tag "decidim_votings_in_person_vote" %>
|
27
|
+
<% end %>
|
@@ -4,7 +4,7 @@
|
|
4
4
|
<div class="filters__section">
|
5
5
|
<div class="filters__search">
|
6
6
|
<div class="input-group">
|
7
|
-
<%= form.search_field :
|
7
|
+
<%= form.search_field :search_text_cont,
|
8
8
|
label: false,
|
9
9
|
class: "input-group-field",
|
10
10
|
placeholder: t(".search"),
|
@@ -20,7 +20,6 @@
|
|
20
20
|
</div>
|
21
21
|
</div>
|
22
22
|
|
23
|
-
<%= form.check_boxes_tree :
|
24
|
-
|
23
|
+
<%= form.check_boxes_tree :with_any_date, date_filter_values, legend_title: t(".date") %>
|
25
24
|
<%= hidden_field_tag :order, order, id: nil, class: "order_filter" %>
|
26
25
|
<% end %>
|
@@ -13,7 +13,7 @@
|
|
13
13
|
</div>
|
14
14
|
<div class="columns mediumlarge-8 large-6 card--process__column">
|
15
15
|
<div class="card--full__image"
|
16
|
-
style="background-image:url(
|
16
|
+
style="background-image:url(<%= promoted_voting.attached_uploader(:banner_image).path %>)">
|
17
17
|
<div class="card__content row collapse">
|
18
18
|
<div class="large-6 large-offset-6 columns">
|
19
19
|
<%= link_to voting_path(promoted_voting), class: "button expanded button--sc" do %>
|
@@ -18,8 +18,10 @@
|
|
18
18
|
<body>
|
19
19
|
<main class="focus">
|
20
20
|
<%= render partial: "layouts/decidim/election_votes_header" %>
|
21
|
+
|
21
22
|
<%= yield %>
|
22
|
-
<%= render partial: "layouts/decidim/js_configuration" %>
|
23
23
|
</main>
|
24
|
+
|
25
|
+
<%= render partial: "layouts/decidim/decidim_javascript" %>
|
24
26
|
</body>
|
25
27
|
</html>
|
data/config/assets.rb
CHANGED
@@ -11,7 +11,7 @@ Decidim::Webpacker.register_entrypoints(
|
|
11
11
|
decidim_elections_admin_trustees_process: "#{base_path}/app/packs/entrypoints/decidim_elections_admin_trustees_process.js",
|
12
12
|
decidim_elections_admin_vote_statistics: "#{base_path}/app/packs/entrypoints/decidim_elections_admin_vote_statistics.js",
|
13
13
|
decidim_elections_trustee_key_ceremony: "#{base_path}/app/packs/entrypoints/decidim_elections_trustee_key_ceremony.js",
|
14
|
-
|
14
|
+
decidim_elections_trustee_tally_started: "#{base_path}/app/packs/entrypoints/decidim_elections_trustee_tally_started.js",
|
15
15
|
decidim_elections_trustee_zone: "#{base_path}/app/packs/entrypoints/decidim_elections_trustee_zone.js",
|
16
16
|
decidim_elections_trustee_trustee_zone: "#{base_path}/app/packs/entrypoints/decidim_elections_trustee_trustee_zone.js",
|
17
17
|
decidim_elections_voter_casting_vote: "#{base_path}/app/packs/entrypoints/decidim_elections_voter_casting-vote.js",
|
data/config/locales/am-ET.yml
CHANGED
data/config/locales/ar.yml
CHANGED
@@ -1,3 +1,4 @@
|
|
1
|
+
---
|
1
2
|
ar:
|
2
3
|
activemodel:
|
3
4
|
attributes:
|
@@ -5,21 +6,11 @@ ar:
|
|
5
6
|
description: الوصف
|
6
7
|
election:
|
7
8
|
description: الوصف
|
8
|
-
monitoring_committee_member:
|
9
|
-
name: الاسم
|
10
|
-
polling_officer:
|
11
|
-
name: الاسم
|
12
9
|
decidim:
|
13
|
-
components:
|
14
|
-
elections:
|
15
|
-
name: الانتخابات
|
16
10
|
elections:
|
17
11
|
admin:
|
18
|
-
models:
|
19
|
-
answer:
|
20
|
-
name: الإجابة
|
21
12
|
steps:
|
22
|
-
|
13
|
+
tally_started:
|
23
14
|
invalid: كانت هناك مشكلة في الإبلاغ عن الأمين المفقود
|
24
15
|
mark_as_missing: وضع علامة مفقود
|
25
16
|
mark_as_missing_description: يجب أن يشارك جميع الأمناء في هذه العملية، ولكن إذا لم يتمكن الأمين من المشاركة في العملية، يمكنك وضع علامة على أنها مفقودة.
|
@@ -31,33 +22,16 @@ ar:
|
|
31
22
|
results_title: النتائج
|
32
23
|
results:
|
33
24
|
percentage: "%{count}%"
|
34
|
-
models:
|
35
|
-
trustees_participatory_space:
|
36
|
-
fields:
|
37
|
-
name: الاسم
|
38
25
|
trustee_zone:
|
39
26
|
trustees:
|
40
27
|
show:
|
41
28
|
identification_keys:
|
42
29
|
cancel: إلغاء
|
43
|
-
votes:
|
44
|
-
confirm:
|
45
|
-
answer: الإجابة
|
46
30
|
votings:
|
47
31
|
admin:
|
48
|
-
models:
|
49
|
-
monitoring_committee_member:
|
50
|
-
fields:
|
51
|
-
name: الاسم
|
52
|
-
polling_officer:
|
53
|
-
fields:
|
54
|
-
name: الاسم
|
55
32
|
monitoring_committee_election_results:
|
56
33
|
actions:
|
57
34
|
title: الإجراءات
|
58
|
-
monitoring_committee_members:
|
59
|
-
actions:
|
60
|
-
destroy: حذف
|
61
35
|
polling_officer_zone:
|
62
36
|
closures:
|
63
37
|
edit:
|
@@ -65,16 +39,3 @@ ar:
|
|
65
39
|
close_modal: غلق
|
66
40
|
sign:
|
67
41
|
cancel: إلغاء
|
68
|
-
in_person_votes:
|
69
|
-
verify_document:
|
70
|
-
name: الاسم
|
71
|
-
polling_officers:
|
72
|
-
index:
|
73
|
-
polling_station:
|
74
|
-
name: الاسم
|
75
|
-
polling_officers:
|
76
|
-
actions:
|
77
|
-
destroy: حذف
|
78
|
-
polling_stations:
|
79
|
-
actions:
|
80
|
-
destroy: حذف
|
data/config/locales/bg.yml
CHANGED