Compare commits
No commits in common. "63aa3587da42c1822439456da523e4b0545fbd73" and "191b946a732f5ec658ac4c700c1454f74e7c3ef8" have entirely different histories.
63aa3587da
...
191b946a73
10 changed files with 15 additions and 12 deletions
|
@ -13,7 +13,7 @@ repos:
|
||||||
hooks:
|
hooks:
|
||||||
- id: flake8
|
- id: flake8
|
||||||
args: ["--max-line-length=88", "--extend-ignore=E203"]
|
args: ["--max-line-length=88", "--extend-ignore=E203"]
|
||||||
exclude: "lps/lps/settings/|migrations"
|
exclude: "lps/lps/settings/"
|
||||||
- repo: https://github.com/Riverside-Healthcare/djLint
|
- repo: https://github.com/Riverside-Healthcare/djLint
|
||||||
rev: v1.23.3
|
rev: v1.23.3
|
||||||
hooks:
|
hooks:
|
||||||
|
|
|
@ -8,6 +8,7 @@ from django.db import migrations, models
|
||||||
|
|
||||||
|
|
||||||
class Migration(migrations.Migration):
|
class Migration(migrations.Migration):
|
||||||
|
|
||||||
dependencies = [
|
dependencies = [
|
||||||
("base", "0002_alter_navigationsettings_phone"),
|
("base", "0002_alter_navigationsettings_phone"),
|
||||||
("wagtailcore", "0093_uploadedfile"),
|
("wagtailcore", "0093_uploadedfile"),
|
||||||
|
|
|
@ -5,6 +5,7 @@ from django.db import migrations, models
|
||||||
|
|
||||||
|
|
||||||
class Migration(migrations.Migration):
|
class Migration(migrations.Migration):
|
||||||
|
|
||||||
dependencies = [
|
dependencies = [
|
||||||
("base", "0003_formpage_formfield"),
|
("base", "0003_formpage_formfield"),
|
||||||
("wagtailimages", "0026_delete_uploadedimage"),
|
("wagtailimages", "0026_delete_uploadedimage"),
|
||||||
|
|
|
@ -26,7 +26,6 @@ class NavigationSettings(BaseGenericSetting):
|
||||||
)
|
)
|
||||||
]
|
]
|
||||||
|
|
||||||
|
|
||||||
@register_setting
|
@register_setting
|
||||||
class SiteSettings(BaseGenericSetting):
|
class SiteSettings(BaseGenericSetting):
|
||||||
icon = models.ForeignKey(
|
icon = models.ForeignKey(
|
||||||
|
@ -38,7 +37,9 @@ class SiteSettings(BaseGenericSetting):
|
||||||
help_text="Icône du site",
|
help_text="Icône du site",
|
||||||
)
|
)
|
||||||
|
|
||||||
panels = [MultiFieldPanel([FieldPanel("icon")], "Informations du site")]
|
panels = [
|
||||||
|
MultiFieldPanel(
|
||||||
|
[FieldPanel("icon")], "Informations du site")]
|
||||||
|
|
||||||
|
|
||||||
class FormField(AbstractFormField):
|
class FormField(AbstractFormField):
|
||||||
|
|
|
@ -1,9 +1,9 @@
|
||||||
from django import template
|
from django import template
|
||||||
|
|
||||||
from wagtail.models import Site
|
from wagtail.models import Site
|
||||||
|
|
||||||
register = template.Library()
|
register = template.Library()
|
||||||
|
|
||||||
|
|
||||||
@register.simple_tag(takes_context=True)
|
@register.simple_tag(takes_context=True)
|
||||||
def get_site_root(context):
|
def get_site_root(context):
|
||||||
return Site.find_for_request(context["request"]).root_page
|
return Site.find_for_request(context["request"]).root_page
|
||||||
|
|
|
@ -5,6 +5,7 @@ from django.db import migrations, models
|
||||||
|
|
||||||
|
|
||||||
class Migration(migrations.Migration):
|
class Migration(migrations.Migration):
|
||||||
|
|
||||||
dependencies = [
|
dependencies = [
|
||||||
("home", "0004_homepage_hero_text_homepage_image"),
|
("home", "0004_homepage_hero_text_homepage_image"),
|
||||||
("wagtailimages", "0026_delete_uploadedimage"),
|
("wagtailimages", "0026_delete_uploadedimage"),
|
||||||
|
|
|
@ -4,6 +4,7 @@ from django.db import migrations
|
||||||
|
|
||||||
|
|
||||||
class Migration(migrations.Migration):
|
class Migration(migrations.Migration):
|
||||||
|
|
||||||
dependencies = [
|
dependencies = [
|
||||||
("home", "0005_homepage_icon"),
|
("home", "0005_homepage_icon"),
|
||||||
]
|
]
|
||||||
|
|
|
@ -1,4 +1,4 @@
|
||||||
{% load static wagtailcore_tags wagtailuserbar wagtailimages_tags %}
|
{% load static wagtailcore_tags wagtailuserbar %}
|
||||||
<!DOCTYPE html>
|
<!DOCTYPE html>
|
||||||
<html lang="en">
|
<html lang="en">
|
||||||
<head>
|
<head>
|
||||||
|
@ -30,8 +30,6 @@
|
||||||
rel="stylesheet" />
|
rel="stylesheet" />
|
||||||
<link rel="stylesheet" type="text/css" href="{% static 'css/lps.css' %}">
|
<link rel="stylesheet" type="text/css" href="{% static 'css/lps.css' %}">
|
||||||
{% block extra_css %}{# Override this in templates to add extra stylesheets #}{% endblock %}
|
{% block extra_css %}{# Override this in templates to add extra stylesheets #}{% endblock %}
|
||||||
{% image settings.base.SiteSettings.icon fill-32x32 format-png as favicon %}
|
|
||||||
<link rel="icon" href="{{ favicon.url }}">
|
|
||||||
</head>
|
</head>
|
||||||
<body>
|
<body>
|
||||||
{% wagtailuserbar %}
|
{% wagtailuserbar %}
|
||||||
|
|
Reference in a new issue