From 8a0883d461efbbce3a6c439e7f807602cc184ced Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Beno=C3=AEt=20Bryon?= <benoit@marmelune.net>
Date: Sat, 13 Jun 2015 00:56:57 +0200
Subject: [PATCH] Refs #92 - 'make demo' installs demo, 'make runserver' runs
 demo server.

---
 Makefile                             | 10 ++++++----
 demo/demoproject/fixtures/demo.json  |  2 +-
 demo/demoproject/templates/home.html |  3 +++
 3 files changed, 10 insertions(+), 5 deletions(-)

diff --git a/Makefile b/Makefile
index 1a9b8bd..e1b1888 100644
--- a/Makefile
+++ b/Makefile
@@ -75,12 +75,14 @@ readme:
 #: demo - Setup demo project.
 .PHONY: demo
 demo:
+	pip install -e .
+	pip install -e demo
 	demo migrate --noinput
 	# Install fixtures.
-	mkdir -p var/media
-	cp -r demo/demoproject/fixtures var/media/object
-	cp -r demo/demoproject/fixtures var/media/object-other
-	cp -r demo/demoproject/fixtures var/media/nginx
+	mkdir -p var/media/object var/media/object-other/ var/media/nginx
+	cp -r demo/demoproject/fixtures/* var/media/object/
+	cp -r demo/demoproject/fixtures/* var/media/object-other/
+	cp -r demo/demoproject/fixtures/* var/media/nginx/
 	demo loaddata demo.json
 
 
diff --git a/demo/demoproject/fixtures/demo.json b/demo/demoproject/fixtures/demo.json
index ec4e68d..0424b6c 100644
--- a/demo/demoproject/fixtures/demo.json
+++ b/demo/demoproject/fixtures/demo.json
@@ -4,7 +4,7 @@
         "model": "object.document", 
         "fields": {
             "slug": "hello-world", 
-            "file": "document/hello-world.txt"
+            "file": "object/hello-world.txt"
         }
     }
 ]
diff --git a/demo/demoproject/templates/home.html b/demo/demoproject/templates/home.html
index f3d9588..b46d3cd 100644
--- a/demo/demoproject/templates/home.html
+++ b/demo/demoproject/templates/home.html
@@ -11,6 +11,9 @@
         <p>In the following views, Django streams the files, no optimization
            has been setup.</p>
         <ul>
+            <li>
+                <a href="{% url 'object:default_file' 'hello-world' %}">object:default_file</a>
+            </li>
         </ul>
 
         <h2>Optimized downloads</h2>