Refactor coffee scale app

2018-01-28 20:32:07 +02:00
parent 253f720043
commit 509b157d65
6 changed files with 8 additions and 5 deletions
@@ -16,7 +16,7 @@ body {
  background-size: contain;
  background-repeat: no-repeat;
  background-position: bottom center;
-  background-image: url("/static/img/smokes.png");
+  background-image: url("/static/coffee_scale/img/smokes.png");
  transform-origin: bottom;
  animation: smokes 8s ease-in-out 0s infinite;
  opacity:0;
@@ -27,7 +27,7 @@ body {
  background-size: contain;
  background-repeat: no-repeat;
  background-position: top center;
-  background-image: url("/static/img/coffeecup3.png");
+  background-image: url("/static/coffee_scale/img/coffeecup3.png");
  height:60%;
 }
 #scale{
@@ -1,3 +1,6 @@
+{% load i18n %}
+{% load static %}
+
 <html>
 <head>
  <title>Coffee Cups @Guild Room - AYY SIK ry</title>
@@ -12,8 +15,8 @@
  <script src="https://ajax.googleapis.com/ajax/libs/jquery/3.2.1/jquery.min.js"></script>
  <script src="https://cdnjs.cloudflare.com/ajax/libs/paho-mqtt/1.0.2/mqttws31.js"
          type="text/javascript"></script>
-  <link rel="stylesheet" href="/static/css/coffee.css" />
-  <script src="/static/js/coffee.js"></script>
+  <link rel="stylesheet" href="{% static "coffee_scale/css/coffee.css" %}">
+  <script src="{% static "coffee_scale/js/coffee.js" %}"></script>
 </head>

 <body>
@@ -8,4 +8,4 @@ from django.conf import settings


 def coffee_view(request):
-    return render(request, 'coffee.html')
+    return render(request, 'coffee_scale:coffee.html')