Commit daf1edf0 authored by fred's avatar fred

switch to combo for content management system

parent 572e84c3
...@@ -136,6 +136,9 @@ INSTALLED_APPS = ( ...@@ -136,6 +136,9 @@ INSTALLED_APPS = (
'nonstop', 'nonstop',
'panikdb.aa', 'panikdb.aa',
'panikdb.customtags', 'panikdb.customtags',
'gadjo',
'combo.data',
'combo.manager',
) )
# A sample logging configuration. The only tangible logging # A sample logging configuration. The only tangible logging
...@@ -213,6 +216,19 @@ p a:hover { border-bottom: 1px solid black; } ...@@ -213,6 +216,19 @@ p a:hover { border-bottom: 1px solid black; }
RAVEN_CONFIG = None RAVEN_CONFIG = None
COMBO_PUBLIC_TEMPLATES = {
'standard': {
'name': 'Standard',
'template': 'combo/page_template.html',
'placeholders': {
'content': {
'name': 'Content',
},
}
},
}
try: try:
from local_settings import * from local_settings import *
except ImportError: except ImportError:
......
...@@ -628,3 +628,14 @@ a [class^="icon-"], a [class*=" icon-"] { ...@@ -628,3 +628,14 @@ a [class^="icon-"], a [class*=" icon-"] {
.icon-pushpin:before { content: "\f08d "; } .icon-pushpin:before { content: "\f08d "; }
.icon-circle-arrow-down:after { content: "  \f0ab"; } .icon-circle-arrow-down:after { content: "  \f0ab"; }
div#placeholders {
overflow: hidden;
}
div#appbar > a {
position: relative;
top: -45px;
float: right;
margin-left: 2em;
}
{% load url from future %} {% load url from future %}{% load i18n %}{% load panikdbtags %}<!DOCTYPE html>
{% load i18n %}
{% load panikdbtags %}
<!DOCTYPE html>
<html> <html>
<head> <head>
<meta charset="utf-8"/> <meta charset="utf-8"/>
...@@ -39,7 +36,7 @@ ...@@ -39,7 +36,7 @@
</div> </div>
<div id="splash"> <div id="splash">
{% if user.id %} {% if user.id %}
<form action="{% url 'haystack_search' %}"> <form class="popup-ignore" action="{% url 'haystack_search' %}">
<input type="search" name="q" placeholder="Rechercher"/> <input type="search" name="q" placeholder="Rechercher"/>
<button class="icon-search"></button> <button class="icon-search"></button>
</form> </form>
......
{% extends "base.html" %}
{% load static %}
{% block extrascripts %}
<script src="{% static "ckeditor/ckeditor/ckeditor.js" %}"></script>
<script type="text/javascript" src="{% static "ckeditor/ckeditor-init.js" %}"></script>
<script src="{% static "js/combo.manager.js" %}"></script>
<script src="{% static "js/gadjo.js" %}"></script>
<link href="{% static "css/combo.manager.css" %}" rel="stylesheet" type="text/css"/>
{% endblock %}
{% block more-user-links %}
<a href="{% url 'combo-manager-homepage' %}">CMS</a>
{% endblock %}
...@@ -17,6 +17,8 @@ from newsletter.urls import management_patterns as newsletter_urlpatterns ...@@ -17,6 +17,8 @@ from newsletter.urls import management_patterns as newsletter_urlpatterns
from matos.urls import urlpatterns as matos_urlpatterns from matos.urls import urlpatterns as matos_urlpatterns
from nonstop.urls import urlpatterns as nonstop_urlpatterns from nonstop.urls import urlpatterns as nonstop_urlpatterns
from combo.manager.urls import urlpatterns as combo_manager_urls
from urls_utils import decorated_includes from urls_utils import decorated_includes
...@@ -43,6 +45,9 @@ urlpatterns = patterns('', ...@@ -43,6 +45,9 @@ urlpatterns = patterns('',
url(r'^newsletters/', url(r'^newsletters/',
decorated_includes(login_required, include(newsletter_urlpatterns))), decorated_includes(login_required, include(newsletter_urlpatterns))),
url(r'^cms/',
decorated_includes(login_required, include(combo_manager_urls))),
url(r'^news/$', 'panikdb.views.news', name='news-list'), url(r'^news/$', 'panikdb.views.news', name='news-list'),
url(r'^focus/set/(?P<object_type>[\w,-]+)/(?P<object_id>\d+)$', url(r'^focus/set/(?P<object_type>[\w,-]+)/(?P<object_id>\d+)$',
......
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