From 509b157d650166aaf112a12efb1511e0a7d7f483 Mon Sep 17 00:00:00 2001 From: Jan Tuomi Date: Sun, 28 Jan 2018 20:32:07 +0200 Subject: [PATCH] Refactor coffee scale app --- .../static/{ => coffee_scale}/css/coffee.css | 4 ++-- .../static/{ => coffee_scale}/img/coffeecup3.png | Bin .../static/{ => coffee_scale}/img/smokes.png | Bin coffee_scale/static/{ => coffee_scale}/js/coffee.js | 0 coffee_scale/templates/coffee.html | 7 +++++-- coffee_scale/views.py | 2 +- 6 files changed, 8 insertions(+), 5 deletions(-) rename coffee_scale/static/{ => coffee_scale}/css/coffee.css (94%) rename coffee_scale/static/{ => coffee_scale}/img/coffeecup3.png (100%) rename coffee_scale/static/{ => coffee_scale}/img/smokes.png (100%) rename coffee_scale/static/{ => coffee_scale}/js/coffee.js (100%) diff --git a/coffee_scale/static/css/coffee.css b/coffee_scale/static/coffee_scale/css/coffee.css similarity index 94% rename from coffee_scale/static/css/coffee.css rename to coffee_scale/static/coffee_scale/css/coffee.css index de6d2be..e090c2a 100644 --- a/coffee_scale/static/css/coffee.css +++ b/coffee_scale/static/coffee_scale/css/coffee.css @@ -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{ diff --git a/coffee_scale/static/img/coffeecup3.png b/coffee_scale/static/coffee_scale/img/coffeecup3.png similarity index 100% rename from coffee_scale/static/img/coffeecup3.png rename to coffee_scale/static/coffee_scale/img/coffeecup3.png diff --git a/coffee_scale/static/img/smokes.png b/coffee_scale/static/coffee_scale/img/smokes.png similarity index 100% rename from coffee_scale/static/img/smokes.png rename to coffee_scale/static/coffee_scale/img/smokes.png diff --git a/coffee_scale/static/js/coffee.js b/coffee_scale/static/coffee_scale/js/coffee.js similarity index 100% rename from coffee_scale/static/js/coffee.js rename to coffee_scale/static/coffee_scale/js/coffee.js diff --git a/coffee_scale/templates/coffee.html b/coffee_scale/templates/coffee.html index b09a25d..b4800c6 100644 --- a/coffee_scale/templates/coffee.html +++ b/coffee_scale/templates/coffee.html @@ -1,3 +1,6 @@ +{% load i18n %} +{% load static %} + Coffee Cups @Guild Room - AYY SIK ry @@ -12,8 +15,8 @@ - - + + diff --git a/coffee_scale/views.py b/coffee_scale/views.py index b973641..0a57385 100644 --- a/coffee_scale/views.py +++ b/coffee_scale/views.py @@ -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')