tinkal/FestinHegre
3
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/feature/Back' into feature/Back

Browse Source 
# Conflicts:
#	templates/gestion_user/index.html.twig
#	templates/index/cuisinier.html.twig
This commit is contained in:
Joshua 2024-11-21 15:03:10 +01:00
commit e3b7926fa4
2 changed files with 9 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
templates/gestion_user/index.html.twig
View File

@ -4,12 +4,8 @@
{% block body %} {% block body %}
<style> <style>
</style> </style>
<form id="UpdateUser" action="{{ path('update-user', { 'id': app.user.id }) }}" method="post"> <form id="UpdateUser" action="{{ path('update-user', { 'id': app.user.id }) }}" method="post">
<div id="InformationUser"> <div id="InformationUser">
<div class="user-info-item"> <div class="user-info-item">
@ -29,8 +25,8 @@
<span class="user-info-value">{{ app.user.getRolesAsString() }}</span> <span class="user-info-value">{{ app.user.getRolesAsString() }}</span>
</div> </div>
<div class="btn"> <div class="btn-update">
<button type="submit" class="submit-button">Mettre à jour</button> <button>Modifier</button>
</div> </div>
</div> </div>
</form> </form>

28
templates/index/cuisinier.html.twig
View File

@ -3,38 +3,19 @@
{% block head %} {% block head %}
<head> <head>
<meta charset="UTF-8"> <meta charset="UTF-8">
<title>{% block title %}Cuisine{% endblock %}</title> <title>{% block title %}Index FestinHegre!{% endblock %}</title>
<link rel="icon" href="data:image/svg+xml,<svg xmlns=%22http://www.w3.org/2000/svg%22 viewBox=%220 0 128 128%22><text y=%221.2em%22 font-size=%2296%22>⚫️</text><text y=%221.3em%22 x=%220.2em%22 font-size=%2276%22 fill=%22%23fff%22>sf</text></svg>"> <link rel="icon" href="data:image/svg+xml,<svg xmlns=%22http://www.w3.org/2000/svg%22 viewBox=%220 0 128 128%22><text y=%221.2em%22 font-size=%2296%22>⚫️</text><text y=%221.3em%22 x=%220.2em%22 font-size=%2276%22 fill=%22%23fff%22>sf</text></svg>">
<link href="https://fonts.cdnfonts.com/css/brittany-signature" rel="stylesheet"> <link href="https://fonts.cdnfonts.com/css/brittany-signature" rel="stylesheet">
</head> </head>
{% endblock %} {% endblock %}
{% block stylesheets %} {% block stylesheets %}
<link rel="stylesheet" href="{{ asset('css/modal.css') }}"> <!-- Ajout du fichier CSS --> <link rel="stylesheet" href="{{ asset('css/Index.css') }}"> <!-- Ajout du fichier CSS -->
<link rel="stylesheet" href="{{ asset('css/GestionUser.css') }}"> <!-- Ajout du fichier CSS -->
{% endblock %} {% endblock %}
{% block body %} {% block body %}
<style> <style>
#container_gestion_user {
background-color: white;
margin-left: 20%; /* Centrage vertical */
margin-top: 5%;
padding: 20px;
border: 1px solid black;
width: 75%; /* Largeur du contenu de la modal */
height: 100%; /* Hauteur du contenu de la modal */
box-shadow: 0px 4px 8px rgba(0, 0, 0, 0.2);
display: none;
}
a{
text-decoration: none;
}
a:visited {
color: initial;
}
</style> </style>
<!-- Top Bar --> <!-- Top Bar -->
@ -135,7 +116,10 @@
</script> </script>
<!-- Include modals --> <!-- Include modals -->
{% include 'Modals/gestionUtilisateurModal.html.twig' %}
{% include 'Modals/gestionTableModal.html.twig' %}
{% include 'Modals/gestionCompteModal.html.twig' %} {% include 'Modals/gestionCompteModal.html.twig' %}
{% include 'Modals/gestionUtilisateurModal.html.twig' %}
{% endblock %} {% endblock %}