change block personcontent to content more consistent with other templates and less need for if-statements

This commit is contained in:
2022-02-24 15:58:02 +01:00
parent f8ec0f85e5
commit c4e0b68ebe
64 changed files with 66 additions and 73 deletions

View File

@@ -5,7 +5,7 @@
{% block title 'Remove activity'|trans %}
{% block personcontent %}
{% block content %}
{{ include('@ChillMain/Util/confirmation_template.html.twig',
{
'title' : 'Remove activity'|trans,

View File

@@ -20,7 +20,7 @@
{% block title 'Update activity'|trans %}
{% block personcontent %}
{% block content %}
<div class="activity-edit">
<div id="activity"></div> {# <=== vue component #}

View File

@@ -30,7 +30,7 @@
{{ encore_entry_link_tags('mod_notification_toggle_read_status') }}
{% endblock %}
{% block personcontent %}
{% block content %}
{% set person_id = null %}
{% if person %}

View File

@@ -4,7 +4,7 @@
{% block title 'Activity creation' |trans %}
{% block personcontent %}
{% block content %}
<div class="activity-new">
<div id="activity"></div> {# <=== vue component #}

View File

@@ -4,6 +4,6 @@
{% block title 'Activity creation'|trans %}
{% block personcontent %}
{% block content %}
{% include 'ChillActivityBundle:Activity:selectType.html.twig' %}
{% endblock %}

View File

@@ -18,11 +18,11 @@
{% import 'ChillActivityBundle:ActivityReason:macro.html.twig' as m %}
{% block personcontent -%}
{% block content -%}
<div class="activity-show">
{% include 'ChillActivityBundle:Activity:show.html.twig' with {'context': 'person'} %}
</div>
{% endblock personcontent %}
{% endblock %}
{% block block_post_menu %}
<div class="post-menu pt-4">

View File

@@ -25,7 +25,7 @@
{% endblock %}
{% block layout_wvm_content %}
{% block admin_content %}<!-- block personcontent empty -->
{% block admin_content %}<!-- block content empty -->
<h1>{{ 'Activity configuration' |trans }}</h1>
{% endblock %}
{% endblock %}