Skip to content
Snippets Groups Projects
Commit 8d492255 authored by Julian's avatar Julian
Browse files

Use Django-media instead of static files

parent 2d7b5c7c
No related branches found
No related tags found
No related merge requests found
......@@ -19,7 +19,7 @@ config = {
config = getattr(settings, 'FAVICON_CONFIG', config)
image_path = os.path.join(settings.STATIC_ROOT, getattr(settings, "FAVICON_PATH", "favicon"))
image_path = getattr(settings, "FAVICON_PATH", "favicon")
def pre_delete_image(sender, instance, **kwargs):
......@@ -28,7 +28,7 @@ def pre_delete_image(sender, instance, **kwargs):
class Favicon(models.Model):
title = models.CharField(max_length=100)
faviconImage = models.ImageField(upload_to=settings.STATIC_ROOT + "favicon")
faviconImage = models.ImageField(upload_to=image_path)
isFavicon = models.BooleanField(default=True)
......@@ -97,7 +97,7 @@ class FaviconImg(models.Model):
faviconFK = models.ForeignKey(Favicon, on_delete=models.CASCADE)
size = models.IntegerField()
rel = models.CharField(max_length=250, null=True)
faviconImage = models.ImageField(upload_to='favicon')
faviconImage = models.ImageField(upload_to=image_path)
def del_image(self):
self.faviconImage.delete()
......
from django import template
from django.utils.safestring import mark_safe
from django.conf.urls.static import static
from favicon.models import Favicon, config
......@@ -14,7 +13,7 @@ def place_favicon(context):
Template Syntax:
{% placeFavicon %}
{% place_favicon %}
"""
fav = Favicon.objects.filter(isFavicon=True).first()
......@@ -24,10 +23,10 @@ def place_favicon(context):
for rel in config:
for size in sorted(config[rel], reverse=True):
n = fav.get_favicon(size=size, rel=rel)
html += f'<link rel="{n.rel}" sizes="{n.size}x{n.size}" href="{static(n.faviconImage.url)}"/>'
html += f'<link rel="{n.rel}" sizes="{n.size}x{n.size}" href="{n.faviconImage.url}"/>'
default_fav = fav.get_favicon(size=32, rel='shortcut icon')
html += f'<link rel="{default_fav.rel}" sizes="{default_fav.size}x{default_fav.size}"\
href="{static(default_fav.faviconImage.url)}"/>'
href="{default_fav.faviconImage.url}"/>'
return mark_safe(html)
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment