entrouvert
/
cut-publik-theme
Archived
17
0
Fork 0
Code Issues Pull Requests Releases Activity

regroup user attributes on profile page (#18085)

This commit is contained in:
Serghei Mihai 2017-08-23 10:45:16 +02:00
parent dd183bd1d1
commit 2ee545a44a
3 changed files with 111 additions and 39 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

66
static/grandlyon-cut/_custom.scss
View File

@ -20,6 +20,14 @@ a.button {
font-size: 1.45em;
}
.nodata {
font-style: italic;
}
.hidden {
display: none;
}
div#header {
padding: 0;
background: #fff;
@ -133,6 +141,15 @@ div#main-content {
margin: 3em 0;
}
}
h3 {
padding-bottom: 1ex;
border-bottom: 2px solid #000;
&.section {
font-weight: normal;
border-bottom: 2px solid #b3b3b3;
padding-bottom: 0;
}
}
div#registration_completion {
width: 60em;
margin: 0 auto;
@ -140,15 +157,6 @@ div#main-content {
@include header(100%);
padding-bottom: 2ex;
}
h3 {
padding-bottom: 1ex;
border-bottom: 2px solid #000;
&.section {
font-weight: normal;
border-bottom: 2px solid #b3b3b3;
padding-bottom: 0;
}
}
p {
text-align: left;
}
@ -528,23 +536,30 @@ div#footnote {
}
div.cut-edit {
column-count: 2;
-moz-column-count: 2;
-webkit-column-count: 2;
@media screen and (max-width: $mobile-limit) {
column-count: 1;
-moz-column-count: 1;
-webkit-column-count: 1;
> div {
column-count: 2;
-moz-column-count: 2;
-webkit-column-count: 2;
column-gap: 3em;
@media screen and (max-width: $mobile-limit) {
column-count: 1;
-moz-column-count: 1;
-webkit-column-count: 1;
}
div {
-webkit-column-break-inside: avoid;
page-break-inside: avoid;
break-inside: avoid;
break-inside: avoid-column;
}
}
h2 {
color: #808080;
border-bottom: 3px solid #ccc;
}
label {
font-weight: bold;
}
> div {
width: 100%;
height: 6em;
text-align: left;
display: inline-block;
}
}
#cut-account {
@ -568,9 +583,6 @@ div.cut-edit {
font-weight: bold;
}
}
h2.cut-edit-title {
border-bottom: 3px solid #ccc;
}
div.progress {
float: left;
padding-right: 10%;
@ -718,6 +730,10 @@ div.cut-edit {
list-style-type: none;
padding: 2.5ex 0;
border-bottom: 2px solid #ccc;
&.nodata {
border: 0;
padding: 0;
}
span.field-value {
float: right;
color: #000;

49
templates/authentic2/accounts.html
View File

@ -110,9 +110,32 @@
<h2 id="mes-donnees-complementaires">Mes données complémentaires</h2>
<p>Les données complémentaires enrichissent votre compte pour faciliter vos démarches.</p>
<h3 class="section">Données d’identité complementaires</h3>
<ul>
{% for key, values in profile %}
{% if key == 'Département de naissance' or key == "Noms d'usage" or key == "Nom d'usage" or key == "Prénoms d'usage" or key == 'Numéro sur la voie' or key == 'Nom de la voie' or key == "Complément d'adresse" or key == 'Code postal' or key == 'Nom de la commune' or key == 'Pays' or key == 'Téléphone mobile personnel' or key == 'Téléphone fixe personnel' or key == 'Téléphone mobile professionnel' or key == 'Téléphone fixe professionnel' %}
{% if key == "Noms d'usage" or key == "Nom d'usage" or key == "Prénoms d'usage" %}
<li><span class="field-label">{{ key|upper }}</span>
<span class="field-value">
{% if not values %}<span class="nodata">(non spécifié)</span>
{% elif values|length == 1 %}{{ values.0 }}{% else %}
<ul>
{% for value in values %}
<li>{{ value }}</li>
{% endfor %}
</ul>
{% endif %}
</span>
</li>
{% endif %}
{% endfor %}
<li class="center nodata{% for key, values in profile %}{% if key == "Noms d'usage" or key == "Nom d'usage" or key == "Prénoms d'usage" %} hidden{% endif %}{% endfor %}">Non renseigné</li>
</ul>
<h3 class="section">Adresse</h3>
<ul>
{% for key, values in profile %}
{% if key == "Numéro sur la voie" or key == "Nom de la voie" or key == "Complément d'adresse" or key == "Code postal" or key == "Nom de la commune" or key == "Pays" %}
<li><span class="field-label">{{ key|upper }}</span>
<span class="field-value">
{% if not values %}<span class="nodata">(non spécifié)</span>
@ -132,12 +155,36 @@
<span class="field-label">ADRESSE FOURNIE PAR FRANCECONNECT</span>
<span class="field-value">{% firstof user.fc_accounts.all.0.get_user_info.address.formatted user.fc_accounts.all.0.get_user_info.address %}</span>
</li>
{% else %}
<li class="center nodata{% if user.fc_accounts.all.0.get_user_info.address %} hidden {% else %}{% for key, values in profile %}{% if key == "Numéro sur la voie" or key == "Nom de la voie" or key == "Complément d'adresse" or key == "Code postal" or key == "Nom de la commune" or key == "Pays" %} hidden{% endif %}{% endfor %}{% endif %}">Non renseigné</li>
{% endif %}
</ul>
<h3 class="section">Coordonnées</h3>
<ul>
{% for key, values in profile %}
{% if key == "Téléphone mobile personnel" or key == "Téléphone fixe personnel" or key == "Téléphone mobile professionnel" or key == "Téléphone fixe professionnel" %}
<li><span class="field-label">{{ key|upper }}</span>
<span class="field-value">
{% if not values %}<span class="nodata">(non spécifié)</span>
{% elif values|length == 1 %}{{ values.0 }}{% else %}
<ul>
{% for value in values %}
<li>{{ value }}</li>
{% endfor %}
</ul>
{% endif %}
</span>
</li>
{% endif %}
{% endfor %}
{% if user.fc_accounts.all.0.get_user_info.phone_number %}
<li>
<span class="field-label">TÉLÉPHONE FOURNI PAR FRANCECONNECT</span>
<span class="field-value">{{ user.fc_accounts.all.0.get_user_info.phone_number }}</span>
</li>
{% else %}
<li class="center nodata{% if user.fc_accounts.all.0.get_user_info.phone_number %} hidden{% else %}{% for key, values in profile %}{% if key == "Téléphone mobile personnel" or key == "Téléphone fixe personnel" or key == "Téléphone mobile professionnel" or key == "Téléphone fixe professionnel" %} hidden{% endif %}{% endfor %}{% endif %}">Non renseigné</li>
{% endif %}
</ul>
<div class="edit center">

35
templates/authentic2/cut-edit-crown.html
View File

@ -2,18 +2,27 @@
{% block cut-edit-title %}Modifier mes données complémentaires{% endblock %}
{% block form %}
<div>{{ form.preferred_username.label_tag }} {{ form.preferred_username }} {{ form.preferred_username.errors }}</div>
<div>{{ form.preferred_givenname.label_tag }} {{ form.preferred_givenname }} {{ form.preferred_givenname.errors }}</div>
<div>{{ form.birthdepartment.label_tag }} {{ form.birthdepartment }} {{ form.birthdepartment.errors }}</div>
<div>{{ form.home_mobile_phone.label_tag }} {{ form.home_mobile_phone }} {{ form.home_mobile_phone.errors }}</div>
<div>{{ form.home_phone.label_tag }} {{ form.home_phone }} {{ form.home_phone.errors }}</div>
<div>{{ form.professional_mobile_phone.label_tag }} {{ form.professional_mobile_phone }} {{ form.professional_mobile_phone.errors }}</div>
<div>{{ form.professional_phone.label_tag }} {{ form.professional_phone }} {{ form.professional_phone.errors }}</div>
<div>{{ form.address_number.label_tag }} {{ form.address_number }} {{ form.address_number.errors }}</div>
<div>{{ form.address_street.label_tag }} {{ form.address_street }} {{ form.address_street.errors }}</div>
<div>{{ form.address_complement.label_tag }} {{ form.address_complement }} {{ form.address_complement.errors }}</div>
<div>{{ form.address_zipcode.label_tag }} {{ form.address_zipcode }} {{ form.address_zipcode.errors }}</div>
<div>{{ form.address_city.label_tag }} {{ form.address_city }} {{ form.address_city.errors }}</div>
<div>{{ form.address_country.label_tag }} {{ form.address_country }} {{ form.address_country.errors }}</div>
<h3 class="section">Identité</h3>
<div>
<div>{{ form.preferred_username.label_tag }} {{ form.preferred_username }} {{ form.preferred_username.errors }}</div>
<div>{{ form.preferred_givenname.label_tag }} {{ form.preferred_givenname }} {{ form.preferred_givenname.errors }}</div>
<div>{{ form.birthdepartment.label_tag }} {{ form.birthdepartment }} {{ form.birthdepartment.errors }}</div>
</div>
<h3 class="section">Adresse</h3>
<div>
<div>{{ form.address_number.label_tag }} {{ form.address_number }} {{ form.address_number.errors }}</div>
<div>{{ form.address_street.label_tag }} {{ form.address_street }} {{ form.address_street.errors }}</div>
<div>{{ form.address_complement.label_tag }} {{ form.address_complement }} {{ form.address_complement.errors }}</div>
<div>{{ form.address_zipcode.label_tag }} {{ form.address_zipcode }} {{ form.address_zipcode.errors }}</div>
<div>{{ form.address_city.label_tag }} {{ form.address_city }} {{ form.address_city.errors }}</div>
<div>{{ form.address_country.label_tag }} {{ form.address_country }} {{ form.address_country.errors }}</div>
</div>
<h3 class="section">Coordonnées</h3>
<div>
<div>{{ form.home_mobile_phone.label_tag }} {{ form.home_mobile_phone }} {{ form.home_mobile_phone.errors }}</div>
<div>{{ form.home_phone.label_tag }} {{ form.home_phone }} {{ form.home_phone.errors }}</div>
<div>{{ form.professional_mobile_phone.label_tag }} {{ form.professional_mobile_phone }} {{ form.professional_mobile_phone.errors }}</div>
<div>{{ form.professional_phone.label_tag }} {{ form.professional_phone }} {{ form.professional_phone.errors }}</div>
</div>
{% endblock %}