Merge remote-tracking branch 'origin/esteban' into esteban

# Conflicts:
#	templates/profile/intern.html.twig
This commit is contained in:
BARILLOT Esteban 2025-05-05 14:25:52 +02:00
commit 8835680b99

View File

@ -27,32 +27,6 @@
href="{{ path('app_intern_resume',{id: app.user.id}) }}"> Ajouter / Modifier le CV href="{{ path('app_intern_resume',{id: app.user.id}) }}"> Ajouter / Modifier le CV
</a> </a>
<hr class="my-10"/>
{% if app.user.resume != "" %}
<iframe class="w-full" src={{ 'cv/' ~ app.user.resume }}></iframe>
{% if app.user.resumeName != "" %}
<p class="text-gray-600 italic">Nom du fichier : {{ app.user.resumeName }}</p>
{% endif %}
{% endif %}
<br>
<a class="bg-teal-500 hover:bg-teal-600 text-white py-2 px-4 rounded-full"
href="{{ path('app_intern_resume',{id: app.user.id}) }}"> Ajouter / Modifier le CV
</a>
<hr class="my-10"/>
{% if app.user.resume != "" %}
<iframe class="w-full" src={{ 'cv/' ~ app.user.resume }}></iframe>
{% if app.user.resumeName != "" %}
<p class="text-gray-600 italic">Nom du fichier : {{ app.user.resumeName }}</p>
{% endif %}
{% endif %}
<br>
<a class="bg-teal-500 hover:bg-teal-600 text-white py-2 px-4 rounded-full"
href="{{ path('app_intern_resume',{id: app.user.id}) }}"> Ajouter / Modifier le CV
</a>
<h3 class="text-lg font-semibold mt-6">Vos diplômes :</h3> <h3 class="text-lg font-semibold mt-6">Vos diplômes :</h3>
<ul class="list-disc list-inside text-gray-800"> <ul class="list-disc list-inside text-gray-800">
{% if app.user.degrees|length > 0 %} {% if app.user.degrees|length > 0 %}