staticfiles

This commit is contained in:
nikolark committed 2016-08-06 14:59:14 +02:00
1 parent 817676a451
commit d797d370ca
9 files changed
+11 -8

No files matched your search

+2 -1
View File
@@ -4,4 +4,5 @@ db.sqlite3
*.pyc
__pycache__
/venv
local_settings.py
local_settings.py
/staticfiles
+2
View File
@@ -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 *
File renamed without changes.
File renamed without changes.
File renamed without changes.

Before

Width:  |  Height:  |  Size: 35 KiB

After

Width:  |  Height:  |  Size: 35 KiB

File renamed without changes.
+7 -7
View File
@@ -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>