diff options
author | Étienne Loks <etienne.loks@peacefrogs.net> | 2012-10-09 17:47:02 +0200 |
---|---|---|
committer | Étienne Loks <etienne.loks@peacefrogs.net> | 2012-10-09 17:47:02 +0200 |
commit | 57af459400d9160f413f384d140f80e9e2329b61 (patch) | |
tree | d6d70cf31a6038062e06eabd43f96926f9576268 /example_project/urls.py | |
parent | ef17bd0f0e94a0c379b1b9b37216e2290707a558 (diff) | |
download | Chimère-57af459400d9160f413f384d140f80e9e2329b61.tar.bz2 Chimère-57af459400d9160f413f384d140f80e9e2329b61.zip |
Integration of Alban Tiberghien <alban.tiberghien@gmail.com> changes to make the application more 'pip' and 'virtualenv' friendly
Changes has been integrated in alternate files 'local_settings.py.pip.sample'
and 'apache-wsgi-pip.conf' in order to not conflict with installation
not using 'pip'.
The changes are:
- Add django-extensions
- Install tinymce as 3rd app
- Minor fix in jquery path
- Fix shabang in order to work with virtual environment
As I want to minimise the size of the tracked files in the Git
repository jQuery-UI files were not included (as a small fix Google CDN
is set by default for jquery-UI).
Diffstat (limited to 'example_project/urls.py')
-rw-r--r-- | example_project/urls.py | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/example_project/urls.py b/example_project/urls.py index a49cb4f..e37ae53 100644 --- a/example_project/urls.py +++ b/example_project/urls.py @@ -28,6 +28,11 @@ urlpatterns = patterns('django.views.static', (r'^%s(?P<path>.*)' % settings.MEDIA_URL[1:], 'serve', {'document_root': settings.MEDIA_ROOT}), ) + +if "tinymce" in settings.INSTALLED_APPS: + urlpatterns += patterns('django.views.static', + (r'^tinymce/', include('tinymce.urls')),) + urlpatterns += staticfiles_urlpatterns() urlpatterns += patterns('', |