switch to combo as content management system

diff --git a/panikweb/settings.py b/panikweb/settings.py
index 5906075e8a6295c6d1726e870e3860341d418e48..236c2e7e79a4571f18d5a0b182d1e4891c7ba126 100644 (file)
--- a/panikweb/settings.py
+++ b/panikweb/settings.py
@@ -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:

diff --git a/panikweb/urls.py b/panikweb/urls.py
index 09d0941d1b6d4f5d093257b9a846be0ac191bc93..0712e98259ec3a3ee53d79e22751e5e8b3b087b7 100644 (file)
--- a/panikweb/urls.py
+++ b/panikweb/urls.py
@@ -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 *

diff --git a/panikweb_templates/templates/base.html b/panikweb_templates/templates/base.html
index c5e5402ba641da39724049fdc483fe761cf707ee..d263f24443268f49b553c6d41821fbb2544fb46d 100644 (file)
--- a/panikweb_templates/templates/base.html
+++ b/panikweb_templates/templates/base.html
@@ -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>

diff --git a/panikweb_templates/templates/combo/page_template.html b/panikweb_templates/templates/combo/page_template.html
new file mode 100644 (file)
index 0000000..2f74186
--- /dev/null
+++ b/panikweb_templates/templates/combo/page_template.html
@@ -0,0 +1,33 @@
+{% 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 %}