Merge pull request #27 from dtekcth/static-fixes

Static fixes

Makefile

@@ -1,6 +1,6 @@
 #!make
-include variables.env
-export $(shell sed 's/=.*//' variables.env)
+include .env
+export $(shell sed 's/=.*//' .env)
 
 test:
 	env

README.md

@@ -45,8 +45,8 @@ that are not checked in to Git:
 * Database password
 
 There is a file in the root directory of this repo called
-`variables.env.template`.  This file should be copied into a file called
-`variables.env`, where you define these variables according to your liking.
+`.env.template`.  This file should be copied into a file called
+`.env`, where you define these variables according to your liking.
 Django's secret key should be a "large, unpredictable value".  Just google
 "[Django Secret Key Generator](https://www.miniwebtool.com/django-secret-key-generator/)" and you should find something.
 

docker-compose.yml

@@ -19,6 +19,7 @@ services:
             DB_PASSWORD: "$DB_PASSWORD"
             DB_HOST: "db"
             DB_PORT: "5432"
+            DJANGO_SECRET_KEY: "$DJANGO_SECRET_KEY"
         depends_on:
             - db
         volumes:

dtekportal/homepage/templates/homepage/index/welcome-box.html

@@ -1,10 +1,11 @@
 {% load i18n %}
+{% load static %}
 
 
 <div class="box">
-    <img src="https://www.chalmers.se/SiteCollectionImages/Programmallar/Masterprogram/image3-datateknik_300.jpg" style="height:3em;
+    <img src="{% static 'datalogo.svg' %}" style="height:3em;
     position: absolute;
-    right: 10px;">
+    right: 20px;">
 
     <header>
         <h2>{% trans "Välkommen" %}</h2>