composer/iTop
6
0
Fork 0
mirror of https://github.com/Combodo/iTop.git synced 2026-02-13 07:24:13 +01:00
Code Issues Packages Projects Releases Wiki Activity

migration symfony 5 4 (#300)

Browse Source 
* symfony 5.4 (diff dev)

* symfony 5.4 (working)

* symfony 5.4 (update autoload)

* symfony 5.4 (remove swiftmailer mailer implementation)

* symfony 5.4 (php doc and split Global accessor class)


### Impacted packages:

composer require php:">=7.2.5 <8.0.0" symfony/console:5.4.* symfony/dotenv:5.4.* symfony/framework-bundle:5.4.* symfony/twig-bundle:5.4.* symfony/yaml:5.4.* --update-with-dependencies

composer require symfony/stopwatch:5.4.* symfony/web-profiler-bundle:5.4.* --dev --update-with-dependencies
This commit is contained in:
bdalsass
2022-06-16 09:13:24 +02:00
committed by GitHub
parent abb13b70b9
commit 79da71ecf8
2178 changed files with 87439 additions and 59451 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
templates/pages/login/base.html.twig
View File

@@ -3,9 +3,9 @@
{% block body %}
{% import "macros.twig" as Macro %}
<div id="login-body">
{% block login_header %}
{% import "macros.twig" as Macro %}
<div id="login-header">
{{ Macro.BlockExtension(aPluginFormData, 'login_header') }}
</div>
@@ -21,12 +21,14 @@
{% block login_content %}
{% endblock login_content %}
{% block login_additional_content %}
{% import "macros.twig" as Macro %}
<div id="login-additional-content">
{{ Macro.BlockExtension(aPluginFormData, 'login_additional_content') }}
</div>
{% endblock login_additional_content %}
{% endblock login_content_outer %}
{% block login_footer %}
{% import "macros.twig" as Macro %}
<div id="login-footer">
{{ Macro.BlockExtension(aPluginFormData, 'login_footer') }}
</div>

8
templates/pages/login/login.html.twig
View File

@@ -4,7 +4,7 @@
{% extends "base.html.twig" %}
{% block login_content %}
{% import "macros.twig" as Macro %}
<div id="login-content">
{% block login_title %}
<div id="login-title">
@@ -22,31 +22,37 @@
<div id="login-form-content">
{% block login_sso_buttons %}
<div id="login-sso-buttons">
{% import "macros.twig" as Macro %}
{{ Macro.BlockExtension(aPluginFormData, 'login_sso_buttons', '<div class="divider"><hr class="left">' ~ 'UI:Login:SeparatorOr'|dict_s ~ '<hr class="right"/></div>') }}
</div>
{% endblock login_sso_buttons %}
{% block login_input %}
<div id="login-input">
{% import "macros.twig" as Macro %}
{{ Macro.BlockExtension(aPluginFormData, 'login_input') }}
</div>
{% endblock login_input %}
{% block login_additional_controls %}
<div id="login-additional-controls">
{% import "macros.twig" as Macro %}
{{ Macro.BlockExtension(aPluginFormData, 'login_additional_controls') }}
</div>
{% endblock login_additional_controls %}
{% block login_submit %}
<div id="login-submit">
{% import "macros.twig" as Macro %}
{{ Macro.BlockExtension(aPluginFormData, 'login_submit') }}
</div>
{% endblock login_submit %}
{% block login_links %}
<div id="login-links">
{% import "macros.twig" as Macro %}
{{ Macro.BlockExtension(aPluginFormData, 'login_links') }}
</div>
{% endblock login_links %}
{% block login_form_footer %}
<div id="login-form-footer">
{% import "macros.twig" as Macro %}
{{ Macro.BlockExtension(aPluginFormData, 'login_form_footer') }}
</div>
{% endblock login_form_footer %}

4
templates/pages/login/macros.twig
View File

@@ -3,12 +3,14 @@
{% macro BlockExtension(aPluginFormData, sBlockName, sText = '') %}
{% set bHaveBlock = 'false' %}
{% for oLoginData in aPluginFormData if (oLoginData is defined and oLoginData.GetBlockExtension(sBlockName)) %}
{% for oLoginData in aPluginFormData %}
{% if (oLoginData is defined and oLoginData.GetBlockExtension(sBlockName)) %}
{% set bHaveBlock = 'true' %}
{% set oBlockExtension = oLoginData.GetBlockExtension(sBlockName) %}
{% set sTwig = oBlockExtension.GetTwig() %}
{% set aData = oBlockExtension.GetData() %}
{% include sTwig ignore missing %}
{% endif %}
{% endfor %}
{% if bHaveBlock == 'true' %}
{{ sText|raw }}