diff --git a/examples/wagtaildemo/Procfile b/examples/wagtaildemo/Procfile
new file mode 100644
index 00000000..9f804e6f
--- /dev/null
+++ b/examples/wagtaildemo/Procfile
@@ -0,0 +1 @@
+web: uwsgi --http :$PORT --module wagtaildemo.heroku_wsgi --master --processes 2 --static-map /media/=/app/media/ --offload-threads 1
diff --git a/examples/wagtaildemo/README.md b/examples/wagtaildemo/README.md
index 051cbd46..927a9898 100644
--- a/examples/wagtaildemo/README.md
+++ b/examples/wagtaildemo/README.md
@@ -1,16 +1,22 @@
-Wagtail demo
+[](https://heroku.com/deploy?template=https://github.com/torchbox/wagtaildemo)
+
+Wagtail demo project
=======================
-[Wagtail](http://wagtail.io) is distributed as a Python package, to be incorporated into a Django project via the INSTALLED_APPS setting. To get you up and running quickly, we provide a demo site with all the configuration in place, including a set of example page types.
+This is a demonstration project for [Wagtail CMS](http://wagtail.io).
-Setup (with Vagrant - recommended)
------
+*We do __not__ recommend using this project to start your own site*. This project is only to provide some examples of implementing common features, it is not an exemplar of Django or Wagtail best practice.
-We recommend running Wagtail in a virtual machine using Vagrant, as this ensures that the correct dependencies are in place regardless of how your host machine is set up.
+If you're reasonably new to Python/Django, we suggest you run this project on a Virtual Machine using Vagrant, which helps resolve common software dependency issues. However for more experienced developers, instructions to start this project without Vagrant follow below.
+
+Once you're familiar with the examples in this project and you want to start a real site, we strongly recommend running the ``wagtail start`` command in a fresh virtual environment, explained in the [Wagtail CMS Documentation](http://wagtail.readthedocs.org/en/latest/getting_started/).
+
+Setup with Vagrant
+------------------
### Dependencies
* [VirtualBox](https://www.virtualbox.org/)
-* [Vagrant 1.1+](http://www.vagrantup.com)
+* [Vagrant 1.5+](http://www.vagrantup.com)
### Installation
Run the following commands:
@@ -20,25 +26,11 @@ Run the following commands:
vagrant up
vagrant ssh
(then, within the SSH session:)
- ./manage.py createsuperuser
./manage.py runserver 0.0.0.0:8000
-This will make the app accessible on the host machine as http://localhost:8111/ - you can access the Wagtail admin interface at http://localhost:8111/admin/ . The codebase is located on the host
-machine, exported to the VM as a shared folder; code editing and Git operations will generally be done on the host.
+The demo site will now be accessible at [http://localhost:8000/](http://localhost:8000/) and the Wagtail admin interface at [http://localhost:8000/admin/](http://localhost:8000/admin/) . Log into the admin with the credentials ``admin / changeme``.
-### Developing Wagtail
-The above setup is all you need for trying out the demo site and building Wagtail-powered sites. To develop Wagtail itself, you'll need a working copy of [the Wagtail codebase](https://github.com/torchbox/wagtail) alongside your demo site, shared with your VM so that it is picked up instead of the packaged copy of Wagtail. From the location where you cloned wagtaildemo:
-
- git clone https://github.com/torchbox/wagtail.git
- cd wagtaildemo
- cp Vagrantfile.local.example Vagrantfile.local
- (edit Vagrantfile.local to specify the path to the wagtail codebase, if required)
- cp wagtaildemo/settings/local.py.example wagtaildemo/settings/local.py
- (uncomment the lines from 'import sys' onward, and edit the rest of local.py as appropriate)
-
-If your VM is currently running, you'll then need to run `vagrant halt` followed by `vagrant up` for the changes to take effect.
-
-Setup (without Vagrant)
+Setup without Vagrant
-----
Don't want to set up a whole VM to try out Wagtail? No problem.
@@ -52,15 +44,13 @@ With PostgreSQL running (and configured to allow you to connect as the 'postgres
git clone https://github.com/torchbox/wagtaildemo.git
cd wagtaildemo
- pip install -r requirements/dev.txt
+ pip install -r requirements.txt
createdb -Upostgres wagtaildemo
- ./manage.py syncdb
./manage.py migrate
+ ./manage.py load_initial_data
./manage.py createsuperuser
./manage.py runserver
### SQLite support
-SQLite is supported as an alternative to PostgreSQL - update the DATABASES setting
-in wagtaildemo/settings/base.py to use 'django.db.backends.sqlite3', as you would
-with a regular Django project.
+SQLite is supported as an alternative to PostgreSQL. Before running the `pip install -r requirements.txt` step above, delete the `psycopg2` line in requirements.txt; then, in wagtaildemo/settings/base.py, update the `DATABASES` setting to use `'django.db.backends.sqlite3'` and set `NAME` to be the full path of your database file, as you would with a regular Django project.
diff --git a/examples/wagtaildemo/Vagrantfile b/examples/wagtaildemo/Vagrantfile
index 71342a8a..b0792ccb 100644
--- a/examples/wagtaildemo/Vagrantfile
+++ b/examples/wagtaildemo/Vagrantfile
@@ -1,46 +1,85 @@
# -*- mode: ruby -*-
# vi: set ft=ruby :
-Vagrant::Config.run do |config|
+# All Vagrant configuration is done below. The "2" in Vagrant.configure
+# configures the configuration version (we support older styles for
+# backwards compatibility). Please don't change it unless you know what
+# you're doing.
+Vagrant.configure(2) do |config|
+ # The most common configuration options are documented and commented below.
+ # For a complete reference, please see the online documentation at
+ # https://docs.vagrantup.com.
- # Base box to build off, and download URL for when it doesn't exist on the user's system already
- config.vm.box = "wagtail-base-v0.3"
- config.vm.box_url = "http://downloads.torchbox.com/wagtail-base-v0.3.box"
+ # Every Vagrant development environment requires a box. You can search for
+ # boxes at https://atlas.hashicorp.com/search.
+ config.vm.box = "torchbox/wagtail"
+ config.vm.box_version = "~> 1.0"
- # You can also build from a vanilla precise32 box, although it'll take longer
- # config.vm.box = "precise32"
- # config.vm.box_url = "http://files.vagrantup.com/precise32.box"
+ # Disable automatic box update checking. If you disable this, then
+ # boxes will only be checked for updates when the user runs
+ # `vagrant box outdated`. This is not recommended.
+ # config.vm.box_check_update = false
- # As an alternative to precise32, VMs can be built from the 'django-base' box as defined at
- # https://github.com/torchbox/vagrant-django-base , which has more of the necessary server config
- # baked in and thus takes less time to initialise. To go down this route, you will need to build
- # and host django-base.box yourself, and substitute your own URL below.
- #config.vm.box = "django-base-v2.1"
- #config.vm.box_url = "http://vmimages.torchbox.com/django-base-v2.1.box" # Torchbox-internal URL to django-base.box
-
- # Boot with a GUI so you can see the screen. (Default is headless)
- # config.vm.boot_mode = :gui
-
- # Assign this VM to a host only network IP, allowing you to access it
- # via the IP.
- # config.vm.network "33.33.33.10"
-
- # Forward a port from the guest to the host, which allows for outside
- # computers to access the VM, whereas host only networking does not.
- config.vm.forward_port 8000, 8111
-
- # Share an additional folder to the guest VM. The first argument is
- # an identifier, the second is the path on the guest to mount the
- # folder, and the third is the path on the host to the actual folder.
- config.vm.share_folder "project", "/home/vagrant/wagtaildemo", "."
-
- # Enable provisioning with a shell script.
- config.vm.provision :shell, :path => "etc/install/install.sh", :args => "wagtaildemo"
+ # Create a forwarded port mapping which allows access to a specific port
+ # within the machine from a port on the host machine. In the example below,
+ # accessing "localhost:8000" will access port 8000 on the guest machine.
+ config.vm.network "forwarded_port", guest: 8000, host: 8000
- # If a 'Vagrantfile.local' file exists, import any configuration settings
- # defined there into here. Vagrantfile.local is ignored in version control,
- # so this can be used to add configuration specific to this computer.
- if File.exist? "Vagrantfile.local"
- instance_eval File.read("Vagrantfile.local"), "Vagrantfile.local"
- end
+ # Create a private network, which allows host-only access to the machine
+ # using a specific IP.
+ # config.vm.network "private_network", ip: "192.168.33.10"
+
+ # Create a public network, which generally matched to bridged network.
+ # Bridged networks make the machine appear as another physical device on
+ # your network.
+ # config.vm.network "public_network"
+
+ # Share an additional folder to the guest VM. The first argument is
+ # the path on the host to the actual folder. The second argument is
+ # the path on the guest to mount the folder. And the optional third
+ # argument is a set of non-required options.
+ # config.vm.synced_folder "../data", "/vagrant_data"
+
+ config.vm.synced_folder ".", "/home/vagrant/wagtaildemo"
+
+ # Provider-specific configuration so you can fine-tune various
+ # backing providers for Vagrant. These expose provider-specific options.
+ # Example for VirtualBox:
+ #
+ # config.vm.provider "virtualbox" do |vb|
+ # # Display the VirtualBox GUI when booting the machine
+ # vb.gui = true
+ #
+ # # Customize the amount of memory on the VM:
+ # vb.memory = "1024"
+ # end
+ #
+ # View the documentation for the provider you are using for more
+ # information on available options.
+
+ # Define a Vagrant Push strategy for pushing to Atlas. Other push strategies
+ # such as FTP and Heroku are also available. See the documentation at
+ # https://docs.vagrantup.com/v2/push/atlas.html for more information.
+ # config.push.define "atlas" do |push|
+ # push.app = "YOUR_ATLAS_USERNAME/YOUR_APPLICATION_NAME"
+ # end
+
+ # Enable provisioning with a shell script. Additional provisioners such as
+ # Puppet, Chef, Ansible, Salt, and Docker are also available. Please see the
+ # documentation for more information about their specific syntax and use.
+ # config.vm.provision "shell", inline: <<-SHELL
+ # sudo apt-get update
+ # sudo apt-get install -y apache2
+ # SHELL
+ config.vm.provision :shell, :path => "vagrant/provision.sh"
+
+ # Enable agent forwarding over SSH connections.
+ config.ssh.forward_agent = true
+
+ # If a 'Vagrantfile.local' file exists, import any configuration settings
+ # defined there into here. Vagrantfile.local is ignored in version control,
+ # so this can be used to add configuration specific to this computer.
+ if File.exist? "Vagrantfile.local"
+ instance_eval File.read("Vagrantfile.local"), "Vagrantfile.local"
+ end
end
diff --git a/examples/wagtaildemo/Vagrantfile.local.example b/examples/wagtaildemo/Vagrantfile.local.example
index 99eaff9d..6366f9a1 100644
--- a/examples/wagtaildemo/Vagrantfile.local.example
+++ b/examples/wagtaildemo/Vagrantfile.local.example
@@ -11,8 +11,9 @@
# Clone https://github.com/torchbox/wagtail somewhere convenient, and replace
# "../wagtail" below with the correct path:
-config.vm.share_folder "wagtail", "/home/vagrant/wagtail", "../wagtail"
+config.vm.synced_folder "../wagtail", "/home/vagrant/wagtail"
-# You'll also need to tweak the Python path so that it picks up this instance of
-# Wagtail rather than the packaged one - see wagtaildemo/settings/local.py.example.
+# You'll also need to configure your Python environment within the VM to pick up this
+# instance of Wagtail rather than the packaged one; usually this is done by running
+# `./setup.py develop` within the checked-out Wagtail codebase.
diff --git a/examples/wagtaildemo/app.json b/examples/wagtaildemo/app.json
new file mode 100644
index 00000000..e4ceb028
--- /dev/null
+++ b/examples/wagtaildemo/app.json
@@ -0,0 +1,16 @@
+{
+ "name": "Wagtaildemo",
+ "description": "Wagtaildemo",
+ "repository": "https://github.com/torchbox/wagtaildemo",
+ "logo": "http://wagtail.io/static/wagtailsite/images/navlogo2.png",
+ "keywords": ["wagtail", "django"],
+ "env": {
+ "DJANGO_SETTINGS_MODULE": "wagtaildemo.settings.heroku"
+ },
+ "scripts": {
+ "postdeploy": "django-admin.py migrate && django-admin.py load_initial_data && echo 'from wagtail.wagtailimages.models import Rendition; Rendition.objects.all().delete()' | django-admin.py shell"
+ },
+ "addons": [
+ "heroku-postgresql:hobby-dev"
+ ]
+}
diff --git a/examples/wagtaildemo/bin/post_compile b/examples/wagtaildemo/bin/post_compile
new file mode 100644
index 00000000..366847d7
--- /dev/null
+++ b/examples/wagtaildemo/bin/post_compile
@@ -0,0 +1,8 @@
+# Copy image files into media folder
+mkdir -p media/original_images
+cp demo/fixtures/images/* media/original_images/
+
+# dj shortcut
+if ! command -v dj; then
+ ln -s /app/.heroku/python/bin/django-admin /app/.heroku/python/bin/dj
+fi
diff --git a/examples/wagtaildemo/demo/fixtures/demo.json b/examples/wagtaildemo/demo/fixtures/demo.json
index 86732b8a..4fe0d79d 100644
--- a/examples/wagtaildemo/demo/fixtures/demo.json
+++ b/examples/wagtaildemo/demo/fixtures/demo.json
@@ -592,6 +592,15 @@
"page": 17
}
},
+{
+ "pk": 2,
+ "model": "demo.advert",
+ "fields": {
+ "url": "",
+ "text": "Contact",
+ "page": 12
+ }
+},
{
"pk": 5,
"model": "demo.blogindexpage",
@@ -615,7 +624,7 @@
"pk": 16,
"model": "demo.blogpage",
"fields": {
- "body": "
mtDNA cytochrome b and NADH dehydrogenase subunit 2 sequence data (Voelker, 2002) is of limited use: the suspicion that there is a superspecies of probably 3 white-bellied, black-throated wagtails is confirmed. Also, there is another superspecies in sub-Saharan Africa, three white-throated species with a black breast-band. The remaining five species are highly variable morphologically and their relationships with each other and with the two clades have not yet been satisfactorily explained.
The origin of the genus appears to be in the general area of Eastern Siberia/Mongolia. Wagtails spread rapidly across Eurasia and dispersed to Africa in the Zanclean (Early Pliocene) where the sub-Saharan lineage was later isolated. The African Pied Wagtail (and possibly the Mekong Wagtail) diverged prior to the massive radiation of the white-bellied black-throated and most yellow-bellied forms, all of which took place during the late Piacenzian (early Late Pliocene), c. 3 mya.
mtDNA cytochrome b and NADH dehydrogenase subunit 2 sequence data (Voelker, 2002) is of limited use: the suspicion that there is a superspecies of probably 3 white-bellied, black-throated wagtails is confirmed. Also, there is another superspecies in sub-Saharan Africa, three white-throated species with a black breast-band. The remaining five species are highly variable morphologically and their relationships with each other and with the two clades have not yet been satisfactorily explained.
The origin of the genus appears to be in the general area of Eastern Siberia/Mongolia. Wagtails spread rapidly across Eurasia and dispersed to Africa in the Zanclean (Early Pliocene) where the sub-Saharan lineage was later isolated. The African Pied Wagtail (and possibly the Mekong Wagtail) diverged prior to the massive radiation of the white-bellied black-throated and most yellow-bellied forms, all of which took place during the late Piacenzian (early Late Pliocene), c. 3 mya.
mtDNA cytochrome b and NADH dehydrogenase subunit 2 sequence data (Voelker, 2002) is of limited use: the suspicion that there is a superspecies of probably 3 white-bellied, black-throated wagtails is confirmed. Also, there is another superspecies in sub-Saharan Africa, three white-throated species with a black breast-band. The remaining five species are highly variable morphologically and their relationships with each other and with the two clades have not yet been satisfactorily explained.
The origin of the genus appears to be in the general area of Eastern Siberia/Mongolia. Wagtails spread rapidly across Eurasia and dispersed to Africa in the Zanclean (Early Pliocene) where the sub-Saharan lineage was later isolated. The African Pied Wagtail (and possibly the Mekong Wagtail) diverged prior to the massive radiation of the white-bellied black-throated and most yellow-bellied forms, all of which took place during the late Piacenzian (early Late Pliocene), c. 3 mya.
mtDNA cytochrome b and NADH dehydrogenase subunit 2 sequence data (Voelker, 2002) is of limited use: the suspicion that there is a superspecies of probably 3 white-bellied, black-throated wagtails is confirmed. Also, there is another superspecies in sub-Saharan Africa, three white-throated species with a black breast-band. The remaining five species are highly variable morphologically and their relationships with each other and with the two clades have not yet been satisfactorily explained.
\"}, {\"type\": \"paragraph\", \"value\": \"
The origin of the genus appears to be in the general area of Eastern Siberia/Mongolia. Wagtails spread rapidly across Eurasia and dispersed to Africa in the Zanclean (Early Pliocene) where the sub-Saharan lineage was later isolated. The African Pied Wagtail (and possibly the Mekong Wagtail) diverged prior to the massive radiation of the white-bellied black-throated and most yellow-bellied forms, all of which took place during the late Piacenzian (early Late Pliocene), c. 3 mya.
mtDNA cytochrome b and NADH dehydrogenase subunit 2 sequence data (Voelker, 2002) is of limited use: the suspicion that there is a superspecies of probably 3 white-bellied, black-throated wagtails is confirmed. Also, there is another superspecies in sub-Saharan Africa, three white-throated species with a black breast-band. The remaining five species are highly variable morphologically and their relationships with each other and with the two clades have not yet been satisfactorily explained.
\"}, {\"type\": \"paragraph\", \"value\": \"
The origin of the genus appears to be in the general area of Eastern Siberia/Mongolia. Wagtails spread rapidly across Eurasia and dispersed to Africa in the Zanclean (Early Pliocene) where the sub-Saharan lineage was later isolated. The African Pied Wagtail (and possibly the Mekong Wagtail) diverged prior to the massive radiation of the white-bellied black-throated and most yellow-bellied forms, all of which took place during the late Piacenzian (early Late Pliocene), c. 3 mya.
mtDNA cytochrome b and NADH dehydrogenase subunit 2 sequence data (Voelker, 2002) is of limited use: the suspicion that there is a superspecies of probably 3 white-bellied, black-throated wagtails is confirmed. Also, there is another superspecies in sub-Saharan Africa, three white-throated species with a black breast-band. The remaining five species are highly variable morphologically and their relationships with each other and with the two clades have not yet been satisfactorily explained.
mtDNA cytochrome b and NADH dehydrogenase subunit 2 sequence data (Voelker, 2002) is of limited use: the suspicion that there is a superspecies of probably 3 white-bellied, black-throated wagtails is confirmed. Also, there is another superspecies in sub-Saharan Africa, three white-throated species with a black breast-band. The remaining five species are highly variable morphologically and their relationships with each other and with the two clades have not yet been satisfactorily explained.
\"}, {\"type\": \"pullquote\", \"value\": {\"quote\": \"There is another superspecies in sub-Saharan Africa, three white-throated species with a black breast-band\", \"attribution\": \"Wikipedia\"}}, {\"type\": \"paragraph\", \"value\": \"
mtDNA cytochrome b and NADH dehydrogenase subunit 2 sequence data (Voelker, 2002) is of limited use: the suspicion that there is a superspecies of probably 3 white-bellied, black-throated wagtails is confirmed. Also, there is another superspecies in sub-Saharan Africa, three white-throated species with a black breast-band. The remaining five species are highly variable morphologically and their relationships with each other and with the two clades have not yet been satisfactorily explained.
Wagtails are slender, often colourful, ground-feeding insectivores of open country in the Old World. They are ground nesters, laying up to six speckled eggs at a time. Among their most conspicuous behaviours is a near constant tail wagging, a trait that has given the birds their common name. In spite of the ubiquity of the behaviour and observations of it, the reasons for it are poorly understood. It has been suggested that it may flush up prey, or that it may signal submissiveness to other wagtails. Recent studies have suggested instead that it is a signal of vigilance that may aid to deter potential predators.
At first glance, the wagtails appear to be divided into a yellow-bellied group and a white-bellied one, or one where the upper head is black and another where it is usually gray, but may be olive, yellow, or other colours. However, these are not evolutionary lineages; change of belly colour and increase of melanin have occurred independently several times in the wagtails, and the colour patterns which actually indicate relationships are more subtle.
mtDNA cytochrome b and NADH dehydrogenase subunit 2 sequence data (Voelker, 2002) is of limited use: the suspicion that there is a superspecies of probably 3 white-bellied, black-throated wagtails is confirmed. Also, there is another superspecies in sub-Saharan Africa, three white-throated species with a black breast-band. The remaining five species are highly variable morphologically and their relationships with each other and with the two clades have not yet been satisfactorily explained.
The origin of the genus appears to be in the general area of Eastern Siberia/Mongolia. Wagtails spread rapidly across Eurasia and dispersed to Africa in the Zanclean (Early Pliocene) where the sub-Saharan lineage was later isolated. The African Pied Wagtail (and possibly the Mekong Wagtail) diverged prior to the massive radiation of the white-bellied black-throated and most yellow-bellied forms, all of which took place during the late Piacenzian (early Late Pliocene), c. 3 mya.
Three species are poly- or paraphyletic in the present taxonomical arrangement and either subspecies need to be reassigned and/or species split up. The Blue-headed Wagtail (AKA Yellow Wagtail and many other names), especially, has always been a taxonomical nightmare with over a dozen currently accepted subspecies and many more invalid ones. The two remaining \"monochrome\" species, Mekong and African Pied Wagtail may be closely related, or a most striking example of convergent evolution.
Prehistoric wagtails known from fossils are Motacilla humata and Motacilla major.
See the species accounts for more on individual species' relationships.
mtDNA cytochrome b and NADH dehydrogenase subunit 2 sequence data (Voelker, 2002) is of limited use: the suspicion that there is a superspecies of probably 3 white-bellied, black-throated wagtails is confirmed. Also, there is another superspecies in sub-Saharan Africa, three white-throated species with a black breast-band. The remaining five species are highly variable morphologically and their relationships with each other and with the two clades have not yet been satisfactorily explained.
\"}, {\"type\": \"paragraph\", \"value\": \"
The origin of the genus appears to be in the general area of Eastern Siberia/Mongolia. Wagtails spread rapidly across Eurasia and dispersed to Africa in the Zanclean (Early Pliocene) where the sub-Saharan lineage was later isolated. The African Pied Wagtail (and possibly the Mekong Wagtail) diverged prior to the massive radiation of the white-bellied black-throated and most yellow-bellied forms, all of which took place during the late Piacenzian (early Late Pliocene), c. 3 mya.
mtDNA cytochrome b and NADH dehydrogenase subunit 2 sequence data (Voelker, 2002) is of limited use: the suspicion that there is a superspecies of probably 3 white-bellied, black-throated wagtails is confirmed. Also, there is another superspecies in sub-Saharan Africa, three white-throated species with a black breast-band. The remaining five species are highly variable morphologically and their relationships with each other and with the two clades have not yet been satisfactorily explained.
\"}, {\"type\": \"paragraph\", \"value\": \"
The origin of the genus appears to be in the general area of Eastern Siberia/Mongolia. Wagtails spread rapidly across Eurasia and dispersed to Africa in the Zanclean (Early Pliocene) where the sub-Saharan lineage was later isolated. The African Pied Wagtail (and possibly the Mekong Wagtail) diverged prior to the massive radiation of the white-bellied black-throated and most yellow-bellied forms, all of which took place during the late Piacenzian (early Late Pliocene), c. 3 mya.
mtDNA cytochrome b and NADH dehydrogenase subunit 2 sequence data (Voelker, 2002) is of limited use: the suspicion that there is a superspecies of probably 3 white-bellied, black-throated wagtails is confirmed. Also, there is another superspecies in sub-Saharan Africa, three white-throated species with a black breast-band. The remaining five species are highly variable morphologically and their relationships with each other and with the two clades have not yet been satisfactorily explained.
mtDNA cytochrome b and NADH dehydrogenase subunit 2 sequence data (Voelker, 2002) is of limited use: the suspicion that there is a superspecies of probably 3 white-bellied, black-throated wagtails is confirmed. Also, there is another superspecies in sub-Saharan Africa, three white-throated species with a black breast-band. The remaining five species are highly variable morphologically and their relationships with each other and with the two clades have not yet been satisfactorily explained.
\"}, {\"type\": \"pullquote\", \"value\": {\"quote\": \"There is another superspecies in sub-Saharan Africa, three white-throated species with a black breast-band\", \"attribution\": \"Wikipedia\"}}, {\"type\": \"paragraph\", \"value\": \"
mtDNA cytochrome b and NADH dehydrogenase subunit 2 sequence data (Voelker, 2002) is of limited use: the suspicion that there is a superspecies of probably 3 white-bellied, black-throated wagtails is confirmed. Also, there is another superspecies in sub-Saharan Africa, three white-throated species with a black breast-band. The remaining five species are highly variable morphologically and their relationships with each other and with the two clades have not yet been satisfactorily explained.
Wagtails are slender, often colourful, ground-feeding insectivores of open country in the Old World. They are ground nesters, laying up to six speckled eggs at a time. Among their most conspicuous behaviours is a near constant tail wagging, a trait that has given the birds their common name. In spite of the ubiquity of the behaviour and observations of it, the reasons for it are poorly understood. It has been suggested that it may flush up prey, or that it may signal submissiveness to other wagtails. Recent studies have suggested instead that it is a signal of vigilance that may aid to deter potential predators.
At first glance, the wagtails appear to be divided into a yellow-bellied group and a white-bellied one, or one where the upper head is black and another where it is usually gray, but may be olive, yellow, or other colours. However, these are not evolutionary lineages; change of belly colour and increase of melanin have occurred independently several times in the wagtails, and the colour patterns which actually indicate relationships are more subtle.
mtDNA cytochrome b and NADH dehydrogenase subunit 2 sequence data (Voelker, 2002) is of limited use: the suspicion that there is a superspecies of probably 3 white-bellied, black-throated wagtails is confirmed. Also, there is another superspecies in sub-Saharan Africa, three white-throated species with a black breast-band. The remaining five species are highly variable morphologically and their relationships with each other and with the two clades have not yet been satisfactorily explained.
The origin of the genus appears to be in the general area of Eastern Siberia/Mongolia. Wagtails spread rapidly across Eurasia and dispersed to Africa in the Zanclean (Early Pliocene) where the sub-Saharan lineage was later isolated. The African Pied Wagtail (and possibly the Mekong Wagtail) diverged prior to the massive radiation of the white-bellied black-throated and most yellow-bellied forms, all of which took place during the late Piacenzian (early Late Pliocene), c. 3 mya.
Three species are poly- or paraphyletic in the present taxonomical arrangement and either subspecies need to be reassigned and/or species split up. The Blue-headed Wagtail (AKA Yellow Wagtail and many other names), especially, has always been a taxonomical nightmare with over a dozen currently accepted subspecies and many more invalid ones. The two remaining \"monochrome\" species, Mekong and African Pied Wagtail may be closely related, or a most striking example of convergent evolution.
Prehistoric wagtails known from fossils are Motacilla humata and Motacilla major.
See the species accounts for more on individual species' relationships.
mtDNA cytochrome b and NADH dehydrogenase subunit 2 sequence data (Voelker, 2002) is of limited use: the suspicion that there is a superspecies of probably 3 white-bellied, black-throated wagtails is confirmed. Also, there is another superspecies in sub-Saharan Africa, three white-throated species with a black breast-band. The remaining five species are highly variable morphologically and their relationships with each other and with the two clades have not yet been satisfactorily explained.
\"}, {\"type\": \"paragraph\", \"value\": \"
The origin of the genus appears to be in the general area of Eastern Siberia/Mongolia. Wagtails spread rapidly across Eurasia and dispersed to Africa in the Zanclean (Early Pliocene) where the sub-Saharan lineage was later isolated. The African Pied Wagtail (and possibly the Mekong Wagtail) diverged prior to the massive radiation of the white-bellied black-throated and most yellow-bellied forms, all of which took place during the late Piacenzian (early Late Pliocene), c. 3 mya.
mtDNA cytochrome b and NADH dehydrogenase subunit 2 sequence data (Voelker, 2002) is of limited use: the suspicion that there is a superspecies of probably 3 white-bellied, black-throated wagtails is confirmed. Also, there is another superspecies in sub-Saharan Africa, three white-throated species with a black breast-band. The remaining five species are highly variable morphologically and their relationships with each other and with the two clades have not yet been satisfactorily explained.
\"}, {\"type\": \"paragraph\", \"value\": \"
The origin of the genus appears to be in the general area of Eastern Siberia/Mongolia. Wagtails spread rapidly across Eurasia and dispersed to Africa in the Zanclean (Early Pliocene) where the sub-Saharan lineage was later isolated. The African Pied Wagtail (and possibly the Mekong Wagtail) diverged prior to the massive radiation of the white-bellied black-throated and most yellow-bellied forms, all of which took place during the late Piacenzian (early Late Pliocene), c. 3 mya.
mtDNA cytochrome b and NADH dehydrogenase subunit 2 sequence data (Voelker, 2002) is of limited use: the suspicion that there is a superspecies of probably 3 white-bellied, black-throated wagtails is confirmed. Also, there is another superspecies in sub-Saharan Africa, three white-throated species with a black breast-band. The remaining five species are highly variable morphologically and their relationships with each other and with the two clades have not yet been satisfactorily explained.
mtDNA cytochrome b and NADH dehydrogenase subunit 2 sequence data (Voelker, 2002) is of limited use: the suspicion that there is a superspecies of probably 3 white-bellied, black-throated wagtails is confirmed. Also, there is another superspecies in sub-Saharan Africa, three white-throated species with a black breast-band. The remaining five species are highly variable morphologically and their relationships with each other and with the two clades have not yet been satisfactorily explained.
\"}, {\"type\": \"pullquote\", \"value\": {\"quote\": \"There is another superspecies in sub-Saharan Africa, three white-throated species with a black breast-band\", \"attribution\": \"Wikipedia\"}}, {\"type\": \"paragraph\", \"value\": \"
mtDNA cytochrome b and NADH dehydrogenase subunit 2 sequence data (Voelker, 2002) is of limited use: the suspicion that there is a superspecies of probably 3 white-bellied, black-throated wagtails is confirmed. Also, there is another superspecies in sub-Saharan Africa, three white-throated species with a black breast-band. The remaining five species are highly variable morphologically and their relationships with each other and with the two clades have not yet been satisfactorily explained.
Wagtails are slender, often colourful, ground-feeding insectivores of open country in the Old World. They are ground nesters, laying up to six speckled eggs at a time. Among their most conspicuous behaviours is a near constant tail wagging, a trait that has given the birds their common name. In spite of the ubiquity of the behaviour and observations of it, the reasons for it are poorly understood. It has been suggested that it may flush up prey, or that it may signal submissiveness to other wagtails. Recent studies have suggested instead that it is a signal of vigilance that may aid to deter potential predators.
"
+ "body": "[{\"type\": \"intro\", \"value\": \"
Wagtails are slender, often colourful, ground-feeding insectivores of open country in the Old World.\\u00a0
\"}, {\"type\": \"paragraph\", \"value\": \"
They are ground nesters, laying up to six speckled eggs at a time. Among their most conspicuous behaviours is a near constant tail wagging, a trait that has given the birds their common name.\\u00a0
\"}, {\"type\": \"paragraph\", \"value\": \"
In spite of the ubiquity of the behaviour and observations of it, the reasons for it are poorly understood. It has been suggested that it may flush up prey, or that it may signal submissiveness to other wagtails. Recent studies have suggested instead that it is a signal of vigilance that may aid to deter potential predators.
+{% endblock %}
{% block content %}
{% include "demo/includes/carousel.html" with carousel_items=self.carousel_items.all only %}
- {% include "demo/includes/body.html" with body=self.body only %}
-
- {% with self.tags.all as tags %}
- {% if tags %}
-
Tags
- {% for tag in tags %}
-
- {% endfor %}
- {% endif %}
- {% endwith %}
+ {% if self.body %}
+
+ {% include "demo/includes/streamfield.html" with content=self.body %}
+
+ {% endif %}
{% include "demo/includes/related_links.html" with related_links=self.related_links.all only %}
{% endblock %}
diff --git a/examples/wagtaildemo/demo/templates/demo/contact_page.html b/examples/wagtaildemo/demo/templates/demo/contact_page.html
index 8f631e27..2cdb993b 100644
--- a/examples/wagtaildemo/demo/templates/demo/contact_page.html
+++ b/examples/wagtaildemo/demo/templates/demo/contact_page.html
@@ -1,19 +1,22 @@
{% extends "demo/base.html" %}
-{% load demo_tags %}
+{% load demo_tags wagtailcore_tags %}
{% block content %}
- {% include "demo/includes/body.html" with body=self.body only %}
+ {% if self.body %}
+
+ {{ self.body|richtext }}
+
+ {% endif %}
{% include "demo/includes/contact.html" with contact=self only %}
{% if self.post_code %}
-
- {% get_googe_maps_key as google_maps_key %}
-
{% endif %}
{% if self.signup_link %}
@@ -30,7 +30,11 @@
{% include "demo/includes/carousel.html" with carousel_items=self.carousel_items.all only %}
- {% include "demo/includes/body.html" with body=self.body only %}
+ {% if self.body %}
+
+ {{ self.body|richtext }}
+
+ {% endif %}
{% with self.speakers.all as speakers %}
{% if speakers %}
diff --git a/examples/wagtaildemo/demo/templates/demo/home_page.html b/examples/wagtaildemo/demo/templates/demo/home_page.html
index 1ca1cfaf..929ac55d 100644
--- a/examples/wagtaildemo/demo/templates/demo/home_page.html
+++ b/examples/wagtaildemo/demo/templates/demo/home_page.html
@@ -2,10 +2,25 @@
{% load demo_tags %}
+{% block heading %}
+
+
Wagtail Demo
+
A set of demo templates to show you what Wagtail can do.
+ {% block search_box %}
+ {% include "demo/includes/search_box.html" only %}
+ {% endblock %}
+
+{% endblock %}
+
+
{% block content %}
{% include "demo/includes/carousel.html" with carousel_items=self.carousel_items.all only %}
- {% include "demo/includes/body.html" with body=self.body only %}
+ {% if self.body %}
+
+ {% include "demo/includes/streamfield.html" with content=self.body %}
+
+ {% endif %}
{% person_listing_homepage %}
diff --git a/examples/wagtaildemo/demo/templates/demo/includes/blog_list_item.html b/examples/wagtaildemo/demo/templates/demo/includes/blog_list_item.html
index 09d528a5..42563aa7 100644
--- a/examples/wagtaildemo/demo/templates/demo/includes/blog_list_item.html
+++ b/examples/wagtaildemo/demo/templates/demo/includes/blog_list_item.html
@@ -2,16 +2,19 @@
{# Individual blog item in a list - used on blog index and home page #}
-
+ {% if carousel_item.embed_url %}
+ {# Embedded video - requires an embedly key to be stored in wagtaildemo/settings/local.py #}
+
+ {% embed carousel_item.embed_url 1000 %}
+
+ {% else %}
+ {# Carousel image - first store image as a variable in order to construct an image tag with a title applied (title is used by bxslider js to construct the caption) #}
+ {% image carousel_item.image width-1000 as carouselimagedata %}
+
+ {% endif %}
+ {% if carousel_item.caption or carousel_item.link %}
+
+
{{ carousel_item.caption }}
+ {% if carousel_item.link %}
+ Open
+ {% endif %}
+
{% endif %}
diff --git a/examples/wagtaildemo/demo/templates/demo/includes/event_list_item.html b/examples/wagtaildemo/demo/templates/demo/includes/event_list_item.html
index 583a3e9e..b33893af 100644
--- a/examples/wagtaildemo/demo/templates/demo/includes/event_list_item.html
+++ b/examples/wagtaildemo/demo/templates/demo/includes/event_list_item.html
@@ -2,16 +2,19 @@
{# Individual event item in a list - used on event index and home page #}
-
+
diff --git a/examples/wagtaildemo/demo/templates/demo/includes/person_list_item.html b/examples/wagtaildemo/demo/templates/demo/includes/person_list_item.html
new file mode 100644
index 00000000..6c2f2ed1
--- /dev/null
+++ b/examples/wagtaildemo/demo/templates/demo/includes/person_list_item.html
@@ -0,0 +1,19 @@
+{% load wagtailcore_tags wagtailimages_tags %}
+
+{# Individual person item in a list - used on people index and home page #}
+
+
\ No newline at end of file
diff --git a/examples/wagtaildemo/demo/templates/demo/person_page.html b/examples/wagtaildemo/demo/templates/demo/person_page.html
index 6c8496fb..944ffbfe 100644
--- a/examples/wagtaildemo/demo/templates/demo/person_page.html
+++ b/examples/wagtaildemo/demo/templates/demo/person_page.html
@@ -1,20 +1,22 @@
{% extends "demo/base.html" %}
-{% load wagtailimages_tags %}
+{% load wagtailcore_tags wagtailimages_tags %}
{% block content %}
{% include "demo/includes/intro.html" with intro=self.intro only %}
{% if self.image %}
- {# Person image - first store image as a variable in order to construct an image tag with a class applied #}
- {% image self.image width-300 as photo %}
-
+ {% image self.image width-300 class="img-thumbnail" %}
{% endif %}
{% if self.biography %}
Biography
{% endif %}
- {% include "demo/includes/body.html" with body=self.biography only %}
+ {% if self.body %}
+
+ {{ self.body|richtext }}
+
+ {% endif %}
{% include "demo/includes/contact.html" with contact=self only %}
diff --git a/examples/wagtaildemo/demo/templates/demo/search_results.html b/examples/wagtaildemo/demo/templates/demo/search_results.html
index 22c637c0..31a02c81 100644
--- a/examples/wagtaildemo/demo/templates/demo/search_results.html
+++ b/examples/wagtaildemo/demo/templates/demo/search_results.html
@@ -1,41 +1,44 @@
{% extends "demo/base.html" %}
{% load wagtailcore_tags %}
-{% block title %}Search{% if search_results %} Results{% endif %}{% endblock %}
+{% block title %}Search{% if search_results %} results{% endif %}{% endblock %}
-{% block search_box %}
- {% include "demo/includes/search_box.html" with query_string=query_string only %}
+{% block heading %}
+
+ Search results{% if request.GET.query %} for “{{ request.GET.query }}”{% endif %}
+
{% endblock %}
+
{% block content %}
-
Search Results{% if request.GET.q %} for {{ request.GET.q }}{% endif %}
-
- {% with query.editors_picks.all as editors_picks %}
- {% if editors_picks %}
-
- {% for blog in blogs %}
- {% include "demo/includes/blog_list_item.html" %}
- {% endfor %}
+ {% for blog in blogs %}
+ {% include "demo/includes/blog_list_item.html" %}
+ {% endfor %}
+
{% endif %}
diff --git a/examples/wagtaildemo/demo/templates/demo/tags/breadcrumbs.html b/examples/wagtaildemo/demo/templates/demo/tags/breadcrumbs.html
new file mode 100644
index 00000000..b75cc276
--- /dev/null
+++ b/examples/wagtaildemo/demo/templates/demo/tags/breadcrumbs.html
@@ -0,0 +1,13 @@
+{% load wagtailcore_tags %}
+
+{% if ancestors %}
+
+ {% for ancestor in ancestors %}
+ {% if forloop.last %}
+
-{% endif %}
-
\ No newline at end of file
diff --git a/examples/wagtaildemo/demo/templates/demo/tags/top_menu.html b/examples/wagtaildemo/demo/templates/demo/tags/top_menu.html
index 3c847d11..6550772b 100644
--- a/examples/wagtaildemo/demo/templates/demo/tags/top_menu.html
+++ b/examples/wagtaildemo/demo/templates/demo/tags/top_menu.html
@@ -12,12 +12,14 @@
{# Link to home page #}
- {{ site_root.title }}
+
+
+
diff --git a/examples/wagtaildemo/demo/templatetags/demo_tags.py b/examples/wagtaildemo/demo/templatetags/demo_tags.py
index 63695109..21ad7aa9 100644
--- a/examples/wagtaildemo/demo/templatetags/demo_tags.py
+++ b/examples/wagtaildemo/demo/templatetags/demo_tags.py
@@ -2,14 +2,14 @@ from datetime import date
from django import template
from django.conf import settings
-from demo.models import *
+from demo.models import PersonPage, BlogPage, EventPage, Advert, Page
register = template.Library()
# settings value
@register.assignment_tag
-def get_googe_maps_key():
+def get_google_maps_key():
return getattr(settings, 'GOOGLE_MAPS_KEY', "")
@@ -21,10 +21,7 @@ def get_site_root(context):
def has_menu_children(page):
- if page.get_children().filter(live=True, show_in_menus=True):
- return True
- else:
- return False
+ return page.get_children().live().in_menu().exists()
# Retrieves the top menu items - the immediate children of the parent page
@@ -32,12 +29,14 @@ def has_menu_children(page):
# a dropdown class to be applied to a parent
@register.inclusion_tag('demo/tags/top_menu.html', takes_context=True)
def top_menu(context, parent, calling_page=None):
- menuitems = parent.get_children().filter(
- live=True,
- show_in_menus=True
- )
+ menuitems = parent.get_children().live().in_menu()
for menuitem in menuitems:
menuitem.show_dropdown = has_menu_children(menuitem)
+ # We don't directly check if calling_page is None since the template
+ # engine can pass an empty string to calling_page
+ # if the variable passed as calling_page does not exist.
+ menuitem.active = (calling_page.url.startswith(menuitem.url)
+ if calling_page else False)
return {
'calling_page': calling_page,
'menuitems': menuitems,
@@ -50,10 +49,7 @@ def top_menu(context, parent, calling_page=None):
@register.inclusion_tag('demo/tags/top_menu_children.html', takes_context=True)
def top_menu_children(context, parent):
menuitems_children = parent.get_children()
- menuitems_children = menuitems_children.filter(
- live=True,
- show_in_menus=True
- )
+ menuitems_children = menuitems_children.live().in_menu()
return {
'parent': parent,
'menuitems_children': menuitems_children,
@@ -62,30 +58,6 @@ def top_menu_children(context, parent):
}
-# Retrieves the secondary links for the 'also in this section' links
-# - either the children or siblings of the current page
-@register.inclusion_tag('demo/tags/secondary_menu.html', takes_context=True)
-def secondary_menu(context, calling_page=None):
- pages = []
- if calling_page:
- pages = calling_page.get_children().filter(
- live=True,
- show_in_menus=True
- )
-
- # If no children, get siblings instead
- if len(pages) == 0:
- pages = calling_page.get_siblings(inclusive=False).filter(
- live=True,
- show_in_menus=True
- )
- return {
- 'pages': pages,
- # required by the pageurl tag that we want to use within this template
- 'request': context['request'],
- }
-
-
# Retrieves all live pages which are children of the calling page
#for standard index listing
@register.inclusion_tag(
@@ -93,7 +65,7 @@ def secondary_menu(context, calling_page=None):
takes_context=True
)
def standard_index_listing(context, calling_page):
- pages = calling_page.get_children().filter(live=True)
+ pages = calling_page.get_children().live()
return {
'pages': pages,
# required by the pageurl tag that we want to use within this template
@@ -107,9 +79,9 @@ def standard_index_listing(context, calling_page):
takes_context=True
)
def person_listing_homepage(context, count=2):
- people = PersonPage.objects.filter(live=True).order_by('?')
+ people = PersonPage.objects.live().order_by('?')
return {
- 'people': people[:count],
+ 'people': people[:count].select_related('feed_image'),
# required by the pageurl tag that we want to use within this template
'request': context['request'],
}
@@ -121,9 +93,9 @@ def person_listing_homepage(context, count=2):
takes_context=True
)
def blog_listing_homepage(context, count=2):
- blogs = BlogPage.objects.filter(live=True).order_by('-date')
+ blogs = BlogPage.objects.live().order_by('-date')
return {
- 'blogs': blogs[:count],
+ 'blogs': blogs[:count].select_related('feed_image'),
# required by the pageurl tag that we want to use within this template
'request': context['request'],
}
@@ -135,10 +107,10 @@ def blog_listing_homepage(context, count=2):
takes_context=True
)
def event_listing_homepage(context, count=2):
- events = EventPage.objects.filter(live=True)
+ events = EventPage.objects.live()
events = events.filter(date_from__gte=date.today()).order_by('date_from')
return {
- 'events': events[:count],
+ 'events': events[:count].select_related('feed_image'),
# required by the pageurl tag that we want to use within this template
'request': context['request'],
}
@@ -148,41 +120,21 @@ def event_listing_homepage(context, count=2):
@register.inclusion_tag('demo/tags/adverts.html', takes_context=True)
def adverts(context):
return {
- 'adverts': Advert.objects.all(),
+ 'adverts': Advert.objects.select_related('page'),
'request': context['request'],
}
-# Format times e.g. on event page
-@register.filter
-def time_display(time):
- # Get hour and minute from time object
- hour = time.hour
- minute = time.minute
-
- # Convert to 12 hour format
- if hour >= 12:
- pm = True
- hour -= 12
+@register.inclusion_tag('demo/tags/breadcrumbs.html', takes_context=True)
+def breadcrumbs(context):
+ self = context.get('self')
+ if self is None or self.depth <= 2:
+ # When on the home page, displaying breadcrumbs is irrelevant.
+ ancestors = ()
else:
- pm = False
- if hour == 0:
- hour = 12
-
- # Hour string
- hour_string = str(hour)
-
- # Minute string
- if minute != 0:
- minute_string = "." + str(minute)
- else:
- minute_string = ""
-
- # PM string
- if pm:
- pm_string = "pm"
- else:
- pm_string = "am"
-
- # Join and return
- return "".join([hour_string, minute_string, pm_string])
+ ancestors = Page.objects.ancestor_of(
+ self, inclusive=True).filter(depth__gt=2)
+ return {
+ 'ancestors': ancestors,
+ 'request': context['request'],
+ }
diff --git a/examples/wagtaildemo/demo/utils.py b/examples/wagtaildemo/demo/utils.py
index 1f170cb6..ff7a4a99 100644
--- a/examples/wagtaildemo/demo/utils.py
+++ b/examples/wagtaildemo/demo/utils.py
@@ -52,7 +52,8 @@ def export_event(event, format='ical'):
return string
# Make a uid
- uid = hashlib.sha1(event.url + str(start_datetime)).hexdigest() + '@wagtaildemo'
+ event_string = event.url + str(start_datetime)
+ uid = hashlib.sha1(event_string.encode('utf-8')).hexdigest() + '@wagtaildemo'
# Make event
ical_components.extend([
diff --git a/examples/wagtaildemo/demo/views.py b/examples/wagtaildemo/demo/views.py
new file mode 100644
index 00000000..18decec6
--- /dev/null
+++ b/examples/wagtaildemo/demo/views.py
@@ -0,0 +1,45 @@
+from django.shortcuts import render
+from django.core.paginator import Paginator, EmptyPage, PageNotAnInteger
+
+from wagtail.wagtailcore.models import Page
+from wagtail.wagtailsearch.models import Query
+
+try:
+ # Wagtail >= 1.1
+ from wagtail.contrib.wagtailsearchpromotions.models import SearchPromotion
+except ImportError:
+ # Wagtail < 1.1
+ from wagtail.wagtailsearch.models import EditorsPick as SearchPromotion
+
+
+def search(request):
+ # Search
+ search_query = request.GET.get('query', None)
+ if search_query:
+ search_results = Page.objects.live().search(search_query)
+ query = Query.get(search_query)
+
+ # Record hit
+ query.add_hit()
+
+ # Get search picks
+ search_picks = query.editors_picks.all()
+ else:
+ search_results = Page.objects.none()
+ search_picks = SearchPromotion.objects.none()
+
+ # Pagination
+ page = request.GET.get('page', 1)
+ paginator = Paginator(search_results, 10)
+ try:
+ search_results = paginator.page(page)
+ except PageNotAnInteger:
+ search_results = paginator.page(1)
+ except EmptyPage:
+ search_results = paginator.page(paginator.num_pages)
+
+ return render(request, 'demo/search_results.html', {
+ 'search_query': search_query,
+ 'search_results': search_results,
+ 'search_picks': search_picks,
+ })
diff --git a/examples/wagtaildemo/demo/wagtail_hooks.py b/examples/wagtaildemo/demo/wagtail_hooks.py
new file mode 100644
index 00000000..f0d05146
--- /dev/null
+++ b/examples/wagtaildemo/demo/wagtail_hooks.py
@@ -0,0 +1,8 @@
+from django.utils.html import format_html
+from django.conf import settings
+
+from wagtail.wagtailcore import hooks
+
+@hooks.register('insert_editor_css')
+def editor_css():
+ return format_html('')
diff --git a/examples/wagtaildemo/etc/install/bashrc b/examples/wagtaildemo/etc/install/bashrc
deleted file mode 100644
index 120a7c1f..00000000
--- a/examples/wagtaildemo/etc/install/bashrc
+++ /dev/null
@@ -1,106 +0,0 @@
-# ~/.bashrc: executed by bash(1) for non-login shells.
-# see /usr/share/doc/bash/examples/startup-files (in the package bash-doc)
-# for examples
-
-# If not running interactively, don't do anything
-[ -z "$PS1" ] && return
-
-# don't put duplicate lines in the history. See bash(1) for more options
-# ... or force ignoredups and ignorespace
-HISTCONTROL=ignoredups:ignorespace
-
-# append to the history file, don't overwrite it
-shopt -s histappend
-
-# for setting history length see HISTSIZE and HISTFILESIZE in bash(1)
-HISTSIZE=1000
-HISTFILESIZE=2000
-
-# check the window size after each command and, if necessary,
-# update the values of LINES and COLUMNS.
-shopt -s checkwinsize
-
-# make less more friendly for non-text input files, see lesspipe(1)
-[ -x /usr/bin/lesspipe ] && eval "$(SHELL=/bin/sh lesspipe)"
-
-# set variable identifying the chroot you work in (used in the prompt below)
-if [ -z "$debian_chroot" ] && [ -r /etc/debian_chroot ]; then
- debian_chroot=$(cat /etc/debian_chroot)
-fi
-
-# set a fancy prompt (non-color, unless we know we "want" color)
-case "$TERM" in
- xterm-color) color_prompt=yes;;
-esac
-
-# uncomment for a colored prompt, if the terminal has the capability; turned
-# off by default to not distract the user: the focus in a terminal window
-# should be on the output of commands, not on the prompt
-#force_color_prompt=yes
-
-if [ -n "$force_color_prompt" ]; then
- if [ -x /usr/bin/tput ] && tput setaf 1 >&/dev/null; then
- # We have color support; assume it's compliant with Ecma-48
- # (ISO/IEC-6429). (Lack of such support is extremely rare, and such
- # a case would tend to support setf rather than setaf.)
- color_prompt=yes
- else
- color_prompt=
- fi
-fi
-
-if [ "$color_prompt" = yes ]; then
- PS1='${debian_chroot:+($debian_chroot)}\[\033[01;32m\]\u@\h\[\033[00m\]:\[\033[01;34m\]\w\[\033[00m\]\$ '
-else
- PS1='${debian_chroot:+($debian_chroot)}\u@\h:\w\$ '
-fi
-unset color_prompt force_color_prompt
-
-# If this is an xterm set the title to user@host:dir
-case "$TERM" in
-xterm*|rxvt*)
- PS1="\[\e]0;${debian_chroot:+($debian_chroot)}\u@\h: \w\a\]$PS1"
- ;;
-*)
- ;;
-esac
-
-# enable color support of ls and also add handy aliases
-if [ -x /usr/bin/dircolors ]; then
- test -r ~/.dircolors && eval "$(dircolors -b ~/.dircolors)" || eval "$(dircolors -b)"
- alias ls='ls --color=auto'
- #alias dir='dir --color=auto'
- #alias vdir='vdir --color=auto'
-
- alias grep='grep --color=auto'
- alias fgrep='fgrep --color=auto'
- alias egrep='egrep --color=auto'
-fi
-
-# some more ls aliases
-alias ll='ls -alF'
-alias la='ls -A'
-alias l='ls -CF'
-
-# Alias definitions.
-# You may want to put all your additions into a separate file like
-# ~/.bash_aliases, instead of adding them here directly.
-# See /usr/share/doc/bash-doc/examples in the bash-doc package.
-
-if [ -f ~/.bash_aliases ]; then
- . ~/.bash_aliases
-fi
-
-# enable programmable completion features (you don't need to enable
-# this, if it's already enabled in /etc/bash.bashrc and /etc/profile
-# sources /etc/bash.bashrc).
-if [ -f /etc/bash_completion ] && ! shopt -oq posix; then
- . /etc/bash_completion
-fi
-
-export WORKON_HOME=$HOME/.virtualenvs
-export PIP_DOWNLOAD_CACHE=$HOME/.pip_download_cache
-source /usr/local/bin/virtualenvwrapper.sh
-
-alias dj="/home/vagrant/.virtualenvs/wagtaildemo/bin/python /home/vagrant/wagtaildemo/manage.py"
-alias djrun="dj runserver 0.0.0.0:8000"
diff --git a/examples/wagtaildemo/etc/install/etc-bash.bashrc b/examples/wagtaildemo/etc/install/etc-bash.bashrc
deleted file mode 100644
index 00d0a7bb..00000000
--- a/examples/wagtaildemo/etc/install/etc-bash.bashrc
+++ /dev/null
@@ -1,68 +0,0 @@
-# System-wide .bashrc file for interactive bash(1) shells.
-
-# To enable the settings / commands in this file for login shells as well,
-# this file has to be sourced in /etc/profile.
-
-# If not running interactively, don't do anything
-[ -z "$PS1" ] && return
-
-# check the window size after each command and, if necessary,
-# update the values of LINES and COLUMNS.
-shopt -s checkwinsize
-
-# set variable identifying the chroot you work in (used in the prompt below)
-if [ -z "$debian_chroot" ] && [ -r /etc/debian_chroot ]; then
- debian_chroot=$(cat /etc/debian_chroot)
-fi
-
-# set a fancy prompt (non-color, overwrite the one in /etc/profile)
-PS1='${debian_chroot:+($debian_chroot)}\u@\h:\w\$ '
-
-# Commented out, don't overwrite xterm -T "title" -n "icontitle" by default.
-# If this is an xterm set the title to user@host:dir
-#case "$TERM" in
-#xterm*|rxvt*)
-# PROMPT_COMMAND='echo -ne "\033]0;${USER}@${HOSTNAME}: ${PWD}\007"'
-# ;;
-#*)
-# ;;
-#esac
-
-# enable bash completion in interactive shells
-#if [ -f /etc/bash_completion ] && ! shopt -oq posix; then
-# . /etc/bash_completion
-#fi
-
-# sudo hint
-if [ ! -e "$HOME/.sudo_as_admin_successful" ] && [ ! -e "$HOME/.hushlogin" ] ; then
- case " $(groups) " in *\ admin\ *)
- if [ -x /usr/bin/sudo ]; then
- cat <<-EOF
- To run a command as administrator (user "root"), use "sudo ".
- See "man sudo_root" for details.
-
- EOF
- fi
- esac
-fi
-
-# if the command-not-found package is installed, use it
-if [ -x /usr/lib/command-not-found -o -x /usr/share/command-not-found/command-not-found ]; then
- function command_not_found_handle {
- # check because c-n-f could've been removed in the meantime
- if [ -x /usr/lib/command-not-found ]; then
- /usr/bin/python /usr/lib/command-not-found -- "$1"
- return $?
- elif [ -x /usr/share/command-not-found/command-not-found ]; then
- /usr/bin/python /usr/share/command-not-found/command-not-found -- "$1"
- return $?
- else
- printf "%s: command not found\n" "$1" >&2
- return 127
- fi
- }
-fi
-
-export LANGUAGE=en_GB.UTF-8
-export LANG=en_GB.UTF-8
-export LC_ALL=en_GB.UTF-8
diff --git a/examples/wagtaildemo/etc/install/install.sh b/examples/wagtaildemo/etc/install/install.sh
deleted file mode 100644
index b72b3035..00000000
--- a/examples/wagtaildemo/etc/install/install.sh
+++ /dev/null
@@ -1,87 +0,0 @@
-#!/bin/bash
-
-# Script to set up a Django project on Vagrant.
-
-# Installation settings
-
-PROJECT_NAME=$1
-
-DB_NAME=$PROJECT_NAME
-VIRTUALENV_NAME=$PROJECT_NAME
-
-PROJECT_DIR=/home/vagrant/$PROJECT_NAME
-VIRTUALENV_DIR=/home/vagrant/.virtualenvs/$PROJECT_NAME
-
-PGSQL_VERSION=9.1
-
-# Need to fix locale so that Postgres creates databases in UTF-8
-cp -p $PROJECT_DIR/etc/install/etc-bash.bashrc /etc/bash.bashrc
-locale-gen en_GB.UTF-8
-dpkg-reconfigure locales
-
-export LANGUAGE=en_GB.UTF-8
-export LANG=en_GB.UTF-8
-export LC_ALL=en_GB.UTF-8
-
-# Install essential packages from Apt
-apt-get update -y
-# Python dev packages
-apt-get install -y build-essential python python-dev python-setuptools python-pip
-# Dependencies for image processing with Pillow (drop-in replacement for PIL)
-# supporting: jpeg, tiff, png, freetype, littlecms
-# (pip install pillow to get pillow itself)
-apt-get install -y libjpeg-dev libtiff-dev zlib1g-dev libfreetype6-dev liblcms2-dev
-# Git (we'd rather avoid people keeping credentials for git commits in the repo, but sometimes we need it for pip requirements that aren't in PyPI)
-apt-get install -y git
-
-# Optional: install redis (recommended for production sites as a backend
-# for Celery and Django cache)
-#
-# apt-get install -y redis-server
-
-# Postgresql
-if ! command -v psql; then
- apt-get install -y postgresql-$PGSQL_VERSION libpq-dev
- cp $PROJECT_DIR/etc/install/pg_hba.conf /etc/postgresql/$PGSQL_VERSION/main/
- /etc/init.d/postgresql reload
-fi
-
-# virtualenv global setup
-easy_install -U pip
-pip install virtualenv virtualenvwrapper stevedore virtualenv-clone
-
-
-# bash environment global setup
-cp -p $PROJECT_DIR/etc/install/bashrc /home/vagrant/.bashrc
-su - vagrant -c "mkdir -p /home/vagrant/.pip_download_cache"
-
-# ---
-
-# Optional: install ElasticSearch (for higher-performance / more flexible search functionality)
-#
-# if ! command -v /usr/share/elasticsearch/bin/elasticsearch; then
-# apt-get install -y openjdk-7-jre-headless
-# echo "Downloading ElasticSearch..."
-# wget -q https://download.elasticsearch.org/elasticsearch/elasticsearch/elasticsearch-1.2.1.deb
-# dpkg -i elasticsearch-1.2.1.deb
-# service elasticsearch start
-# fi
-
-# postgresql setup for project
-createdb -Upostgres $DB_NAME
-
-# dependencies for lxml (for HTML whitelisting)
-apt-get install -y libxml2-dev libxslt-dev
-
-# virtualenv setup for project
-su - vagrant -c "/usr/local/bin/virtualenv $VIRTUALENV_DIR && \
- echo $PROJECT_DIR > $VIRTUALENV_DIR/.project && \
- PIP_DOWNLOAD_CACHE=/home/vagrant/.pip_download_cache $VIRTUALENV_DIR/bin/pip install -r $PROJECT_DIR/requirements/dev.txt"
-
-echo "workon $VIRTUALENV_NAME" >> /home/vagrant/.bashrc
-
-# Set execute permissions on manage.py, as they get lost if we build from a zip file
-chmod a+x $PROJECT_DIR/manage.py
-
-# Django project setup
-su - vagrant -c "source $VIRTUALENV_DIR/bin/activate && cd $PROJECT_DIR && python manage.py syncdb --noinput && python manage.py migrate --noinput"
diff --git a/examples/wagtaildemo/etc/install/pg_hba.conf b/examples/wagtaildemo/etc/install/pg_hba.conf
deleted file mode 100644
index 8564a9b1..00000000
--- a/examples/wagtaildemo/etc/install/pg_hba.conf
+++ /dev/null
@@ -1,89 +0,0 @@
-# PostgreSQL Client Authentication Configuration File
-# ===================================================
-#
-# Refer to the "Client Authentication" section in the
-# PostgreSQL documentation for a complete description
-# of this file. A short synopsis follows.
-#
-# This file controls: which hosts are allowed to connect, how clients
-# are authenticated, which PostgreSQL user names they can use, which
-# databases they can access. Records take one of these forms:
-#
-# local DATABASE USER METHOD [OPTIONS]
-# host DATABASE USER CIDR-ADDRESS METHOD [OPTIONS]
-# hostssl DATABASE USER CIDR-ADDRESS METHOD [OPTIONS]
-# hostnossl DATABASE USER CIDR-ADDRESS METHOD [OPTIONS]
-#
-# (The uppercase items must be replaced by actual values.)
-#
-# The first field is the connection type: "local" is a Unix-domain socket,
-# "host" is either a plain or SSL-encrypted TCP/IP socket, "hostssl" is an
-# SSL-encrypted TCP/IP socket, and "hostnossl" is a plain TCP/IP socket.
-#
-# DATABASE can be "all", "sameuser", "samerole", a database name, or
-# a comma-separated list thereof.
-#
-# USER can be "all", a user name, a group name prefixed with "+", or
-# a comma-separated list thereof. In both the DATABASE and USER fields
-# you can also write a file name prefixed with "@" to include names from
-# a separate file.
-#
-# CIDR-ADDRESS specifies the set of hosts the record matches.
-# It is made up of an IP address and a CIDR mask that is an integer
-# (between 0 and 32 (IPv4) or 128 (IPv6) inclusive) that specifies
-# the number of significant bits in the mask. Alternatively, you can write
-# an IP address and netmask in separate columns to specify the set of hosts.
-#
-# METHOD can be "trust", "reject", "md5", "password", "gss", "sspi", "krb5",
-# "ident", "pam", "ldap" or "cert". Note that "password" sends passwords
-# in clear text; "md5" is preferred since it sends encrypted passwords.
-#
-# OPTIONS are a set of options for the authentication in the format
-# NAME=VALUE. The available options depend on the different authentication
-# methods - refer to the "Client Authentication" section in the documentation
-# for a list of which options are available for which authentication methods.
-#
-# Database and user names containing spaces, commas, quotes and other special
-# characters must be quoted. Quoting one of the keywords "all", "sameuser" or
-# "samerole" makes the name lose its special character, and just match a
-# database or username with that name.
-#
-# This file is read on server startup and when the postmaster receives
-# a SIGHUP signal. If you edit the file on a running system, you have
-# to SIGHUP the postmaster for the changes to take effect. You can use
-# "pg_ctl reload" to do that.
-
-# Put your actual configuration here
-# ----------------------------------
-#
-# If you want to allow non-local connections, you need to add more
-# "host" records. In that case you will also need to make PostgreSQL listen
-# on a non-local interface via the listen_addresses configuration parameter,
-# or via the -i or -h command line switches.
-#
-
-
-
-
-# DO NOT DISABLE!
-# If you change this first entry you will need to make sure that the
-# database
-# super user can access the database using some other method.
-# Noninteractive
-# access to all databases is required during automatic maintenance
-# (custom daily cronjobs, replication, and similar tasks).
-#
-# Database administrative login by UNIX sockets
-local all postgres trust
-
-# TYPE DATABASE USER CIDR-ADDRESS METHOD
-
-# "local" is for Unix domain socket connections only
-#local all all trust
-# IPv4 local connections:
-#host all all 127.0.0.1/32 md5
-# IPv6 local connections:
-#host all all ::1/128 md5
-# This is for general access databases:
-local all all trust
-host all all 127.0.0.1/32 trust
diff --git a/examples/wagtaildemo/requirements.txt b/examples/wagtaildemo/requirements.txt
new file mode 100644
index 00000000..a15cc1f0
--- /dev/null
+++ b/examples/wagtaildemo/requirements.txt
@@ -0,0 +1,19 @@
+Django>=1.10,<1.11
+psycopg2==2.6
+django-compressor>=1.4
+django-modelcluster>=0.6
+wagtail>=1.10,<1.11
+django-taggit>=0.14.0
+django-libsass>=0.2
+libsass==0.8.2
+Pillow==3.2.0
+html5lib==0.999999
+
+# Dependencies for hosting
+django-redis==3.8.2
+elasticsearch==1.2.0
+
+# Dependencies for Heroku deployment
+dj-database-url==0.3.0
+whitenoise>=3.1,<4.0
+uwsgi>=2.0,<2.1
diff --git a/examples/wagtaildemo/requirements/base.txt b/examples/wagtaildemo/requirements/base.txt
deleted file mode 100644
index 118530bf..00000000
--- a/examples/wagtaildemo/requirements/base.txt
+++ /dev/null
@@ -1,8 +0,0 @@
-Django>=1.6.2,<1.7
-South>=1.0.0
-psycopg2>=2.5.2
-django-compressor>=1.4
-django-modelcluster>=0.4
-wagtail>=0.7
-django-taggit>=0.11.2
-django-libsass>=0.2
diff --git a/examples/wagtaildemo/requirements/dev.txt b/examples/wagtaildemo/requirements/dev.txt
deleted file mode 100644
index a3e81b8d..00000000
--- a/examples/wagtaildemo/requirements/dev.txt
+++ /dev/null
@@ -1 +0,0 @@
--r base.txt
diff --git a/examples/wagtaildemo/requirements/production.txt b/examples/wagtaildemo/requirements/production.txt
deleted file mode 100644
index bd00e816..00000000
--- a/examples/wagtaildemo/requirements/production.txt
+++ /dev/null
@@ -1,6 +0,0 @@
--r base.txt
-django-celery==3.1.1
-gunicorn==18.0
-redis==2.9.1
-django-redis-cache==0.10.2
-elasticsearch==1.0.0
diff --git a/examples/wagtaildemo/vagrant/provision.sh b/examples/wagtaildemo/vagrant/provision.sh
new file mode 100755
index 00000000..eee2653a
--- /dev/null
+++ b/examples/wagtaildemo/vagrant/provision.sh
@@ -0,0 +1,51 @@
+#!/bin/bash
+
+PROJECT_NAME="wagtaildemo"
+
+PROJECT_DIR=/home/vagrant/wagtaildemo
+VIRTUALENV_DIR=/home/vagrant/.virtualenvs/$PROJECT_NAME
+
+PYTHON=$VIRTUALENV_DIR/bin/python
+PIP=$VIRTUALENV_DIR/bin/pip
+
+
+# Create database
+su - vagrant -c "createdb $PROJECT_NAME"
+
+
+# Virtualenv setup for project
+su - vagrant -c "pyvenv $VIRTUALENV_DIR"
+# Replace previous line with this if you are using Python 2
+# su - vagrant -c "/usr/local/bin/virtualenv $VIRTUALENV_DIR"
+
+su - vagrant -c "echo $PROJECT_DIR > $VIRTUALENV_DIR/.project"
+
+#Update pip
+su - vagrant -c "$PIP install -U pip"
+
+# Install PIP requirements
+su - vagrant -c "$PIP install -r $PROJECT_DIR/requirements.txt -f /home/vagrant/wheelhouse"
+
+
+# Set execute permissions on manage.py as they get lost if we build from a zip file
+chmod a+x $PROJECT_DIR/manage.py
+
+
+# Run migrate/update_index/load_initial_data
+su - vagrant -c "$PYTHON $PROJECT_DIR/manage.py migrate --noinput && \
+ $PYTHON $PROJECT_DIR/manage.py load_initial_data && \
+ $PYTHON $PROJECT_DIR/manage.py update_index"
+
+
+# Add a couple of aliases to manage.py into .bashrc
+cat << EOF >> /home/vagrant/.bashrc
+export PYTHONPATH=$PROJECT_DIR
+export DJANGO_SETTINGS_MODULE=$PROJECT_NAME.settings.dev
+
+alias dj="django-admin"
+alias djrun="dj runserver 0.0.0.0:8000"
+
+source $VIRTUALENV_DIR/bin/activate
+export PS1="[$PROJECT_NAME \W]\\$ "
+cd $PROJECT_DIR
+EOF
diff --git a/examples/wagtaildemo/wagtaildemo/heroku_wsgi.py b/examples/wagtaildemo/wagtaildemo/heroku_wsgi.py
new file mode 100644
index 00000000..743f5e43
--- /dev/null
+++ b/examples/wagtaildemo/wagtaildemo/heroku_wsgi.py
@@ -0,0 +1,6 @@
+from whitenoise.django import DjangoWhiteNoise
+
+from .wsgi import application as _application
+
+
+application = DjangoWhiteNoise(_application)
diff --git a/examples/wagtaildemo/wagtaildemo/settings/base.py b/examples/wagtaildemo/wagtaildemo/settings/base.py
index e4227310..187b169a 100644
--- a/examples/wagtaildemo/wagtaildemo/settings/base.py
+++ b/examples/wagtaildemo/wagtaildemo/settings/base.py
@@ -3,16 +3,14 @@
import os
PROJECT_ROOT = os.path.join(os.path.dirname(__file__), '..', '..')
+BASE_DIR = PROJECT_ROOT
DEBUG = True
-TEMPLATE_DEBUG = DEBUG
ADMINS = (
# ('Your Name', 'your_email@example.com'),
)
-MANAGERS = ADMINS
-
# Default to dummy email backend. Configure dev/production/local backend
# as per https://docs.djangoproject.com/en/dev/topics/email/#email-backends
EMAIL_BACKEND = 'django.core.mail.backends.dummy.EmailBackend'
@@ -21,11 +19,6 @@ DATABASES = {
'default': {
'ENGINE': 'django.db.backends.postgresql_psycopg2',
'NAME': 'wagtaildemo',
- 'USER': 'postgres',
- 'PASSWORD': '',
- 'HOST': '', # Set to empty string for localhost.
- 'PORT': '', # Set to empty string for default.
- 'CONN_MAX_AGE': 600, # number of seconds database connections should persist for
}
}
@@ -54,14 +47,13 @@ USE_I18N = True
# If you set this to False, Django will not format dates, numbers and
# calendars according to the current locale.
-# Note that with this set to True, Wagtail will fall back on using numeric dates
-# in date fields, as opposed to 'friendly' dates like "24 Sep 2013", because
-# Python's strptime doesn't support localised month names: https://code.djangoproject.com/ticket/13339
-USE_L10N = False
+USE_L10N = True
# If you set this to False, Django will not use timezone-aware datetimes.
USE_TZ = True
+DATE_FORMAT = 'j F Y'
+
# Absolute filesystem path to the directory that will hold user-uploaded files.
# Example: "/home/media/media.lawrence.com/media/"
MEDIA_ROOT = os.path.join(PROJECT_ROOT, 'media')
@@ -103,13 +95,6 @@ STATICFILES_FINDERS = (
# Make this unique, and don't share it with anybody.
SECRET_KEY = 'wq21wtjo3@d_qfjvd-#td!%7gfy2updj2z+nev^k$iy%=m4_tr'
-# List of callables that know how to import templates from various sources.
-TEMPLATE_LOADERS = (
- 'django.template.loaders.filesystem.Loader',
- 'django.template.loaders.app_directories.Loader',
- # 'django.template.loaders.eggs.Loader',
-)
-
MIDDLEWARE_CLASSES = (
'django.middleware.common.CommonMiddleware',
'django.contrib.sessions.middleware.SessionMiddleware',
@@ -123,25 +108,11 @@ MIDDLEWARE_CLASSES = (
'wagtail.wagtailredirects.middleware.RedirectMiddleware',
)
-from django.conf import global_settings
-TEMPLATE_CONTEXT_PROCESSORS = global_settings.TEMPLATE_CONTEXT_PROCESSORS + (
- 'django.core.context_processors.request',
- "fobi.context_processors.theme", # Important!
- "fobi.context_processors.dynamic_values", # Optional
- "context_processors.testing", # Testing
-)
-
ROOT_URLCONF = 'wagtaildemo.urls'
# Python dotted path to the WSGI application used by Django's runserver.
WSGI_APPLICATION = 'wagtaildemo.wsgi.application'
-TEMPLATE_DIRS = (
- # Put strings here, like "/home/html/django_templates" or "C:/www/django/templates".
- # Always use forward slashes, even on Windows.
- # Don't forget to use absolute paths, not relative paths.
-)
-
INSTALLED_APPS = (
'django.contrib.auth',
'django.contrib.contenttypes',
@@ -150,10 +121,10 @@ INSTALLED_APPS = (
'django.contrib.messages',
'django.contrib.staticfiles',
- 'south',
'compressor',
'taggit',
'modelcluster',
+ 'rest_framework',
'django.contrib.admin',
# Uncomment the next line to enable admin documentation:
# 'django.contrib.admindocs',
@@ -169,6 +140,7 @@ INSTALLED_APPS = (
'wagtail.wagtailredirects',
'wagtail.wagtailforms',
'wagtail.wagtailsites',
+ 'wagtail.contrib.wagtailapi',
'demo',
@@ -294,19 +266,45 @@ INSTALLED_APPS = (
'fobi.contrib.themes.simple', # Simple theme
)
+# Add wagtail.contrib.wagtailsearchpromotions to INSTALLED_APPS
+# if we're on Wagtail 1.1 or later.
+# NB this is a quick-and-dirty version check that won't work with
+# full generality (double-digit versions, alpha/beta releases)
+from wagtail.wagtailcore import __version__
+if __version__.split('.') > ['1', '0']:
+ INSTALLED_APPS = list(INSTALLED_APPS) + ['wagtail.contrib.wagtailsearchpromotions']
+
+
EMAIL_SUBJECT_PREFIX = '[wagtaildemo] '
INTERNAL_IPS = ('127.0.0.1', '10.0.2.2')
+
+TEMPLATES = [
+ {
+ 'BACKEND': 'django.template.backends.django.DjangoTemplates',
+ 'APP_DIRS': True,
+ 'OPTIONS': {
+ 'context_processors': [
+ 'django.contrib.auth.context_processors.auth',
+ 'django.template.context_processors.debug',
+ 'django.template.context_processors.request',
+ 'django.template.context_processors.media',
+ 'django.template.context_processors.static',
+ 'django.contrib.messages.context_processors.messages',
+ "fobi.context_processors.theme", # Important!
+ "fobi.context_processors.dynamic_values", # Optional
+ "context_processors.testing", # Testing
+ ],
+ },
+ },
+]
+
# django-compressor settings
COMPRESS_PRECOMPILERS = (
('text/x-scss', 'django_libsass.SassCompiler'),
)
-# Auth settings
-LOGIN_URL = 'django.contrib.auth.views.login'
-LOGIN_REDIRECT_URL = 'wagtailadmin_home'
-
# A sample logging configuration. The only tangible logging
# performed by this configuration is to send an email to
# the site admins on every HTTP 500 error when DEBUG=False.
@@ -340,6 +338,3 @@ LOGGING = {
# WAGTAIL SETTINGS
WAGTAIL_SITE_NAME = 'wagtaildemo'
-
-# Override the search results template for wagtailsearch
-WAGTAILSEARCH_RESULTS_TEMPLATE = 'demo/search_results.html'
diff --git a/examples/wagtaildemo/wagtaildemo/settings/dev.py b/examples/wagtaildemo/wagtaildemo/settings/dev.py
index c55e11f2..a7cea7de 100644
--- a/examples/wagtaildemo/wagtaildemo/settings/dev.py
+++ b/examples/wagtaildemo/wagtaildemo/settings/dev.py
@@ -5,7 +5,7 @@ DEBUG = True
EMAIL_BACKEND = 'django.core.mail.backends.console.EmailBackend'
# BASE_URL required for notification emails
-BASE_URL = 'http://localhost:8111'
+BASE_URL = 'http://localhost:8000'
try:
from .local import *
diff --git a/examples/wagtaildemo/wagtaildemo/settings/heroku.py b/examples/wagtaildemo/wagtaildemo/settings/heroku.py
new file mode 100644
index 00000000..17de7f28
--- /dev/null
+++ b/examples/wagtaildemo/wagtaildemo/settings/heroku.py
@@ -0,0 +1,25 @@
+import dj_database_url
+import os
+
+from .base import *
+
+
+DEBUG = True
+
+# Accept all hostnames, since we don't know in advance which hostname will be used for any given Heroku instance.
+# IMPORTANT: Set this to a real hostname when using this in production!
+# See https://docs.djangoproject.com/en/1.10/ref/settings/#allowed-hosts
+ALLOWED_HOSTS = ['*']
+
+EMAIL_BACKEND = 'django.core.mail.backends.console.EmailBackend'
+
+# BASE_URL required for notification emails
+BASE_URL = 'http://localhost:8000'
+
+DATABASES = {'default': dj_database_url.config(default='postgres://postgres@localhost:5432/wagtaildemo')}
+
+
+try:
+ from .local import *
+except ImportError:
+ pass
diff --git a/examples/wagtaildemo/wagtaildemo/settings/local.py.example b/examples/wagtaildemo/wagtaildemo/settings/local.py.example
index 729293c4..8d486c10 100644
--- a/examples/wagtaildemo/wagtaildemo/settings/local.py.example
+++ b/examples/wagtaildemo/wagtaildemo/settings/local.py.example
@@ -3,7 +3,7 @@
# local.py should not be checked in to version control.
EMBEDLY_KEY = 'get-one-from-http://embed.ly/'
-GOOGLE_MAPS_KEY = 'get-one-from-https://code.google.com/apis/console/?noredirect'
+# GOOGLE_MAPS_KEY = 'get-one-from-https://code.google.com/apis/console/?noredirect'
# It is strongly recommended that you define a SECRET_KEY here, where it won't be visible
# in your version control system.
@@ -12,29 +12,17 @@ SECRET_KEY = 'enter-a-long-unguessable-string-here'
# When developing Wagtail templates, we recommend django-debug-toolbar
# for keeping track of page rendering times. To use it:
-# pip install django-debug-toolbar==1.0.1
-# and uncomment the lines below.
+# pip install django-debug-toolbar
+# uncomment the lines below, and uncomment the corresponding lines in urls.py
# from .base import INSTALLED_APPS, MIDDLEWARE_CLASSES
# INSTALLED_APPS += (
# 'debug_toolbar',
# )
-# MIDDLEWARE_CLASSES += (
+# MIDDLEWARE_CLASSES = [
# 'debug_toolbar.middleware.DebugToolbarMiddleware',
-# )
+# ] + list(MIDDLEWARE_CLASSES)
# # django-debug-toolbar settings
# DEBUG_TOOLBAR_CONFIG = {
# 'INTERCEPT_REDIRECTS': False,
# }
-
-
-# If you're developing Wagtail itself (as opposed to building a Wagtail-powered site), you'll
-# want to tweak the Python path so that it picks up your working copy of the Wagtail code
-# rather than the packaged copy - uncomment the lines below to do that.
-# Here we assume that you have it in a 'wagtail' directory at the same level as your
-# 'wagtaildemo' checkout - adjust the path as appropriate.
-
-# import sys
-# import os
-# PATH_TO_WAGTAIL = os.path.join(os.path.dirname(__file__), '..', '..', '..', 'wagtail')
-# sys.path.insert(1, PATH_TO_WAGTAIL)
diff --git a/examples/wagtaildemo/wagtaildemo/settings/production.py b/examples/wagtaildemo/wagtaildemo/settings/production.py
index 601a7f96..aa5fdcfa 100644
--- a/examples/wagtaildemo/wagtaildemo/settings/production.py
+++ b/examples/wagtaildemo/wagtaildemo/settings/production.py
@@ -11,13 +11,6 @@ WAGTAILSEARCH_BACKENDS = {
}
-INSTALLED_APPS+= (
- 'djcelery',
- 'kombu.transport.django',
- 'gunicorn',
-)
-
-
CACHES = {
'default': {
'BACKEND': 'redis_cache.cache.RedisCache',
@@ -37,14 +30,6 @@ TEMPLATE_LOADERS = (
)),
)
-# CELERY SETTINGS
-import djcelery
-djcelery.setup_loader()
-
-BROKER_URL = 'redis://'
-CELERY_SEND_TASK_ERROR_EMAILS = True
-CELERYD_LOG_COLOR = False
-
try:
from .local import *
diff --git a/examples/wagtaildemo/wagtaildemo/urls.py b/examples/wagtaildemo/wagtaildemo/urls.py
index 07dca2e3..af689b79 100644
--- a/examples/wagtaildemo/wagtaildemo/urls.py
+++ b/examples/wagtaildemo/wagtaildemo/urls.py
@@ -1,41 +1,59 @@
-from django.conf.urls import patterns, include, url
+from django.conf.urls import include, url
from django.conf.urls.static import static
-from django.views.generic.base import RedirectView
-from django.contrib import admin
from django.conf import settings
-import os.path
+from django.contrib import admin
-from wagtail.wagtailcore import urls as wagtail_urls
from wagtail.wagtailadmin import urls as wagtailadmin_urls
from wagtail.wagtaildocs import urls as wagtaildocs_urls
-from wagtail.wagtailsearch.urls import frontend as wagtailsearch_frontend_urls
+from wagtail.wagtailcore import urls as wagtail_urls
+from wagtail.contrib.wagtailapi import urls as wagtailapi_urls
+from wagtail.api.v2.router import WagtailAPIRouter
+from wagtail.api.v2.endpoints import PagesAPIEndpoint
+from wagtail.wagtaildocs.api.v2.endpoints import DocumentsAPIEndpoint
+from wagtail.wagtailimages.api.v2.endpoints import ImagesAPIEndpoint
-admin.autodiscover()
+from demo import views
-# Signal handlers
-from wagtail.wagtailsearch.signal_handlers import register_signal_handlers as wagtailsearch_register_signal_handlers
-wagtailsearch_register_signal_handlers()
+api = WagtailAPIRouter('api')
+api.register_endpoint('pages', PagesAPIEndpoint)
+api.register_endpoint('images', ImagesAPIEndpoint)
+api.register_endpoint('documents', DocumentsAPIEndpoint)
-urlpatterns = patterns('',
+urlpatterns = [
url(r'^django-admin/', include(admin.site.urls)),
url(r'^admin/', include(wagtailadmin_urls)),
- url(r'^search/', include(wagtailsearch_frontend_urls)),
url(r'^documents/', include(wagtaildocs_urls)),
- # For anything not caught by a more specific rule above, hand over to
- # Wagtail's serving mechanism
- url(r'', include(wagtail_urls)),
-)
+ url(r'search/$', views.search, name='search'),
+ url(r'^api/', include(wagtailapi_urls)),
+ url(r'^api/v2/', include(api.urls)),
+]
if settings.DEBUG:
from django.contrib.staticfiles.urls import staticfiles_urlpatterns
+ from django.views.generic.base import RedirectView
- urlpatterns += staticfiles_urlpatterns() # tell gunicorn where static files are in dev mode
- urlpatterns += static(settings.MEDIA_URL + 'images/', document_root=os.path.join(settings.MEDIA_ROOT, 'images'))
- urlpatterns += patterns('',
- (r'^favicon\.ico$', RedirectView.as_view(url=settings.STATIC_URL + 'demo/images/favicon.ico'))
- )
+ urlpatterns += staticfiles_urlpatterns()
+ urlpatterns += static(settings.MEDIA_URL, document_root=settings.MEDIA_ROOT)
+ urlpatterns += [
+ url(r'^favicon\.ico$', RedirectView.as_view(url=settings.STATIC_URL + 'demo/images/favicon.ico'))
+ ]
+
+ # Uncomment the lines below to enable django-debug-toolbar (along with the
+ # corresponding lines in settings/local.py):
+ #import debug_toolbar
+
+ #urlpatterns += [
+ # url(r'^__debug__/', include(debug_toolbar.urls)),
+ #]
+
+
+# For anything not caught by a more specific rule above, hand over to
+# Wagtail's serving mechanism (must come last)
+urlpatterns += [
+ url(r'', include(wagtail_urls)),
+]
- {% endif %}
+
+
+ 
+ {% endif %}
{% endblock %}
diff --git a/examples/wagtaildemo/demo/templates/demo/event_page.html b/examples/wagtaildemo/demo/templates/demo/event_page.html
index bc6dd0f6..50732eb2 100644
--- a/examples/wagtaildemo/demo/templates/demo/event_page.html
+++ b/examples/wagtaildemo/demo/templates/demo/event_page.html
@@ -4,8 +4,8 @@
{% block content %}
+ {% image self.image width-300 class="img-thumbnail" %}
{% endif %}
{% if self.biography %}
{% endif %}
- {% include "demo/includes/body.html" with body=self.biography only %}
+ {% if self.body %}
+
+
+
-
+ - {% endif %} - -
+
{% endfor %}
-
+ 
+
+ {% if child.value.caption %}
+