diff --git a/ak/views.py b/ak/views.py index 0d4891f9..9447a293 100644 --- a/ak/views.py +++ b/ak/views.py @@ -12,7 +12,7 @@ from versions.models import Version class HomepageView(TemplateView): """ - Our default homepage for Forum. We expect you to not use this view + Our default homepage for temp-site. We expect you to not use this view after you start working on your project. """ diff --git a/config/wsgi.py b/config/wsgi.py index 5f11ba87..2e767eb2 100644 --- a/config/wsgi.py +++ b/config/wsgi.py @@ -1,5 +1,5 @@ """ -WSGI config for Forum. +WSGI config for temp-site. """ import os diff --git a/templates/_base.html b/templates/_base.html index e517e1c0..c7be271c 100644 --- a/templates/_base.html +++ b/templates/_base.html @@ -30,7 +30,6 @@ {% endblock js %} {% block body %} - {# The forum content will go in this 'body' block #} {% endblock body %} {% block extra_js %} diff --git a/templates/base.html b/templates/base.html index c4fca882..d7761076 100644 --- a/templates/base.html +++ b/templates/base.html @@ -63,9 +63,6 @@ {% block messages %}{% include "partials/messages.html" %}{% endblock messages %} - {% comment %}body block is for use in forums{% endcomment %} - {% block forum_body %}{% endblock %} -
{% block content_wrapper %} {% block subnav %}{% endblock %} diff --git a/templates/board_base.html b/templates/board_base.html deleted file mode 100644 index f4123754..00000000 --- a/templates/board_base.html +++ /dev/null @@ -1,68 +0,0 @@ -{% extends "base.html" %} -{% load static %} -{% load i18n %} -{% load forum_permission_tags %} - -{% block title %}{{ MACHINA_FORUM_NAME|default:"Forum" }} — {% block sub_title %}{% endblock sub_title %}{% endblock title %} - -{% block css %} -{{ block.super }} - - -{% endblock css %} - -{% block forum_body %} - - {# commented out because it's not in the designs #} -{#{% block header %}#} -{##} -{#{% endblock header %}#} - -
-
-
- {% block breadcrumb %}{% include "partials/breadcrumb.html" %}{% endblock breadcrumb %} -
- -
-
-{% endblock forum_body %} - -{% block footer_js %} -{{ block.super }} - - - -{% endblock footer_js %} diff --git a/templates/homepage.html b/templates/homepage.html index 4fbe1292..fcbb7ee8 100644 --- a/templates/homepage.html +++ b/templates/homepage.html @@ -135,7 +135,7 @@
Join the conversation - Visit Forum > +
diff --git a/templates/partials/avatar.html b/templates/partials/avatar.html index 93fe7c97..9e1f1a33 100644 --- a/templates/partials/avatar.html +++ b/templates/partials/avatar.html @@ -1,6 +1,5 @@ -{% load forum_member_tags %} {% if profile.avatar %} -{{ profile.user|forum_member_display_name }} +{{ profile.user }} {% elif show_placeholder %} diff --git a/templates/partials/breadcrumb.html b/templates/partials/breadcrumb.html deleted file mode 100644 index 4fa543ae..00000000 --- a/templates/partials/breadcrumb.html +++ /dev/null @@ -1,37 +0,0 @@ -{% load i18n %} - - diff --git a/users/views.py b/users/views.py index 952830c7..c29a9c76 100644 --- a/users/views.py +++ b/users/views.py @@ -51,7 +51,7 @@ class CurrentUserAPIView(generics.RetrieveUpdateAPIView): class ProfileView(DetailView): """ ViewSet to show statistics about a user to include - stats, badges, forum posts, reviews, etc. + stats, badges, reviews, etc. """ model = User