mirror of
https://github.com/inventree/InvenTree
synced 2024-08-30 18:33:04 +00:00
add custom logo option
This commit is contained in:
parent
002f5ec288
commit
1bce7b745e
@ -25,6 +25,7 @@ import moneyed
|
|||||||
import yaml
|
import yaml
|
||||||
from django.utils.translation import gettext_lazy as _
|
from django.utils.translation import gettext_lazy as _
|
||||||
from django.contrib.messages import constants as messages
|
from django.contrib.messages import constants as messages
|
||||||
|
from django.core.files.storage import default_storage
|
||||||
import django.conf.locale
|
import django.conf.locale
|
||||||
|
|
||||||
from .config import get_base_dir, get_config_file, get_plugin_file, get_setting
|
from .config import get_base_dir, get_config_file, get_plugin_file, get_setting
|
||||||
@ -920,3 +921,13 @@ CUSTOMIZE = get_setting(
|
|||||||
{}
|
{}
|
||||||
)
|
)
|
||||||
|
|
||||||
|
CUSTOM_LOGO = get_setting(
|
||||||
|
'INVENTREE_LOGO',
|
||||||
|
CONFIG.get('logo', False),
|
||||||
|
False
|
||||||
|
)
|
||||||
|
|
||||||
|
# check that the logo-file exsists in media
|
||||||
|
if CUSTOM_LOGO and not default_storage.exists(CUSTOM_LOGO):
|
||||||
|
CUSTOM_LOGO = False
|
||||||
|
logger.warning("The custom logo file could not be found in the default media storage")
|
||||||
|
@ -18,7 +18,8 @@ from django.conf import settings as djangosettings
|
|||||||
from django import template
|
from django import template
|
||||||
from django.urls import reverse
|
from django.urls import reverse
|
||||||
from django.utils.safestring import mark_safe
|
from django.utils.safestring import mark_safe
|
||||||
from django.templatetags.static import StaticNode
|
from django.templatetags.static import StaticNode, static
|
||||||
|
from django.core.files.storage import default_storage
|
||||||
|
|
||||||
from InvenTree import version, settings
|
from InvenTree import version, settings
|
||||||
|
|
||||||
@ -529,6 +530,15 @@ def inventree_customize(reference, *args, **kwargs):
|
|||||||
return djangosettings.CUSTOMIZE.get(reference, '')
|
return djangosettings.CUSTOMIZE.get(reference, '')
|
||||||
|
|
||||||
|
|
||||||
|
@register.simple_tag()
|
||||||
|
def inventree_logo(*args, **kwargs):
|
||||||
|
""" Return the path to the logo-file """
|
||||||
|
|
||||||
|
if settings.CUSTOM_LOGO:
|
||||||
|
return default_storage.url(settings.CUSTOM_LOGO)
|
||||||
|
return static('img/inventree.png')
|
||||||
|
|
||||||
|
|
||||||
class I18nStaticNode(StaticNode):
|
class I18nStaticNode(StaticNode):
|
||||||
"""
|
"""
|
||||||
custom StaticNode
|
custom StaticNode
|
||||||
|
@ -30,7 +30,7 @@
|
|||||||
<div class='container-fluid'>
|
<div class='container-fluid'>
|
||||||
|
|
||||||
<div class='clearfix content-heading login-header d-flex flex-wrap'>
|
<div class='clearfix content-heading login-header d-flex flex-wrap'>
|
||||||
<img class="pull-left" src="{% static 'img/inventree.png' %}" width="60" height="60"/>
|
<img class="pull-left" src="{% inventree_logo %}" width="60" height="60"/>
|
||||||
{% include "spacer.html" %}
|
{% include "spacer.html" %}
|
||||||
<span class='float-right'><h3>{% block body_title %}{% trans 'Site is in Maintenance' %}{% endblock %}</h3></span>
|
<span class='float-right'><h3>{% block body_title %}{% trans 'Site is in Maintenance' %}{% endblock %}</h3></span>
|
||||||
</div>
|
</div>
|
||||||
|
@ -67,7 +67,7 @@
|
|||||||
<div class='container-fluid'>
|
<div class='container-fluid'>
|
||||||
|
|
||||||
<div class='clearfix content-heading login-header d-flex flex-wrap'>
|
<div class='clearfix content-heading login-header d-flex flex-wrap'>
|
||||||
<img class="pull-left" src="{% static 'img/inventree.png' %}" width="60" height="60"/>
|
<img class="pull-left" src="{% inventree_logo %}" width="60" height="60"/>
|
||||||
{% include "spacer.html" %}
|
{% include "spacer.html" %}
|
||||||
<span class='float-right'><h3>{% inventree_title %}</h3></span>
|
<span class='float-right'><h3>{% inventree_title %}</h3></span>
|
||||||
</div>
|
</div>
|
||||||
|
@ -14,7 +14,7 @@
|
|||||||
<nav class="navbar {% if sticky %}fixed-top{% endif %} navbar-expand-lg navbar-light">
|
<nav class="navbar {% if sticky %}fixed-top{% endif %} navbar-expand-lg navbar-light">
|
||||||
<div class="container-fluid">
|
<div class="container-fluid">
|
||||||
<div class="navbar-header clearfix content-heading">
|
<div class="navbar-header clearfix content-heading">
|
||||||
<a class="navbar-brand" id='logo' href="{% url 'index' %}" style="padding-top: 7px; padding-bottom: 5px;"><img src="{% static 'img/inventree.png' %}" width="32" height="32" style="display:block; margin: auto;"/></a>
|
<a class="navbar-brand" id='logo' href="{% url 'index' %}" style="padding-top: 7px; padding-bottom: 5px;"><img src="{% inventree_logo %}" width="32" height="32" style="display:block; margin: auto;"/></a>
|
||||||
</div>
|
</div>
|
||||||
<div class="navbar-collapse collapse" id="navbar-objects">
|
<div class="navbar-collapse collapse" id="navbar-objects">
|
||||||
<ul class="navbar-nav">
|
<ul class="navbar-nav">
|
||||||
|
Loading…
Reference in New Issue
Block a user