Skip to content

Commit 48119db

Browse files
glibersatglibersat
committed
Merge branch 'develop'
2 parents 7119098 + 309e0d8 commit 48119db

12 files changed

Lines changed: 507 additions & 539 deletions

File tree

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

Lines changed: 20 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;
@@ -694,6 +710,10 @@ form > p {
694710
border-bottom: 1px solid var(--light-border-default-grey, #e5e5e5) !important;
695711
}
696712

713+
.no-interaction-possible {
714+
pointer-events: none;
715+
}
716+
697717
/* ¯¯¯¯ *\
698718
COLORS
699719
\* ˍˍˍˍ */

‎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/apps/projects/templates/projects/project/actions.html‎

Lines changed: 41 additions & 62 deletions
Original file line numberDiff line numberDiff line change
@@ -28,68 +28,47 @@
2828
{% get_obj_perms request.user for request.site as "user_site_perms" %}
2929
{% get_obj_perms request.user for project as "user_project_perms" %}
3030
{% include "projects/project/navigation.html" with recommandations=True %}
31-
{% if project.inactive_since != None %}
32-
<div class="specific-border-4pxsolid1e1e1e">
33-
{% include "projects/project/fragments/project_banner/paused_project_banner.html" %}
34-
<div>
35-
{% elif project.status == 'DRAFT' %}
36-
<div class="specific-border-4pxsolid000091">
37-
{% include "projects/project/fragments/project_banner/non_published_project_banner.html" %}
38-
{% elif not advising and is_regional_actor and not is_staff %}
39-
<div x-data
40-
x-init="$nextTick(() => $store.showRole.init())"
41-
class="specific-border-4pxsolid000091">
42-
{% include "projects/project/fragments/project_banner/join_project_banner.html" %}
43-
<div>
44-
{% endif %}
45-
{{ can_administrate|json_script:"canAdministrate" }}
46-
{{ user_project_perms|json_script:"userProjectPerms" }}
47-
{{ is_switchtender|json_script:"isSwitchtender" }}
48-
{{ user.email|json_script:"userEmail" }}
49-
{{ advising_position.is_observer|json_script:"isObserverOnProject" }}
50-
{{ advising_position.is_advisor|json_script:"isAdvisorOnProject" }}
51-
{% if is_switchtender and project.tasks.all.count == 0 %}
52-
<div data-test-id="no-tasks-banner" class="bg-light fr-p-3w rounded-2">
53-
<h3 class="fw-light">Pas encore de recommandations au demandeur ?</h3>
54-
<p class="fst-italic fw-light fr-mb-2w">
55-
Soyez la première personne à proposer des recommandations ou des ressources au demandeur !
56-
</p>
57-
{% if advising or is_staff %}
58-
<a data-test-id="submit-task-button"
59-
href="{% url 'projects-create-task' %}?project_id={{ project.id }}"
60-
class="fr-btn">Émettre une recommandation</a>
61-
<a href="{% url 'projects-project-tasks-suggest' project.pk %}"
62-
class="fr-btn fr-btn--secondary"
63-
data-test-id="see-suggest-task-button">Examiner les ressources suggérées</a>
64-
{% else %}
65-
<button class="fr-btn"
66-
data-bs-toggle="dropdown"
67-
data-bs-auto-close="outside"
68-
aria-expanded="false"
69-
aria-controls="select-observer-or-advisor">
70-
Rejoindre ce dossier pour l'aiguiller
71-
</button>
72-
{% endif %}
73-
</div>
74-
{% elif not is_switchtender and project.tasks.public.count == 0 %}
75-
<div class="bg-light fr-p-3w rounded-2">
76-
<h3 class="fw-light">Vous n'avez pas de recommandations en cours</h3>
77-
<p class="fst-italic fw-light">Des recommandations vous seront proposées par notre équipe dès que possible.</p>
78-
<p class="fst-italic fw-light">
79-
Vous pouvez accélerer les recommandations <span class="fw-bolder">en complétant le questionnaire d'exploration</span>.
80-
</p>
81-
<a href="{% url 'survey-project-session' project.id %}" class="fr-btn">Compléter le questionnaire d'exploration</a>
82-
</div>
83-
{% else %}
84-
{% include "projects/project/fragments/tasks_inline_kanban/tasks_inline_kanban.html" %}
85-
{% endif %}
86-
{% if project.inactive_since != None %}
87-
</div>
88-
</div>
89-
{% elif project.status == 'DRAFT' %}
90-
</div>
91-
{% elif not advising and is_regional_actor and not is_staff %}
92-
</div>
31+
{% include "projects/project/fragments/project_banner/banner_wrapper.html" with part='open' %}
32+
{{ can_administrate|json_script:"canAdministrate" }}
33+
{{ user_project_perms|json_script:"userProjectPerms" }}
34+
{{ is_switchtender|json_script:"isSwitchtender" }}
35+
{{ user.email|json_script:"userEmail" }}
36+
{{ advising_position.is_observer|json_script:"isObserverOnProject" }}
37+
{{ advising_position.is_advisor|json_script:"isAdvisorOnProject" }}
38+
{% if is_switchtender and project.tasks.all.count == 0 %}
39+
<div data-test-id="no-tasks-banner" class="bg-light fr-p-3w rounded-2">
40+
<h3 class="fw-light">Pas encore de recommandations au demandeur ?</h3>
41+
<p class="fst-italic fw-light fr-mb-2w">
42+
Soyez la première personne à proposer des recommandations ou des ressources au demandeur !
43+
</p>
44+
{% if advising or is_staff %}
45+
<a data-test-id="submit-task-button"
46+
href="{% url 'projects-create-task' %}?project_id={{ project.id }}"
47+
class="fr-btn">Émettre une recommandation</a>
48+
<a href="{% url 'projects-project-tasks-suggest' project.pk %}"
49+
class="fr-btn fr-btn--secondary"
50+
data-test-id="see-suggest-task-button">Examiner les ressources suggérées</a>
51+
{% else %}
52+
<button class="fr-btn"
53+
data-bs-toggle="dropdown"
54+
data-bs-auto-close="outside"
55+
aria-expanded="false"
56+
aria-controls="select-observer-or-advisor">
57+
Rejoindre ce dossier pour l'aiguiller
58+
</button>
59+
{% endif %}
9360
</div>
61+
{% elif not is_switchtender and project.tasks.public.count == 0 %}
62+
<div class="bg-light fr-p-3w rounded-2">
63+
<h3 class="fw-light">Vous n'avez pas de recommandations en cours</h3>
64+
<p class="fst-italic fw-light">Des recommandations vous seront proposées par notre équipe dès que possible.</p>
65+
<p class="fst-italic fw-light">
66+
Vous pouvez accélerer les recommandations <span class="fw-bolder">en complétant le questionnaire d'exploration</span>.
67+
</p>
68+
<a href="{% url 'survey-project-session' project.id %}" class="fr-btn">Compléter le questionnaire d'exploration</a>
69+
</div>
70+
{% else %}
71+
{% include "projects/project/fragments/tasks_inline_kanban/tasks_inline_kanban.html" %}
9472
{% endif %}
73+
{% include "projects/project/fragments/project_banner/banner_wrapper.html" with part='close' %}
9574
{% endblock project_detail %}

0 commit comments

Comments
 (0)