Skip to content

Commit 309e0d8

Browse files
glibersatglibersat
authored
Merge pull request #1502 from betagouv/feat/ff-invitation-page#1477
feat(invite-form): Amélioration de l'UI
2 parents 9e2fb06 + 8982c91 commit 309e0d8

3 files changed

Lines changed: 64 additions & 44 deletions

File tree

‎recoco/apps/home/static/home/css/dsfr/custom-dsfr.scss‎

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -69,6 +69,22 @@ a {
6969
}
7070
}
7171

72+
/* ¯¯¯¯ *\
73+
INPUTS
74+
\* ˍˍˍˍ */
75+
76+
.fr-input::placeholder {
77+
color: #acacac;
78+
}
79+
80+
/* ¯¯¯¯ *\
81+
ICONS
82+
\* ˍˍˍˍ */
83+
84+
.fr-icon-margin-right-sm::before {
85+
margin-right: 0.2rem;
86+
}
87+
7288
p a {
7389
text-decoration: underline;
7490
color: #0000ee;

‎recoco/apps/invites/templates/invites/fragments/invite_form.html‎

Lines changed: 46 additions & 36 deletions
Original file line numberDiff line numberDiff line change
@@ -8,34 +8,39 @@
88
<div class="project-card__content">
99
<div class="project__title">
1010
<span class="project-card__project-name">{{ invite.project.name }}</span>
11-
<span class="project-card__project-org-name">{{ invite.project.org_name }}</span>
11+
{% if invite.project.owner.profile.organization.name %}
12+
<span class="project-card__project-org-name">{{ invite.project.owner.profile.organization.name }}</span>
13+
{% elif invite.project.org_name %}
14+
<span class="project-card__project-org-name">{{ invite.project.org_name }}</span>
15+
{% endif %}
1216
</div>
1317
<div class="project__info">
14-
{% if invite.project.project_sites.origin.site.configuration.logo_small %}
15-
<img src="{{ invite.project.project_sites.origin.site.configuration.logo_small.url }}"
16-
width="16px"
17-
height="auto"
18-
alt="Logo {{ invite.project.project_sites.origin.site.configuration.name }}" />
19-
{% else %}
20-
<span class="fr-icon--sm fr-icon-window-line" aria-hidden="true"></span>
21-
{% endif %}
22-
<span class="project-card__project-site fr-mr-1w">provient de {{ invite.project.project_sites.origin.site.name }}</span>
23-
<span class="project-card__project-insee fr-icon--sm fr-icon-map-pin-2-line fr-mr-1w">{{ invite.project.commune.name }} ({{ invite.project.commune.insee }})</span>
24-
{% if invite.project.owner %}
25-
<span class="project-card__project-org fr-icon--sm fr-icon-parent-line fr-mr-1w">{{ invite.project.owner.profile.organization.name }}</span>
18+
{% if request.site.id != invite.project.project_sites.origin.site.id %}
19+
{% if invite.project.project_sites.origin.site.configuration.logo_small %}
20+
<img src="{{ invite.project.project_sites.origin.site.configuration.logo_small.url }}"
21+
width="16px"
22+
height="auto"
23+
alt="Logo {{ invite.project.project_sites.origin.site.configuration.name }}" />
24+
{% else %}
25+
<span class="fr-icon--sm fr-icon-window-line" aria-hidden="true"></span>
26+
{% endif %}
27+
<span class="project-card__project-site fr-mr-1w">provient de {{ invite.project.project_sites.origin.site.name }}</span>
2628
{% endif %}
27-
<span class="project-card__project-date fr-icon--sm fr-icon-calendar-event-line fr-mr-1w">déposé depuis {{ invite.project.created_on|timesince }}</span>
29+
<span class="project-card__project-insee fr-icon--sm fr-icon-map-pin-2-line fr-mr-1w fr-icon-margin-right-sm">{{ invite.project.commune.name }} ({{ invite.project.commune.insee }})</span>
30+
<span class="project-card__project-date fr-icon--sm fr-icon-calendar-event-line fr-mr-1w fr-icon-margin-right-sm">déposé depuis {{ invite.project.created_on|timesince }}</span>
2831
</div>
29-
<div class="project__info">
30-
<div class="project-card__project-tags">
31-
<span class="icon fr-icon-tag-line fr-icon--sm" aria-hidden="true"></span>
32-
{% for tag in invite.project.tags.all %}<span class="project-card__project-tag">#{{ tag }}</span>{% endfor %}
32+
{% if invite.project.tags.all %}
33+
<div class="project__info">
34+
<div class="project-card__project-tags">
35+
<span class="icon fr-icon-tag-line fr-icon--sm" aria-hidden="true"></span>
36+
{% for tag in invite.project.tags.all %}<span class="project-card__project-tag">#{{ tag }}</span>{% endfor %}
37+
</div>
3338
</div>
34-
</div>
39+
{% endif %}
3540
</div>
3641
</div>
37-
<p class="fr-mb-3v">Message d'invitation :</p>
3842
{% if invite.message %}
43+
<p class="fr-mb-3v">Message d'invitation :</p>
3944
<div class="bg-light fr-p-2w fr-mb-4w">
4045
<p>{{ invite.message }}</p>
4146
{% include "user/user_card.html" with user=invite.inviter %}
@@ -112,17 +117,17 @@ <h3>Créez votre compte {{ request.site.name }}</h3>
112117
</div>
113118
</div>
114119
</div>
115-
{% endif %}
116-
<ul class="fr-btns-group fr-btns-group--inline-sm fr-mt-4w">
117-
<li class="w-50">
118-
<button class="fr-btn fr-btn--tertiary-no-outline w-100 align-self-center"
119-
type="submit"
120-
form="refuse-form">Refuser</button>
121-
</li>
122-
<li class="w-50">
123-
<button class="fr-btn fr-btn--primary w-100 align-self-center" type="submit">Rejoindre le dossier</button>
124-
</li>
125-
</ul>
120+
{% endif %}
121+
<ul class="fr-btns-group fr-btns-group--inline-sm fr-mt-4w">
122+
<li class="w-50">
123+
<button class="fr-btn fr-btn--tertiary w-100 align-self-center"
124+
type="submit"
125+
form="refuse-form">Refuser</button>
126+
</li>
127+
<li class="w-50">
128+
<button class="fr-btn fr-btn--primary w-100 align-self-center" type="submit">Rejoindre le dossier</button>
129+
</li>
130+
</ul>
126131
</form>
127132
<form action="{% url 'invites-invite-refuse' invite.pk %}"
128133
method="post"
@@ -132,9 +137,14 @@ <h3>Créez votre compte {{ request.site.name }}</h3>
132137
</div>
133138
{% endblock layout_content %}
134139
{% block layout_secondary_content %}
135-
<h3 class="fw-bolder">Qu'est ce que {{ request.site.name }} ?</h3>
136-
{% include "invites/invite_site_message.html" %}
137-
<p>
138-
<a class="fr-link" href="{% url 'home' %}">En savoir plus</a>
139-
</p>
140+
<div class="container__form d-flex justify-content-center">
141+
<div class="layout__form">
142+
<h3 class="fw-bolder">Qu'est ce que {{ request.site.name }} ?</h3>
143+
{% include "invites/invite_site_message.html" %}
144+
<p>{{ request.site.configuration.description }}</p>
145+
<p>
146+
<a class="fr-link" href="{% url 'home' %}">En savoir plus</a>
147+
</p>
148+
</div>
149+
</div>
140150
{% endblock layout_secondary_content %}

‎recoco/templates/default_site/account/layout/layout.html‎

Lines changed: 2 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -56,12 +56,6 @@ <h3 class="fr-stepper__title dsfr-stepper__title-resize">
5656
{% endblock layout_content %}
5757
</div>
5858
</div>
59-
{% if layout_secondary_content %}
60-
<div class="container__form d-flex justify-content-center">
61-
<div class="layout__form">
62-
{% block layout_secondary_content %}
63-
{% endblock layout_secondary_content %}
64-
</div>
65-
</div>
66-
{% endif %}
59+
{% block layout_secondary_content %}
60+
{% endblock layout_secondary_content %}
6761
</div>

0 commit comments

Comments
 (0)