Skip to content

Commit

Permalink
Merge branch 'release/2.26.0'
Browse files Browse the repository at this point in the history
  • Loading branch information
@jdelasoie
jdelasoie committed Jun 30, 2021
2 parents dd689d5 + e2a819a commit 288c5e9
Show file tree
Hide file tree
Showing 16 changed files with 459 additions and 292 deletions.
3 changes: 3 additions & 0 deletions CHANGELOG.md
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,8 @@
# CHANGELOG

*2.26.0* (2021-06-30)
- Add 'study plan: course' page template #508

*2.25.0* (2021-06-17)
- Dependency overhaul - 0 critical, 6 high vulnerabilities found by `yarn audit` (compared to 361 high and 2 critical)
- No functional changes
Expand Down
2 changes: 1 addition & 1 deletion VERSION
View file
Original file line number Diff line number Diff line change
@@ -1 +1 @@
2.25.0
2.26.0
1 change: 1 addition & 0 deletions assets/components/base.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -49,6 +49,7 @@ const init = () => {
backToTopBtn();
rangeSlider();
restauration();
studyplan();

guide();
anchors();
Expand Down
1 change: 1 addition & 0 deletions assets/components/base.scss
View file
Original file line number Diff line number Diff line change
Expand Up @@ -128,3 +128,4 @@
// pages:
@import 'pages/people-detail/people-detail';
@import 'pages/blog-single/blog-single';
@import 'pages/study-plan-course/study-plan-course';
281 changes: 65 additions & 216 deletions assets/components/content-types/coursebook/coursebook-program.twig
View file
Original file line number Diff line number Diff line change
@@ -1,216 +1,65 @@
<div class="box">
<h3>In the programs</h3>
<ul class="tree noNav">
<li class="open collapsable">
<div class="underline" id="bama_cyclemaster-sv_b"><a href="/studyplan/en/master/bioengineering">Bioengineering,
2018-2019, Master semester 1</a></div>
<ul>
<li><strong>Semester</strong><br>
<div class="img_legende automne">
<div class="little_icon"></div>
</div>&nbsp;Fall
</li>
<li><strong>Exam form</strong><br>
<div class="img_legende winter">
<div class="little_icon"></div>
</div>
&nbsp;Oral
</li>
<li><strong>Credits</strong><br><span class="nbCredits">4</span></li>
<li><strong>Subject examined</strong><br>Sensorimotor neuroprosthetics</li>
<li><strong>Lecture</strong><br>2&nbsp;Hour(s) per week x 14 weeks<br></li>
<li><strong>Exercises</strong><br>2&nbsp;Hour(s) per week x 14 weeks<br></li>
</ul>
</li>
<li>
<div class="underline" id="bama_cyclemaster-sv_b"><a href="/studyplan/en/master/bioengineering">Bioengineering,
2018-2019, Master semester 3</a></div>
<ul>
<li><strong>Semester</strong><br>
<div class="img_legende automne">
<div class="little_icon"></div>
</div>&nbsp;Fall
</li>
<li><strong>Exam form</strong><br>
<div class="img_legende winter">
<div class="little_icon"></div>
</div>
&nbsp;Oral
</li>
<li><strong>Credits</strong><br><span class="nbCredits">4</span></li>
<li><strong>Subject examined</strong><br>Sensorimotor neuroprosthetics</li>
<li><strong>Lecture</strong><br>2&nbsp;Hour(s) per week x 14 weeks<br></li>
<li><strong>Exercises</strong><br>2&nbsp;Hour(s) per week x 14 weeks<br></li>
</ul>
</li>
<li>
<div class="underline" id="bama_cyclemaster-mt_ro"><a href="/studyplan/en/master/robotics">Robotics, 2018-2019,
Master semester 1</a></div>
<ul>
<li><strong>Semester</strong><br>
<div class="img_legende automne">
<div class="little_icon"></div>
</div>&nbsp;Fall
</li>
<li><strong>Exam form</strong><br>
<div class="img_legende winter">
<div class="little_icon"></div>
</div>
&nbsp;Oral
</li>
<li><strong>Credits</strong><br><span class="nbCredits">4</span></li>
<li><strong>Subject examined</strong><br>Sensorimotor neuroprosthetics</li>
<li><strong>Lecture</strong><br>2&nbsp;Hour(s) per week x 14 weeks<br></li>
<li><strong>Exercises</strong><br>2&nbsp;Hour(s) per week x 14 weeks<br></li>
</ul>
</li>
<li>
<div class="underline" id="bama_cyclemaster-sv"><a href="/studyplan/en/master/life-sciences-and-technologies">Life
Sciences and Technologies, 2018-2019, Master semester 1</a></div>
<ul>
<li><strong>Semester</strong><br>
<div class="img_legende automne">
<div class="little_icon"></div>
</div>&nbsp;Fall
</li>
<li><strong>Exam form</strong><br>
<div class="img_legende winter">
<div class="little_icon"></div>
</div>
&nbsp;Oral
</li>
<li><strong>Credits</strong><br><span class="nbCredits">4</span></li>
<li><strong>Subject examined</strong><br>Sensorimotor neuroprosthetics</li>
<li><strong>Lecture</strong><br>2&nbsp;Hour(s) per week x 14 weeks<br></li>
<li><strong>Exercises</strong><br>2&nbsp;Hour(s) per week x 14 weeks<br></li>
</ul>
</li>
<li>
<div class="underline" id="bama_cyclemaster-sv_stv"><a href="/studyplan/en/master/life-sciences-and-technologies-master-program">Life
Sciences and Technologies - master program, 2018-2019, Master semester 1</a></div>
<ul>
<li><strong>Semester</strong><br>
<div class="img_legende automne">
<div class="little_icon"></div>
</div>&nbsp;Fall
</li>
<li><strong>Exam form</strong><br>
<div class="img_legende winter">
<div class="little_icon"></div>
</div>
&nbsp;Oral
</li>
<li><strong>Credits</strong><br><span class="nbCredits">4</span></li>
<li><strong>Subject examined</strong><br>Sensorimotor neuroprosthetics</li>
<li><strong>Lecture</strong><br>2&nbsp;Hour(s) per week x 14 weeks<br></li>
<li><strong>Exercises</strong><br>2&nbsp;Hour(s) per week x 14 weeks<br></li>
</ul>
</li>
<li>
<div class="underline" id="bama_cyclemaster-sv_stv"><a href="/studyplan/en/master/life-sciences-and-technologies-master-program">Life
Sciences and Technologies - master program, 2018-2019, Master semester 3</a></div>
<ul>
<li><strong>Semester</strong><br>
<div class="img_legende automne">
<div class="little_icon"></div>
</div>&nbsp;Fall
</li>
<li><strong>Exam form</strong><br>
<div class="img_legende winter">
<div class="little_icon"></div>
</div>
&nbsp;Oral
</li>
<li><strong>Credits</strong><br><span class="nbCredits">4</span></li>
<li><strong>Subject examined</strong><br>Sensorimotor neuroprosthetics</li>
<li><strong>Lecture</strong><br>2&nbsp;Hour(s) per week x 14 weeks<br></li>
<li><strong>Exercises</strong><br>2&nbsp;Hour(s) per week x 14 weeks<br></li>
</ul>
</li>
<li>
<div class="underline" id="min-min_neupro"><a href="/studyplan/en/minor/neuroprosthetics">Neuroprosthetics minor,
2018-2019, Autumn semester</a></div>
<ul>
<li><strong>Semester</strong><br>
<div class="img_legende automne">
<div class="little_icon"></div>
</div>&nbsp;Fall
</li>
<li><strong>Exam form</strong><br>
<div class="img_legende winter">
<div class="little_icon"></div>
</div>
&nbsp;Oral
</li>
<li><strong>Credits</strong><br><span class="nbCredits">4</span></li>
<li><strong>Subject examined</strong><br>Sensorimotor neuroprosthetics</li>
<li><strong>Lecture</strong><br>2&nbsp;Hour(s) per week x 14 weeks<br></li>
<li><strong>Exercises</strong><br>2&nbsp;Hour(s) per week x 14 weeks<br></li>
</ul>
</li>
<li>
<div class="underline" id="min-min_neur_comp"><a href="/studyplan/en/minor/computational-neurosciences">Computational
Neurosciences minor, 2018-2019, Autumn semester</a></div>
<ul>
<li><strong>Semester</strong><br>
<div class="img_legende automne">
<div class="little_icon"></div>
</div>&nbsp;Fall
</li>
<li><strong>Exam form</strong><br>
<div class="img_legende winter">
<div class="little_icon"></div>
</div>
&nbsp;Oral
</li>
<li><strong>Credits</strong><br><span class="nbCredits">4</span></li>
<li><strong>Subject examined</strong><br>Sensorimotor neuroprosthetics</li>
<li><strong>Lecture</strong><br>2&nbsp;Hour(s) per week x 14 weeks<br></li>
<li><strong>Exercises</strong><br>2&nbsp;Hour(s) per week x 14 weeks<br></li>
</ul>
</li>
<li>
<div class="underline" id="min-min_biomed"><a href="/studyplan/en/minor/biomedical-technologies">Biomedical
technologies minor, 2018-2019, Autumn semester</a></div>
<ul>
<li><strong>Semester</strong><br>
<div class="img_legende automne">
<div class="little_icon"></div>
</div>&nbsp;Fall
</li>
<li><strong>Exam form</strong><br>
<div class="img_legende winter">
<div class="little_icon"></div>
</div>
&nbsp;Oral
</li>
<li><strong>Credits</strong><br><span class="nbCredits">4</span></li>
<li><strong>Subject examined</strong><br>Sensorimotor neuroprosthetics</li>
<li><strong>Lecture</strong><br>2&nbsp;Hour(s) per week x 14 weeks<br></li>
<li><strong>Exercises</strong><br>2&nbsp;Hour(s) per week x 14 weeks<br></li>
</ul>
</li>
<li>
<div class="underline" id="edoc-edne"><a href="/studyplan/en/doctoral_school/neuroscience">Neuroscience (edoc),
2018-2019</a></div>
<ul>
<li><strong>Semester</strong><br>
<div class="img_legende automne">
<div class="little_icon"></div>
</div>&nbsp;Fall
</li>
<li><strong>Exam form</strong><br>
<div class="img_legende winter">
<div class="little_icon"></div>
</div>
&nbsp;Oral
</li>
<li><strong>Credits</strong><br><span class="nbCredits">4</span></li>
<li><strong>Subject examined</strong><br>Sensorimotor neuroprosthetics</li>
<li><strong>Lecture</strong><br>2&nbsp;Hour(s) per week x 14 weeks<br></li>
<li><strong>Exercises</strong><br>2&nbsp;Hour(s) per week x 14 weeks<br></li>
</ul>
</li>
</ul>
<div style="clear: both;"></div>
</div>
<button
class="collapse-title collapse-title-desktop"
type="button"
data-toggle="collapse"
data-target="#study-plan-1"
aria-expanded="true"
aria-controls="study-plan-1"
>
Architecture<br>
<span class="d-block font-weight-normal">2020-2021, Bachelor semestre 6</span>
</button>

<div class="collapse collapse-item show collapse-item-desktop" id="study-plan-1">
<ul class="list-bullet">
<li><strong>Semestre:</strong> Printemps</li>
<li><strong>Examen:</strong> Oral (session d’été)</li>
<li><strong>Matière examinée:</strong> Art et Architecture</li>
<li><strong>Cours:</strong> 2 heures hebdo x 14 semaines</li>
<li><strong>Projet:</strong> 4 heures hebdo x 14 semaines</li>
</ul>
</div>

<button
class="collapse-title collapse-title-desktop collapsed"
type="button"
data-toggle="collapse"
data-target="#study-plan-2"
aria-expanded="false"
aria-controls="study-plan-2"
>
Architecture<br>
<span class="d-block font-weight-normal">2020-2021, Bachelor semestre 6b</span>
</button>

<div class="collapse collapse-item collapse-item-desktop" id="study-plan-2">
<ul class="list-bullet">
<li><strong>Semestre:</strong> Printemps</li>
<li><strong>Examen:</strong> Oral (session d’été)</li>
<li><strong>Matière examinée:</strong> Art et Architecture</li>
<li><strong>Cours:</strong> 2 heures hebdo x 14 semaines</li>
<li><strong>Projet:</strong> 4 heures hebdo x 14 semaines</li>
</ul>
</div>

<button
class="collapse-title collapse-title-desktop collapsed"
type="button"
data-toggle="collapse"
data-target="#study-plan-3"
aria-expanded="false"
aria-controls="study-plan-3"
>
Lorem ipsum dolor sit amet<br>
<span class="d-block font-weight-normal">2020-2021, Semestre automne</span>
</button>

<div class="collapse collapse-item collapse-item-desktop" id="study-plan-3">
<ul class="list-bullet">
<li><strong>Semestre:</strong> Printemps</li>
<li><strong>Examen:</strong> Oral (session d’été)</li>
<li><strong>Matière examinée:</strong> Art et Architecture</li>
<li><strong>Cours:</strong> 2 heures hebdo x 14 semaines</li>
<li><strong>Projet:</strong> 4 heures hebdo x 14 semaines</li>
</ul>
</div>
Loading

0 comments on commit 288c5e9

Please sign in to comment.