diff --git a/panikdb/settings.py b/panikdb/settings.py index 349484a2c838559abad83f13497b5dec7316596f..ccab3a35594b4d85264c9305c09578839f08ac0b 100644 --- a/panikdb/settings.py +++ b/panikdb/settings.py @@ -136,6 +136,9 @@ INSTALLED_APPS = ( 'nonstop', 'panikdb.aa', 'panikdb.customtags', + 'gadjo', + 'combo.data', + 'combo.manager', ) # A sample logging configuration. The only tangible logging @@ -213,6 +216,19 @@ p a:hover { border-bottom: 1px solid black; } RAVEN_CONFIG = None +COMBO_PUBLIC_TEMPLATES = { + 'standard': { + 'name': 'Standard', + 'template': 'combo/page_template.html', + 'placeholders': { + 'content': { + 'name': 'Content', + }, + } + }, +} + + try: from local_settings import * except ImportError: diff --git a/panikdb/static/css/style.css b/panikdb/static/css/style.css index 647e763f44d40da499e9bf551a4684687928a95a..abd6d9756b7d41df3ce4cfb12bde450ac744920e 100644 --- a/panikdb/static/css/style.css +++ b/panikdb/static/css/style.css @@ -628,3 +628,14 @@ a [class^="icon-"], a [class*=" icon-"] { .icon-pushpin:before { content: "\f08d "; } .icon-circle-arrow-down:after { content: "  \f0ab"; } + +div#placeholders { + overflow: hidden; +} + +div#appbar > a { + position: relative; + top: -45px; + float: right; + margin-left: 2em; +} diff --git a/panikdb/templates/base.html b/panikdb/templates/base.html index 0c0635478b9a9fe79377311a30301bb17b5eeca4..95b13fde1326b2aec8f5714c05082a9620667951 100644 --- a/panikdb/templates/base.html +++ b/panikdb/templates/base.html @@ -1,7 +1,4 @@ -{% load url from future %} -{% load i18n %} -{% load panikdbtags %} - +{% load url from future %}{% load i18n %}{% load panikdbtags %} @@ -39,7 +36,7 @@
{% if user.id %} -
+
diff --git a/panikdb/templates/combo/manager_base.html b/panikdb/templates/combo/manager_base.html new file mode 100644 index 0000000000000000000000000000000000000000..20aa194fe4909998921085e16062201acaa34e19 --- /dev/null +++ b/panikdb/templates/combo/manager_base.html @@ -0,0 +1,14 @@ +{% extends "base.html" %} +{% load static %} + +{% block extrascripts %} + + + + + +{% endblock %} + +{% block more-user-links %} +CMS +{% endblock %} diff --git a/panikdb/urls.py b/panikdb/urls.py index 8ced39d7dcd295197b9ac201da6130bd29884c3e..ae33475ca9ab0b7b04e79919b2559128f2ff068f 100644 --- a/panikdb/urls.py +++ b/panikdb/urls.py @@ -17,6 +17,8 @@ from newsletter.urls import management_patterns as newsletter_urlpatterns from matos.urls import urlpatterns as matos_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 @@ -43,6 +45,9 @@ urlpatterns = patterns('', url(r'^newsletters/', 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'^focus/set/(?P[\w,-]+)/(?P\d+)$',