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" %} Annuler - {% elseif mode=="update" %} + {% elseif by=="update" %} Annuler {% else %} - Annuler + Annuler {% endif %}

@@ -54,7 +54,7 @@ {% endif %} - Modifier + Modifier {% elseif config.type=="hero" %}
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

Générale

- {{ render(path("app_config_render",{mode:mode,category:"site",userid:-1})) }} + {{ render(path("app_admin_config_render",{by:by,category:"site",userid:-1})) }}

Couleurs des fonds de page

- {{ render(path("app_config_render",{mode:mode,category:"colorbgbody",userid:-1})) }} + {{ render(path("app_admin_config_render",{by:by,category:"colorbgbody",userid:-1})) }}

Polices

- {{ render(path("app_config_render",{mode:mode,category:"font",userid:-1})) }} + {{ render(path("app_admin_config_render",{by:by,category:"font",userid:-1})) }}

Couleurs des titres

- {{ render(path("app_config_render",{mode:mode,category:"colorfttitle",userid:-1})) }} + {{ render(path("app_admin_config_render",{by:by,category:"colorfttitle",userid:-1})) }}

Couleurs de la police

- {{ render(path("app_config_render",{mode:mode,category:"colorftbody",userid:-1})) }} + {{ render(path("app_admin_config_render",{by:by,category:"colorftbody",userid:-1})) }}

Logo

- {{ render(path("app_config_render",{mode:mode,category:"logo",userid:-1})) }} + {{ render(path("app_admin_config_render",{by:by,category:"logo",userid:-1})) }}

Social

- {{ render(path("app_config_render",{mode:mode,category:"social",userid:-1})) }} + {{ render(path("app_admin_config_render",{by:by,category:"social",userid:-1})) }}

Carrousel

- {{ render(path("app_config_render",{mode:mode,category:"hero",userid:-1})) }} + {{ render(path("app_admin_config_render",{by:by,category:"hero",userid:-1})) }}

Image

- {{ render(path("app_config_render",{mode:mode,category:"image",userid:-1})) }} + {{ render(path("app_admin_config_render",{by:by,category:"image",userid:-1})) }}
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 @@ {% if config.changeable %} - {% if mode=="profil" %} - - + {% if by=="profil" %} + + {% else %} - - + + {% endif %} {% endif %} 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 @@ {% if is_granted('ROLE_ADMIN') %} - + - + {% endif %} @@ -109,10 +109,10 @@ {% if is_granted('ROLE_ADMIN') %} - + - + {% endif %} @@ -298,7 +298,7 @@ {% set source="thumbori_"~illustration.illustration %} {% endif %} - +
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 @@ {% if is_granted('ROLE_ADMIN') %} - + - + {% endif %} @@ -126,10 +126,10 @@ {% if is_granted('ROLE_ADMIN') %} - + - + {% endif %} @@ -260,7 +260,7 @@ {% set source="thumbori_"~illustration.illustration %} {% endif %} - +
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 @@ {{ form_widget(form.submit) }} - - {% if by=="console" %} - Annuler + {% if by=="admin" %} + Annuler + {% elseif by=="update" %} + Annuler + {% elseif by=="profil" %} + Annuler + {% elseif by=="illustration" %} + Annuler {% else %} - Annuler + Annuler {% 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 -

Ajouter

+

Ajouter

@@ -19,6 +19,7 @@ ILLUSTRATIONS Action Miniature + Utilisateurs Date Catégorie Nom @@ -28,11 +29,11 @@ ILLUSTRATIONS {% for illustration in illustrations %} - + {% if illustration.id >=0 %} - + {% endif %} - + @@ -56,9 +57,11 @@ ILLUSTRATIONS {% set height=30*90/21 %} {% endif %} -
+
+ + {{ illustration.category.user.username }} {{ illustration.submittime|date("Y-m-d H:i") }} {{ illustration.category.name }} {{ illustration.name }} 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 @@ +

Ajouter

+ +
+ + + + + + + + + + + + {% for illustration in illustrations %} + + + + + + + + + {% endfor %} + +
ActionMiniatureDateCatégorieNom
+ + {% if illustration.id >=0 %} + + {% endif %} + + + + {% 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 %} + +
+ +
{{ illustration.submittime|date("Y-m-d H:i") }}{{ illustration.category.name }}{{ illustration.name }}
+
+ + \ 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 @@ {% if not next is empty %} - + {% endif %} {% if not prev is empty %} - + {% endif %} @@ -66,8 +66,8 @@ {% if is_granted("ROLE_ADMIN") %} - - + + {% 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 @@
  • Administration
  • - + Configurations
    • @@ -23,7 +23,7 @@
  • - + Illustrations
    • @@ -35,7 +35,7 @@
  • - + Webzine
    • 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 @@
    -
    +
    Informations @@ -79,7 +79,7 @@
    -
    +
    {% if form.roles is defined %}
    @@ -100,9 +100,9 @@
    {% 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 %}
    @@ -113,40 +113,62 @@
    {% 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 %}
    + {% endif %} +
    -
    -
    - Hero -
    -
    - {% 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 %} -
    +
    +
    +
    + Hero
    - -
    -
    - Images -
    -
    - {% 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 %} -
    -
    - {% endif %} -
    +
    + {% 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 %} +
    +
    + +
    +
    + Images +
    +
    + {% 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 %} +
    +
    +
    +
    + +
    +
    + +
    + +
    +
    +
    + Illustrations +
    +
    + {% if mode=="profil" %} + {{ render(path("app_user_illustration")) }} + {% else %} + {{ render(path("app_admin_illustration",{by:mode,userid:user.id})) }} + {% endif %} +
    +
    {{ 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 @@ {% endif %} - - {% if is_granted('ROLE_ADMIN') %} -
  • - -
    • - -
  • - - - -
    • - {% endif %} + {% if is_granted('ROLE_ADMIN') %} +
  • + + + +
    • + {% endif %}
  • {% if app.user %} {% if appAuth=="MYSQL" %}