diff --git a/app/assets/stylesheets/participation.scss b/app/assets/stylesheets/participation.scss index e849afc81..4726d0114 100644 --- a/app/assets/stylesheets/participation.scss +++ b/app/assets/stylesheets/participation.scss @@ -1382,6 +1382,7 @@ ul.ballot-list { &.can-answer:after, &.cant-answer:after, &.not-logged-in:after, + &.already-answer:after, &.unverified:after { font-family: "icons" !important; left: 34px; @@ -1390,20 +1391,20 @@ ul.ballot-list { } &.can-answer { - border-right: 60px solid $success-bg; + border-right: 60px solid $info-bg; &:after { - color: $color-success; - content: "\59"; + color: $color-info; + content: "\6c"; } } &.cant-answer { - border-right: 60px solid $warning-bg; + border-right: 60px solid $alert-bg; &:after { - color: $color-warning; - content: "\76"; + color: $color-alert; + content: "\74"; } } @@ -1424,6 +1425,15 @@ ul.ballot-list { content: "\6f"; } } + + &.already-answer { + border-right: 60px solid $success-bg; + + &:after { + color: $color-success; + content: "\59"; + } + } } .dates { diff --git a/app/views/polls/_poll_group.html.erb b/app/views/polls/_poll_group.html.erb index a34191415..d9a36bd47 100644 --- a/app/views/polls/_poll_group.html.erb +++ b/app/views/polls/_poll_group.html.erb @@ -1,9 +1,13 @@ <% poll_group.each do |poll| %>
<% if poll.answerable_by?(current_user) && poll.votable_by?(current_user) %> -
"> - <%= t("polls.index.can_answer") %> -
+ <%= link_to poll, + class: "icon-poll-answer can-answer", + title: t("polls.index.can_answer") do %> + + <%= t("polls.index.can_answer") %> + + <% end %> <% elsif current_user.nil? %> <%= link_to new_user_session_path, class: "icon-poll-answer not-logged-in", @@ -20,6 +24,10 @@ <%= t("polls.index.cant_answer_verify") %> <% end %> + <% elsif !poll.votable_by?(current_user) %> +
"> + <%= t("polls.index.already_answer") %> +
<% else %>
"> <%= t("polls.index.cant_answer") %> diff --git a/config/locales/en.yml b/config/locales/en.yml index 78be150cd..3f812fffb 100755 --- a/config/locales/en.yml +++ b/config/locales/en.yml @@ -410,6 +410,7 @@ en: cant_answer: "This poll is not available on your geozone" cant_answer_not_logged_in: "You must sign in or sign up to participate" cant_answer_verify: "You must verify your account in order to answer" + already_answer: "You already have participated in this poll" show: dates_title: "Participation dates" cant_answer_not_logged_in: "You must %{signin} or %{signup} to participate." diff --git a/config/locales/es.yml b/config/locales/es.yml index 273bfa93d..adeae8825 100755 --- a/config/locales/es.yml +++ b/config/locales/es.yml @@ -410,6 +410,7 @@ es: cant_answer: "Esta votación no está disponible en tu zona" cant_answer_not_logged_in: "Necesitas iniciar sesión o registrarte para participar" cant_answer_verify: "Por favor verifica tu cuenta para poder responder" + already_answer: "Ya has participado en esta votación" show: dates_title: "Fechas de participación" cant_answer_not_logged_in: "Necesitas %{signin} o %{signup} para participar."