combo: add a template with a sidebar to default configuration

This commit is contained in:
Frédéric Péters 2014-12-30 11:12:00 +01:00
parent 31031985a2
commit 3e126c8a9e
2 changed files with 42 additions and 1 deletions

View File

@ -0,0 +1,28 @@
{% load combo %}<!DOCTYPE html>
<html>
<head>
<meta charset="utf-8"/>
<title>Combo</title>
<style>
div#content {
margin-right: 20%;
}
div#sidebar {
position: absolute;
right: 0;
top: 2em;
width: 20%;
}
</style>
</head>
<body>
<h1>{{ page.title }}</h1>
<div id="content">
{% placeholder "content" %}
</div>
<div id="sidebar">
<h2>Sidebar</h2>
{% placeholder "sidebar" %}
</div>
</body>
</html>

View File

@ -122,8 +122,21 @@ COMBO_PUBLIC_TEMPLATES = {
'name': 'Content',
}
}
}
},
'standard-sidebar': {
'name': 'Standard + sidebar',
'template': 'combo/page_template_sidebar.html',
'placeholders': {
'content': {
'name': 'Content',
},
'sidebar': {
'name': 'Sidebar',
}
}
},
}
local_settings_file = os.environ.get('COMBO_SETTINGS_FILE',
os.path.join(os.path.dirname(__file__), 'local_settings.py'))
if os.path.exists(local_settings_file):