polls are functional now

3 files changed, 86 insertions, 2 deletions

diff --git a/apioforum/templates/common.html b/apioforum/templates/common.html
index 8fcf5fe..3321085 100644
--- a/apioforum/templates/common.html
+++ b/apioforum/templates/common.html
@@ -6,7 +6,7 @@
 	{{url_for('thread.view_thread', thread_id=post.thread)}}#post_{{post.id}}
 {%- endmacro %}
 
-{% macro disp_post(post, buttons=False) %}
+{% macro disp_post(post, buttons=False, footer=None) %}
 <div class="post" id="post_{{post.id}}">
     <div class="post-heading">
         <span class="post-heading-a">
@@ -34,6 +34,11 @@
     <div class="post-content md">
         {{ post.content|md|safe }}
     </div>
+    {% if footer %}
+    <div class="post-footer">
+        {{ footer }}
+    </div>
+    {% endif %}
 </div>
 {% endmacro %}
 
diff --git a/apioforum/templates/config_thread.html b/apioforum/templates/config_thread.html
index b26a73d..2c9804e 100644
--- a/apioforum/templates/config_thread.html
+++ b/apioforum/templates/config_thread.html
@@ -2,6 +2,7 @@
 {% from 'common.html' import tag %}
 {% block header %}<h1>{% block title %}configure thread '{{thread.title}}'{% endblock %}</h1>{% endblock %}
 {% block content %}
+<h2>thread options</h2>
 <form method="post">
 <fieldset>
 <legend>title</legend>
@@ -27,4 +28,28 @@
 <input type="submit" value="confirm">
 <a href="{{url_for('thread.view_thread',thread_id=thread.id)}}">cancel</a>
 </form>
+
+{% if thread.poll is none %}
+<h2>create poll</h2>
+<form method="post" action="{{url_for('thread.create_poll',thread_id=thread.id)}}">
+    <fieldset>
+        <legend>create poll</legend>
+        <label for="polltitle">question title</label>
+        <input type="title" id="polltitle" name="polltitle">
+        <br>
+        <label for="polloptions">potential options (one per line)</label>
+        <textarea name="polloptions" id="polloptions"></textarea>
+    </fieldset>
+    <p>important: once a poll is created, you will not be able to modify it except to delete it entirely</p>
+    <input type="submit" value="create">
+</form>
+{% else %}
+<h2>delete poll</h2>
+<p>there is already a poll attached to this thread. you can delete it, which will allow you to create a new one, but this will erase all existing votes and data for the current poll.</p>
+<form action="{{url_for('thread.delete_poll',thread_id=thread.id)}}" method="post">
+    <input type="submit" value="confirm: delete poll">
+</form>
+
+{% endif %}
+
 {% endblock %}
diff --git a/apioforum/templates/view_thread.html b/apioforum/templates/view_thread.html
index fb62880..7bf253d 100644
--- a/apioforum/templates/view_thread.html
+++ b/apioforum/templates/view_thread.html
@@ -5,6 +5,14 @@
 {% endblock %}
 
 {%block content%}
+{% if poll %}
+<p>{{poll.title}}</p>
+<ul>
+    {%for opt in poll.options%}
+    <li>#{{opt.option_idx}} - {{opt.text}} - {{opt.num or 0}}</li>
+    {%endfor%}
+</ul>
+{% endif %}
 <div class="thread-top-bar">
     <span class="thread-top-bar-a">
         {% if g.user == thread.creator %}
@@ -21,12 +29,58 @@
 
 <div class="posts">
     {% for post in posts %}
-	{{ disp_post(post, True) }}
+        {% if votes[post.id] %}
+
+            {% set vote = votes[post.id] %}        
+            {% set option_idx = vote.option_idx %}
+            
+            {# this is bad but it's going to get refactored anyway #}
+            {% set footer %}
+                {% if vote.is_retraction %}
+                    {{post.author}} retracted their vote
+                {% else %}
+                    {% set option = poll.options[option_idx-1] %}
+                    {% if vote.current %}
+                        {{post.author}} votes for {{option_idx}}: {{option.text}}
+                    {% else %}
+                        {{post.author}} voted for {{option_idx}}: {{option.text}}, but later changed their vote
+                    {% endif %}
+                {% endif %}
+
+            {% endset %}
+
+            {{ disp_post(post, buttons=True, footer=footer) }}
+            
+        {% else %}
+            {{ disp_post(post, buttons=True) }}
+        {% endif %}
     {% endfor %}
 </div>
 {% if g.user %}
 <form class="new-post" action="{{url_for('thread.create_post',thread_id=thread.id)}}" method="POST">
     <textarea class="new-post-box" placeholder="your post here..." name="content"></textarea>
+    {% if poll %}
+    <fieldset>
+        <legend>poll: {{poll.title}}</legend>
+        <p>if you want, you can submit a vote along with this post. if you have previously voted
+           on this poll, your previous vote will be changed</p>
+
+        <input type="radio" id="dontvote" name="poll" value="dontvote" checked>
+        <label for="dontvote">do not submit any vote at the moment</label>
+
+        {% if has_voted %}
+        <br>
+        <input type="radio" id="retractvote" name="poll" value="retractvote">
+        <label for="retractvote">retract my vote, and go back to having no vote on this poll</label>
+        {% endif %}
+
+        {% for opt in poll.options %}
+            <br>
+            <input type="radio" id="option_{{opt.option_idx}}" name="poll" value="{{opt.option_idx}}">
+            <label for="option_{{opt.option_idx}}">submit a vote for #{{opt.option_idx}} - {{opt.text}}</label>
+        {% endfor %}
+    </fieldset>
+    {% endif %}
     <input type="submit" value="yes">
 </form>
 {% else %}