a13bb89f31
Cactus is a simple but powerful static website generator using Python and the Django template system. Cactus also makes it easy to develop locally and deploy your site to S3 directly. It works great for company, portfolio, personal, support websites and blogs. To get a quick overview watch this short video tutorial: https://vimeo.com/46999791 WWW: http://github.com/koenbok/Cactus
28 lines
960 B
Python
28 lines
960 B
Python
--- cactus/site.py.orig 2015-03-22 19:28:26 UTC
|
|
+++ cactus/site.py
|
|
@@ -7,8 +7,11 @@ import traceback
|
|
import socket
|
|
|
|
import django.conf
|
|
-from django.template.loader import add_to_builtins
|
|
-
|
|
+# BACKPORT https://github.com/koenbok/Cactus/pull/106
|
|
+try:
|
|
+ from django.template.loader import add_to_builtins
|
|
+except ImportError: # Django < 1.8
|
|
+ from django.template import add_to_builtins
|
|
from cactus import ui as ui_module
|
|
from cactus.config.router import ConfigRouter
|
|
from cactus.deployment import get_deployment_engine_class
|
|
@@ -138,9 +141,10 @@ class Site(SiteCompatibilityLayer):
|
|
to look for included templates.
|
|
"""
|
|
|
|
+# BACKPORT https://github.com/jezdez/django-hosts/issues/31
|
|
settings = {
|
|
"TEMPLATE_DIRS": [self.template_path, self.page_path],
|
|
- "INSTALLED_APPS": ['django.contrib.markup'],
|
|
+ "INSTALLED_APPS": ['django_markwhat'],
|
|
}
|
|
|
|
if self.locale is not None:
|