add fiber to handle text pages

diff --git a/panikweb/settings.py b/panikweb/settings.py
index dfb83dc838931b0422def23de5fe41fa4ab1855e..857cc071d7db1dfd27e2cc0f0581dc6c762c3d95 100644 (file)
--- a/panikweb/settings.py
+++ b/panikweb/settings.py
@@ -3,6 +3,8 @@
 
 import os
 
+import django.conf.global_settings as DEFAULT_SETTINGS
+
 DEBUG = True  # Turn off for production
 TEMPLATE_DEBUG = DEBUG
 DEBUG_TOOLBAR = True
@@ -84,6 +86,7 @@ STATICFILES_DIRS = (
 STATICFILES_FINDERS = (
     'django.contrib.staticfiles.finders.FileSystemFinder',
     'django.contrib.staticfiles.finders.AppDirectoriesFinder',
+    'compressor.finders.CompressorFinder',
 #    'django.contrib.staticfiles.finders.DefaultStorageFinder',
 )
 
@@ -104,9 +107,16 @@ MIDDLEWARE_CLASSES = (
     'django.middleware.csrf.CsrfViewMiddleware',
     'django.contrib.auth.middleware.AuthenticationMiddleware',
     'django.contrib.messages.middleware.MessageMiddleware',
+    'fiber.middleware.ObfuscateEmailAddressMiddleware',
+    'fiber.middleware.AdminPageMiddleware',
     #'request.middleware.RequestMiddleware',
 )
 
+TEMPLATE_CONTEXT_PROCESSORS = DEFAULT_SETTINGS.TEMPLATE_CONTEXT_PROCESSORS + (
+    'django.core.context_processors.request',
+)
+
+
 ROOT_URLCONF = 'panikweb.urls'
 
 TEMPLATE_DIRS = (
@@ -128,6 +138,9 @@ INSTALLED_APPS = (
     'taggit',
     'panikweb_templates',
     'panikweb.paniktags',
+    'mptt',
+    'compressor',
+    'fiber',
     'jquery',
     'ckeditor',
     'emissions',
@@ -144,6 +157,10 @@ HAYSTACK_CONNECTIONS = {
     },
 }
 
+FIBER_TEMPLATE_CHOICES = (
+    ('tpl-default.html', 'Default template'),
+)
+
 try:
     from local_settings import *
 except ImportError, e:

diff --git a/panikweb/urls.py b/panikweb/urls.py
index 0c1a210d16739b31daece41097a0ae5136ff5b2d..13f5c10894838caad0bd3d7704c063337e8a2c55 100644 (file)
--- a/panikweb/urls.py
+++ b/panikweb/urls.py
@@ -16,6 +16,10 @@ urlpatterns = patterns('',
     url(r'^get$', 'panikweb.views.get', name='get'),
     url(r'^player$', 'panikweb.views.player', name='player'),
 
+    (r'^api/v2/', include('fiber.rest_api.urls')),
+    (r'^admin/fiber/', include('fiber.admin_urls')),
+    (r'^jsi18n/$', 'django.views.i18n.javascript_catalog', {'packages': ('fiber',),}),
+
     url(r'^admin/', include(admin.site.urls)),
     url(r'^admin/doc/', include('django.contrib.admindocs.urls')),
 )
@@ -26,6 +30,10 @@ urlpatterns += staticfiles_urlpatterns()
 from django.conf.urls.static import static
 urlpatterns += static(settings.MEDIA_URL, document_root=settings.MEDIA_ROOT)
 
+urlpatterns += patterns('',
+    (r'', 'fiber.views.page'),
+)
+
 try:
     from local_urls import *
 except ImportError, e:

diff --git a/panikweb_templates/templates/tpl-default.html b/panikweb_templates/templates/tpl-default.html
new file mode 100644 (file)
index 0000000..8737d2a
--- /dev/null
+++ b/panikweb_templates/templates/tpl-default.html
@@ -0,0 +1,10 @@
+{% extends "base.html" %}
+{% load fiber_tags %}
+
+{% block main %}
+
+<h3>{{ fiber_page.title }}</h3>
+
+{% show_page_content "main" %}
+
+{% endblock %}

diff --git a/requirements.txt b/requirements.txt
index 25f9b5d3a29e5c98ba3779e2c6c0bfcb2921690d..3ab4918d87f18ccddc9ff07b50b75259baa082f6 100644 (file)
--- a/requirements.txt
+++ b/requirements.txt
@@ -5,3 +5,4 @@ git+https://github.com/toastdriven/django-haystack.git
 django-debug-toolbar<1.0.0
 django-jquery
 django-taggit
+django-fiber