Skip to content
This repository has been archived by the owner on Sep 13, 2018. It is now read-only.

Commit

Permalink
Add wagtail
Browse files Browse the repository at this point in the history
  • Loading branch information
nikolas authored and thraxil committed Nov 18, 2016
1 parent ded113b commit 778ae46
Show file tree
Hide file tree
Showing 3 changed files with 36 additions and 10 deletions.
8 changes: 3 additions & 5 deletions README.md
Expand Up @@ -89,11 +89,9 @@ Set up a new virtual environment, e.g.

$ virtualenv ve

Activate your virtual environment, source ve/bin/activate, or previx all commands with 've/bin/'
Activate your virtual environment, source ve/bin/activate, or prefix all commands with 've/bin/'

$ pip install Paste
$ pip install PasteDeploy
$ pip install ccnmtldjango
$ pip install Paste PasteDeploy ccnmtldjango

ccnmtldjango should automatically pull in the remaining needed dependencies (just
PasteScript, actually). If that gives you problems, the most likely
Expand Down Expand Up @@ -222,7 +220,7 @@ Differences from a standard Django install

Obviously, a bunch of libraries and such have been added and there's
the whole virtualenv thing. There are also some differences from a
standard django project (ie, the result of `django-admin.py startproject`) that you should be awayre of.
standard django project (ie, the result of `django-admin.py startproject`) that you should be aware of.

First, the settings have been split up to make dev/staging/prod
deployments easier to configure. A regular django install will have
Expand Down
23 changes: 22 additions & 1 deletion ccnmtldjango/template/+package+/settings_shared.py_tmpl
Expand Up @@ -13,9 +13,13 @@ PROJECT_APPS = [

USE_TZ = True

MIDDLEWARE_CLASSES += [ # noqa
'wagtail.wagtailcore.middleware.SiteMiddleware',
'wagtail.wagtailredirects.middleware.RedirectMiddleware',
]

INSTALLED_APPS += [ # noqa
'sorl.thumbnail',
'tagging',
'typogrify',
'bootstrap3',
'bootstrapform',
Expand All @@ -25,6 +29,21 @@ INSTALLED_APPS += [ # noqa
'pagetree',
'pageblocks',
'quizblock',

'wagtail.wagtailforms',
'wagtail.wagtailredirects',
'wagtail.wagtailembeds',
'wagtail.wagtailsites',
'wagtail.wagtailusers',
'wagtail.wagtailsnippets',
'wagtail.wagtaildocs',
'wagtail.wagtailimages',
'wagtail.wagtailsearch',
'wagtail.wagtailadmin',
'wagtail.wagtailcore',
'modelcluster',
'taggit',

'${package}.main',
]

Expand All @@ -41,3 +60,5 @@ THUMBNAIL_SUBDIR = "thumbs"
LOGIN_REDIRECT_URL = "/"

ACCOUNT_ACTIVATION_DAYS = 7

WAGTAIL_SITE_NAME = '${package}'
15 changes: 11 additions & 4 deletions ccnmtldjango/template/requirements.txt
Expand Up @@ -17,7 +17,7 @@ configparser==3.5.0
pycodestyle==2.2.0
flake8==3.2.0
tornado==4.4.2
BeautifulSoup==3.2.1
beautifulsoup4==4.5.1
cssselect==1.0.0
lxml==3.6.4
fuzzywuzzy==0.14.0
Expand Down Expand Up @@ -57,7 +57,6 @@ python-dateutil==2.6.0

djangowind==0.16.0
sorl==3.1
tagging==0.3-pre
typogrify==2.0.7
django-indexer==0.3.0
django-templatetag-sugar==1.0
Expand All @@ -68,13 +67,13 @@ rcssmin==1.0.6 # django-compressor
rjsmin==1.0.12 # django-compressor
django-compressor==2.1
django-statsd-mozilla==0.3.16
raven==5.9.0
raven==5.32.0
django-bootstrap3==7.1.0
django-bootstrap-form==3.2.1
django-debug-toolbar==1.6
django-waffle==0.11.1
django-jenkins==0.110.0
django-smoketest==1.0.0
django-smoketest==1.1.0
django-extensions==1.7.4
django-stagingcontext==0.1.0
django-ga-context==0.1.0
Expand All @@ -90,4 +89,12 @@ django-infranil==1.1.0
django-flatblocks==0.9.3
django-storages-redux==1.3.2

wagtail==1.7
djangorestframework==3.5.3
Willow==0.4
django-modelcluster==2.0
django-taggit==0.21.3
Unidecode==0.04.19
html5lib==0.999999999

ccnmtlsettings==1.2.0

0 comments on commit 778ae46

Please sign in to comment.