Commit e44c2df7 authored by fred's avatar fred

switch to combo as content management system

parent 0f36893f
......@@ -150,6 +150,8 @@ INSTALLED_APPS = (
'ckeditor',
'emissions',
'newsletter',
'combo.data',
'combo.public',
)
CKEDITOR_UPLOAD_PATH = os.path.join(MEDIA_ROOT, 'uploads')
......@@ -214,6 +216,20 @@ DEBUG_TOOLBAR_PANELS = (
'debug_toolbar.panels.logger.LoggingPanel',
)
COMBO_PUBLIC_TEMPLATES = {
'standard': {
'name': 'Standard',
'template': 'combo/page_template.html',
'placeholders': {
'content': {
'name': 'Content',
},
}
},
}
try:
from local_settings import *
except ImportError, e:
......
......@@ -48,9 +48,7 @@ urlpatterns += staticfiles_urlpatterns()
from django.conf.urls.static import static
urlpatterns += static(settings.MEDIA_URL, document_root=settings.MEDIA_ROOT)
urlpatterns += patterns('',
(r'', 'panikweb.views.fiber_page'),
)
urlpatterns += patterns('', url(r'', include('combo.public.urls')))
try:
from local_urls import *
......
......@@ -65,7 +65,10 @@
</div>
<div id="Footer">
<nav class="wrapper">
{% show_menu "footer-menu" 1 1 "all" %}
<ul>
<li><a href="/credits/">Crédits</a></li>
<li><a href="/mentions-legales/">Mentions légales</a></li>
</ul>
</nav>
</div>
</div>
......
{% extends "base.html" %}
{% load combo %}
{% block title %}{{ page.title }}{% endblock %}
{% block toptitle %}
<h1 class="top">À propos</h1>
{% endblock %}
{% block nav %}
<div id="About">
<div class="mainSub">
<nav class="distributed">
{% show_menu 0 %}
</nav>
</div>
</div>
{% endblock %}
{% block main %}
<div class="wrapper navigation">
<div id="fiber-content" class="leftPart">
<h2 class="title">{{ page.title }}</h2>
<div class="text">{% placeholder "content" %}</div>
</div>
<div id="fiber-nav" class="sub rightPart custom marged">
{% block menu %}{% show_menu 1 %}{% endblock %}
</div>
</div>
{% endblock %}
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