core.site.name and core.site.logo are not longer required

This commit is contained in:
Simon Vieille 2023-07-19 20:42:26 +02:00
parent 231742eb0d
commit 10221591c2
10 changed files with 11 additions and 11 deletions

View file

@ -51,12 +51,10 @@ class Configuration implements ConfigurationInterface
->scalarNode('name')
->defaultValue('Murph')
->isRequired()
->cannotBeEmpty()
->end()
->scalarNode('logo')
->defaultValue('build/images/core/logo.svg')
->isRequired()
->cannotBeEmpty()
->end()
->arrayNode('controllers')
->prototype('array')

View file

@ -2,7 +2,7 @@
{% import _self as macros %}
{% block title %}{{ 'My account'|trans }} - {{ parent() }}{% endblock %}
{% block title %}{{ 'My account'|trans }} {{ parent() ? ('- ' ~ parent()) : '' }}{% endblock %}
{% block body %}
<div class="bg-light">

View file

@ -4,7 +4,7 @@
{% block body_class %}has-form{% endblock %}
{% block title %}{{ configuration.pageTitle(context)|trans|build_string(entity) }} - {{ parent() }}{% endblock %}
{% block title %}{{ configuration.pageTitle(context)|trans|build_string(entity) }} {{ parent() ? ('- ' ~ parent()) : '' }}{% endblock %}
{% block body %}
{% block header %}

View file

@ -2,7 +2,7 @@
{% set context = context ?? 'index' %}
{% block title %}{{ configuration.pageTitle(context)|trans }} - {{ parent() }}{% endblock %}
{% block title %}{{ configuration.pageTitle(context)|trans }} {{ parent() ? ('- ' ~ parent()) : '' }}{% endblock %}
{% block body %}
{% block header %}

View file

@ -4,7 +4,7 @@
{% block body_class %}has-form{% endblock %}
{% block title %}{{ configuration.pageTitle(context)|trans|build_string(entity) }} - {{ parent() }}{% endblock %}
{% block title %}{{ configuration.pageTitle(context)|trans|build_string(entity) }} {{ parent() ? ('- ' ~ parent()) : '' }}{% endblock %}
{% block body %}
{% block header %}

View file

@ -2,7 +2,7 @@
{% set context = context ?? 'show' %}
{% block title %}{{ configuration.pageTitle(context)|trans|build_string(entity) }} - {{ parent() }}{% endblock %}
{% block title %}{{ configuration.pageTitle(context)|trans|build_string(entity) }} {{ parent() ? ('- ' ~ parent()) : '' }}{% endblock %}
{% block body %}
{% block header %}

View file

@ -15,7 +15,9 @@
<nav class="navbar fixed-top navbar-expand-md navbar-light bg-light border-bottom">
<a class="navbar-brand" href="{{ path('admin_dashboard_index') }}">
<img id="logo" src="{{ asset(site_logo) }}" alt="{{ site_name }}" title="{{ site_name }}">
{% if site_logo %}
<img id="logo" src="{{ asset(site_logo) }}" alt="{{ site_name }}" title="{{ site_name }}">
{% endif %}
<span class="ml-2 d-none d-md-inline">{{ site_name }}</span>
</a>

View file

@ -1,6 +1,6 @@
{% extends '@Core/admin/layout.html.twig' %}
{% block title %}{{ 'Settings'|trans }} - {{ parent() }}{% endblock %}
{% block title %}{{ 'Settings'|trans }} {{ parent() ? ('- ' ~ parent()) : '' }}{% endblock %}
{% block body %}
<div class="bg-light">

View file

@ -1,6 +1,6 @@
{% extends '@Core/admin/layout.html.twig' %}
{% block title %}{{ 'Tree'|trans }} - {{ parent() }}{% endblock %}
{% block title %}{{ 'Tree'|trans }} {{ parent() ? ('- ' ~ parent()) : '' }}{% endblock %}
{% block body %}
<div class="bg-light">

View file

@ -1,6 +1,6 @@
{% extends '@Core/admin/layout.html.twig' %}
{% block title %}{{ 'Tasks'|trans }} - {{ parent() }}{% endblock %}
{% block title %}{{ 'Tasks'|trans }} {{ parent() ? ('- ' ~ parent()) : '' }}{% endblock %}
{% block body %}
<div class="bg-light">