diff --git a/pinaxcon/settings.py b/pinaxcon/settings.py index 46615e12..d6b46ee9 100644 --- a/pinaxcon/settings.py +++ b/pinaxcon/settings.py @@ -110,7 +110,6 @@ TEMPLATES = [ "account.context_processors.account", "pinax_theme_bootstrap.context_processors.theme", "symposion.reviews.context_processors.reviews", - "sekizai.context_processors.sekizai", ], }, }, @@ -206,18 +205,6 @@ INSTALLED_APPS = [ "jquery", "djangoformsetjs", - # wiki - "django_nyt", - "mptt", - "sekizai", - "sorl.thumbnail", - "wiki", - "wiki.plugins.attachments", - "wiki.plugins.notifications", - "wiki.plugins.images", - "wiki.plugins.macros", - - #testing "django_nose", ] @@ -372,20 +359,12 @@ TEST_RUNNER = 'django_nose.NoseTestSuiteRunner' ADMIN_USERNAMES = [] -# Wiki settings -WIKI_CHECK_SLUG_URL_AVAILABLE = False - # Tell nose to measure coverage on the 'foo' and 'bar' apps NOSE_ARGS = [ '--with-coverage', '--cover-package=registrasion.controllers,registrasion.models', ] -WIKI_CAN_READ = True -WIKI_CAN_WRITE = True -WIKI_CAN_DELETE = True -WIKI_ACCOUNT_HANDLING = False - # Production settings have their own file to override stuff here try: LOCAL_SETTINGS diff --git a/pinaxcon/templates/wiki/base.html b/pinaxcon/templates/wiki/base.html deleted file mode 100644 index 5eb070f1..00000000 --- a/pinaxcon/templates/wiki/base.html +++ /dev/null @@ -1,36 +0,0 @@ -{% extends "site_base_wagtail.html" %} -{% load sekizai_tags i18n wiki_tags static %} - -{% block head_title %} - {% block wiki_pagetitle %}{% endblock %} -{% endblock %} - -{% block styles %} - - - {{ block.super }} - -{% endblock styles %} - -{% block content %} -