about summary refs log tree commit diff
path: root/app/views/stream_entries/_poll.html.haml
diff options
context:
space:
mode:
authorEugen Rochko <eugen@zeonfederated.com>2019-03-05 03:51:18 +0100
committerGitHub <noreply@github.com>2019-03-05 03:51:18 +0100
commita198add83bb527c32fa0e01404338562b157da99 (patch)
treec5a507a1e40092b89fe0c8ab6ffe36fa126628f1 /app/views/stream_entries/_poll.html.haml
parent0a39c81dd87242feb84da68b8907c3e45620eadf (diff)
Fix various issues in polls (#10165)
* Fix ActivityPub poll results being serialized even with hide_totals

* Fix poll refresh button having a different font size

* Display poll in OpenGraph description

* Fix NoMethodError when serializing votes

Regression from #10158

* Fix polls on public pages being broken for non-logged-in users

* Do not show time remaining if poll has no expiration date
Diffstat (limited to 'app/views/stream_entries/_poll.html.haml')
-rw-r--r--app/views/stream_entries/_poll.html.haml16
1 files changed, 10 insertions, 6 deletions
diff --git a/app/views/stream_entries/_poll.html.haml b/app/views/stream_entries/_poll.html.haml
index 974aff9bd..c7e5e0c63 100644
--- a/app/views/stream_entries/_poll.html.haml
+++ b/app/views/stream_entries/_poll.html.haml
@@ -1,5 +1,5 @@
-- options = (!poll.expired? && poll.hide_totals?) ? poll.unloaded_options : poll.loaded_options
-- voted = poll.votes.where(account: current_user.account).exists?
+- options      = (!poll.expired? && poll.hide_totals?) ? poll.unloaded_options : poll.loaded_options
+- voted        = user_signed_in? && poll.votes.where(account: current_account).exists?
 - show_results = voted || poll.expired?
 
 .poll
@@ -9,17 +9,21 @@
         - if show_results
           - percent = 100 * option.votes_count / poll.votes_count
           %span.poll__chart{ style: "width: #{percent}%" }
+
           %label.poll__text><
-            %span.poll__number= percent
+            %span.poll__number= percent.round
             = option.title
         - else
           %label.poll__text><
-            %span.poll__input{ class: poll.multiple ? 'checkbox' : nil}><
+            %span.poll__input{ class: poll.multiple? ? 'checkbox' : nil}><
             = option.title
   .poll__footer
     - unless show_results
       %button.button.button-secondary{ disabled: true }
         = t('statuses.poll.vote')
+
     %span= t('statuses.poll.total_votes', count: poll.votes_count)
-    ·
-    %span= poll.expires_at
+
+    - unless poll.expires_at.nil?
+      ·
+      %span= l poll.expires_at