Updated html structures and class ids

widget_princessgabi/forum/templates/forum/forum.html

@@ -13,8 +13,8 @@
 
 {% block body %}
 
-{% block content %}
-<div class="main">
+    {% block content %}
+    <div class="main">
         <h2>Forum posts:</h2>
         <div class="list">
             <ol>
@@ -25,14 +25,14 @@
                 {% endfor %}
             </ol>
         </div>
-    <a href="../forumposts/add/" class="add-btn"><i class="fa fa-plus"></i> New Post</a>
-</div>
-{% endblock %}
-<div class="links">
+        <a href="forumposts/add" class="add-btn"><i class="fa fa-plus"></i> New Post</a>
+    </div>
+    {% endblock %}
+    <div class="links">
         <a href="../dashboard/" class="btn-primary">Dashboard</a>
         <a href="../announcements/" class="btn-primary">Announcement Board</a>
         <a href="../assignments/" class="btn-primary">Assignments</a>
         <a href="../calendar/" class="btn-primary">Calendar</a>
-</div>
+    </div>
 
 {% endblock %}
\ No newline at end of file

widget_princessgabi/forum/templates/forum/forumpost-add.html

@@ -8,7 +8,12 @@
 
 {% block title %}Add Post{% endblock %}
 
-{% block content %}
+{% block header %}
+    <h1>Add a new post: </h1>
+{% endblock %}
+
+{% block body %}
+    {% block content %}
         {{ form.non_field_errors }}
         {% for field in form %}
             {% if field.errors %}
@@ -21,13 +26,12 @@
             {% endif %}
         {% endfor %}
 
-    <h1>Add a new post: </h1>
-
-<div class = "form">
+    <div class = "form">
         <form method = 'POST'>
             {% csrf_token %}
             {{ form.as_p }}
             <input type = "submit" value = "Save New Post">
         </form>
-</div>
+    </div>
+    {% endblock %}
 {% endblock %}
\ No newline at end of file

widget_princessgabi/forum/templates/forum/forumpost-details.html

@@ -4,12 +4,13 @@
 
 {% block stylesheets %}
     <link rel="stylesheet" type="text/css" href="{% static 'forum/forum.css' %}">
-    <link rel="stylesheet" href="'https://cdnjs.cloudfare.com/ajax/libs/font-awesome/4.7.0/css/font-awesome.min.css">
+    <link rel="stylesheet" href="'https://cdnjs.cloudflare.com/ajax/libs/font-awesome/4.7.0/css/font-awesome.min.css">
 {% endblock %}
 
 {% block title %} {{ object.title }} {% endblock %}
 
-<div class ="forum-content"> 
+{% block body %}
+    <div class ="forum-content"> 
     {% block content %}
         <h1>{{ object.title }}</h1>
         <h2>by {{ object.author.first_name }} {{ object.author.last_name }}</h2>
@@ -26,8 +27,8 @@
             </li>
             {% endfor %}
         </ul>
+    {% endblock %}
     
     <a href = "{% url 'forum:forumpost-edit' forumpost.id %}" class = "edit-btn" ><i class = "fa fa-edit"></i>Edit Post</a>
-</div>
-
+    </div>
 {% endblock %}
\ No newline at end of file

widget_princessgabi/forum/templates/forum/forumpost-edit.html

@@ -8,7 +8,12 @@
 
 {% block title %}Edit Post{% endblock %}
 
-{% block content %}
+{% block header %}
+    <h1>Edit Post:</h1>
+{% endblock %}
+
+{% block body %}
+    {% block content %}
         {{ form.non_field_errors }}
         {% for field in form %}
             {% if field.errors %}
@@ -21,13 +26,12 @@
             {% endif %}
         {% endfor %}
 
-    <h1>Edit Post:</h1>
-
-<div class = "forum">
+    <div class = "form">
         <form method = 'POST'>
             {% csrf_token %}
             {{ form.as_p }}
             <input type = "submit" value = "Save Changes to Post">
         </form>
-</div>
+    </div>
+    {% endblock %}
 {% endblock %}
\ No newline at end of file

widget_princessgabi/forum/urls.py

@@ -3,7 +3,7 @@ from .views import forum, ForumPostDetailView, ForumPostCreateView, ForumPostUpd
 
 urlpatterns = [
     path('', forum, name = "forum"),
-    path("forum/forumposts/<int:pk>/details/", ForumPostDetailView.as_view(), name = "forumpost-details"),
+    path('forum/forumposts/<int:pk>/details/', ForumPostDetailView.as_view(), name = "forumpost-details"),
     path('forumposts/add', ForumPostCreateView.as_view(), name = "forumpost-add"),
     path('forumposts/<int:pk>/edit', ForumPostUpdateView.as_view(), name = "forumpost-edit")
 ]