diff --git a/app/assets/stylesheets/participation.scss b/app/assets/stylesheets/participation.scss index c23ea5b6c..7d6a0fff7 100644 --- a/app/assets/stylesheets/participation.scss +++ b/app/assets/stylesheets/participation.scss @@ -335,8 +335,16 @@ word-wrap: break-word; } - .callout.proposal-retired { - font-size: $base-font-size; + .callout { + &.token-message { + background-color: #fff; + border-color: $info-border; + color: $color-info; + } + + &.proposal-retired { + font-size: $base-font-size; + } } .social-share-full .social-share-button { diff --git a/app/views/polls/show.html.erb b/app/views/polls/show.html.erb index 437328615..19daf5e35 100644 --- a/app/views/polls/show.html.erb +++ b/app/views/polls/show.html.erb @@ -39,12 +39,6 @@ <% else %> - <% if poll_voter_token(@poll, current_user).empty? %> - - <% end %> - <% if current_user && !@poll.votable_by?(current_user) %>
<%= t("polls.show.already_voted_in_web") %> @@ -55,6 +49,14 @@ <% @questions.each do |question| %> <%= render 'polls/questions/question', question: question, token: @token %> <% end %> + + <% if poll_voter_token(@poll, current_user).empty? %> + + <% end %> + + <%= link_to t("polls.show.participate_in_other_polls"), polls_path, class: "button hollow" %>
diff --git a/config/locales/en/general.yml b/config/locales/en/general.yml index 297ec276a..413a6abf8 100644 --- a/config/locales/en/general.yml +++ b/config/locales/en/general.yml @@ -494,6 +494,7 @@ en: zoom_plus: Expand image read_more: "Read more about %{answer}" read_less: "Read less about %{answer}" + participate_in_other_polls: Participate in other polls poll_questions: create_question: "Create question" default_valid_answers: "Yes, No" diff --git a/config/locales/es/general.yml b/config/locales/es/general.yml index da81699d0..b8747406b 100644 --- a/config/locales/es/general.yml +++ b/config/locales/es/general.yml @@ -494,6 +494,7 @@ es: zoom_plus: Ampliar imagen read_more: "Leer más sobre %{answer}" read_less: "Leer menos sobre %{answer}" + participate_in_other_polls: Participar en otras votaciones poll_questions: create_question: "Crear pregunta para votación" default_valid_answers: "Sí, No"