clean up some locations of things

2 files changed, 3 insertions, 11 deletions

diff --git a/blog/models.py b/blog/models.py
index d53fb64..e34ca58 100644
--- a/blog/models.py
+++ b/blog/models.py
@@ -24,7 +24,8 @@ class BlogIndexPage(Page):
     def get_context(self, request):
         # Update context to include only published posts, ordered by reverse-chron
         context = super().get_context(request)
-        blogpages = self.get_children().live().order_by('-first_published_at')
+        # We have to add the type because we want tags and categories to live under blog
+        blogpages = self.get_children().live().order_by('-first_published_at').type(BlogPost)
         paginator = Paginator(blogpages, 5)
         # Try to get the ?page=x value
         page = request.GET.get("page")
diff --git a/blog/templates/blog/blog_index_page.html b/blog/templates/blog/blog_index_page.html
index 3a36238..d58d1a9 100644
--- a/blog/templates/blog/blog_index_page.html
+++ b/blog/templates/blog/blog_index_page.html
@@ -60,21 +60,12 @@
         </li>
         {% endif %}
         {% endif %}
-
       </div>
 
       <!-- Sidebar Widgets Column -->
       <div class="col-md-4">
-
       {% include "search.html" %}
-
-
       </div>
-
-    </div>
-    <!-- /.row -->
-
-  </div>
-    
+    </div>    
 </div>
 {% endblock %}