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 %} -
-
-
- {% block wiki_breadcrumbs %}{% endblock %} - {% block wiki_contents %}{% endblock %} -
-
-
-{% endblock %} - -{% block scripts_extra %} - {{ block.super }} - - - - -{% endblock %} diff --git a/pinaxcon/urls.py b/pinaxcon/urls.py index 9598abe3..17d22084 100644 --- a/pinaxcon/urls.py +++ b/pinaxcon/urls.py @@ -6,9 +6,6 @@ from django.views.generic import TemplateView from wagtail.wagtailadmin import urls as wagtailadmin_urls from wagtail.wagtailcore import urls as wagtail_urls -from wiki.urls import get_pattern as get_wiki_pattern -from django_nyt.urls import get_pattern as get_nyt_pattern - from django.contrib import admin import symposion.views @@ -41,9 +38,6 @@ urlpatterns = [ url(r'^tickets/', include('registrasion.urls')), url(r'^nested_admin/', include('nested_admin.urls')), - # Wiki - url(r'^notifications/', get_nyt_pattern()), - url(r'^wiki/', get_wiki_pattern()), # Default catch-all for wagtail pages. url(r'^', include(wagtail_urls)), diff --git a/requirements.txt b/requirements.txt index 6d43643c..9ab54894 100644 --- a/requirements.txt +++ b/requirements.txt @@ -17,9 +17,6 @@ django-debug-toolbar==1.6 # database mysqlclient>=1.3.3 -#Wiki -wiki==0.1.2 - # For testing django-nose==1.4.3 coverage==4.0.3