Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[WIP] [feature/OS-386 => DEV] Retour de tests Confirmation #12

Open
wants to merge 1 commit into
base: dev
Choose a base branch
from
+20 −4
Open

[WIP] [feature/OS-386 => DEV] Retour de tests Confirmation #12

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion locale/fr_BE/LC_MESSAGES/django.po
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -868,7 +868,7 @@ msgid ""
"No later than 24 months after the CDD grants PhD admission, the candidate "
"must take a confirmation exam."
msgstr ""
"Dans un délai maximum de 24 mois à compter de la date d'admission au "
"Dans un délai maximum 24 mois à compter de la date d'admission au "
"doctorat par la CDD, le ou la candidate présente une épreuve de confirmation."

msgid "No one invited"
Expand Down
2 changes: 1 addition & 1 deletion static/parcours_doctoral/training.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -70,7 +70,7 @@
}

.card-header .card-title > a:after {
font-family: 'Font Awesome 5 Free';
font-family: 'Font Awesome 5 Pro';
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Finalement, cela semble être obligatoire d'indiquer cette police si la version payante de Fontawesome est utilisée.

font-weight: 900;
content: "\f078";
}
Expand Down
7 changes: 6 additions & 1 deletion templates/parcours_doctoral/tab_layout.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -147,8 +147,13 @@
{% get_current_tab as current_tab %}
<div class="text-end mb-3">
{% block submit_button %}
{% if cancel_url and cancel_url != request.path and doctorate|can_read_tab:current_tab %}
<a href="{{ cancel_url }}" class="btn btn-light border border-dark-subtle">
{% trans 'Cancel' %}
</a>
{% endif %}
<button
type="submit" class="{{ submit_class|default:'btn btn-light border border-dark-subtle' }}"
type="submit" class="{{ submit_class|default:'btn btn-primary border border-dark-subtle' }}"
{% if cancel_url and not doctorate|can_update_tab:current_tab %}
disabled
{% endif %}
Expand Down
13 changes: 12 additions & 1 deletion templates/parcours_doctoral/tags/doctorate_tabs_bar.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,7 @@
{% doctorate_subtabs doctorate %} for other displays.
{% endcomment %}
{% trans "Save" context 'doctorate' as save_label %}
{% url "parcours_doctoral:"|add:request.resolver_match.url_name view.kwargs.pk as cancel_url %}

<div class="mb-3">
{# Nav for mobile display #}
Expand Down Expand Up @@ -87,10 +88,15 @@
{% endif %}
{% endfor %}

{# Submit button if needed (mobile display) #}
{# Submit button if needed (desktop display) #}
{% get_current_tab as current_tab %}
{% if with_submit %}
<div class="ms-auto">
{% if cancel_url and cancel_url != request.path and doctorate|can_read_tab:current_tab %}
<a href="{{ cancel_url }}" class="btn btn-light border border-dark-subtle">
{% trans 'Cancel' %}
</a>
{% endif %}
<button
type="submit"
class="btn btn-primary"
Expand Down Expand Up @@ -120,6 +126,11 @@
{# Submit button if needed (mobile display) #}
{% if with_submit %}
<div class="text-end d-md-none">
{% if cancel_url and cancel_url != request.path and doctorate|can_read_tab:current_tab %}
<a href="{{ cancel_url }}" class="btn btn-light border border-dark-subtle">
{% trans 'Cancel' %}
</a>
{% endif %}
<button
type="submit"
class="btn btn-primary"
Expand Down