Permalink
Browse files

cleanup

  • Loading branch information...
1 parent d7d2dac commit e30e81de419307660783c3e8b85c36ec7fd580e6 @digi604 digi604 committed Mar 22, 2010
View
@@ -17,7 +17,7 @@
DATABASE_NAME = 'cms' # Or path to database file if using sqlite3.
DATABASE_USER = 'cms' # Not used with sqlite3.
DATABASE_PASSWORD = 'cms' # Not used with sqlite3.
-DATABASE_HOST = 'intra.divio.ch' # Set to empty string for localhost. Not used with sqlite3.
+DATABASE_HOST = '' # Set to empty string for localhost. Not used with sqlite3.
DATABASE_PORT = '' # Set to empty string for default. Not used with sqlite3.
# Test database settings
@@ -42,7 +42,8 @@
# Absolute path to the directory that holds media.
MEDIA_ROOT = os.path.join(PROJECT_DIR, 'media/')
-# Absolute path to the directory that holds media.
+# Absolute path to the directory that holds media.
+# DO NOT ACTUALLY USE THIS IN YOUR OWN PROJECT!!!! THIS IS JUST FOR TESTING
CMS_MEDIA_ROOT = os.path.join(PROJECT_DIR, '../cms/media/cms/')
#ADMIN_MEDIA_ROOT = os.path.join(PROJECT_DIR, '../admin_media/')
MEDIA_URL = '/media/'
@@ -125,7 +126,7 @@
'reversion',
'example.sampleapp',
#'debug_toolbar',
- #'south',
+ 'south',
)
gettext = lambda s: s
@@ -154,11 +155,7 @@
CMS_TEMPLATES = (
('col_two.html', gettext('two columns')),
('col_three.html', gettext('three columns')),
-
- ('index.html', gettext('default')),
- ('nice.html', gettext('nice one')),
- ('cool.html', gettext('cool one')),
- ('long-folder-long/long-template-name.html', gettext('long')),
+ ('nav_playground.html', gettext('navigation examples')),
)
@@ -1,8 +0,0 @@
-{% extends "index.html" %}
-{% load cms_tags %}
-
-{% block title %}Cool template{% endblock %}
-
-{% block content %}{{ block.super }}
- {% placeholder fancy-content %}
-{% endblock %}
@@ -1,8 +0,0 @@
-{% extends "index.html" %}
-{% load cms_tags %}
-
-{% block title %}Nice template{% endblock %}
-
-{% block content %}{{ block.super }}
- {% placeholder fancy-content markItUpMarkdown %}
-{% endblock %}
@@ -1,12 +0,0 @@
-{% extends "index.html" %}
-{% load cms_tags %}
-
-{% block title %}Nice template{% endblock %}
-
-{% block content %}{{ block.super }}
- <div style="clear: both;">
- <h3>Fancy Content placeholder</h3>
- {% placeholder fancy-content %}
- </div>
-{% endblock %}
-

0 comments on commit e30e81d

Please sign in to comment.