Chill-project/chill-bundles
6
0
Fork 0
mirror of https://gitlab.com/Chill-Projet/chill-bundles.git synced 2025-08-20 14:43:49 +00:00
Code Issues Actions Projects Releases Wiki Activity

Merge branch 'bootstrap5' into 110_extend_thirdparty

Browse Source
This commit is contained in:
Mathieu Jaumotte
2021-07-23 17:09:45 +02:00
parent a559589883 a6266c5317
commit 5d1d6c83a9
416 changed files with 761 additions and 15467 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/Bundle/ChillMainBundle/Resources/views/CRUD/_edit_content.html.twig
View File

@@ -1,4 +1,4 @@
<div class="{% block crud_content_main_div_class %}col-10 centered{% endblock %}">
<div class="{% block crud_content_main_div_class %}{% endblock %}">
{% block crud_content_header %}
<h1>{{ ('crud.'~crud_name~'.title_edit')|trans }}</h1>
{% endblock crud_content_header %}

7
src/Bundle/ChillMainBundle/Resources/views/Login/login.html.twig
View File

@@ -23,7 +23,7 @@
{{ 'Login to %installation_name%' | trans({ '%installation_name%' : installation.name } ) }}
</title>
<link rel="shortcut icon" href="{{ asset('build/images/favicon.ico') }}" type="image/x-icon">
<link rel="stylesheet" href="{{ asset('build/login.css') }}"/>
{{ encore_entry_link_tags('page_login') }}
</head>
<body>
<div id="content">
@@ -42,14 +42,13 @@
<input type="hidden" name="_csrf_token" value="{{ csrf_token('authenticate') }}" />
<br/>
<button type="submit" name="login">{{ 'Login'|trans }}</button>
</form>
<p class="forgot-password-link"><a href="{{ path('password_request_recover') }}">{{ 'Forgot your password ?'|trans }}</a></p>
{{ include('@ChillMain/Login/_footer.html.twig') }}
</div>
<script type="text/javascript" src="{{ asset('build/runtime.js') }}"></script>
{{ encore_entry_script_tags('page_login') }}
</body>
</html>

23
src/Bundle/ChillMainBundle/Resources/views/Password/recover_layout.html.twig
View File

@@ -1,5 +1,5 @@
{#
* Copyright (C) 2014-2015, Champs Libres Cooperative SCRLFS,
* Copyright (C) 2014-2015, Champs Libres Cooperative SCRLFS,
<info@champs-libres.coop> / <http://www.champs-libres.coop>
*
* This program is free software: you can redistribute it and/or modify
@@ -24,25 +24,20 @@
{{ 'Login to %installation_name%' | trans({ '%installation_name%' : installation.name } ) }}
</title>
<link rel="shortcut icon" href="{{ asset('build/images/favicon.ico') }}" type="image/x-icon">
<link rel="stylesheet" href="{{ asset('build/chill.css') }}"/>
{{ encore_entry_link_tags('chill') }}
</head>
<body>
<header class="navigation container-fluid">
<div class="col-4 d-md-none parent">
<div class="col-10 col-md-12 offset-2 logo-container">
<a href="{{ path('chill_main_homepage') }}">
<img class="logo" src="{{ asset('build/images/logo-chill-sans-slogan_white.png') }}">
</a>
<div class="col-4 d-md-none parent">
<div class="col-10 col-md-12 offset-2 logo-container">
<a href="{{ path('chill_main_homepage') }}">
<img class="logo" src="{{ asset('build/images/logo-chill-sans-slogan_white.png') }}">
</a>
</div>
</div>
</div>
</header>
<div id="content">
<div id="content">
{% block content %}{% endblock %}
</div>
</body>

22
src/Bundle/ChillMainBundle/Resources/views/Search/advanced_search.html.twig
View File

@@ -18,17 +18,16 @@
{% block title title|trans %}
{% block content %}
<div style="margin-right: 2em; margin-left: 2em;">
<h1>{{ title|trans }}</h1>
<div class="col-md-10 col-xxl search-list">
<h1>{{ title|trans }}</h1>
{{ form_start(form) }}
{% for f in form %}
{% if f.vars.name != 'submit' %}
{% if f.vars.name != 'submit' %}
{{ form_row(f) }}
{% endif %}
{% endfor %}
@@ -38,9 +37,8 @@
{{ form_widget(form.submit, { 'attr' : { 'class': 'btn btn-create change-icon' } } ) }}
</li>
</ul>
{{ form_end(form) }}
</div>
</div>
{% endblock %}

4
src/Bundle/ChillMainBundle/Resources/views/Search/error.html.twig
View File

@@ -19,7 +19,9 @@
{% set _search_pattern = pattern %}
{% block content %}
<div class="col-md-10 col-xxl search-list">
<p class="col-8 centered error">{{ message }}</p>
<p class="error">{{ message }}</p>
</div>
{% endblock %}

14
src/Bundle/ChillMainBundle/Resources/views/Search/list.html.twig
View File

@@ -21,13 +21,11 @@
{% block title %}{{ 'Search %pattern%'|trans({ '%pattern%' : pattern }) }}{% endblock title %}
{% block content %}
<div class="col-md-10 col-xxl search-list">
<div class="col-12 parent" >
<div class="col-10 push-1 parent">
{% for result in results %}
{{ result|raw }}
{% endfor %}
</div>
</div>
{% for result in results %}
{{ result|raw }}
{% endfor %}
{% endblock %}
</div>
{% endblock %}

47
src/Bundle/ChillMainBundle/Resources/views/layout.html.twig
View File

@@ -26,33 +26,34 @@
<meta charset="UTF-8" />
<meta http-equiv="x-ua-compatible" content="ie=edge">
<meta name="viewport" content="width=device-width, initial-scale=1.0" />
<title>{{ installation.name }} - {% block title %}{% endblock %}</title>
<link rel="shortcut icon" href="{{ asset('build/images/favicon.ico') }}" type="image/x-icon">
{{ encore_entry_link_tags('bootstrap') }}
{{ encore_entry_link_tags('forkawesome') }}
{{ encore_entry_link_tags('ckeditor5') }}
{{ encore_entry_link_tags('mod_bootstrap') }}
{{ encore_entry_link_tags('mod_forkawesome') }}
{{ encore_entry_link_tags('mod_ckeditor5') }}
{{ encore_entry_link_tags('chill') }}
{% block css%}<!-- nothing added to css -->{% endblock %}
</head>
<body>
{{ include('@ChillMain/Layout/_header.html.twig') }}
{% block top_banner %}{#
To use if you want to add a banner below the header (ie the menu)
{% block top_banner %}{#
To use if you want to add a banner below the header (ie the menu)
#}{% endblock %}
<div class="content" id="content">
{% block sublayout_content %}
<div class="container-xxl">
<div class="row justify-content-center">
{% block sublayout_content %}
<div class="row justify-content-center my-5">
{# Flash messages ! #}
{% if app.session.flashbag.all()|length > 0 %}
<div class="col-8 mt-5 flash_message">
<div class="col-8 mb-5 flash_message">
{% for flashMessage in app.session.flashbag.get('success') %}
<div class="col-8 alert alert-success flash_message">
<span>{{ flashMessage|raw }}</span>
@@ -70,18 +71,18 @@
<span>{{ flashMessage|raw }}</span>
</div>
{% endfor %}
</div>
{% endif %}
{% block content %}
<div class="col-8 mt-5 main_search">
<div class="col-8 main_search">
<h2>{{ 'Search'|trans }}</h2>
<form action="{{ path('chill_main_search') }}" method="get">
<input class="form-control form-control-lg" name="q" type="search" placeholder="{{ 'Search persons, ...'|trans }}" />
<center>
<button type="submit" class="btn btn-lg btn-warning mt-2">
<button type="submit" class="btn btn-lg btn-warning mt-3">
<i class="fa fa-fw fa-search"></i> {{ 'Search'|trans }}
</button>
</center>
@@ -90,18 +91,20 @@
{{ chill_widget('homepage', {} ) }}
{% endblock %}
</div>
{% endblock %}
</div>
{% endblock %}
</div>
{{ include('@ChillMain/Layout/_footer.html.twig') }}
{{ encore_entry_script_tags('bootstrap') }}
{{ encore_entry_script_tags('forkawesome') }}
{{ encore_entry_script_tags('ckeditor5') }}
{{ encore_entry_script_tags('mod_bootstrap') }}
{{ encore_entry_script_tags('mod_forkawesome') }}
{{ encore_entry_script_tags('mod_ckeditor5') }}
{{ encore_entry_script_tags('chill') }}
<script type="text/javascript">
window.addEventListener('DOMContentLoaded', function(e) {
chill.checkOtherValueOnChange();
@@ -112,7 +115,7 @@
chill.categoryLinkParentChildSelect();
});
</script>
{% block js%}<!-- nothing added to js -->{% endblock %}
</body>
</html>

62
src/Bundle/ChillMainBundle/Resources/views/layoutWithVerticalMenu.html.twig
View File

@@ -24,42 +24,40 @@
{% extends "@ChillMain/layout.html.twig" %}
{% block sublayout_content %}
<div class="container-xxl">
<div class="row">
<div class="col-md-9">
{# Flash messages ! #}
{% if app.session.flashbag.all()|length > 0 %}
<div class="row justify-content-center mt-5">
{% for flashMessage in app.session.flashbag.get('success') %}
<div class="col-8 alert alert-success flash_message">
<span>{{ flashMessage|raw }}</span>
</div>
{% endfor %}
<div class="row">
<div class="col-md-9 my-5">
{% for flashMessage in app.session.flashbag.get('error') %}
<div class="col-8 alert alert-danger flash_message">
<span>{{ flashMessage|raw }}</span>
</div>
{% endfor %}
{# Flash messages ! #}
{% if app.session.flashbag.all()|length > 0 %}
<div class="row justify-content-center mb-5">
{% for flashMessage in app.session.flashbag.get('notice') %}
<div class="col-8 alert alert-warning flash_message">
<span>{{ flashMessage|raw }}</span>
</div>
{% endfor %}
</div>
{% endif %}
{% for flashMessage in app.session.flashbag.get('success') %}
<div class="col-8 alert alert-success flash_message">
<span>{{ flashMessage|raw }}</span>
</div>
{% endfor %}
{% for flashMessage in app.session.flashbag.get('error') %}
<div class="col-8 alert alert-danger flash_message">
<span>{{ flashMessage|raw }}</span>
</div>
{% endfor %}
{% for flashMessage in app.session.flashbag.get('notice') %}
<div class="col-8 alert alert-warning flash_message">
<span>{{ flashMessage|raw }}</span>
</div>
{% endfor %}
{% block layout_wvm_content %}<!-- content of the layoutWithVerticalMenu is empty -->
{% endblock %}
</div>
<div class="col-md-3">
{% block vertical_menu_content %}<!-- vertical menu of the layoutWithVerticalMenu is empty -->
{% endblock %}
</div>
{% endif %}
{% block layout_wvm_content %}<!-- content of the layoutWithVerticalMenu is empty -->
{% endblock %}
</div>
<div class="col-md-3">
{% block vertical_menu_content %}<!-- vertical menu of the layoutWithVerticalMenu is empty -->
{% endblock %}
</div>
</div>
{% endblock %}