Skip to content

Commit 54c137b

Browse files
mathieuzenmathieuzen
authored
Merge pull request #473 from uclouvain/qa
QA -> PROD
2 parents 870d201 + 7688de7 commit 54c137b

File tree

1 file changed

+58
-65
lines changed

1 file changed

+58
-65
lines changed

‎templates/internships.html‎

Lines changed: 58 additions & 65 deletions
Original file line numberDiff line numberDiff line change
@@ -67,90 +67,85 @@ <h2>{% trans 'Internships' %}</h2>
6767

6868
<div class="card card-default">
6969
<div class="card-body">
70-
<ul class="nav nav-tabs">
71-
{% for luy in all_speciality %}
72-
<li class="nav-item">
70+
<nav>
71+
<div class="nav nav-tabs" id="nav-tab" role="tablist">
72+
{% for luy in all_speciality %}
7373
<a class="nav-link
7474
{% if not speciality_sort_value %}
7575
{% if active_tab|add:"0" == luy.id %}
7676
active
7777
{% endif %}
78-
{%endif%}" href="{% url 'internships' cohort_id=cohort.id specialty_id=luy.id %}">
78+
{%endif%}"
79+
href="{% url 'internships' cohort_id=cohort.id specialty_id=luy.id %}">
7980
{{luy.name}}
8081
</a>
81-
</li>
82-
{% endfor %}
83-
<li class="nav-item">
84-
<a class="nav-link {%if speciality_sort_value%}active{%endif%}"
85-
data-bs-toggle="tab" href="#tab_choice">{% trans 'Internship choice' %}</a>
86-
</li>
87-
</ul>
82+
{% endfor %}
83+
<a class="nav-link {% if speciality_sort_value %} active {% endif %}"
84+
href="{% url 'internships' cohort_id=cohort.id %}?speciality_sort=1">
85+
{% trans 'Internship choice' %}
86+
</a>
87+
</div>
88+
</nav>
8889
{% csrf_token %}
89-
<div class="tab-content">
90+
<div class="tab-content" id="nav-tabContent">
9091
{% for luy in all_speciality %}
91-
<div id="tab_{{luy.tab}}" class="tab-pane fade
92+
<div id="tab_{{luy.tab}}" role="tabpanel" class="tab-pane fade
9293
{% if not speciality_sort_value %}
9394
{% if active_tab|add:"0" == luy.id %}
9495
show active
9596
{% endif %}
9697
{%endif%}">
9798
<h3>{{luy.name}}</h3>
9899
<div class="card card-default">
99-
<div class="tab-content">
100-
<div role="tabpanel" class="tab-pane fade show active" id="profile">
101-
<table class="table table-hover">
102-
<thead>
103-
<tr>
104-
<th align="center">{% trans 'Hospital' %}</th>
105-
<th align="center">{% trans 'Maximum number of students' %}</th>
106-
<th align="center">{% trans 'Number of first choices' %}</th>
107-
<th align="center">{% trans 'Number of other choices' %}</th>
108-
<th align="center">{% trans 'Details' %}</th>
109-
</tr>
110-
</thead>
111-
<tbody>
112-
{% for internship in all_internships %}
113-
{% if internship.speciality == luy %}
114-
<tr>
115-
<td>
116-
{{ internship.organization.reference }} - {{ internship.organization }}
117-
</td>
118-
<td align="center">
119-
{{ internship.maximum_enrollments }}
120-
</td>
121-
<td align="center">
122-
{{ internship.number_first_choice }}
123-
</td>
124-
<td align="center">
125-
{{ internship.number_other_choice }}
126-
</td>
127-
<td align="center">
128-
<a class="btn btn-info" target="_blank" id="lnk_students_choice{{internship.id}}"
129-
href="{% url 'internship_detail_student_choice' cohort_id=cohort.id offer_id=internship.id %}">
130-
<span class="fa fa-search text-white" aria-hidden="true"></span>
131-
</a>
132-
</td>
133-
</tr>
134-
{% endif %}
135-
{% endfor %}
136-
</tbody>
137-
</table>
138-
</div>
100+
<table class="table table-hover">
101+
<thead>
102+
<tr>
103+
<th align="center">{% trans 'Hospital' %}</th>
104+
<th align="center">{% trans 'Maximum number of students' %}</th>
105+
<th align="center">{% trans 'Number of first choices' %}</th>
106+
<th align="center">{% trans 'Number of other choices' %}</th>
107+
<th align="center">{% trans 'Details' %}</th>
108+
</tr>
109+
</thead>
110+
<tbody>
111+
{% for internship in all_internships %}
112+
{% if internship.speciality == luy %}
113+
<tr>
114+
<td>
115+
{{ internship.organization.reference }} - {{ internship.organization }}
116+
</td>
117+
<td align="center">
118+
{{ internship.maximum_enrollments }}
119+
</td>
120+
<td align="center">
121+
{{ internship.number_first_choice }}
122+
</td>
123+
<td align="center">
124+
{{ internship.number_other_choice }}
125+
</td>
126+
<td align="center">
127+
<a class="btn btn-info" target="_blank" id="lnk_students_choice{{internship.id}}"
128+
href="{% url 'internship_detail_student_choice' cohort_id=cohort.id offer_id=internship.id %}">
129+
<span class="fa fa-search text-white" aria-hidden="true"></span>
130+
</a>
131+
</td>
132+
</tr>
133+
{% endif %}
134+
{% endfor %}
135+
</tbody>
136+
</table>
139137
</div>
140-
</div>
141138
</div>
142139
{%endfor%}
143-
<div id="tab_choice" class="tab-pane fade
144-
{% if speciality_sort_value %}
145-
show active
146-
{%endif%}">
140+
<div id="tab_choice" role="tabpanel" class="tab-pane fade
141+
{% if speciality_sort_value %}
142+
show active
143+
{%endif%}">
147144
<div class="card card-default">
148-
<div class="tab-content">
149-
<div role="tabpanel" class="tab-pane fade show active" id="profile">
150145
<table class="table table-hover">
151146
<form action="{% url 'internships' cohort_id=cohort.id %}" method="get" class="form-horizontal">
152-
<div class="input-group" style="padding: 15px;">
153-
<label class="control-label" for="speciality_sort">{% trans 'Internship' %}</label>
147+
<div class="input-group p-3 d-flex justify-content-between align-items-center gap-3">
148+
<label class="control-label m-0" for="speciality_sort">{% trans 'Internship' %}</label>
154149
<select name="speciality_sort" onChange="javascript: this.form.submit();" class="form-select" >
155150
<option value="0">--</option>
156151
<option value="all" {% if speciality_sort_value == "all" %}selected{% endif %}>{% trans 'All internships' %}</option>
@@ -197,7 +192,7 @@ <h3>{{luy.name}}</h3>
197192
<td align="center">
198193
<a class="btn btn-info" target="_blank" id="lnk_students_choice{{internship.id}}"
199194
href="{% url 'internship_detail_student_choice' cohort_id=cohort.id offer_id=internship.id %}">
200-
<span class="fa fa-search" aria-hidden="true">
195+
<span class="fa fa-search text-white" aria-hidden="true">
201196
</span>
202197
</a>
203198
</td>
@@ -206,8 +201,6 @@ <h3>{{luy.name}}</h3>
206201
{% endfor %}
207202
</tbody>
208203
</table>
209-
</div>
210-
</div>
211204
</div>
212205
</div>
213206
</div>

0 commit comments

Comments
 (0)