From d797d370ca20635e0c0155aa2697239ba979ed12 Mon Sep 17 00:00:00 2001
From: Nikolai R Kristiansen <nikolaik@gmail.com>
Date: Sat, 6 Aug 2016 14:59:14 +0200
Subject: [PATCH] staticfiles

---
 .gitignore                                        |   3 ++-
 infoskjerm2/settings.py                           |   2 ++
 slides/static/{ => slides}/app.css                |   0
 slides/static/{ => slides}/app.js                 |   0
 .../logo_dns2014_emblem_uten_tekst_hvit.png       | Bin
 .../{ => slides}/vendor/jquery-3.1.0.min.js       |   0
 .../vendor/jquery-migrate-1.4.1.min.js            |   0
 .../{ => slides}/vendor/jquery.cycle.all.min.js   |   0
 slides/templates/index.html                       |  14 +++++++-------
 9 files changed, 11 insertions(+), 8 deletions(-)
 rename slides/static/{ => slides}/app.css (100%)
 rename slides/static/{ => slides}/app.js (100%)
 rename slides/static/{ => slides}/images/logo_dns2014_emblem_uten_tekst_hvit.png (100%)
 rename slides/static/{ => slides}/vendor/jquery-3.1.0.min.js (100%)
 rename slides/static/{ => slides}/vendor/jquery-migrate-1.4.1.min.js (100%)
 rename slides/static/{ => slides}/vendor/jquery.cycle.all.min.js (100%)

diff --git a/.gitignore b/.gitignore
index 4bc4cfa..87b96cc 100644
--- a/.gitignore
+++ b/.gitignore
@@ -4,4 +4,5 @@ db.sqlite3
 *.pyc
 __pycache__
 /venv
-local_settings.py
\ No newline at end of file
+local_settings.py
+/staticfiles
diff --git a/infoskjerm2/settings.py b/infoskjerm2/settings.py
index 1dd4ed8..41196e5 100644
--- a/infoskjerm2/settings.py
+++ b/infoskjerm2/settings.py
@@ -116,6 +116,8 @@ USE_TZ = True
 # https://docs.djangoproject.com/en/1.10/howto/static-files/
 STATIC_URL = '/static/'
 
+STATIC_ROOT = os.path.join(BASE_DIR, 'staticfiles')
+
 # Local settings
 try:
     from .local_settings import *
diff --git a/slides/static/app.css b/slides/static/slides/app.css
similarity index 100%
rename from slides/static/app.css
rename to slides/static/slides/app.css
diff --git a/slides/static/app.js b/slides/static/slides/app.js
similarity index 100%
rename from slides/static/app.js
rename to slides/static/slides/app.js
diff --git a/slides/static/images/logo_dns2014_emblem_uten_tekst_hvit.png b/slides/static/slides/images/logo_dns2014_emblem_uten_tekst_hvit.png
similarity index 100%
rename from slides/static/images/logo_dns2014_emblem_uten_tekst_hvit.png
rename to slides/static/slides/images/logo_dns2014_emblem_uten_tekst_hvit.png
diff --git a/slides/static/vendor/jquery-3.1.0.min.js b/slides/static/slides/vendor/jquery-3.1.0.min.js
similarity index 100%
rename from slides/static/vendor/jquery-3.1.0.min.js
rename to slides/static/slides/vendor/jquery-3.1.0.min.js
diff --git a/slides/static/vendor/jquery-migrate-1.4.1.min.js b/slides/static/slides/vendor/jquery-migrate-1.4.1.min.js
similarity index 100%
rename from slides/static/vendor/jquery-migrate-1.4.1.min.js
rename to slides/static/slides/vendor/jquery-migrate-1.4.1.min.js
diff --git a/slides/static/vendor/jquery.cycle.all.min.js b/slides/static/slides/vendor/jquery.cycle.all.min.js
similarity index 100%
rename from slides/static/vendor/jquery.cycle.all.min.js
rename to slides/static/slides/vendor/jquery.cycle.all.min.js
diff --git a/slides/templates/index.html b/slides/templates/index.html
index e3eb16f..c7799e8 100644
--- a/slides/templates/index.html
+++ b/slides/templates/index.html
@@ -1,16 +1,16 @@
-{% load staticfiles %}
+{% load static %}
 <!doctype html>
 <html>
 <head>
 	<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
 	<title>Slides</title>
-	<script type="text/javascript" src="{% static "vendor/jquery-3.1.0.min.js" %}"></script>
-	<script type="text/javascript" src="{% static "vendor/jquery-migrate-1.4.1.min.js" %}"></script>
-	<script type="text/javascript" src="{% static "vendor/jquery.cycle.all.min.js" %}"></script>
+	<script type="text/javascript" src="{% static "slides/vendor/jquery-3.1.0.min.js" %}"></script>
+	<script type="text/javascript" src="{% static "slides/vendor/jquery-migrate-1.4.1.min.js" %}"></script>
+	<script type="text/javascript" src="{% static "slides/vendor/jquery.cycle.all.min.js" %}"></script>
 
-    <link rel="stylesheet" href="{% static "app.css" %}">
+    <link rel="stylesheet" href="{% static "slides/app.css" %}">
 </head>
-<body style="background: black url('{% static "images/logo_dns2014_emblem_uten_tekst_hvit.png" %}') no-repeat center center;">
+<body style="background: black url('{% static "slides/images/logo_dns2014_emblem_uten_tekst_hvit.png" %}') no-repeat center center;">
     <div id="slideshow">
         <iframe class="slide"></iframe>
         <iframe class="slide"></iframe>
@@ -20,7 +20,7 @@
     <script type="text/javascript">
       var slides = {{ slides_js|safe }};
     </script>
-    <script type="text/javascript" src="{% static "app.js" %}"></script>
+    <script type="text/javascript" src="{% static "slides/app.js" %}"></script>
 
 </body>
 </html>