djsundog/brutaldon
1
0
Fork 0
mirror of http://git.carcosa.net/jmcbray/brutaldon.git synced 2024-11-23 07:13:52 -05:00
Code Issues Projects Releases Wiki Activity

Support for viewing completed polls

Browse Source
This commit is contained in:
Jason McBrayer 2019-07-09 19:37:18 -04:00
parent 76b50cedd2
commit 83f46babe5
4 changed files with 190 additions and 146 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
brutaldon/static/css/brutaldon-dark.css
View File

@ -240,6 +240,12 @@ a.navbar-item span:nth-child(2):before
content: " ";
}
div.poll {
margin-bottom: 1ex;
margin-top: 1em;
max-width: 90%;
}
/* Fix some rules that don't need to be there */
.content figure:not(:last-child)
{

9
brutaldon/static/css/brutaldon.css
View File

@ -2,7 +2,6 @@ body > section > div.container {
max-width: 100%;
}
.reblog-icon {
position: relative;
top: -24px;
@ -219,6 +218,14 @@ a.navbar-item span:nth-child(2):before
content: " ";
}
div.poll {
margin-bottom: 1ex;
margin-top: 1em;
max-width: 90%;
}
/* Fix some rules that don't need to be there */
.content figure:not(:last-child)
{

14
brutaldon/templates/main/toot_partial.html
View File

@ -30,7 +30,8 @@
<div class="content">
<p>
<strong>{{ toot.account.display_name }}</strong>
<small><a href="{% url "user" toot.account.acct %}">@{{ toot.account.acct }}</a></small>
<small><a href="{% url "user" toot.account.acct %}">
@{{ toot.account.acct }}</a></small>
<a href="{{ toot.url }}">
<small>{{ toot.created_at |humane_time }}</small>
</a>
@ -52,6 +53,17 @@
</div>
{% endif %}
{% if toot.poll %}
<div class="poll">
{% if toot.poll.voted or toot.poll.expired %}
{% include "polls/completed_partial.html" with toot=toot %}
{% else %}
<!-- Poll form -->
{% endif %}
</div>
{% endif %}
{% if toot.card %}
<div class="card">
<div class="card-content columns">

19
brutaldon/templates/polls/completed_partial.html Normal file
View File

@ -0,0 +1,19 @@
{% load sanitizer %}
{% load taglinks %}
{% load static %}
<div class="columns is-multiline">
{% for option in toot.poll.options %}
<div class="column is-one-quarter">
<strong>{{ option.title }}</strong>
({{ option.votes_count}} vote{{ option.votes_count|pluralize }})
</div>
<div class="column is-three-quarters">
<progress class="progress is-primary"
value="{{ option.votes_count }}"
max="{{ toot.poll.votes_count }}"
{{ option.votes_count }}
</progress>
</div>
{% endfor %}
</div>