Static asset configuration

jussiarpalahti · May 15, 2015 · 9c20f1b · 9c20f1b
1 parent a00932f
commit 9c20f1b
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 1 deletion.
diff --git a/app/models.py b/app/models.py
@@ -3,6 +3,7 @@
 
 
 class Observer(models.Model):
+    name = models.CharField(max_length=512)
     location = models.CharField("Coordinates of observer", max_length=512)
     min = models.IntegerField("lowest observed measurement")
     max = models.IntegerField("highest observed measurement")

diff --git a/app/templates/app/base.html b/app/templates/app/base.html
@@ -3,6 +3,8 @@
 <head lang="en">
     <meta charset="UTF-8">
     <title>Vesikorkeusmittauspisteiden tiedot</title>
+    {% load staticfiles %}
+    <link rel="stylesheet" href="{% static "app/app.css" %}">
 </head>
 <body>
 <h1>Vesikorkeusmittauspisteiden tiedot</h1>

diff --git a/projekti/db.sqlite3 b/projekti/db.sqlite3
diff --git a/projekti/projekti/urls.py b/projekti/projekti/urls.py
@@ -19,8 +19,13 @@
 from app.urls import router
 import app.urls
 
-urlpatterns = [
+from django.conf.urls.static import static
+from django.conf import settings
+
+urlpatterns = static(settings.STATIC_URL, document_root=settings.STATIC_ROOT)
+urlpatterns += [
     url(r'^admin/', include(admin.site.urls)),
     url(r'^api/', include(router.urls)),
+
     url(r'', include(app.urls))
 ]