diff --git a/templates/Config/edit.html.twig b/templates/Config/edit.html.twig
index 8da9a69..39f8cf7 100755
--- a/templates/Config/edit.html.twig
+++ b/templates/Config/edit.html.twig
@@ -8,12 +8,12 @@
{{ form_widget(form.submit) }}
- {% if mode=="profil" %}
+ {% if by=="profil" %}
<a class="btn btn-secondary" href={{ path('app_user_profil') }}>Annuler</a>
- {% elseif mode=="update" %}
+ {% elseif by=="update" %}
<a class="btn btn-secondary" href={{ path('app_user_update',{id:userid}) }}>Annuler</a>
{% else %}
- <a class="btn btn-secondary" href={{ path('app_config') }}>Annuler</a>
+ <a class="btn btn-secondary" href={{ path('app_admin_config') }}>Annuler</a>
{% endif %}
<br><br>
@@ -54,7 +54,7 @@
{% endif %}
<img id="config_value_img" src="{{asset("uploads/logo/"~config.value)}}" style="background-color: {{color}}; width:90px;height:90px; margin:auto;display:block;">
- <a class="btn btn-info" style="width:90px" onClick="ModalLoad('extraLargeModal','Logo','{{ path('app_config_logo') }}');" title='Ajouter un Logo'>Modifier</a>
+ <a class="btn btn-info" style="width:90px" onClick="ModalLoad('extraLargeModal','Logo','{{ path('app_user_config_logo') }}');" title='Ajouter un Logo'>Modifier</a>
</div>
{% elseif config.type=="hero" %}
<div style="margin:10px auto;">
diff --git a/templates/Config/list.html.twig b/templates/Config/list.html.twig
index 98318b7..4bd6532 100644
--- a/templates/Config/list.html.twig
+++ b/templates/Config/list.html.twig
@@ -9,43 +9,43 @@ CONFIGURATIONS
<div class="row mt-4">
<div class="col-md-12">
<h3>Générale</h3>
- {{ render(path("app_config_render",{mode:mode,category:"site",userid:-1})) }}
+ {{ render(path("app_admin_config_render",{by:by,category:"site",userid:-1})) }}
</div>
<div class="col-md-6">
<h3>Couleurs des fonds de page</h3>
- {{ render(path("app_config_render",{mode:mode,category:"colorbgbody",userid:-1})) }}
+ {{ render(path("app_admin_config_render",{by:by,category:"colorbgbody",userid:-1})) }}
</div>
<div class="col-md-6">
<h3>Polices</h3>
- {{ render(path("app_config_render",{mode:mode,category:"font",userid:-1})) }}
+ {{ render(path("app_admin_config_render",{by:by,category:"font",userid:-1})) }}
</div>
<div class="col-md-6">
<h3>Couleurs des titres </h3>
- {{ render(path("app_config_render",{mode:mode,category:"colorfttitle",userid:-1})) }}
+ {{ render(path("app_admin_config_render",{by:by,category:"colorfttitle",userid:-1})) }}
</div>
<div class="col-md-6">
<h3>Couleurs de la police </h3>
- {{ render(path("app_config_render",{mode:mode,category:"colorftbody",userid:-1})) }}
+ {{ render(path("app_admin_config_render",{by:by,category:"colorftbody",userid:-1})) }}
</div>
<div class="col-md-6">
<h3>Logo</h3>
- {{ render(path("app_config_render",{mode:mode,category:"logo",userid:-1})) }}
+ {{ render(path("app_admin_config_render",{by:by,category:"logo",userid:-1})) }}
<h3>Social</h3>
- {{ render(path("app_config_render",{mode:mode,category:"social",userid:-1})) }}
+ {{ render(path("app_admin_config_render",{by:by,category:"social",userid:-1})) }}
</div>
<div class="col-md-6">
<h3>Carrousel</h3>
- {{ render(path("app_config_render",{mode:mode,category:"hero",userid:-1})) }}
+ {{ render(path("app_admin_config_render",{by:by,category:"hero",userid:-1})) }}
<h3>Image</h3>
- {{ render(path("app_config_render",{mode:mode,category:"image",userid:-1})) }}
+ {{ render(path("app_admin_config_render",{by:by,category:"image",userid:-1})) }}
</div>
</div>
diff --git a/templates/Config/render.html.twig b/templates/Config/render.html.twig
index 07261ae..e5e94da 100644
--- a/templates/Config/render.html.twig
+++ b/templates/Config/render.html.twig
@@ -13,12 +13,12 @@
<tr>
<td width="70px">
{% if config.changeable %}
- {% if mode=="profil" %}
- <a href="{{path("app_config_user_update",{mode:mode,id:config.id})}}"><i class="fa fa-file"></i></a>
- <a href="{{path("app_config_user_delete",{mode:mode,id:config.id})}}"><i class="fa fa-trash"></i></a>
+ {% if by=="profil" %}
+ <a href="{{path("app_user_config_update",{by:by,id:config.id})}}"><i class="fa fa-file"></i></a>
+ <a href="{{path("app_user_config_delete",{by:by,id:config.id})}}"><i class="fa fa-trash"></i></a>
{% else %}
- <a href="{{path("app_config_update",{mode:mode,id:config.id,userid:userid})}}"><i class="fa fa-file"></i></a>
- <a href="{{path("app_config_delete",{mode:mode,id:config.id,userid:userid})}}"><i class="fa fa-trash"></i></a>
+ <a href="{{path("app_admin_config_update",{by:by,id:config.id,userid:userid})}}"><i class="fa fa-file"></i></a>
+ <a href="{{path("app_admin_config_delete",{by:by,id:config.id,userid:userid})}}"><i class="fa fa-trash"></i></a>
{% endif %}
{% endif %}
</td>
diff --git a/templates/Crop/crop03.html.twig b/templates/Crop/crop03.html.twig
new file mode 100644
index 0000000..6a60259
--- /dev/null
+++ b/templates/Crop/crop03.html.twig
@@ -0,0 +1,12 @@
+{% extends 'base.html.twig' %}
+
+{% block localjavascript %}
+ {% if reportinput == "refresh" %}
+ window.parent.location.href = window.parent.location.href;
+ {% elseif reportinput != "none" %}
+ window.parent.$("#{{ reportinput }}").val("thumb_{{ file }}");
+ window.parent.$("#{{ reportinput }}_img").attr("src","/{{ appAlias }}/uploads/{{ type }}/thumb_{{ file }}");
+ {% endif %}
+
+ window.parent.$("#extraLargeModal").modal('hide');
+{% endblock %}
diff --git a/templates/Home/home.html.twig b/templates/Home/home.html.twig
index dce4b4e..c0b3e8f 100644
--- a/templates/Home/home.html.twig
+++ b/templates/Home/home.html.twig
@@ -57,10 +57,10 @@
</a>
{% if is_granted('ROLE_ADMIN') %}
- <a href={{ path("app_illustration") }} class="btn btn-link" title="Configuration">
+ <a href={{ path("app_admin") }} class="btn btn-link" title="Configuration">
<i class="fa fa-cog fa-fw"></i>
</a>
- <a href={{ path("app_illustration_submit") }} class="btn btn-link" title="Créer une Illustration">
+ <a href={{ path("app_illustration_submit",{"by":"user","userid":app.user.id}) }} class="btn btn-link" title="Créer une Illustration">
<i class="fa fa-paint-brush fa-fw"></i>
</a>
{% endif %}
@@ -109,10 +109,10 @@
</a>
{% if is_granted('ROLE_ADMIN') %}
- <a href={{ path("app_illustration") }} class="btn btn-link" title="Configuration">
+ <a href={{ path("app_admin") }} class="btn btn-link" title="Configuration">
<i class="fa fa-cog fa-fw"></i>
</a>
- <a href={{ path("app_illustration_submit") }} class="btn btn-link" title="Créer une Illustration">
+ <a href={{ path("app_illustration_submit",{"by":"user","userid":app.user.id}) }} class="btn btn-link" title="Créer une Illustration">
<i class="fa fa-paint-brush fa-fw"></i>
</a>
{% endif %}
@@ -298,7 +298,7 @@
{% set source="thumbori_"~illustration.illustration %}
{% endif %}
- <a href="{{ path("app_illustration_view",{"idcat":illustration.category.id,"id":illustration.id}) }}">
+ <a href="{{ path("app_illustration_view",{"by":"home","idcat":illustration.category.id,"id":illustration.id}) }}">
<div id="illustration{{illustration.id}}" class="grid-item grid-item-size {{class}} cssfilter no-cache-bg" data-width="{{illustration.width}}" data-background-image="/{{ appAlias }}/uploads/illustration/{{source}}" data-height="{{illustration.height}}" style="height:auto;background-position: center ; background-size: cover; background-image: url(/{{ appAlias }}/uploads/illustration/{{source}}");">
</div>
</a>
diff --git a/templates/Home/user.html.twig b/templates/Home/user.html.twig
index d5b3fa3..c03ac75 100644
--- a/templates/Home/user.html.twig
+++ b/templates/Home/user.html.twig
@@ -74,10 +74,10 @@
</a>
{% if is_granted('ROLE_ADMIN') %}
- <a href={{ path("app_illustration") }} class="btn btn-link" title="Configuration">
+ <a href={{ path("app_admin") }} class="btn btn-link" title="Configuration">
<i class="fa fa-cog fa-fw"></i>
</a>
- <a href={{ path("app_illustration_submit") }} class="btn btn-link" title="Créer une Illustration">
+ <a href={{ path("app_illustration_submit",{"by":"user","userid":app.user.id}) }} class="btn btn-link" title="Créer une Illustration">
<i class="fa fa-paint-brush fa-fw"></i>
</a>
{% endif %}
@@ -126,10 +126,10 @@
</a>
{% if is_granted('ROLE_ADMIN') %}
- <a href={{ path("app_illustration") }} class="btn btn-link" title="Configuration">
+ <a href={{ path("app_admin") }} class="btn btn-link" title="Configuration">
<i class="fa fa-cog fa-fw"></i>
</a>
- <a href={{ path("app_illustration_submit") }} class="btn btn-link" title="Créer une Illustration">
+ <a href={{ path("app_illustration_submit",{"by":"user","userid":app.user.id}) }} class="btn btn-link" title="Créer une Illustration">
<i class="fa fa-paint-brush fa-fw"></i>
</a>
{% endif %}
@@ -260,7 +260,7 @@
{% set source="thumbori_"~illustration.illustration %}
{% endif %}
- <a href="{{ path("app_illustration_view",{"idcat":category.id,"id":illustration.id}) }}">
+ <a href="{{ path("app_illustration_view",{"by":"user","idcat":category.id,"id":illustration.id}) }}">
<div id="illustration{{illustration.id}}" class="grid-item grid-item-size {{class}} cssfilter cssfilter-{{category.id}} no-cache-bg" data-width="{{illustration.width}}" data-background-image="/{{ appAlias }}/uploads/illustration/{{source}}" data-height="{{illustration.height}}" style="height:auto;background-position: center ; background-size: cover; background-image: url(/{{ appAlias }}/uploads/illustration/{{source}}");">
</div>
</a>
diff --git a/templates/Illustration/edit.html.twig b/templates/Illustration/edit.html.twig
index 77120df..c599a0a 100755
--- a/templates/Illustration/edit.html.twig
+++ b/templates/Illustration/edit.html.twig
@@ -11,11 +11,16 @@
</h1>
{{ form_widget(form.submit) }}
-
- {% if by=="console" %}
- <a class="btn btn-secondary" href={{ path('app_illustration') }}>Annuler</a>
+ {% if by=="admin" %}
+ <a class="btn btn-secondary" href={{ path('app_admin_illustration',{'by':by,'userid':-1}) }}>Annuler</a>
+ {% elseif by=="update" %}
+ <a class="btn btn-secondary" href={{ path('app_user_update',{id:userid}) }}>Annuler</a>
+ {% elseif by=="profil" %}
+ <a class="btn btn-secondary" href={{ path('app_user_profil') }}>Annuler</a>
+ {% elseif by=="illustration" %}
+ <a class="btn btn-secondary" href={{ path('app_illustration_view',{'by':"user","idcat":illustration.category.id,"id":illustration.id}) }}>Annuler</a>
{% else %}
- <a class="btn btn-secondary" href={{ path('app_home') }}>Annuler</a>
+ <a class="btn btn-secondary" href={{ path('app_home_user',{'userpseudo':app.user.pseudo}) }}>Annuler</a>
{% endif %}
{% if mode=="update" %}
diff --git a/templates/Illustration/list.html.twig b/templates/Illustration/list.html.twig
index 7cdb9a7..b645fa9 100644
--- a/templates/Illustration/list.html.twig
+++ b/templates/Illustration/list.html.twig
@@ -5,7 +5,7 @@
ILLUSTRATIONS
</h1>
- <p><a class="btn btn-success" href={{ path('app_illustration_submit',{by:'console'}) }}>Ajouter</a></p>
+ <p><a class="btn btn-success" href={{ path('app_illustration_submit',{by:'admin',userid:-1}) }}>Ajouter</a></p>
<div class="card">
<div class="card-header">
@@ -19,6 +19,7 @@ ILLUSTRATIONS
<tr>
<th width="70px" class="no-sort">Action</th>
<th width="70px" class="no-sort">Miniature</th>
+ <th width="70px">Utilisateurs</th>
<th width="70px">Date</th>
<th width="100px">Catégorie</th>
<th>Nom</th>
@@ -28,11 +29,11 @@ ILLUSTRATIONS
{% for illustration in illustrations %}
<tr>
<td>
- <a href="{{path("app_illustration_update",{id:illustration.id,by:'console'})}}"><i class="fa fa-file"></i></a>
+ <a href="{{path("app_illustration_update",{id:illustration.id,by:'admin'})}}"><i class="fa fa-file"></i></a>
{% if illustration.id >=0 %}
- <a href="{{path("app_illustration_delete",{id:illustration.id,by:'console'})}}" data-method="delete" data-confirm="Êtes-vous sûr de vouloir supprimer cet enregistrement ?"><i class="fa fa-trash"></i></a>
+ <a href="{{path("app_illustration_delete",{id:illustration.id,by:'admin'})}}" data-method="delete" data-confirm="Êtes-vous sûr de vouloir supprimer cet enregistrement ?"><i class="fa fa-trash"></i></a>
{% endif %}
- <a style="cursor:pointer" onClick="ModalLoad('extraLargeModal','Illustration','{{ path('app_illustration_crop',{"type":"illustration","reportinput":"refresh","by":"console"}) }}?file={{illustration.illustration}}');"><i class="fa fa-arrows-alt" aria-hidden="true"></i></a>
+ <a style="cursor:pointer" onClick="ModalLoad('extraLargeModal','Illustration','{{ path('app_illustration_crop',{"type":"illustration","reportinput":"refresh"}) }}?file={{illustration.illustration}}');"><i class="fa fa-arrows-alt" aria-hidden="true"></i></a>
</td>
<td>
@@ -56,9 +57,11 @@ ILLUSTRATIONS
{% set height=30*90/21 %}
{% endif %}
- <div style="width:90px; height:{{ height }}px;background-position: center ; background-size: cover; background-image: url(/{{ appAlias }}/uploads/illustration/{{source}}");">
+ <div style="width:90px; height:{{ height }}px;background-position: center ; background-size: cover; background-image: url(/{{ appAlias }}/uploads/illustration/{{source}}?v={{ random(0, 10000) }}");">
</td>
+
+ <td>{{ illustration.category.user.username }}</td>
<td>{{ illustration.submittime|date("Y-m-d H:i") }}</td>
<td>{{ illustration.category.name }}</td>
<td>{{ illustration.name }}</td>
diff --git a/templates/Illustration/listrender.html.twig b/templates/Illustration/listrender.html.twig
new file mode 100644
index 0000000..f9d0107
--- /dev/null
+++ b/templates/Illustration/listrender.html.twig
@@ -0,0 +1,67 @@
+<p><a class="btn btn-success" href={{ path('app_illustration_submit',{by:by,userid:userid}) }}>Ajouter</a></p>
+
+<div class="dataTable_wrapper">
+ <table class="table table-striped table-bordered table-hover" id="illustrations" style="width:100%; zoom:80%;">
+ <thead>
+ <tr>
+ <th width="70px" class="no-sort">Action</th>
+ <th width="70px" class="no-sort">Miniature</th>
+ <th width="70px">Date</th>
+ <th width="100px">Catégorie</th>
+ <th>Nom</th>
+ </tr>
+ </thead>
+ <tbody>
+ {% for illustration in illustrations %}
+ <tr>
+ <td>
+ <a href="{{path("app_illustration_update",{id:illustration.id,by:by,userid:userid})}}"><i class="fa fa-file"></i></a>
+ {% if illustration.id >=0 %}
+ <a href="{{path("app_illustration_delete",{id:illustration.id,by:by,userid:userid})}}" data-method="delete" data-confirm="Êtes-vous sûr de vouloir supprimer cet enregistrement ?"><i class="fa fa-trash"></i></a>
+ {% endif %}
+ <a style="cursor:pointer" onClick="ModalLoad('extraLargeModal','Illustration','{{ path('app_illustration_crop',{"type":"illustration","reportinput":"refresh"}) }}?file={{illustration.illustration}}');"><i class="fa fa-arrows-alt" aria-hidden="true"></i></a>
+ </td>
+
+ <td>
+
+ {% set appthumbheight=app.session.get("appthumbheight") %}
+ {% if illustration.category.usecategoryconfig %}
+ {% set appthumbwidth=illustration.category.appthumbwidth %}
+ {% set appthumbheight=illustration.category.appthumbheight %}
+ {% endif %}
+
+ {% set source="thumb_"~illustration.illustration %}
+ {% if appthumbheight!=0 %}
+ {% set source="thumbori_"~illustration.illustration %}
+ {% endif %}
+
+ {% if appthumbheight==0 %}
+ {% set height=90 %}
+ {% elseif appthumbheight==1 %}
+ {% set height=illustration.height*90/illustration.width %}
+ {% else %}
+ {% set height=30*90/21 %}
+ {% endif %}
+
+ <div style="width:90px; height:{{ height }}px;background-position: center ; background-size: cover; background-image: url(/{{ appAlias }}/uploads/illustration/{{source}}?v={{ random(0, 10000) }}");">
+
+ </td>
+ <td>{{ illustration.submittime|date("Y-m-d H:i") }}</td>
+ <td>{{ illustration.category.name }}</td>
+ <td>{{ illustration.name }}</td>
+ </tr>
+ {% endfor %}
+ </tbody>
+ </table>
+</div>
+
+<script>
+ $(document).ready(function() {
+ $('#illustrations').DataTable({
+ columnDefs: [ { "targets": "no-sort", "orderable": false }, { "targets": "no-string", "type" : "num" } ],
+ responsive: true,
+ iDisplayLength: 10,
+ order: [[ 2, "desc" ]]
+ });
+ });
+</script>
\ No newline at end of file
diff --git a/templates/Illustration/view.html.twig b/templates/Illustration/view.html.twig
index 286a243..a0c296e 100755
--- a/templates/Illustration/view.html.twig
+++ b/templates/Illustration/view.html.twig
@@ -50,10 +50,10 @@
</style>
{% if not next is empty %}
- <a id="bigleft" href="{{ path("app_illustration_view",{"idcat":next[0].category.id,"id":next[0].id})}}"><i class="fas fa-chevron-left fa-3x"></i></a>
+ <a id="bigleft" href="{{ path("app_illustration_view",{"by":by,"idcat":next[0].category.id,"id":next[0].id})}}"><i class="fas fa-chevron-left fa-3x"></i></a>
{% endif %}
{% if not prev is empty %}
- <a id="bigright" href="{{ path("app_illustration_view",{"idcat":prev[0].category.id,"id":prev[0].id})}}"><i class="fas fa-chevron-right fa-3x"></i></a>
+ <a id="bigright" href="{{ path("app_illustration_view",{"by":by,"idcat":prev[0].category.id,"id":prev[0].id})}}"><i class="fas fa-chevron-right fa-3x"></i></a>
{% endif %}
@@ -66,8 +66,8 @@
<a download="{{ illustration.name }}.{{ pathinfo.extension }}" href="/{{ appAlias }}/uploads/illustration/{{illustration.illustration}}"><i class="fa fa-download" aria-hidden="true"></i></a>
{% if is_granted("ROLE_ADMIN") %}
- <a id="update" href="{{ path("app_illustration_update",{"id":illustration.id})}}"><i class="fa fa-file" aria-hidden="true"></i></a>
- <a id="delete" href="{{ path("app_illustration_delete",{"id":illustration.id})}}" data-method="delete" data-confirm="Êtes-vous sûr de vouloir supprimer cet entregistrement ?"><i class="fa fa-trash" aria-hidden="true"></i></a>
+ <a id="update" href="{{ path("app_illustration_update",{"by":"illustration","id":illustration.id})}}"><i class="fa fa-file" aria-hidden="true"></i></a>
+ <a id="delete" href="{{ path("app_illustration_delete",{"by":"illustration","id":illustration.id})}}" data-method="delete" data-confirm="Êtes-vous sûr de vouloir supprimer cet entregistrement ?"><i class="fa fa-trash" aria-hidden="true"></i></a>
<a id="recadre" style="cursor:pointer" onClick="ModalLoad('extraLargeModal','Illustration','{{ path('app_illustration_crop',{"type":"illustration","reportinput":"none"}) }}?file={{illustration.illustration}}');"><i class="fa fa-arrows-alt" aria-hidden="true"></i></a>
{% endif %}
diff --git a/templates/Include/sidebar.html.twig b/templates/Include/sidebar.html.twig
index e364adc..af23914 100644
--- a/templates/Include/sidebar.html.twig
+++ b/templates/Include/sidebar.html.twig
@@ -5,7 +5,7 @@
<li class="title last">Administration</li>
<li>
- <a href="{{path("app_config")}}">
+ <a href="{{path("app_admin_config")}}">
<i class="fa fa-cog fa-fw"></i> Configurations
</a>
</li>
@@ -23,7 +23,7 @@
</li>
<li>
- <a href="{{path("app_illustration")}}">
+ <a href="{{path("app_admin_illustration",{"by":"admin","userid":-1})}}">
<i class="fas fa-image fa-fw"></i> Illustrations
</a>
</li>
@@ -35,7 +35,7 @@
</li>
<li>
- <a href="{{path("app_webzine")}}">
+ <a href="{{path("app_webzine",{"by":"admin"})}}">
<i class="fas fa-book-open fa-fw"></i> Webzine
</a>
</li>
diff --git a/templates/User/edit.html.twig b/templates/User/edit.html.twig
index 25b4fc0..410ecef 100755
--- a/templates/User/edit.html.twig
+++ b/templates/User/edit.html.twig
@@ -60,7 +60,7 @@
</div>
<div class="row justify-content-md-center">
- <div class="col-md-6">
+ <div class="col-md-4">
<div class="card mb-3">
<div class="card-header">
<i class="fa fa-pencil-alt fa-fw"></i> Informations
@@ -79,7 +79,7 @@
</div>
</div>
- <div class="col-md-6">
+ <div class="col-md-4">
{% if form.roles is defined %}
<div class="card mb-2">
<div class="card-header">
@@ -100,9 +100,9 @@
</div>
<div class="card-body">
{% if mode=="profil" %}
- {{ render(path("app_config_user_render",{mode:mode,category:"site"})) }}
+ {{ render(path("app_user_config_render",{by:mode,category:"site"})) }}
{% else %}
- {{ render(path("app_config_render",{mode:mode,category:"site",userid:user.id})) }}
+ {{ render(path("app_admin_config_render",{by:mode,category:"site",userid:user.id})) }}
{% endif %}
</div>
</div>
@@ -113,40 +113,62 @@
</div>
<div class="card-body">
{% if mode=="profil" %}
- {{ render(path("app_config_user_render",{mode:mode,category:"social"})) }}
+ {{ render(path("app_user_config_render",{by:mode,category:"social"})) }}
{% else %}
- {{ render(path("app_config_render",{mode:mode,category:"social",userid:user.id})) }}
+ {{ render(path("app_admin_config_render",{by:mode,category:"social",userid:user.id})) }}
{% endif %}
</div>
</div>
+ {% endif %}
+ </div>
- <div class="card mb-3">
- <div class="card-header">
- <i class="fa fa-pencil-alt fa-fw"></i> Hero
- </div>
- <div class="card-body">
- {% if mode=="profil" %}
- {{ render(path("app_config_user_render",{mode:mode,category:"hero"})) }}
- {% else %}
- {{ render(path("app_config_render",{mode:mode,category:"hero",userid:user.id})) }}
- {% endif %}
- </div>
+ <div class="col-md-4">
+ <div class="card mb-3">
+ <div class="card-header">
+ <i class="fa fa-pencil-alt fa-fw"></i> Hero
</div>
-
- <div class="card mb-3">
- <div class="card-header">
- <i class="fa fa-pencil-alt fa-fw"></i> Images
- </div>
- <div class="card-body">
- {% if mode=="profil" %}
- {{ render(path("app_config_user_render",{mode:mode,category:"image"})) }}
- {% else %}
- {{ render(path("app_config_render",{mode:mode,category:"image",userid:user.id})) }}
- {% endif %}
- </div>
- </div>
- {% endif %}
- </div>
+ <div class="card-body">
+ {% if mode=="profil" %}
+ {{ render(path("app_user_config_render",{by:mode,category:"hero"})) }}
+ {% else %}
+ {{ render(path("app_admin_config_render",{by:mode,category:"hero",userid:user.id})) }}
+ {% endif %}
+ </div>
+ </div>
+
+ <div class="card mb-3">
+ <div class="card-header">
+ <i class="fa fa-pencil-alt fa-fw"></i> Images
+ </div>
+ <div class="card-body">
+ {% if mode=="profil" %}
+ {{ render(path("app_user_config_render",{by:mode,category:"image"})) }}
+ {% else %}
+ {{ render(path("app_admin_config_render",{by:mode,category:"image",userid:user.id})) }}
+ {% endif %}
+ </div>
+ </div>
+ </div>
+ </div>
+
+ <div class="row justify-content-md-center">
+ <div class="col-md-4">
+
+ </div>
+
+ <div class="col-md-8">
+ <div class="card mb-3">
+ <div class="card-header">
+ <i class="fa fa-pencil-alt fa-fw"></i> Illustrations
+ </div>
+ <div class="card-body">
+ {% if mode=="profil" %}
+ {{ render(path("app_user_illustration")) }}
+ {% else %}
+ {{ render(path("app_admin_illustration",{by:mode,userid:user.id})) }}
+ {% endif %}
+ </div>
+ </div>
</div>
</div>
{{ form_end(form) }}
diff --git a/templates/base.html.twig b/templates/base.html.twig
index 4717496..704cdd2 100644
--- a/templates/base.html.twig
+++ b/templates/base.html.twig
@@ -65,19 +65,14 @@
</a>
</li>
{% endif %}
-
- {% if is_granted('ROLE_ADMIN') %}
- <li>
- <a href="{{path("app_illustration")}}"><i class="fa fa-cog fa-fw"></i></a>
- </li>
-
- <li>
- <a href={{ path("app_illustration_submit",{'by':'console'}) }} title="Créer une Illustration">
- <i class="fa fa-paint-brush fa-fw"></i>
- </a>
- </li>
- {% endif %}
+ {% if is_granted('ROLE_ADMIN') %}
+ <li>
+ <a href={{ path("app_admin") }} class="btn btn-link" title="Configuration">
+ <i class="fa fa-cog fa-fw"></i>
+ </a>
+ </li>
+ {% endif %}
<li>
{% if app.user %}
{% if appAuth=="MYSQL" %}