Merge branch 'master' of ssh://git.domainepublic.net/panikweb

.gitignore

@@ -5,6 +5,7 @@ panikweb.sqlite3
 /dist
 /django-panik-emissions
 /django-panik-newsletter
+/media
 /panikweb.egg-info
 /staticroot
 /venv

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
@@ -60,7 +62,7 @@ MEDIA_ROOT = os.path.join(PROJECT_DIR, 'media')
 # URL that handles the media served from MEDIA_ROOT. Make sure to use a
 # trailing slash.
 # Examples: "http://media.lawrence.com/media/", "http://example.com/media/"
-MEDIA_URL = ''
+MEDIA_URL = '/media/'
 
 # Absolute path to the directory static files should be collected to.
 # Don't put anything in this directory yourself; store your static files
@@ -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:

panikweb/urls.py

 from django.conf.urls import patterns, include, url
+from django.conf import settings
+
 from django.views.generic import RedirectView
 from django.core.urlresolvers import reverse_lazy
 
@@ -14,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')),
 )
@@ -21,6 +27,13 @@ urlpatterns = patterns('',
 from django.contrib.staticfiles.urls import staticfiles_urlpatterns
 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:

panikweb_templates/templates/tpl-default.html

+{% extends "base.html" %}
+{% load fiber_tags %}
+
+{% block main %}
+
+<h3>{{ fiber_page.title }}</h3>
+
+{% show_page_content "main" %}
+
+{% endblock %}

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