Commit cfae2701 authored by KarlPineau's avatar KarlPineau

update

parent 96c169d5
{% extends "::CAS/cas_layout.html.twig" %}
{% trans_default_domain 'FOSUserBundle' %}
{% block title %}
Mot de passe - {{ parent() }}
......
<div class="jumbotron">
<h1 style="text-align: center;">Votre mot de passe a été modifié</h1>
<div style="text-align: center;"><a href="http://cliches.histoiredelart.fr"><img src="http://histoiredelart.fr/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 />
<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 />
......
......@@ -20,11 +20,13 @@
{% block content %}
<div class="row">
<div class="col-xs-12">
<div class="jumbotron">
{% block fos_user_content %}
{% include "FOSUserBundle:Profile:edit_content.html.twig" %}
{% endblock fos_user_content %}
<div class="col-12">
<div class="card">
<div class="card-body">
{% block fos_user_content %}
{% include "FOSUserBundle:Profile:edit_content.html.twig" %}
{% endblock fos_user_content %}
</div>
</div>
</div>
</div>
......
......@@ -18,9 +18,9 @@
{% if targetUrl %}
<p><a href="{{ targetUrl }}">{{ 'registration.back'|trans }}</a></p>
{% endif %}
<br />
<div class="text-center">
<a href="{{ path('data_public_home_index') }}" class="btn btn-success btn-lg">DATA</a> - <a href="{{ path('cliches_home_home_index') }}" class="btn btn-success btn-lg">Clichés</a> - <a href="{{ path('tb_home_home_index') }}" class="btn btn-success btn-lg">ConfusArt</a>
<p>
<a href="{{ path('cliches_home_home_index') }}" >Accéder à Clichés</a>
</p>
{% endblock fos_user_content %}
</div>
</div>
......
......@@ -30,7 +30,7 @@
{{ form_rest(form) }}
<br />
<input type="submit" class="btn btn-lg btn-success btn-block" />
<input type="submit" class="btn btn-lg btn-success btn-block" value="Inscription" />
<div class="text-center" style="margin: 10px">OU</div>
<a class="btn btn-lg btn-primary btn-block" href="{{ path('fos_user_security_login') }}">Connexion</a>
{{ form_end(form) }}
\ No newline at end of file
<div class="jumbotron">
<h1 style="text-align: center;">Au revoir !</h1>
<div style="text-align: center;"><a href="http://cliches.histoiredelart.fr"><img src="http://histoiredelart.fr/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 />
<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>
......
label_next: Next
label_previous: Previous
\ No newline at end of file
label_next: Suivant
label_previous: Précédent
\ No newline at end of file
......@@ -12,7 +12,6 @@
{{ parent() }}
{{ encore_entry_link_tags('css_stickyFooter') }}
{{ encore_entry_link_tags('css_autocomplete') }}
{% endblock %}
{% block header %}
......@@ -48,7 +47,7 @@
<div class="dropdown-menu dropdown-menu-right" aria-labelledby="dropdownSitesLink">
<a class="dropdown-item" href="{{ path('cliches_home_home_index') }}">Clichés!</a>
<a class="dropdown-item" href="{{ path('data_public_home_index') }}">Data</a>
<a class="dropdown-item" href="{{ path('tb_home_home_index') }}">ConfusArt</a>
{#<a class="dropdown-item" href="{{ path('tb_home_home_index') }}">ConfusArt</a>#}
</div>
</li>
</ul>
......
......@@ -33,6 +33,7 @@
<a class="dropdown-toggle" href="#" role="button" id="dropdownUserLink" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">{{ app.user.username }}</a>
<div class="dropdown-menu" aria-labelledby="dropdownUserLink">
<a class="dropdown-item" href="{{ path('fos_user_profile_show') }}">Mon profil</a>
<a class="dropdown-item" href="{{ path('cliches_personalplace_privateplayer_index') }}">Mes collections</a>
<a class="dropdown-item" href="{{ path('cliches_personalplace_stats_stats') }}">Mes statistiques</a>
<a class="dropdown-item" href="{{ path('fos_user_security_logout') }}">Déconnexion</a>
{% if is_granted("ROLE_MODO") %}
......@@ -48,7 +49,7 @@
<a class="dropdown-toggle" href="#" role="button" id="dropdownSitesLink" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">Sites</a>
<div class="dropdown-menu dropdown-menu-right" aria-labelledby="dropdownSitesLink">
<a class="dropdown-item" href="{{ path('data_public_home_index') }}">DATA</a>
<a class="dropdown-item" href="{{ path('tb_home_home_index') }}">ConfusArt</a>
{#<a class="dropdown-item" href="{{ path('tb_home_home_index') }}">ConfusArt</a>#}
{% if is_granted("ROLE_ADMIN") %}
<div class="dropdown-divider"></div>
<a class="dropdown-item" href="{{ path('cas_administration_user_index') }}">CAS</a>
......@@ -88,7 +89,7 @@
<div class="col-12 col-sm-4">
<ul class="list-unstyled">
<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>
</ul>
</div>
......@@ -97,6 +98,7 @@
<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="mailto:{{ cliches_mail }}" class="text-muted" title="Questions / Suggestions / Remarques / Aide">{{ cliches_mail }}</a></li>
<li><a href="https://framagit.org/karlpineau/histoiredelart.fr" class="text-muted">Répertoire Framagit</a></li>
</ul>
</div>
<div class="col-12 col-sm-4">
......
......@@ -55,7 +55,7 @@
<a class="dropdown-toggle" href="#" role="button" id="dropdownSitesLink" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">Sites</a>
<div class="dropdown-menu dropdown-menu-right" aria-labelledby="dropdownSitesLink">
<a class="dropdown-item" href="{{ path('cliches_home_home_index') }}">Clichés!</a>
<a class="dropdown-item" href="{{ path('tb_home_home_index') }}">ConfusArt</a>
{#<a class="dropdown-item" href="{{ path('tb_home_home_index') }}">ConfusArt</a>#}
{% if is_granted("ROLE_ADMIN") %}
<div class="dropdown-divider"></div>
<a class="dropdown-item" href="{{ path('cas_administration_user_index') }}">CAS</a>
......@@ -93,7 +93,7 @@
<div class="col-12 col-sm-4">
<ul class="list-unstyled">
<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>
</ul>
</div>
......@@ -102,6 +102,7 @@
<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="mailto:{{ cliches_mail }}" class="text-muted" title="Questions / Suggestions / Remarques / Aide">{{ cliches_mail }}</a></li>
<li><a href="https://framagit.org/karlpineau/histoiredelart.fr" class="text-muted">Répertoire Framagit</a></li>
</ul>
</div>
<div class="col-12 col-sm-4">
......
......@@ -64,7 +64,7 @@
<div class="col-12 col-sm-4">
<ul class="list-unstyled">
<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>
</ul>
</div>
......@@ -73,6 +73,7 @@
<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="mailto:{{ cliches_mail }}" class="text-muted" title="Questions / Suggestions / Remarques / Aide">{{ cliches_mail }}</a></li>
<li><a href="https://framagit.org/karlpineau/histoiredelart.fr" class="text-muted">Répertoire Framagit</a></li>
</ul>
</div>
<div class="col-12 col-sm-4">
......
......@@ -24,7 +24,7 @@
{% for value in propertyContainer.values %}
{% if loop.first == false %}, {% endif %}
{% if value.mainsnak is defined and value.mainsnak.time is defined %}
{{ value.mainsnak.time }}
{{ data_data_wikidata_service.computeTime(value.mainsnak) }}
{% else %}
(Valeur non définie)
{% endif %}
......@@ -51,5 +51,12 @@
{% endfor %}
{% elseif propertyContainer.type == "string" %}
{% for value in propertyContainer.values %}
{% if loop.first == false %}, {% endif %}
{% if value.mainsnak is defined %}
{{ value.mainsnak | capitalize }}
{% else %}
(Valeur non définie)
{% endif %}
{% endfor %}
{% endif %}
\ No newline at end of file
{% if entityProperty.property == "wd-label" %}
{% if "label" in entityProperty.property %}
<div class="list-group-item">
<strong>Label</strong>
<strong>Nom</strong>
<div>
{% for labelC in entityProperty.value|json_decode %}
{% if labelC.language == 'fr' %}{{ labelC.value }}{% endif %}
{% endfor %}
</div>
</div>
{% elseif entityProperty.property == "wd-description" %}
{% elseif "description" in entityProperty.property %}
<div class="list-group-item">
<strong>Description</strong>
<div>
......@@ -16,7 +16,7 @@
{% endfor %}
</div>
</div>
{% elseif entityProperty.property == "wd-aliases" %}
{% elseif "aliases" in entityProperty.property %}
<div class="list-group-item">
<strong>Noms alternatifs</strong>
<div>
......@@ -28,7 +28,7 @@
{% endfor %}
</div>
</div>
{% elseif entityProperty.property != "wd-P18" and entityProperty.property != "wd-label" and entityProperty.property != "wd-description" and entityProperty.property != "wd-aliases" %}
{% elseif "label" not in entityProperty.property and "description" not in entityProperty.property and "aliases" not in entityProperty.property %}
<div class="list-group-item">
<strong>
{% if entityProperty.value != null %}
......@@ -45,69 +45,45 @@
{% endif %}
</strong>
<div>
{% if entityProperty.property matches '/^wd-/' %}
{% if entityProperty.value != null %}
{% set entityPropertyValue = entityProperty.value|json_decode %}
{% if entityPropertyValue.type is defined and entityPropertyValue.type == "entity" and entityPropertyValue.values is defined %}
{% for value in entityPropertyValue.values %}
{% if loop.index > 1 %}, {% endif %}
{% if value.mainsnak is defined %}
<a href="https://www.wikidata.org/wiki/{{ value.mainsnak.value }}" target="_blank">
{% if value.mainsnak.labels.fr is defined %}
{{ value.mainsnak.labels.fr.value }}
{% elseif value.mainsnak.labels.en is defined %}
{{ value.mainsnak.labels.en.value }}
{% else %}
(Valeur non définie)
{% endif %}
</a>
{% else %}
{# dump(entityProperty) #}
{% endif %}
{% endfor %}
{% elseif entityPropertyValue.type is defined and entityPropertyValue.type == "string" and entityPropertyValue.values is defined %}
{% for value in entityPropertyValue.values %}
{% if "://" in value.mainsnak %}<a href="{{ value.mainsnak }}" target="_blank">{% endif %}
{{ value.mainsnak }}
{% if "://" in value.mainsnak %}</a>{% endif %}
{% endfor %}
{% elseif entityPropertyValue.type is defined and entityPropertyValue.type == "monolingualtext" and entityPropertyValue.values is defined %}
{% for value in entityPropertyValue.values %}
{% if "://" in value.mainsnak.text %}<a href="{{ value.mainsnak.text }}" target="_blank">{% endif %}
{{ value.mainsnak.text }}
{% if "://" in value.mainsnak.text %}</a>{% endif %}
{% endfor %}
{% elseif entityPropertyValue.type is defined and entityPropertyValue.type == "quantity" and entityPropertyValue.values is defined %}
{% for value in entityPropertyValue.values %}
{{ value.mainsnak.amount }} ({{ data_data_wikidata_service.getLabelFromEntity(data_data_wikidata_service.getEntity(value.mainsnak.unit|replace({'http://www.wikidata.org/entity/': ''})), 'fr') }})
{% endfor %}
{% elseif entityPropertyValue.type is defined and entityPropertyValue.type == "time" and entityPropertyValue.values is defined %}
{% for value in entityPropertyValue.values %}
{{ data_data_wikidata_service.computeTime(value.mainsnak) }}
{% endfor %}
{% else %}
{# dump(entityProperty) #}
{% endif %}
{% else %}
{# dump(entityProperty) #}
{% endif %}
{% elseif entityProperty.property matches '/^hda-/' %}
{% if entityProperty.value != null %}
{% set entityPropertyValue = entityProperty.value|json_decode %}
{% if entityPropertyValue.values is defined %}
{% for value in entityPropertyValue.values %}
{% if loop.index > 1 %}, {% endif %}
{% if value.mainsnak is defined %}
{% if entityProperty.value != null %}
{% set entityPropertyValue = entityProperty.value|json_decode %}
{% if entityPropertyValue.type is defined and entityPropertyValue.type == "entity" and entityPropertyValue.values is defined %}
{% for value in entityPropertyValue.values %}
{% if loop.index > 1 %}, {% endif %}
{% if value.mainsnak is defined %}
<a href="https://www.wikidata.org/wiki/{{ value.mainsnak.value }}" target="_blank">
{% if value.mainsnak.labels.fr is defined %}
{{ value.mainsnak.labels.fr.value }}
{% elseif value.mainsnak.labels.en is defined %}
{{ value.mainsnak.labels.en.value }}
{% else %}
(Valeur non définie)
{% endif %}
{% endif %}
{% endfor %}
{% else %}
{# dump(entityProperty) #}
{% endif %}
</a>
{% else %}
{# dump(entityProperty) #}
{% endif %}
{% endfor %}
{% elseif entityPropertyValue.type is defined and entityPropertyValue.type == "string" and entityPropertyValue.values is defined %}
{% for value in entityPropertyValue.values %}
{% if "://" in value.mainsnak %}<a href="{{ value.mainsnak }}" target="_blank">{% endif %}
{{ value.mainsnak }}
{% if "://" in value.mainsnak %}</a>{% endif %}
{% endfor %}
{% elseif entityPropertyValue.type is defined and entityPropertyValue.type == "monolingualtext" and entityPropertyValue.values is defined %}
{% for value in entityPropertyValue.values %}
{% if "://" in value.mainsnak.text %}<a href="{{ value.mainsnak.text }}" target="_blank">{% endif %}
{{ value.mainsnak.text }}
{% if "://" in value.mainsnak.text %}</a>{% endif %}
{% endfor %}
{% elseif entityPropertyValue.type is defined and entityPropertyValue.type == "quantity" and entityPropertyValue.values is defined %}
{% for value in entityPropertyValue.values %}
{{ value.mainsnak.amount }} ({{ data_data_wikidata_service.getLabelFromEntity(data_data_wikidata_service.getEntity(value.mainsnak.unit|replace({'http://www.wikidata.org/entity/': ''})), 'fr') }})
{% endfor %}
{% elseif entityPropertyValue.type is defined and entityPropertyValue.type == "time" and entityPropertyValue.values is defined %}
{% for value in entityPropertyValue.values %}
{{ data_data_wikidata_service.computeTime(value.mainsnak) }}
{% endfor %}
{% else %}
{# dump(entityProperty) #}
{% endif %}
......
<div class="col-12 col-sm-3">
<div class="card mt-2">
<a class="no-link" href="{{ path("data_public_entity_view", {'id': entity.id}) }}">
{% if view is defined and view != null %}{{ render(controller('DATAImageBundle:Image:renderImage', {'view_id': view.id, 'class': 'card-img-top size-small'})) }}{% endif %}
<div class="card-body">
<div>
{% if index is defined %}<div class="float-right">
#{{ index }}
</div>{% endif %}
<h4 class="card-title">{{data_data_entity_service.get(entity, 'label')}}</h4>
</div>
<p class="card-text">
{% set resumeArray = [] %}
{% if data_data_entity_service.get(entity, 'description') != null %}
{% set resumeArray = resumeArray|merge([data_data_entity_service.get(entity, 'description')]) %}
{% elseif data_data_entity_service.get(entity, 'P170') != null %}
{% set resumeArray = resumeArray|merge([data_data_entity_service.get(entity, 'P170')]) %}
{% endif %}
{% if data_data_entity_service.getDateOfCreation(entity) != null %}
{% set resumeArray = resumeArray|merge([data_data_entity_service.getDateOfCreation(entity)]) %}
{% endif %}
{% if data_data_entity_service.get(entity, 'P276') != null %}
{# P276 = localisation #}
{% set resumeArray = resumeArray|merge([data_data_entity_service.get(entity, 'P276')]) %}
{% endif %}
{{ resumeArray|join(' | ') }}
</p>
</div>
</a>
</div>
</div>
\ No newline at end of file
......@@ -43,6 +43,7 @@ framework:
validation: { enable_annotations: true }
#serializer: { enable_annotations: true }
default_locale: '%locale%'
translator: { fallbacks: ['%locale%'] }
trusted_hosts: ~
session:
# https://symfony.com/doc/current/reference/configuration/framework.html#handler-id
......@@ -77,7 +78,7 @@ twig:
cliches_player_playerproposalfield_service: "@cliches_player.player_proposal_field"
cliches_player_playerresult_service: "@cliches_player.player_result"
cliches_player_playerexclude_service: "@cliches_player.player_exclude"
cliches_player_playerend_service: "@cliches_player.player_end"
cliches_personalplace_privateplayer_service: "@cliches_personalplace.private_player"
tb_model_testeditem: "@tb_model.testeditem"
tb_model_testeditemresult: "@tb_model.testeditemresult"
tb_model_testeditemresultsession: "@tb_model.testeditemresultsession"
......
......@@ -41,6 +41,6 @@ security:
access_control:
- { path: /super-administration, roles: IS_AUTHENTICATED_ANONYMOUSLY }
- { path: /administration, roles: IS_AUTHENTICATED_ANONYMOUSLY }
- { path: /profile, roles: IS_AUTHENTICATED_ANONYMOUSLY }
\ No newline at end of file
- { path: /super-administration, roles: ROLE_ADMIN }
- { path: /administration, roles: ROLE_MODO }
- { path: /profile, roles: ROLE_USER }
\ No newline at end of file
.autocomplete {
position: absolute;
transition: all 0.5s ease 0s;
max-height: 0;
overflow-y: hidden;
transition-duration: 0.3s;
transition-property: all;
transition-timing-function: cubic-bezier(0, 1, 0.5, 1);
}
.autocomplete.open {
display: block;
transition: all 0.5s ease 0s;
background-color: #FAFAFA;
max-height: 500px;
overflow-y: hidden;
transition-duration: 0.3s;
transition-property: all;
transition-timing-function: cubic-bezier(0, 1, 0.5, 1);
}
.autocomplete:empty,
.autocomplete.open:empty {
display: none;
}
.autocomplete:active,
.autocomplete:focus,
.autocomplete:hover {
background-color: #FAFAFA;
transition: all 0.5s ease 0s;
}
.autocomplete > ul {
list-style-type: none;
margin: 0;
padding: 0;
}
.autocomplete > ul > li {
cursor: pointer;
padding: 5px 0 5px 10px;
}
.autocomplete > ul > li.locked {
cursor: inherit;
}
.autocomplete > ul > li.active,
.autocomplete > ul > li:active,
.autocomplete > ul > li:focus,
.autocomplete > ul > li:hover {
background-color: #EEEEEE;
transition: all 0.5s ease 0s;
}
.autocomplete > ul > li.active a:active,
.autocomplete > ul > li:active a:active,
.autocomplete > ul > li:focus a:active,
.autocomplete > ul > li:hover a:active,
.autocomplete > ul > li.active a:focus,
.autocomplete > ul > li:active a:focus,
.autocomplete > ul > li:focus a:focus,
.autocomplete > ul > li:hover a:focus,
.autocomplete > ul > li.active a:hover,
.autocomplete > ul > li:active a:hover,
.autocomplete > ul > li:focus a:hover,
.autocomplete > ul > li:hover a:hover {
text-decoration: none;
}
input[data-autocomplete] {
border-color: #808080;
border-style: none none solid none;
border-width: 0px 0px 1px 0px;
margin: 0px;
padding: 5px;
width: 100%;
}
......@@ -29,4 +29,13 @@ body {
.mt-8 {
margin-top: 7rem !important;
}
.card-title {
margin-bottom: 0;
}
.no-link, .no-link:hover, .no-link:active, .no-link:visited, .no-link:focus {
color: rgba(0, 0, 0, 0.9);
text-decoration: none;
}
\ No newline at end of file
/*
To change this license header, choose License Headers in Project Properties.
To change this template file, choose Tools | Templates
and open the template in the editor.
*/
/*
Created on : 11 sept. 2015, 15:07:44
Author : karlpineau
*/
html {
width: 100%;
}
body {
width: 100%;
background-image: url("../../web/images/background-kp.jpg");
background-attachment: fixed;
background-repeat: no-repeat;
background-position: center;
}
.container {
width: 100%;
}
@media (min-width:1200px) {
body {
background-size: 100%;
}
}
@media (min-width:800px) and (max-width:1200px) {
body {
background-size: 130%;
}
}
@media (max-width:800px) {
body {
background-size: 220%;
}
}
\ No newline at end of file
body {
padding-top: 40px;
padding-bottom: 40px;
background-color: #f5f5f5;
font-family: 'Roboto', sans-serif;
}
h1 {
font-size: 30px;
}
.form-signin {
padding: 15px;
}
.form-label-group {
position: relative;
margin-bottom: 1rem;
}
.form-label-group input,
.form-label-group label.label-spe {
height: 3.125rem;
padding: .75rem;
}
.form-label-group textarea {
height: 6.125rem;
padding: .75rem;
}
.form-label-group .label-spe {
position: absolute;
top: 0;
left: 0;
display: block;
width: 100%;
margin-bottom: 0; /* Override default `<label>` margin */
line-height: 1.5;
color: #606060;
pointer-events: none;
cursor: text; /* Match the input under the label */
border: 1px solid transparent;
border-radius: .25rem;
transition: all .1s ease-in-out;
font-size: 13px;
}
label:not(.label-spe) {
font-size: 13px;
margin-top: 10px;
}
.form-label-group input::-webkit-input-placeholder {
color: transparent;
}
.form-label-group input:-ms-input-placeholder {
color: transparent;
}
.form-label-group input::-ms-input-placeholder {
color: transparent;
}
.form-label-group input::-moz-placeholder {
color: transparent;
}
.form-label-group input::placeholder {
color: transparent;
}
.form-label-group textarea::placeholder, .form-label-group select::placeholder {
font-size: 13px;
color: #606060;
}
.form-label-group input:not(:placeholder-shown) {