diff --git a/app/assets/stylesheets/admin.scss b/app/assets/stylesheets/admin.scss
index 71027fa75..c46d0fd3d 100644
--- a/app/assets/stylesheets/admin.scss
+++ b/app/assets/stylesheets/admin.scss
@@ -508,3 +508,12 @@ table.investment-projects-summary {
color: $color-alert;
font-weight: bold;
}
+
+table {
+
+ .callout {
+ height: $line-height*2;
+ line-height: $line-height*2;
+ padding: 0 $line-height/2;
+ }
+}
diff --git a/app/views/officing/voters/_already_voted.html.erb b/app/views/officing/voters/_already_voted.html.erb
index f9e81eada..1476913f9 100644
--- a/app/views/officing/voters/_already_voted.html.erb
+++ b/app/views/officing/voters/_already_voted.html.erb
@@ -1,3 +1,7 @@
-
- <%= t("officing.voters.show.error_already_voted") %>
-
\ No newline at end of file
+
+
+
+ <%= t("officing.voters.show.error_already_voted") %>
+
+
+
diff --git a/app/views/officing/voters/_can_vote.html.erb b/app/views/officing/voters/_can_vote.html.erb
index 66a9a5e62..27c5e9dbc 100644
--- a/app/views/officing/voters/_can_vote.html.erb
+++ b/app/views/officing/voters/_can_vote.html.erb
@@ -1,7 +1,14 @@
-
- <%= form_for @user, as: :voter, url: officing_voters_path, method: :post, remote: true do |f| %>
- <%= f.hidden_field :poll_id, value: poll.id %>
- <%= f.hidden_field :user_id, value: @user.id %>
- <%= f.submit t("officing.voters.show.submit"), class: "button success expanded" %>
- <% end %>
-
\ No newline at end of file
+
+
+
+ <%= t("officing.voters.show.can_vote") %>
+
+
+
+ <%= form_for @user, as: :voter, url: officing_voters_path, method: :post, remote: true do |f| %>
+ <%= f.hidden_field :poll_id, value: poll.id %>
+ <%= f.hidden_field :user_id, value: @user.id %>
+ <%= f.submit t("officing.voters.show.submit"), class: "button success expanded" %>
+ <% end %>
+
+
diff --git a/app/views/officing/voters/_voted.html.erb b/app/views/officing/voters/_voted.html.erb
index f2c6547cf..edd098403 100644
--- a/app/views/officing/voters/_voted.html.erb
+++ b/app/views/officing/voters/_voted.html.erb
@@ -1,3 +1,7 @@
-
- <%= t("officing.voters.show.success") %>
-
\ No newline at end of file
+
+
+
+ <%= t("officing.voters.show.success") %>
+
+
+
diff --git a/config/locales/officing.en.yml b/config/locales/officing.en.yml
index c591f7b03..c4134884f 100644
--- a/config/locales/officing.en.yml
+++ b/config/locales/officing.en.yml
@@ -64,8 +64,9 @@ en:
new:
title: Polls
table_poll: Poll
- table_actions: Validate
+ table_actions: Polls status
show:
+ can_vote: Can vote
error_already_voted: Has already participated in this poll
- submit: Validate vote
- success: Vote validated successfully.
+ submit: Confirm vote
+ success: "Vote introduced!"
diff --git a/config/locales/officing.es.yml b/config/locales/officing.es.yml
index 9de110454..1fcbb6f24 100644
--- a/config/locales/officing.es.yml
+++ b/config/locales/officing.es.yml
@@ -64,8 +64,9 @@ es:
new:
title: Votaciones
table_poll: Votación
- table_actions: Validar
+ table_actions: Estado de las votaciones
show:
+ can_vote: Puede votar
error_already_voted: "Ya ha participado en esta votación."
- submit: Validar voto
- success: Voto validado correctamente.
+ submit: Confirmar voto
+ success: "¡Voto introducido!"
diff --git a/spec/features/officing/voters_spec.rb b/spec/features/officing/voters_spec.rb
index a94c764ec..651538808 100644
--- a/spec/features/officing/voters_spec.rb
+++ b/spec/features/officing/voters_spec.rb
@@ -21,14 +21,14 @@ feature 'Voters' do
expect(page).to have_content "Polls"
expect(page).to have_content poll.name
- click_button "Validate vote"
+ click_button "Confirm vote"
- expect(page).to have_content "Vote validated successfully"
- expect(page).to_not have_button "Validate vote"
+ expect(page).to have_content "Vote introduced!"
+ expect(page).to_not have_button "Confirm vote"
page.evaluate_script("window.location.reload()")
expect(page).to have_content "Has already participated in this poll"
- expect(page).to_not have_button "Validate vote"
+ expect(page).to_not have_button "Confirm vote"
end
scenario "Already voted", :js do
@@ -42,11 +42,11 @@ feature 'Voters' do
within("#poll_#{poll1.id}") do
expect(page).to have_content "Has already participated in this poll"
- expect(page).to_not have_button "Validate vote"
+ expect(page).to_not have_button "Confirm vote"
end
within("#poll_#{poll2.id}") do
- expect(page).to have_button "Validate vote"
+ expect(page).to have_button "Confirm vote"
end
end