Manual Merge: completed manual merge of branch 'forum' into master.

widget_django_unchained/forum/templates/forum/confirmation.html

+{% extends 'forum/base.html' %}
+
+{% block content %}
+<p> New Post added! </p>
+
+<p><a href="{% url 'Show Forum Page' %}">Return to Forum page</a></p>
+
+{% endblock %}
\ No newline at end of file

widget_django_unchained/forum/templates/forum/index.html

@@ -14,4 +14,7 @@
             </li>
         </ul>
     {% endfor %}
+
+    <br> 
+    <p>Click here to create a new post: <a href="{% url 'Show Add Post' %}"> New Forum Post</a></p>
 {% endblock %}
\ No newline at end of file

widget_django_unchained/forum/templates/forum/post_form.html

 {% extends 'forum/base.html' %}
 
 {% block content %}
-    <form action="confirmation" method="POST"> 
+    <h2> New Forum Post: </h2>
+    <form action="{% url 'Show Confirmation' %}" method="POST" enctype="multipart/form-data"> 
         {% csrf_token %}
-        <h3> Post Name: </h3> <input type="text" name="post_title"> <br>
-        <h3> Post Body: </h3> <input type="text" name="post_body"> <br>
-        <h3> Author ID </h3> <input type="text" name="author_id"> <br>
+
+        <!-- POST TITLE -->
+        <label for="post_title"> Post Name: </label> <br>
+        <input type="text" name="post_title" id="post_title"> <br>
+
+        <br>
+
+        <!-- POST BODY -->
+        <label for="post_body"> Post Body: </label> <br>
+        <textarea name="post_body" id="post_body" rows="10" cols="100">Type here!</textarea> <br>
+        
+        <br>
+
+        <!-- AUTHOR LIST -->
+        <label for="author_list"> Author List: </label> <br>
+        <select name="post_author" id="author_list">
+            {% for user in users %}
+                <option value="{{user.id}}">{{user.first_name}} {{user.last_name}}</option>
+            {% endfor %}
+        </select> <br>
+        
+        <br>
+
+        <!--IMAGE -->
+        <label for="post_image"> Upload Image: </label> <br>
+        <input type="file" name="post_image" id="post_image" accept="image/*"> <br>
+
+        <br>
+
+        <!--SUBMIT -->
         <input type="submit">
     </form>
 {% endblock %}