Merge branch 'master' into nef

Conflicts:
	chimere/admin.py
	chimere/forms.py
	chimere/models.py
	chimere/settings.sample.py
	chimere/static/chimere/js/jquery.chimere-ol.js
	chimere/templates/chimere/base.html
	chimere/templates/chimere/blocks/head_chimere.html
	chimere/templates/chimere/blocks/map.html
	chimere/templates/chimere/main_map.html
	chimere/templatetags/chimere_tags.py
	chimere/tests.py
	chimere/urls.py
	chimere/views.py
	chimere/widgets.py

1 files changed, 45 insertions, 0 deletions

diff --git a/Makefile.example b/Makefile.example
new file mode 100644
index 0000000..e50bace
--- /dev/null
+++ b/Makefile.example
@@ -0,0 +1,45 @@
+SHELL := /bin/bash
+
+# if a virtualenv is used put the full python path
+# e.g.: PYTHON=$$HOME/.virtualenvs/chimere/bin/python
+PYTHON=python
+# put name of your current project
+project=chimere_example_project
+
+update: clean syncdb compilemessages collectstatic
+
+clean:
+	-rm -rf *~*
+	-find . -name '*.pyc' -exec rm {} \;
+	-find . -name '.*.swp' -exec rm {} \;
+
+test: clean
+	cd $(project); $(PYTHON) manage.py test chimere
+
+pep8:
+	pep8 --filename=*.py --ignore=W --exclude="manage.py,settings.py,migrations" --statistics --repeat .
+
+pylint:
+	pylint "$(CURDIR)/chimere" --ignore=.git,migrations --max-public-methods=50 --ignored-classes=Item.Meta --method-rgx='[a-z_][a-z0-9_]{2,40}$$'
+
+fresh_syncdb:
+	cd $(project); $(PYTHON) ./manage.py syncdb --noinput 2> /dev/null > /dev/null
+	cd $(project); $(PYTHON) ./manage.py migrate chimere 2> /dev/null > /dev/null
+
+syncdb:
+	cd $(project); $(PYTHON) manage.py syncdb --noinput
+	cd $(project); $(PYTHON) manage.py migrate
+
+shell:
+	cd $(project);$(PYTHON) manage.py shell
+
+run:
+	cd $(project); $(PYTHON) manage.py runserver 0.0.0.0:8000
+
+compilemessages:
+	cd $(CURDIR)/chimere; \
+	$(PYTHON) ../$(project)/manage.py compilemessages
+
+collectstatic:
+	cd $(CURDIR)/chimere; \
+	$(PYTHON) ../$(project)/manage.py collectstatic --noinput