Commit 32c1094b authored by fred's avatar fred

add fiber to handle text pages

parent 7f8d8d5e
......@@ -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:
......
......@@ -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:
......
{% extends "base.html" %}
{% load fiber_tags %}
{% block main %}
<h3>{{ fiber_page.title }}</h3>
{% show_page_content "main" %}
{% endblock %}
......@@ -5,3 +5,4 @@ git+https://github.com/toastdriven/django-haystack.git
django-debug-toolbar<1.0.0
django-jquery
django-taggit
django-fiber
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment