diff options
| author | ThibG <thib@sitedethib.com> | 2019-09-22 14:15:18 +0200 |
|---|---|---|
| committer | Eugen Rochko <eugen@zeonfederated.com> | 2019-09-22 14:15:18 +0200 |
| commit | b359974d9b356bb723fe046466b178328cf9bbaf (patch) | |
| tree | bf8cb3887286aaced76a46ab80c7e250afbb763e /app/views/statuses | |
| parent | 26b810561a5b7cfd1766699358d998b5882a5876 (diff) | |
Show user what options they have voted (#11195)
* Add own_votes field to poll results in REST API Fixes #10679 * Display user votes in WebUI * Update styling * Add vote checkmark to public pages
Diffstat (limited to 'app/views/statuses')
| -rw-r--r-- | app/views/statuses/_poll.html.haml | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/app/views/statuses/_poll.html.haml b/app/views/statuses/_poll.html.haml index ba34890df..d6b36a5d1 100644 --- a/app/views/statuses/_poll.html.haml +++ b/app/views/statuses/_poll.html.haml @@ -1,15 +1,19 @@ - show_results = (user_signed_in? && poll.voted?(current_account)) || poll.expired? +- own_votes = user_signed_in? ? poll.own_votes(current_account) : [] .poll %ul - - poll.loaded_options.each do |option| + - poll.loaded_options.each_with_index do |option, index| %li - if show_results - percent = poll.votes_count > 0 ? 100 * option.votes_count / poll.votes_count : 0 %span.poll__chart{ style: "width: #{percent}%" } %label.poll__text>< - %span.poll__number= percent.round + %span.poll__number>< + - if own_votes.include?(index) + %i.poll__vote__mark.fa.fa-check + = percent.round = Formatter.instance.format_poll_option(status, option, autoplay: autoplay) - else %label.poll__text>< |