Commit 523d4754 authored by KarlPineau's avatar KarlPineau

update

parent b0c9914d
...@@ -21,11 +21,16 @@ ...@@ -21,11 +21,16 @@
{% block content %} {% block content %}
<div class="row"> <div class="row">
<div class="col-xs-12"> <div class="col-12">
<div class="jumbotron"> <div class="card">
{% block fos_user_content %} <div class="card-header">
{% include "FOSUserBundle:ChangePassword:changePassword_content.html.twig" %} <strong class="card-title">Modification du mot de passe :</strong>
{% endblock fos_user_content %} </div>
<div class="card-body">
{% block fos_user_content %}
{% include "FOSUserBundle:ChangePassword:change_password_content.html.twig" %}
{% endblock fos_user_content %}
</div>
</div> </div>
</div> </div>
</div> </div>
......
...@@ -12,33 +12,29 @@ ...@@ -12,33 +12,29 @@
<br /> <br />
{% endif %} {% endif %}
<fieldset> <div class="form-group row">
<legend>Modification du mot de passe :</legend> {{ form_label(form.current_password, "Actuel :", {'label_attr': {'class': 'col-sm-3 control-label'}}) }}
<div class="col-sm-6">
<div class="form-group"> {{ form_widget(form.current_password, {'attr': {'placeholder': 'Mot de passe actuel', 'class': 'form-control'}}) }}
{{ form_label(form.current_password, "Actuel :", {'label_attr': {'class': 'col-sm-3 control-label'}}) }}
<div class="col-sm-6">
{{ form_widget(form.current_password, {'attr': {'placeholder': 'Mot de passe actuel', 'class': 'form-control'}}) }}
</div>
</div> </div>
</div>
<div class="form-group"> <div class="form-group row">
{{ form_label(form.plainPassword.first, "Nouveau :", {'label_attr': {'class': 'col-sm-3 control-label'}}) }} {{ form_label(form.plainPassword.first, "Nouveau :", {'label_attr': {'class': 'col-sm-3 control-label'}}) }}
<div class="col-sm-6"> <div class="col-sm-6">
{{ form_widget(form.plainPassword.first, {'attr': {'placeholder': 'Nouveau mot de passe', 'class': 'form-control'}}) }} {{ form_widget(form.plainPassword.first, {'attr': {'placeholder': 'Nouveau mot de passe', 'class': 'form-control'}}) }}
</div>
</div> </div>
</div>
<div class="form-group"> <div class="form-group row">
{{ form_label(form.plainPassword.second, "Vérification :", {'label_attr': {'class': 'col-sm-3 control-label'}}) }} {{ form_label(form.plainPassword.second, "Vérification :", {'label_attr': {'class': 'col-sm-3 control-label'}}) }}
<div class="col-sm-6"> <div class="col-sm-6">
{{ form_widget(form.plainPassword.second, {'attr': {'placeholder': 'Confirmer nouveau mot de passe', 'class': 'form-control'}}) }} {{ form_widget(form.plainPassword.second, {'attr': {'placeholder': 'Confirmer nouveau mot de passe', 'class': 'form-control'}}) }}
</div>
</div>
{{ form_rest(form) }}
<br />
<div class="text-center">
<input class="btn btn-primary" type="submit" value="{{ 'change_password.submit'|trans }}" />
</div> </div>
</fieldset> </div>
{{ form_rest(form) }}
<br />
<div class="text-center">
<input class="btn btn-primary" type="submit" value="{{ 'change_password.submit'|trans }}" />
</div>
{{ form_end(form) }} {{ form_end(form) }}
<div class="jumbotron"> <div class="jumbotron">
<h1 style="text-align: center;">Votre mot de passe a été modifié</h1> <h1 style="text-align: center;">Votre mot de passe a été modifié</h1>
<div style="text-align: center;"><a href="{{ app.request.getSchemeAndHttpHost() }}"><img src="{{ app.request.getSchemeAndHttpHost() }}web/images/logo-big.png" style="max-width: 150px;"/></a></div> <div style="text-align: center;"><a href="{{ app.request.getSchemeAndHttpHost() }}"><img src="{{ app.request.getSchemeAndHttpHost() }}/web/images/logo-big.png" style="max-width: 150px;"/></a></div>
<br /> <br />
<p>Vous avez modifié le mot de passe associé à l'adresse mail <strong>{{ email }}</strong>.Cette modification a bien été prise en compte.</p> <p>Vous avez modifié le mot de passe associé à l'adresse mail <strong>{{ email }}</strong>.Cette modification a bien été prise en compte.</p>
<br /> <br />
......
<div class="jumbotron"> <div class="jumbotron">
<h1 style="text-align: center;">Au revoir !</h1> <h1 style="text-align: center;">Au revoir !</h1>
<div style="text-align: center;"><a href="{{ app.request.getSchemeAndHttpHost() }}"><img src="{{ app.request.getSchemeAndHttpHost() }}web/images/logo-big.png" style="max-width: 150px;"/></a></div> <div style="text-align: center;"><a href="{{ app.request.getSchemeAndHttpHost() }}"><img src="{{ app.request.getSchemeAndHttpHost() }}/web/images/logo-big.png" style="max-width: 150px;"/></a></div>
<br /> <br />
<p>Hey ! Votre compte a bien été supprimé. <br /> <p>Hey ! Votre compte a bien été supprimé. <br />
Nous sommes désolés de vous voir partir :( . Mais bon, nous espérons secrètement vous revoir bientôt sur Clichés! ;).</p> Nous sommes désolés de vous voir partir :( . Mais bon, nous espérons secrètement vous revoir bientôt sur Clichés! ;).</p>
......
...@@ -12,7 +12,7 @@ ...@@ -12,7 +12,7 @@
</div> </div>
<br /> <br />
<p class="alert alert-info"> <p class="alert alert-info">
{{ 'resetting.check_email'|trans({'%email%': email}) }} Un lien de réinitialisation vous a été envoyé.<br />Veuillez consulter votre boite mail.
</p> </p>
<br /> <br />
<p class="text-center"><a href="{{ path('home_home_home_index') }}">Retour</a></p> <p class="text-center"><a href="{{ path('home_home_home_index') }}">Retour</a></p>
......
{% trans_default_domain 'FOSUserBundle' %} {% trans_default_domain 'FOSUserBundle' %}
{{ form_start(form, {'attr': {'class': 'form-signin'}, 'action': path('fos_user_resetting_send_email')}) }} <form action="{{ path('fos_user_resetting_send_email') }}" method="POST" class="form-signin fos_user_resetting_request">
<div> <div>
<div class="pull-right"><img src="{{ asset('images/logo.png') }}" style="max-height: 40px;"/></div> <div class="pull-right"><img src="{{ asset('images/logo.png') }}" style="max-height: 40px;"/></div>
<h2 class="form-signin-heading">Mot de passe oublié ?</h2> <h2 class="form-signin-heading">Mot de passe oublié ?</h2>
</div> </div>
<br />
{% if invalid_username is defined %} {% if invalid_username is defined %}
<p class="alert alert-danger">{{ 'resetting.request.invalid_username'|trans({'%username%': invalid_username}) }}</p> <p class="alert alert-danger">{{ 'resetting.request.invalid_username'|trans({'%username%': invalid_username}) }}</p>
<br /> <br />
{% endif %} {% endif %}
<div>
<label for="username" class="sr-only">Adresse mail</label> <label for="username" class="sr-only">{{ 'resetting.request.username'|trans }}</label>
<input type="text" id="username" name="username" placeholder="Adresse mail" required="required" class="form-control" autofocus /> <input type="text" class="form-control" id="username" name="username" placeholder="Nom d'utilisateur / Adresse mail" required="required" />
</div>
<br /> <div class="mt-3">
<input class="btn btn-lg btn-warning btn-block" type="submit" value="Réinitialiser" /> <input class="btn btn-lg btn-warning btn-block" type="submit" value="{{ 'resetting.request.submit'|trans }}" />
<br /> </div>
<p class="text-center"><a href="{{ path('home_home_home_index') }}">Retour</a></p> <p class="text-center mt-3"><a href="{{ path('home_home_home_index') }}">Retour</a></p>
{{ form_end(form) }} </form>
\ No newline at end of file
...@@ -19,14 +19,14 @@ ...@@ -19,14 +19,14 @@
<div class="container"> <div class="container">
<a class="navbar-brand" href="{{ path('home_home_home_index') }}"> <a class="navbar-brand" href="{{ path('home_home_home_index') }}">
<img src="{{ asset('images/logo.png') }}" width="70" alt="Logo de Clichés!" class="mr-3"> <img src="{{ asset('images/logo.png') }}" width="70" alt="Logo de Clichés!" class="mr-3">
{% block brandtitle %}{% endblock %} <span class="d-none d-sm-inline">{% block brandtitle %}{% endblock %}</span>
</a> </a>
<button class="navbar-toggler" type="button" data-toggle="collapse" data-target="#navbarSupportedContent" aria-controls="navbarSupportedContent" aria-expanded="false" aria-label="Toggle navigation"> <button class="navbar-toggler" type="button" data-toggle="collapse" data-target="#navbarSupportedContent" aria-controls="navbarSupportedContent" aria-expanded="false" aria-label="Toggle navigation">
<span class="navbar-toggler-icon"></span> <span class="navbar-toggler-icon"></span>
</button> </button>
<div class="collapse navbar-collapse" id="navbarSupportedContent"> <div class="collapse navbar-collapse" id="navbarSupportedContent">
<ul class="navbar-nav ml-auto"> <ul class="navbar-nav ml-auto text-right text-sm-left">
{% if is_granted("IS_AUTHENTICATED_REMEMBERED") %} {% if is_granted("IS_AUTHENTICATED_REMEMBERED") %}
<li class="dropdown ml-3 pt-2"> <li class="dropdown ml-3 pt-2">
<a class="dropdown-toggle" href="#" role="button" id="dropdownUserLink" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">{{ app.user.username }}</a> <a class="dropdown-toggle" href="#" role="button" id="dropdownUserLink" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">{{ app.user.username }}</a>
......
...@@ -19,14 +19,14 @@ ...@@ -19,14 +19,14 @@
<div class="container"> <div class="container">
<a class="navbar-brand" href="{{ path('cliches_home_home_index') }}"> <a class="navbar-brand" href="{{ path('cliches_home_home_index') }}">
<img src="{{ asset('images/logo.png') }}" width="70" alt="Logo de Clichés!" class="mr-3"> <img src="{{ asset('images/logo.png') }}" width="70" alt="Logo de Clichés!" class="mr-3">
{% block brandtitle %}{% endblock %} <span class="d-none d-sm-inline">{% block brandtitle %}{% endblock %}</span>
</a> </a>
<button class="navbar-toggler" type="button" data-toggle="collapse" data-target="#navbarSupportedContent" aria-controls="navbarSupportedContent" aria-expanded="false" aria-label="Toggle navigation"> <button class="navbar-toggler" type="button" data-toggle="collapse" data-target="#navbarSupportedContent" aria-controls="navbarSupportedContent" aria-expanded="false" aria-label="Toggle navigation">
<span class="navbar-toggler-icon"></span> <span class="navbar-toggler-icon"></span>
</button> </button>
<div class="collapse navbar-collapse" id="navbarSupportedContent"> <div class="collapse navbar-collapse" id="navbarSupportedContent">
<ul class="navbar-nav ml-auto"> <ul class="navbar-nav ml-auto text-right text-sm-left">
{% if is_granted("IS_AUTHENTICATED_REMEMBERED") %} {% if is_granted("IS_AUTHENTICATED_REMEMBERED") %}
<li class="ml-3"><a href="{{ path('data_public_home_contribute') }}" class="btn btn-primary">Contribuer</a></li> <li class="ml-3"><a href="{{ path('data_public_home_contribute') }}" class="btn btn-primary">Contribuer</a></li>
<li class="dropdown ml-3 pt-2"> <li class="dropdown ml-3 pt-2">
...@@ -86,14 +86,14 @@ ...@@ -86,14 +86,14 @@
<footer class="mt-8 text-muted"> <footer class="mt-8 text-muted">
<div class="container"> <div class="container">
<div class="row"> <div class="row">
<div class="col-12 col-sm-4"> <div class="col-12 col-sm-4 text-center text-sm-left">
<ul class="list-unstyled"> <ul class="list-unstyled">
<li><a href="{{ path('cliches_home_home_index') }}" class="text-muted">Clichés!</a></li> <li><a href="{{ path('cliches_home_home_index') }}" class="text-muted">Clichés!</a></li>
{#<li><a href="{{ path('tb_home_home_index') }}" class="text-muted">ConfusArt</a></li>#} {#<li><a href="{{ path('tb_home_home_index') }}" class="text-muted">ConfusArt</a></li>#}
<li><a href="{{ path('data_public_home_index') }}" class="text-muted">Data</a></li> <li><a href="{{ path('data_public_home_index') }}" class="text-muted">Data</a></li>
</ul> </ul>
</div> </div>
<div class="col-12 col-sm-4"> <div class="col-12 col-sm-4 text-center text-sm-left mt-4 mt-sm-0">
<ul class="list-unstyled"> <ul class="list-unstyled">
<li><a href="{{ path('data_public_home_contribute') }}" class="text-muted">Contribuer</a></li> <li><a href="{{ path('data_public_home_contribute') }}" class="text-muted">Contribuer</a></li>
<li><a href="{{ path('home_home_home_mentionsLegales') }}" class="text-muted">Mentions légales</a></li> <li><a href="{{ path('home_home_home_mentionsLegales') }}" class="text-muted">Mentions légales</a></li>
...@@ -101,8 +101,10 @@ ...@@ -101,8 +101,10 @@
<li><a href="https://framagit.org/karlpineau/histoiredelart.fr" class="text-muted">Répertoire Framagit</a></li> <li><a href="https://framagit.org/karlpineau/histoiredelart.fr" class="text-muted">Répertoire Framagit</a></li>
</ul> </ul>
</div> </div>
<div class="col-12 col-sm-4"> <div class="col-12 col-sm-4 text-center text-sm-left mt-4 mt-sm-0">
<a class="bmc-button" target="_blank" href="https://www.buymeacoffee.com/mcfq2Rdyt"><img src="https://www.buymeacoffee.com/assets/img/BMC-btn-logo.svg" alt="Buy me a coffee"><span style="margin-left:5px">Buy me a coffee</span></a> <a class="bmc-button" target="_blank" href="https://www.buymeacoffee.com/mcfq2Rdyt"><img src="https://www.buymeacoffee.com/assets/img/BMC-btn-logo.svg" alt="Buy me a coffee"><span style="margin-left:5px">Buy me a coffee</span></a>
<div class="mt-2"><a class="text-muted" href='https://ind.ie/ethical-design'><div style='display: block;'>▲❤ <span class="pl-2">We practice <strong>Ethical</strong> Design.</span></div></a></div>
</div> </div>
</div> </div>
{% block footer_content %}{% endblock %} {% block footer_content %}{% endblock %}
......
...@@ -27,14 +27,14 @@ ...@@ -27,14 +27,14 @@
{% if ppid is defined %}{% set homeIndexAttr = homeIndexAttr|merge({'ppid': ppid}) %}{% endif %} {% if ppid is defined %}{% set homeIndexAttr = homeIndexAttr|merge({'ppid': ppid}) %}{% endif %}
<a class="navbar-brand" href="{{ path('data_public_home_index', homeIndexAttr) }}"> <a class="navbar-brand" href="{{ path('data_public_home_index', homeIndexAttr) }}">
<img src="{{ asset('images/logo.png') }}" width="70" alt="Logo de Clichés!" class="mr-3"> <img src="{{ asset('images/logo.png') }}" width="70" alt="Logo de Clichés!" class="mr-3">
{% block h1 %}{% endblock %} <span class="d-none d-sm-inline">{% block h1 %}{% endblock %}</span>
</a> </a>
<button class="navbar-toggler" type="button" data-toggle="collapse" data-target="#navbarSupportedContent" aria-controls="navbarSupportedContent" aria-expanded="false" aria-label="Toggle navigation"> <button class="navbar-toggler" type="button" data-toggle="collapse" data-target="#navbarSupportedContent" aria-controls="navbarSupportedContent" aria-expanded="false" aria-label="Toggle navigation">
<span class="navbar-toggler-icon"></span> <span class="navbar-toggler-icon"></span>
</button> </button>
<div class="collapse navbar-collapse" id="navbarSupportedContent"> <div class="collapse navbar-collapse" id="navbarSupportedContent">
<ul class="navbar-nav ml-auto"> <ul class="navbar-nav ml-auto text-right text-sm-left">
{% if is_granted("IS_AUTHENTICATED_REMEMBERED") %} {% if is_granted("IS_AUTHENTICATED_REMEMBERED") %}
<li><a href="{{ path('data_public_home_contribute') }}" class="btn btn-primary">Contribuer</a></li> <li><a href="{{ path('data_public_home_contribute') }}" class="btn btn-primary">Contribuer</a></li>
<li class="dropdown pt-2 ml-3"> <li class="dropdown pt-2 ml-3">
...@@ -90,14 +90,14 @@ ...@@ -90,14 +90,14 @@
<footer class="mt-8 text-muted"> <footer class="mt-8 text-muted">
<div class="container"> <div class="container">
<div class="row"> <div class="row">
<div class="col-12 col-sm-4"> <div class="col-12 col-sm-4 text-center text-sm-left">
<ul class="list-unstyled"> <ul class="list-unstyled">
<li><a href="{{ path('cliches_home_home_index') }}" class="text-muted">Clichés!</a></li> <li><a href="{{ path('cliches_home_home_index') }}" class="text-muted">Clichés!</a></li>
{#<li><a href="{{ path('tb_home_home_index') }}" class="text-muted">ConfusArt</a></li>#} {#<li><a href="{{ path('tb_home_home_index') }}" class="text-muted">ConfusArt</a></li>#}
<li><a href="{{ path('data_public_home_index') }}" class="text-muted">Data</a></li> <li><a href="{{ path('data_public_home_index') }}" class="text-muted">Data</a></li>
</ul> </ul>
</div> </div>
<div class="col-12 col-sm-4"> <div class="col-12 col-sm-4 text-center text-sm-left mt-4 mt-sm-0">
<ul class="list-unstyled"> <ul class="list-unstyled">
<li><a href="{{ path('data_public_home_contribute') }}" class="text-muted">Contribuer</a></li> <li><a href="{{ path('data_public_home_contribute') }}" class="text-muted">Contribuer</a></li>
<li><a href="{{ path('home_home_home_mentionsLegales') }}" class="text-muted">Mentions légales</a></li> <li><a href="{{ path('home_home_home_mentionsLegales') }}" class="text-muted">Mentions légales</a></li>
...@@ -105,8 +105,10 @@ ...@@ -105,8 +105,10 @@
<li><a href="https://framagit.org/karlpineau/histoiredelart.fr" class="text-muted">Répertoire Framagit</a></li> <li><a href="https://framagit.org/karlpineau/histoiredelart.fr" class="text-muted">Répertoire Framagit</a></li>
</ul> </ul>
</div> </div>
<div class="col-12 col-sm-4"> <div class="col-12 col-sm-4 text-center text-sm-left mt-4 mt-sm-0">
<a class="bmc-button" target="_blank" href="https://www.buymeacoffee.com/mcfq2Rdyt"><img src="https://www.buymeacoffee.com/assets/img/BMC-btn-logo.svg" alt="Buy me a coffee"><span style="margin-left:5px">Buy me a coffee</span></a> <a class="bmc-button" target="_blank" href="https://www.buymeacoffee.com/mcfq2Rdyt"><img src="https://www.buymeacoffee.com/assets/img/BMC-btn-logo.svg" alt="Buy me a coffee"><span style="margin-left:5px">Buy me a coffee</span></a>
<div class="mt-2"><a class="text-muted" href='https://ind.ie/ethical-design'><div style='display: block;'>▲❤ <span class="pl-2">We practice <strong>Ethical</strong> Design.</span></div></a></div>
</div> </div>
</div> </div>
</div> </div>
......
...@@ -24,7 +24,7 @@ ...@@ -24,7 +24,7 @@
</button> </button>
<div class="collapse navbar-collapse" id="navbarSupportedContent"> <div class="collapse navbar-collapse" id="navbarSupportedContent">
<ul class="navbar-nav ml-auto"> <ul class="navbar-nav ml-auto text-right text-sm-left">
{% if is_granted("IS_AUTHENTICATED_REMEMBERED") %} {% if is_granted("IS_AUTHENTICATED_REMEMBERED") %}
<li class="dropdown pt-2"> <li class="dropdown pt-2">
<a class="dropdown-toggle" href="#" role="button" id="dropdownMenuLink" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false"> <a class="dropdown-toggle" href="#" role="button" id="dropdownMenuLink" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
...@@ -61,14 +61,14 @@ ...@@ -61,14 +61,14 @@
<footer class="mt-8 text-muted"> <footer class="mt-8 text-muted">
<div class="container"> <div class="container">
<div class="row"> <div class="row">
<div class="col-12 col-sm-4"> <div class="col-12 col-sm-4 text-sm-left">
<ul class="list-unstyled"> <ul class="list-unstyled">
<li><a href="{{ path('cliches_home_home_index') }}" class="text-muted">Clichés!</a></li> <li><a href="{{ path('cliches_home_home_index') }}" class="text-muted">Clichés!</a></li>
{#<li><a href="{{ path('tb_home_home_index') }}" class="text-muted">ConfusArt</a></li>#} {#<li><a href="{{ path('tb_home_home_index') }}" class="text-muted">ConfusArt</a></li>#}
<li><a href="{{ path('data_public_home_index') }}" class="text-muted">Data</a></li> <li><a href="{{ path('data_public_home_index') }}" class="text-muted">Data</a></li>
</ul> </ul>
</div> </div>
<div class="col-12 col-sm-4"> <div class="col-12 col-sm-4 text-sm-left mt-4 mt-sm-0">
<ul class="list-unstyled"> <ul class="list-unstyled">
<li><a href="{{ path('data_public_home_contribute') }}" class="text-muted">Contribuer</a></li> <li><a href="{{ path('data_public_home_contribute') }}" class="text-muted">Contribuer</a></li>
<li><a href="{{ path('home_home_home_mentionsLegales') }}" class="text-muted">Mentions légales</a></li> <li><a href="{{ path('home_home_home_mentionsLegales') }}" class="text-muted">Mentions légales</a></li>
...@@ -76,8 +76,10 @@ ...@@ -76,8 +76,10 @@
<li><a href="https://framagit.org/karlpineau/histoiredelart.fr" class="text-muted">Répertoire Framagit</a></li> <li><a href="https://framagit.org/karlpineau/histoiredelart.fr" class="text-muted">Répertoire Framagit</a></li>
</ul> </ul>
</div> </div>
<div class="col-12 col-sm-4"> <div class="col-12 col-sm-4 text-sm-left mt-4 mt-sm-0">
<a class="bmc-button" target="_blank" href="https://www.buymeacoffee.com/mcfq2Rdyt"><img src="https://www.buymeacoffee.com/assets/img/BMC-btn-logo.svg" alt="Buy me a coffee"><span style="margin-left:5px">Buy me a coffee</span></a> <a class="bmc-button" target="_blank" href="https://www.buymeacoffee.com/mcfq2Rdyt"><img src="https://www.buymeacoffee.com/assets/img/BMC-btn-logo.svg" alt="Buy me a coffee"><span style="margin-left:5px">Buy me a coffee</span></a>
<div class="mt-2"><a class="text-muted" href='https://ind.ie/ethical-design'><div style='display: block;'>▲❤ <span class="pl-2">We practice <strong>Ethical</strong> Design.</span></div></a></div>
</div> </div>
</div> </div>
</div> </div>
......
...@@ -21,10 +21,8 @@ ...@@ -21,10 +21,8 @@
<strong>Noms alternatifs</strong> <strong>Noms alternatifs</strong>
<div> <div>
{% for labelC in entityProperty.value|json_decode %} {% for labelC in entityProperty.value|json_decode %}
{% for labelL in labelC %} {% if not loop.first > 0 %}, {% endif %}
{% if not loop.first > 0 %}, {% endif %} {% if labelC.language == 'fr' %}{{ labelC.value }}{% endif %}
{{ labelL.value }}
{% endfor %}
{% endfor %} {% endfor %}
</div> </div>
</div> </div>
......
...@@ -182,16 +182,16 @@ sonata_seo: ...@@ -182,16 +182,16 @@ sonata_seo:
'og:site_name': "Clichés!" 'og:site_name': "Clichés!"
'og:description': "Testez vos connaissances en histoire de l'art et archéologie grâce à Clichés!" 'og:description': "Testez vos connaissances en histoire de l'art et archéologie grâce à Clichés!"
'og:type': "website" 'og:type': "website"
'og:url': "https://histoiredelart.fr/cliches" 'og:url': "https://beta.histoiredelart.fr"
'og:title': "Clichés!" 'og:title': "Clichés!"
'og:image': "https://histoiredelart.fr/web/images/logo-big.png" 'og:image': "https://beta.histoiredelart.fr/web/images/logo-light.png"
# Twitter Information # Twitter Information
'twitter:card': "summary" 'twitter:card': "summary"
'twitter:url': "https://histoiredelart.fr/cliches" 'twitter:url': "https://beta.histoiredelart.fr"
'twitter:title': "Clichés!" 'twitter:title': "Clichés!"
'twitter:description': "Testez vos connaissances en histoire de l'art et archéologie grâce à Clichés!" 'twitter:description': "Testez vos connaissances en histoire de l'art et archéologie grâce à Clichés!"
'twitter:image': "https://histoiredelart.fr/web/images/logo-big.png" 'twitter:image': "https://beta.histoiredelart.fr/web/images/logo-light.png"
'twitter:site': "@clichesart" 'twitter:site': "@clichesart"
'twitter:creator': "@clichesart" 'twitter:creator': "@clichesart"
......
...@@ -10,9 +10,9 @@ $(document).ready(function() { ...@@ -10,9 +10,9 @@ $(document).ready(function() {
addPrototype(container_fields, arrayJson[i]['label'], i); addPrototype(container_fields, arrayJson[i]['label'], i);
$('#player_proposal_load_field_playerProposalFields_'+i).prev().remove(); $('#player_proposal_load_field_playerProposalFields_'+i).prev().remove();
$('#player_proposal_load_field_playerProposalFields_'+i+' > div:first-child').addClass('form-group row'); $('#player_proposal_load_field_playerProposalFields_'+i+' > div:first-child').addClass('form-group row mb-0 mb-sm-3');
$('#player_proposal_load_field_playerProposalFields_'+i+' > div:first-child > label').text(arrayJson[i]['label']).addClass('col-sm-5 col-form-label text-right'); $('#player_proposal_load_field_playerProposalFields_'+i+' > div:first-child > label').text(arrayJson[i]['label']).addClass('col-12 col-sm-5 col-form-label text-left text-sm-right');
$('#player_proposal_load_field_playerProposalFields_'+i+' > div:first-child > input').wrap('<div class="col-sm-7"></div>'); $('#player_proposal_load_field_playerProposalFields_'+i+' > div:first-child > input').wrap('<div class="col-12 col-sm-7"></div>');
$('#player_proposal_load_field_playerProposalFields_'+i+' > div:first-child > div > input').addClass('form-control'); $('#player_proposal_load_field_playerProposalFields_'+i+' > div:first-child > div > input').addClass('form-control');
$('#player_proposal_load_field_playerProposalFields_'+i+' > div:last-child').addClass('d-none'); $('#player_proposal_load_field_playerProposalFields_'+i+' > div:last-child').addClass('d-none');
......
...@@ -168,7 +168,7 @@ $(document).ready(function() { ...@@ -168,7 +168,7 @@ $(document).ready(function() {
classComputed = 'border-success'; classComputed = 'border-success';
iconComputed = '<i class="fas fa-check-circle text-success"></i>'; iconComputed = '<i class="fas fa-check-circle text-success"></i>';
} else { } else {
classComputed = 'border-danger'; classComputed = '';
iconComputed = '<i class="fas fa-times-circle text-danger"></i>'; iconComputed = '<i class="fas fa-times-circle text-danger"></i>';
} }
} }
...@@ -176,19 +176,20 @@ $(document).ready(function() { ...@@ -176,19 +176,20 @@ $(document).ready(function() {
$('#divForResults').append('\n\ $('#divForResults').append('\n\
<div class="card mt-3 '+ classComputed +'">\n\ <div class="card mt-3 '+ classComputed +'">\n\
<div class="card-body">\n\ <div class="card-body">\n\
<div class="row">\n\ <a data-toggle="collapse" href="#collapseCardField-'+i+'" role="button" aria-expanded="false" aria-controls="collapseCardField-'+i+'" title="Cliquez pour déplier" class="no-link">\n\
<dl class="col-11 row mb-0">\n\ <div class="row">\n\
<dt class="col-5 text-right"><strong>'+ data[i]['label'].capitalize()+'</strong></dt>\n\ <dl class="col-11 row mb-0">\n\
<dd class="col-7 mb-0">'+ trueResult +'</dd>\n\ <dt class="col-12 col-sm-5 text-left text-sm-right"><strong>'+ data[i]['label'].capitalize()+'</strong></dt>\n\
</dl>\n\ <dd class="col-12 col-sm-7 mb-0">'+ trueResult +'</dd>\n\
<div class="col-1 text-right">\n\ </dl>\n\
<a data-toggle="collapse" href="#collapseCardField-'+i+'" role="button" aria-expanded="false" aria-controls="collapseCardField-'+i+'" title="Cliquez pour déplier">'+ iconComputed +'</a>\n\ <div class="col-1 text-right">'+ iconComputed +'</div>\n\
</div>\n\ </div>\n\
</div>\n\ </a>\n\
<div class="row collapse" id="collapseCardField-'+i+'">\n\ <div class="row collapse" id="collapseCardField-'+i+'">\n\
<div class="col-12 d-block d-sm-none"><hr /></div>\n\
<dl class="col-11 row mb-0">\n\ <dl class="col-11 row mb-0">\n\
<dt class="col-5 text-right font-weight-normal">Votre proposition</dt>\n\ <dt class="col-12 col-sm-5 text-left text-sm-right font-weight-normal">Votre proposition</dt>\n\
<dd class="col-7 mb-0">'+ userValue +'</dd>\n\ <dd class="col-12 col-sm-7 mb-0">'+ userValue +'</dd>\n\
</dl>\n\ </dl>\n\
<div id="info-'+i+'" class="col-12 text-muted" style="line-height: 1;"></div>\n\ <div id="info-'+i+'" class="col-12 text-muted" style="line-height: 1;"></div>\n\
</div>\n\ </div>\n\
......
...@@ -31,6 +31,9 @@ ...@@ -31,6 +31,9 @@
<div class="jumbotron"> <div class="jumbotron">
<div class="row"> <div class="row">
<div class="col-sm-6"> <div class="col-sm-6">
<dl class="dl-horizontal">
<dt>Username</dt><dd>{{ user.username }}</dd>
</dl>
<dl class="dl-horizontal"> <dl class="dl-horizontal">
<dt>Email</dt><dd>{{ user.email }}</dd> <dt>Email</dt><dd>{{ user.email }}</dd>
</dl> </dl>
......
...@@ -30,21 +30,24 @@ ...@@ -30,21 +30,24 @@
{% endfor %} {% endfor %}
<div class="row"> <div class="row">
<div class="col-sm-6"> <div class="col-12 col-sm-6">
<div class="well"> <h3>Mon profil</h3>
<h3>Mon profil</h3> {% block fos_user_content %}
{% block fos_user_content %} {% include "FOSUserBundle:Profile:show_content.html.twig" %}
{% include "FOSUserBundle:Profile:show_content.html.twig" %} {% endblock fos_user_content %}
{% endblock fos_user_content %}
</div>
</div> </div>
<div class="col-sm-6"> <div class="col-12 col-sm-6">
<div class="well"> <h3>Mes préférences</h3>
<h3>Mes préférences</h3> <dl class="row">
<dl class="dl-horizontal"><dt>Préférences mail</dt><dd><a href="{{ path('cas_user_userpreferences_mail') }}">Modifier</a></dd></dl> <dt class="col-12 col-sm-5 text-left text-sm-right">Préférences mail</dt>
<dl class="dl-horizontal"><dt>Préférences Clichés!</dt><dd><a href="{{ path('cas_user_userpreferences_cliches') }}">Modifier</a></dd></dl> <dd class="col-12 col-sm-7"><a href="{{ path('cas_user_userpreferences_mail') }}">Modifier</a></dd>
<dl class="dl-horizontal"><dt>Mon compte</dt><dd><a href="{{ path('cas_user_remove_index') }}" class="main-JS-delete">Supprimer mon compte</a></dd></dl>
</div> <dt class="col-12 col-sm-5 text-left text-sm-right">Préférences Clichés!</dt>
<dd class="col-12 col-sm-7"><a href="{{ path('cas_user_userpreferences_cliches') }}">Modifier</a></dd>
<dt class="col-12 col-sm-5 text-left text-sm-right">Mon compte</dt>
<dd class="col-12 col-sm-7"><a href="{{ path('cas_user_remove_index') }}" class="main-JS-delete">Supprimer mon compte</a></dd>
</dl>
</div> </div>
</div> </div>
{% endblock %} {% endblock %}
{% trans_default_domain 'FOSUserBundle' %} {% trans_default_domain 'FOSUserBundle' %}
<div class="fos_user_user_show"> <div class="fos_user_user_show">
<dl class="dl-horizontal"><dt>Nom d'utilisateur :</dt><dd>{{ user.username }} - <a href="{{ path('fos_user_profile_edit') }}" class="">Modifier</a></dd></dl> <dl class="row">
<dl class="dl-horizontal"><dt>{{ 'profile.show.email'|trans }} :</dt><dd>{{ user.email }} - <a href="{{ path('fos_user_profile_edit') }}" class="">Modifier</a></dd></dl> <dt class="col-12 col-sm-5 text-left text-sm-right">Nom d'utilisateur :</dt>
<dl class="dl-horizontal"><dt>Mot de passe :</dt><dd><a href="{{ path('fos_user_change_password') }}">Modifier</a></dd></dl> <dd class="col-12 col-sm-7">{{ user.username }} <a href="{{ path('fos_user_profile_edit') }}" class="d-block d-sm-inline">Modifier</a></dd>
<dt class="col-12 col-sm-5 text-left text-sm-right">{{ 'profile.show.email'|trans }} :</dt>
<dd class="col-12 col-sm-7">{{ user.email }} <a href="{{ path('fos_user_profile_edit') }}" class="d-block d-sm-inline">Modifier</a></dd>
<dt class="col-12 col-sm-5 text-left text-sm-right">Mot de passe :</dt>
<dd class="col-12 col-sm-7"><a href="{{ path('fos_user_change_password') }}">Modifier</a></dd>
</dl>
</div> </div>
<div class="jumbotron"> <div class="jumbotron">
<h1 style="text-align: center;">Au revoir !</h1> <h1 style="text-align: center;">Au revoir !</h1>
<div style="text-align: center;"><a href="{{ app.request.getSchemeAndHttpHost() }}"><img src="{{ app.request.getSchemeAndHttpHost() }}/web/images/logo-big.png" style="max-width: 150px;"/></a></div> <div style="text-align: center;"><a href="{{ app.request.getSchemeAndHttpHost() }}/"><img src="{{ app.request.getSchemeAndHttpHost() }}/web/images/logo-big.png" style="max-width: 150px;"/></a></div>
<br /> <br />
<p>Hey ! Votre compte a bien été supprimé. <br /> <p>Hey ! Votre compte a bien été supprimé. <br />
Nous sommes désolés de vous voir partir :( . Mais bon, nous espérons secrètement vous revoir bientôt sur Clichés! ;).</p> Nous sommes désolés de vous voir partir :( . Mais bon, nous espérons secrètement vous revoir bientôt sur Clichés! ;).</p>
......
...@@ -11,7 +11,7 @@ ...@@ -11,7 +11,7 @@
<div class="row"> <div class="row">
<div class="col-12 col-sm-7"> <div class="col-12 col-sm-7">
<div class="jumbotron"> <div class="jumbotron">
<h2 class="text-center">Testez vos connaissances <span class="d-block ">en histoire de l'art grâce à Clichés!</span></h2> <h2 class="text-center">Testez vos connaissances <span class="d-inline d-sm-block">en histoire de l'art grâce à Clichés!</span></h2>
{{ render(controller('CLICHESHomeBundle:Home:load')) }} {{ render(controller('CLICHESHomeBundle:Home:load')) }}
<p class="mt-5 mb-0 text-center"><small><a href="{{ path('cliches_personalplace_privateplayer_index') }}">Créez maintenant votre propre collection personnalisée de Clichés!</a></small></p> <p class="mt-5 mb-0 text-center"><small><a href="{{ path('cliches_personalplace_privateplayer_index') }}">Créez maintenant votre propre collection personnalisée de Clichés!</a></small></p>
</div> </div>
...@@ -20,7 +20,7 @@ ...@@ -20,7 +20,7 @@
<div> <div>
<h1>Bienvenue sur Clichés!</h1> <h1>Bienvenue sur Clichés!</h1>
<p>Les clichés constituent l'épreuve phare du concours de conservateur du patrimoine et de l'Ecole du Louvre.<br /> <p>Les clichés constituent l'épreuve phare du concours de conservateur du patrimoine et de l'Ecole du Louvre.<br />
L'un des enjeux constite à reconnaitre l'oeuvre présentée et à indiquer rapidement son cartel.<br /> L'un des enjeux constitue à reconnaitre l'oeuvre présentée et à indiquer rapidement son cartel.<br />
Cette application est là pour vous aider à les réviser.</p> Cette application est là pour vous aider à les réviser.</p>
<p class="text-center"><a href="{{ path('cliches_home_home_discover') }}">Découvrez l'application !</a></p> <p class="text-center"><a href="{{ path('cliches_home_home_discover') }}">Découvrez l'application !</a></p>
</div> </div>
...@@ -28,7 +28,7 @@ ...@@ -28,7 +28,7 @@
<h2>D'où viennent les clichés ?</h2>